some minor changes - switch back to the icons folder in order for the ucc to...

some minor changes - switch back to the icons folder in order for the ucc to work properly in the runner

ucc/ucc.core/src/main/java/org/universAAL/ucc/core/information/Information.java

 package org.universAAL.ucc.core.information;
 
+import java.io.File;
 import java.util.ArrayList;
 
 import org.osgi.framework.Bundle;
@@ -16,21 +17,21 @@ public class Information implements IInformation {
 	public Information(BundleContext context) {
 		this.context = context;
 		String bundlePath = context.getBundle().getLocation();
-		System.out.println(bundlePath);
 	
 		if(countOccurrences(bundlePath)==2){
 			rundir= bundlePath.substring(bundlePath.indexOf(":")+2, bundlePath.lastIndexOf("/"));
 			bundledir=rundir;
 			rundir= rundir.substring(0, rundir.lastIndexOf("/"));
 			rundir= rundir.substring(0, rundir.lastIndexOf("/")+1);
-			System.out.println(rundir);
 	
 		}else{
 			/*rundir= bundlePath.substring(bundlePath.indexOf(":")+1, bundlePath.lastIndexOf("/")+1);
 			System.out.println(rundir);*/
+	
 			rundir="";
 			bundledir="bundles/";
 		}
+		
 	}
 
 	public String[] activeBundles() {

ucc/ucc.model/src/main/java/org/universAAL/ucc/model/ApplicationRegistration.java

@@ -2,9 +2,12 @@ package org.universAAL.ucc.model;
 
 import java.io.BufferedWriter;
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.FileWriter;
 import java.util.Iterator;
 import java.util.Map;
+import java.util.Scanner;
 import java.util.Set;
 import java.util.Map.Entry;
 
@@ -116,9 +119,8 @@ public class ApplicationRegistration implements IApplicationRegistration {
 	}
 	
 	public boolean writeToConfigFile(String appName, String rundir){
-		if(appName.equals("TTA")){
+		if(appName.equals("TTA"))
 			return writeTTA(appName, rundir);
-		}
 		if(appName.equals("Infoframe"))
 			return writeInfoFrame(appName);
 		if(appName.equals("Nutritional Advisor"))
@@ -165,8 +167,9 @@ public class ApplicationRegistration implements IApplicationRegistration {
 		Map<String,String> attributes=Activator.getModel().getApplicationManagment().getConfiguration(appName);
 		Set<String> keys=attributes.keySet();
 		Iterator<String> itr=keys.iterator();
-		new File(rundir+"/configurations/nutritional.uiclient/NutritionalAdvisor").mkdirs();
-		File conf= new File(rundir+"/configurations/nutritional.uiclient/NutritionalAdvisor/setup.properties");
+		new File("configurations/nutritional.uiclient/NutritionalAdvisor").mkdirs();
+		File conf= new File("configurations/nutritional.uiclient/NutritionalAdvisor/setup.properties");	
+
 		
 		
 		try{
@@ -202,10 +205,41 @@ public class ApplicationRegistration implements IApplicationRegistration {
 		}catch (Exception e){//Catch exception if any
 			  System.err.println("Error: " + e.getMessage());
 			  }
+//		writeMenuEntries();
 		return true;
 		
 	}
 	
+//	private void writeMenuEntries(){
+//		File menu[]= new File[3];
+//		menu[0] = new File("configurations/ui.dm.mobile/main_menu_saied_en.txt");
+//		menu[1] = new File("configurations/ui.dm.mobile/main_menu_saied_es.txt");
+//		menu[2] = new File("configurations/ui.dm.mobile/main_menu_saied_hr.txt");
+//		for(File m : menu){
+//			if(m.exists()){
+//				 FileInputStream fis=null;
+//					try {
+//						fis=new FileInputStream(m);
+//					} catch (FileNotFoundException e) {
+//							break;
+//					}
+//					Scanner scanner = new Scanner(fis, "UTF-8");
+//				
+//				    try {
+//				      while (scanner.hasNextLine()){
+//				        String current=scanner.nextLine();
+//				        if(current.equals("")){
+//				        	scanner.
+//				        }
+//				      }
+//				    }
+//				    finally{
+//				      scanner.close();
+//				    }
+//			}
+//		}
+//	}
+	
 	private boolean writeTTA(String appName, String rundir){
 		String path=getConfPath(rundir);
 		if(!new File(path+appName).mkdirs())

ucc/ucc.viewjambi/src/main/java/org/universAAL/ucc/viewjambi/overview/LabeledIcon.java

@@ -33,13 +33,18 @@ public class LabeledIcon extends QAbstractButton{
 //		label.setAlignment(com.trolltech.qt.core.Qt.AlignmentFlag.createQFlags(com.trolltech.qt.core.Qt.AlignmentFlag.AlignCenter));
 		//String test=Activator.getContext().getBundle().getLocation();
 		//if(test.startsWith("file"))
-			//image.setPixmap(new QPixmap(Activator.getInformation().getRunDir()+"icons/"+icon));
-		java.net.URL imgURL = (Activator.class.getClassLoader().getResource("/icon/"+icon));
-		if (imgURL!=null) {
-			String jarPath = "classpath:"
-				+ Activator.getContext().getBundle().getLocation().substring(6)
-				+ "#icon/" + icon;
-			image.setPixmap(new QPixmap(jarPath));
+			image.setPixmap(new QPixmap(Activator.getInformation().getRunDir()+"icons/"+icon));
+		
+		//This does not work with the runner
+//		java.net.URL imgURL = (Activator.class.getClassLoader().getResource("/icons/"+icon));
+//		if (imgURL!=null) {
+//			String jarPath = "classpath:"
+//				+ Activator.getContext().getBundle().getLocation().substring(6)
+//				+ "#icon/" + icon;
+			
+			
+			
+//			image.setPixmap(new QPixmap(jarPath));
 			//else
 				//image.setPixmap(new QPixmap(jarPath+"#icon\\"+icon));
 	//    	image.setAlignment(com.trolltech.qt.core.Qt.AlignmentFlag.createQFlags(com.trolltech.qt.core.Qt.AlignmentFlag.AlignCenter));
@@ -47,9 +52,9 @@ public class LabeledIcon extends QAbstractButton{
 			image.setMinimumSize(new QSize(48,48));
 	    	image.setMaximumSize(new QSize(48,48));
 	    	layout.insertWidget(0, image);
-		}
-		else
-			System.err.println("Icon " + icon + " not found!");
+//		}
+//		else
+//			System.err.println("Icon " + icon + " not found!");
     	label.setMinimumSize(new QSize(70, 30));
     	label.setMaximumSize(new QSize(70, 30));