Changeset 3158

Timestamp:

03/05/10 21:13:05 (2 years ago)

Author:

romain.reuillon

Message:

 

Location:

trunk/openmole

Files:

• runtime/org.openmole.runtime/src/main/java/org/openmole/runtime/internal/Activator.java (modified) (3 diffs)
• ui/org.openmole.ui.console (modified) (1 prop)
• ui/org.openmole.ui.console/src/main/java/org/openmole/ui/console/internal/Activator.java (modified) (3 diffs)

trunk/openmole/runtime/org.openmole.runtime/src/main/java/org/openmole/runtime/internal/Activator.java

@@ -11 +11 @@
 import org.openmole.core.execution.runtimemessageserializer.IEnvironmentDescriptionSerializer;
 import org.openmole.core.execution.runtimemessageserializer.IRuntimeMessageSerializer;
-import org.openmole.misc.backgroundexecutor.ITransferMonitor;
+import org.openmole.misc.backgroundexecutor.IBackgroundExecutor;
 import org.openmole.misc.workspace.IWorkspace;
 
@@ -22 +22 @@
     private static IEnvironmentDescriptionSerializer environmentDescriptionSerializer;
     private static IJSagaSessionService jSagaSessionService;
-    private static ITransferMonitor transferMonitor;
+    private static IBackgroundExecutor backgroundExecutor;
     private static IEventDispatcher eventDispatcher;
     private static IPluginManager pluginManager;
@@ -88 +88 @@
     }
 
-    public static ITransferMonitor getTransferMonitor() {
-        if (transferMonitor != null) {
-            return transferMonitor;
+    public static IBackgroundExecutor getBackgroundExecutor() {
+        if (backgroundExecutor != null) {
+            return backgroundExecutor;
         }
 
         synchronized (Activator.class) {
-            if (transferMonitor == null) {
-                ServiceReference ref = getContext().getServiceReference(ITransferMonitor.class.getName());
-                transferMonitor = (ITransferMonitor) getContext().getService(ref);
+            if (backgroundExecutor == null) {
+                ServiceReference ref = getContext().getServiceReference(IBackgroundExecutor.class.getName());
+                backgroundExecutor = (IBackgroundExecutor) getContext().getService(ref);
             }
-            return transferMonitor;
+            return backgroundExecutor;
         }
     }

trunk/openmole/ui/org.openmole.ui.console

@@ -1 +1 @@
 target
+.pom.xml.swp

@@ -1 +1 @@
 target
+.pom.xml.swp

trunk/openmole/ui/org.openmole.ui.console/src/main/java/org/openmole/ui/console/internal/Activator.java

@@ -5 +5 @@
 import org.osgi.framework.ServiceReference;
 import org.openmole.misc.pluginmanager.IPluginManager;
-import org.openmole.misc.backgroundexecutor.ITransferMonitor;
 import org.openmole.misc.workspace.IWorkspace;
 import org.openmole.core.execution.structuregenerator.IStructureGenerator;
@@ -13 +12 @@
     static BundleContext context;
     private static IWorkspace workspace;
-    private static ITransferMonitor transferMonitor;
     private static IPluginManager pluginManager;
     private static IStructureGenerator structureGenerator;
@@ -49 +47 @@
     }
 
-    public static ITransferMonitor getTransferMonitor() {
-        if (transferMonitor != null) {
-            return transferMonitor;
-        }
-
-        synchronized (Activator.class) {
-            if (transferMonitor == null) {
-                ServiceReference ref = getContext().getServiceReference(ITransferMonitor.class.getName());
-                transferMonitor = (ITransferMonitor) getContext().getService(ref);
-            }
-            return transferMonitor;
-        }
-    }
-
     public synchronized static IStructureGenerator getStructureGenerator() {
         if (structureGenerator == null) {

@@ -1 +1 @@
 target
+.pom.xml.swp