Changeset 3148

Timestamp:

03/05/10 12:05:44 (2 years ago)

Author:

mathieu.leclaire

Message:

Refactor TaskCapsule and TaskComposite creation calls

Location:

trunk/simexplorer-ide/simexplorer-ide-ant/org.openmole.ui/src/org/openmole/ui/workflow/implementation

Files:

• MoleScene.java (modified) (6 diffs)
• MoleSceneFactory.java (modified) (3 diffs)

trunk/simexplorer-ide/simexplorer-ide-ant/org.openmole.ui/src/org/openmole/ui/workflow/implementation/MoleScene.java

@@ -7 +7 @@
 import java.awt.Dimension;
 import javax.swing.JComponent;
+import org.netbeans.api.visual.anchor.AnchorFactory;
+import org.netbeans.api.visual.anchor.AnchorShape;
+import org.netbeans.api.visual.anchor.PointShape;
 import org.netbeans.api.visual.graph.GraphScene;
 import org.netbeans.api.visual.graph.layout.GraphLayout;
@@ -12 +15 @@
 import org.netbeans.api.visual.layout.LayoutFactory;
 import org.netbeans.api.visual.layout.SceneLayout;
+import org.netbeans.api.visual.widget.ConnectionWidget;
 import org.netbeans.api.visual.widget.LayerWidget;
 import org.netbeans.api.visual.widget.Widget;
@@ -28 +32 @@
 public class MoleScene extends GraphScene.StringGraph implements IMoleScene {
 
-    private LayerWidget mainLayer;
+    private LayerWidget mainLayer = new LayerWidget(this);
+    private LayerWidget connectLayer = new LayerWidget(this);
     private IObjectViewUI obUI = null;
     private JComponent view;
@@ -34 +39 @@
     public MoleScene() {
         super();
-        mainLayer = new LayerWidget(this);
         addChild(mainLayer);
 
-        setPreferredSize(new Dimension((int)(ApplicationCustomize.SCREEN_WIDTH*0.8),(int)(ApplicationCustomize.SCREEN_HEIGHT*0.8)));
+        setPreferredSize(new Dimension((int) (ApplicationCustomize.SCREEN_WIDTH * 0.8), (int) (ApplicationCustomize.SCREEN_HEIGHT * 0.8)));
         view = createView();
 
@@ -46 +50 @@
         return view;
     }
-    public IObjectViewUI createXXTask(IGenericTaskCapsule obj,
-            String n,
-            boolean composite) throws InternalProcessingError {
-        if (composite) {
-           obUI = new TaskCompositeViewUI(this,
-                                          (ITaskModelUI) UIFactory.getInstance().create(obj.getAssignedTask()),
-                                          n);
-          // obUI = new TaskViewUI(this, (ITaskModelUI) UIFactory.getInstance().create(obj.getAssignedTask()), n);
-            addNode(n);
-        } else {
-            obUI = new TaskCapsuleViewUI(this);
-            addNode(n);
-        }
-        return obUI;
+
+    public void createTaskComposite(IGenericTaskCapsule obj,
+                                    String n) throws InternalProcessingError {
+        obUI = new TaskCompositeViewUI(this,
+                (ITaskModelUI) UIFactory.getInstance().create(obj.getAssignedTask()),
+                n);
+        addNode(n);
+    }
+
+    public void createTaskCapsule(String n) {
+        obUI = new TaskCapsuleViewUI(this);
+        addNode(n);
+    }
+
+    void createEdge(String edgeID, String sourceNodeID, String targetNodeID) {
+        System.out.println("EDGE: " + edgeID + ", " + sourceNodeID + "," + targetNodeID);
+        System.out.println("contains " + getEdges().contains(edgeID));
+        addEdge(edgeID);
+        setEdgeSource(edgeID, sourceNodeID);
+        setEdgeTarget(edgeID, targetNodeID);
     }
 
@@ -75 +85 @@
     @Override
     protected Widget attachEdgeWidget(String e) {
-        throw new UnsupportedOperationException("Not supported yet.");
+        ConnectionWidget connection = new ConnectionWidget(this);
+        connection.setTargetAnchorShape(AnchorShape.TRIANGLE_FILLED);
+        connection.setEndPointShape(PointShape.SQUARE_FILLED_BIG);
+        connection.getActions().addAction(createObjectHoverAction());
+        connection.getActions().addAction(createSelectAction());
+        // connection.getActions ().addAction (reconnectAction);
+        connectLayer.addChild(connection);
+        return connection;
     }
 
     @Override
-    protected void attachEdgeSourceAnchor(String e, String n, String n1) {
-        throw new UnsupportedOperationException("Not supported yet.");
+    protected void attachEdgeSourceAnchor(String edge, String oldSourceNode, String sourceNode) {
+        Widget w = sourceNode != null ? findWidget(sourceNode) : null;
+        ((ConnectionWidget) findWidget(edge)).setSourceAnchor(AnchorFactory.createRectangularAnchor(w));
     }
 
     @Override
-    protected void attachEdgeTargetAnchor(String e, String n, String n1) {
-        throw new UnsupportedOperationException("Not supported yet.");
+    protected void attachEdgeTargetAnchor(String edge, String oldTargetNode, String targetNode) {
+        Widget w = targetNode != null ? findWidget(targetNode) : null;
+        ((ConnectionWidget) findWidget(edge)).setTargetAnchor(AnchorFactory.createRectangularAnchor(w));
     }
 

trunk/simexplorer-ide/simexplorer-ide-ant/org.openmole.ui/src/org/openmole/ui/workflow/implementation/MoleSceneFactory.java

@@ -20 +20 @@
 public class MoleSceneFactory {
 
+
+/*
+    public static MoleScene buildStubMoleScene(){
+        for(int i=0;i<20;++i){
+            obUI = new TaskCompositeViewUI(this,
+                                          (ITaskModelUI) UIFactory.getInstance().create(obj.getAssignedTask()),
+                                          n);
+          // obUI = new TaskViewUI(this, (ITaskModelUI) UIFactory.getInstance().create(obj.getAssignedTask()), n);
+            addNode(n);
+
+        }
+    }*/
+
+
     public static MoleScene buildMoleScene(IMole mole) throws InternalProcessingError, UserBadDataError {
         final MoleScene scene = new MoleScene();
@@ -32 +46 @@
             public void action(IGenericTaskCapsule visited) throws InternalProcessingError {
                 //Random generator = new Random();
+                String nodeID;
                 Iterator<ITransitionSlot> itG = visited.getIntputTransitionsGroups().iterator();
                 while (itG.hasNext()) {
-                    buildXXTasks(scene, visited);
+                    nodeID = buildXXTasks(scene, visited);
                     Iterator<ITransition<?, ?>> itT = itG.next().getTransitions().iterator();
+                    int i = 0;
                     while (itT.hasNext()) {
                         ITransition<?, ?> transition = itT.next();
-                        buildXXTasks(scene, transition.getEnd());
+                        nodeID = buildXXTasks(scene, transition.getEnd());
+                         
+                   //     String edgeID = String.valueOf(i);
+                  //      String startNodeId = String.valueOf(transition.getStart().toString());
+                   //     scene.createEdge(edgeID, startNodeId, nodeID);
+
+                        i++;
 
                         /*  String startNodeId = " node" + String.valueOf(transition.getEnd().getTask().getName());
@@ -59 +81 @@
     }
 
-    public static void buildXXTasks(MoleScene scene,
-            IGenericTaskCapsule tCapsule) throws InternalProcessingError {
+    public static String buildXXTasks(MoleScene scene,
+                                    IGenericTaskCapsule tCapsule) throws InternalProcessingError {
+        String nodeID;
         if (tCapsule.getTask() != null) {
-            String nodeID = String.valueOf(tCapsule.getTask().getName());
+            nodeID = String.valueOf(tCapsule.getTask().getName());
             if (!scene.getNodes().contains(nodeID)) {
-                scene.createXXTask(tCapsule, nodeID, true);
+                scene.createTaskComposite(tCapsule, nodeID);
             }
         } else {
-            String nodeID = tCapsule.toString();
+            nodeID = tCapsule.toString();
             if (!scene.getNodes().contains(nodeID)) {
-                scene.createXXTask(tCapsule,nodeID,false);
+                scene.createTaskCapsule(nodeID);
             }
         }
+        return nodeID;
     }
 }