From 3db740ec593abe95c79908108c2b56aa4858ee5e Mon Sep 17 00:00:00 2001
From: Alexander Marinc <alexander.marinc@igd.fraunhofer.de>
Date: Tue, 12 Jul 2011 15:26:57 +0000
Subject: [PATCH]
---
ucc/ucc.viewjambi/pom.xml | 6 +-----
.../org/universAAL/ucc/viewjambi/Activator.java | 14 ++++++++++++--
.../org/universAAL/ucc/viewjambi/MainWindow.java | 4 ++--
.../org/universAAL/ucc/viewjambi/SubWindow.java | 2 +-
4 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/ucc/ucc.viewjambi/pom.xml b/ucc/ucc.viewjambi/pom.xml
index fbe397bde..228fc980f 100644
--- a/ucc/ucc.viewjambi/pom.xml
+++ b/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>
diff --git a/ucc/ucc.viewjambi/src/main/java/org/universAAL/ucc/viewjambi/Activator.java b/ucc/ucc.viewjambi/src/main/java/org/universAAL/ucc/viewjambi/Activator.java
index e534218aa..b495ef78e 100644
--- a/ucc/ucc.viewjambi/src/main/java/org/universAAL/ucc/viewjambi/Activator.java
+++ b/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")
diff --git a/ucc/ucc.viewjambi/src/main/java/org/universAAL/ucc/viewjambi/MainWindow.java b/ucc/ucc.viewjambi/src/main/java/org/universAAL/ucc/viewjambi/MainWindow.java
index 7e174a3e7..d1aad32a7 100644
--- a/ucc/ucc.viewjambi/src/main/java/org/universAAL/ucc/viewjambi/MainWindow.java
+++ b/ucc/ucc.viewjambi/src/main/java/org/universAAL/ucc/viewjambi/MainWindow.java
@@ -1,8 +1,8 @@
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.*;
diff --git a/ucc/ucc.viewjambi/src/main/java/org/universAAL/ucc/viewjambi/SubWindow.java b/ucc/ucc.viewjambi/src/main/java/org/universAAL/ucc/viewjambi/SubWindow.java
index 035e861d5..83f161412 100644
--- a/ucc/ucc.viewjambi/src/main/java/org/universAAL/ucc/viewjambi/SubWindow.java
+++ b/ucc/ucc.viewjambi/src/main/java/org/universAAL/ucc/viewjambi/SubWindow.java
@@ -1,6 +1,6 @@
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;
--
GitLab