Changeset 3161

Timestamp:

03/06/10 15:42:39 (2 years ago)

Author:

romain.reuillon

Message:

ui enhancement

Location:

trunk/openmole

Files:

• core/org.openmole.core.workflow.implementation/src/main/java/org/openmole/core/workflow/implementation/mole/execution/MoleExecution.java (modified) (3 diffs)
• core/org.openmole.core.workflow.model/src/main/java/org/openmole/core/workflow/model/mole/execution/IMoleExecution.java (modified) (1 diff)
• misc/org.openmole.misc.tools/src/main/java/org/openmole/misc/tools/structure/Counter.java (modified) (3 diffs)
• ui/org.openmole.ui.console/src/main/java/org/openmole/ui/console/Application.java (modified) (2 diffs)
• ui/org.openmole.ui.console/src/main/java/org/openmole/ui/console/internal/command/Print.java (moved) (moved from trunk/openmole/ui/org.openmole.ui.console/src/main/java/org/openmole/ui/console/internal/command/Echo.java) (2 diffs)
• ui/org.openmole.ui.console/src/main/java/org/openmole/ui/console/internal/viewer/EnvironmentViewer.java (modified) (1 diff)

trunk/openmole/core/org.openmole.core.workflow.implementation/src/main/java/org/openmole/core/workflow/implementation/mole/execution/MoleExecution.java

@@ -17 +17 @@
 package org.openmole.core.workflow.implementation.mole.execution;
 
+import com.db4o.CorruptionException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.LinkedList;
 import java.util.Map;
 import java.util.TreeMap;
@@ -212 +214 @@
         getSubmiter().interrupt();
 
-        for(IMoleJob moleJob : allMoleJobs()) {
+        for(IMoleJob moleJob : getAllMoleJobsInternal()) {
             moleJob.cancel();
         }
@@ -226 +228 @@
     }
 
-    public Iterable<IMoleJob> allMoleJobs() {
+
+    private Iterable<IMoleJob> getAllMoleJobsInternal() {
         return inProgress.keySet();
     }
 
+    @Override
+    public synchronized Iterable<IMoleJob> getAllMoleJobs() {
+        Collection<IMoleJob> ret = new LinkedList<IMoleJob>();
+
+        for(IMoleJob moleJob : getAllMoleJobsInternal()) {
+            ret.add(moleJob);
+        }
+
+        return ret;
+    }
 
     @Override

trunk/openmole/core/org.openmole.core.workflow.model/src/main/java/org/openmole/core/workflow/model/mole/execution/IMoleExecution.java

@@ -59 +59 @@
 
     IExecutionContext getExecutionContext();
+
+    Iterable<IMoleJob> getAllMoleJobs();
 }

trunk/openmole/misc/org.openmole.misc.tools/src/main/java/org/openmole/misc/tools/structure/Counter.java

@@ -22 +22 @@
  * @author Romain Reuillon <romain.reuillon at openmole.org>
  */
-public class Counter {
+public class Counter implements Comparable<Counter> {
 
-    int value;
+    Integer value;
 
     public Counter() {
@@ -42 +42 @@
     }
 
-    public int getValue() {
+    public Integer getValue() {
         return value;
     }
 
-     public void increment(int val) {
+     public void increment(Integer val) {
         value+=val;
     }
@@ -54 +54 @@
     }
 
+    @Override
+    public String toString() {
+        return getValue().toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final Counter other = (Counter) obj;
+        if (this.getValue() != other.getValue() && (this.getValue() == null || !this.getValue().equals(other.getValue()))) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = this.getValue().hashCode();
+        return hash;
+    }
+
+
+
+    public int compareTo(Counter intgr) {
+        return getValue().compareTo(intgr.getValue());
+    }
+
+
+
+
+
 }

trunk/openmole/ui/org.openmole.ui.console/src/main/java/org/openmole/ui/console/Application.java

@@ -9 +9 @@
 import org.openmole.misc.workspace.ForbidenPasswordProvider;
 import org.openmole.ui.console.internal.Activator;
-import org.openmole.ui.console.internal.command.Echo;
+import org.openmole.ui.console.internal.command.Print;
 import org.openmole.ui.console.internal.command.Ppasswd;
 //import org.openmole.core.execution.environmentprovider.glite.GliteEnvironment;
@@ -35 +35 @@
         Groovysh g = new Groovysh(Groovy.class.getClassLoader(), binding, new IO());
 
-        g.leftShift(new Echo(g,"echo", "\\ec"));
-        g.leftShift(new Ppasswd(g,"ppwd", "\\ppwd"));
+        g.leftShift(new Print(g,"print", "\\pr"));
+        g.leftShift(new Ppasswd(g,"ppasswd", "\\pp"));
 
         g.run();

trunk/openmole/ui/org.openmole.ui.console/src/main/java/org/openmole/ui/console/internal/command/Print.java

@@ -22 +22 @@
 import org.codehaus.groovy.tools.shell.Shell;
 import org.openmole.core.workflow.model.execution.IEnvironment;
+import org.openmole.core.workflow.model.mole.execution.IMoleExecution;
 import org.openmole.misc.tools.service.HierarchicalRegistry;
 import org.openmole.ui.console.internal.viewer.EnvironmentViewer;
 import org.openmole.ui.console.internal.viewer.IViewer;
+import org.openmole.ui.console.internal.viewer.MoleExecutionViewer;
 
 /**
@@ -30 +32 @@
  * @author Romain Reuillon <romain.reuillon at openmole.org>
  */
-public class Echo extends CommandSupport {
+public class Print extends CommandSupport {
 
     private HierarchicalRegistry<IViewer> viewers = new HierarchicalRegistry<IViewer>();
 
 
-    public Echo(Shell shell, String string, String string1) {
+    public Print(Shell shell, String string, String string1) {
         super(shell, string, string1);
         viewers.register(IEnvironment.class, new EnvironmentViewer());
+        viewers.register(IMoleExecution.class, new MoleExecutionViewer());
     }
 

trunk/openmole/ui/org.openmole.ui.console/src/main/java/org/openmole/ui/console/internal/viewer/EnvironmentViewer.java

@@ -48 +48 @@
 
         for(ExecutionState state : ExecutionState.values()) {
-            System.out.println(state.getLabel() + ": " + accounting.get(state).getValue());
+            System.out.println(state.getLabel() + ": " + accounting.get(state));
         }