No commit message

No commit message

ucc/ucc.viewjambi/pom.xml

@@ -22,11 +22,6 @@
 			<artifactId>ucc.core</artifactId>
 			<version>0.0.1</version>
 		</dependency>
-		<dependency>
-			<groupId>org.universAAL.ucc</groupId>
-			<artifactId>ucc.viewapi</artifactId>
-			<version>0.0.1</version>
-		</dependency>
 	</dependencies>
     <build>
 		<plugins>
@@ -40,6 +35,7 @@
 						<Bundle-Activator>org.universAAL.ucc.viewjambi.Activator</Bundle-Activator>
 						<Bundle-Description>${project.description}</Bundle-Description>
 						<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+						<Private-Package>org.universAAL.ucc.viewjambi.*</Private-Package>
 						<Include-Resource>
 							lib=lib, {maven-resources}
 						</Include-Resource>				

ucc/ucc.viewjambi/src/main/java/org/universAAL/ucc/viewjambi/Activator.java

@@ -2,24 +2,34 @@ package org.universAAL.ucc.viewjambi;
 
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
+import org.universAAL.ucc.model.api.IModel;
+import org.universAAL.ucc.view.api.IMainWindow;
 
 import com.trolltech.qt.gui.QApplication;
 
 public class Activator implements BundleActivator{
 	public static Thread thread = null;
 	
+	private IMainWindow mainWindow = null;
+	
 	public void start(final BundleContext context) throws Exception {
 		thread = new Thread(new Runnable() {
 			public void run() {
 				QApplication.initialize(new String[0]);
 				
-				MainWindow testMainWindow = new MainWindow(context);
-		        testMainWindow.show();
+				MainWindow newWindow = new MainWindow(context);
+				newWindow.show();
+				
+				mainWindow = newWindow;
 		        
 		        QApplication.exec();
 			}
 		});
 		thread.start();
+		
+		while (mainWindow == null);
+		
+		context.registerService(new String[] { IMainWindow.class.getName() }, mainWindow, null);
 	}
 
 	@SuppressWarnings("deprecation")

ucc/ucc.viewjambi/src/main/java/org/universAAL/ucc/viewjambi/MainWindow.java

 package org.universAAL.ucc.viewjambi;
 
 import org.osgi.framework.BundleContext;
-import org.universAAL.ucc.viewapi.interfaces.IMainWindow;
-import org.universAAL.ucc.viewapi.interfaces.ISubWindow;
+import org.universAAL.ucc.view.api.IMainWindow;
+import org.universAAL.ucc.view.api.ISubWindow;
 import org.universAAL.ucc.viewjambi.install.InstallView;
 
 import com.trolltech.qt.gui.*;

ucc/ucc.viewjambi/src/main/java/org/universAAL/ucc/viewjambi/SubWindow.java

 package org.universAAL.ucc.viewjambi;
 
-import org.universAAL.ucc.viewapi.interfaces.ISubWindow;
+import org.universAAL.ucc.view.api.ISubWindow;
 
 import com.trolltech.qt.gui.QMdiSubWindow;