Changeset 3142 for trunk/simexplorer-ide/simexplorer-ide-ant/org.openmole.ui/src/org/openmole/ui/workflow/implementation/TaskXXFactory.java

Timestamp:

03/04/10 12:19:02 (2 years ago)

Author:

mathieu.leclaire

Message:

Task selection and preference class implementation.

Files:

• trunk/simexplorer-ide/simexplorer-ide-ant/org.openmole.ui/src/org/openmole/ui/workflow/implementation/TaskXXFactory.java (modified) (14 diffs)

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

@@ -1 +1 @@
 package org.openmole.ui.workflow.implementation;
 
+import java.awt.Color;
+import org.openmole.ui.workflow.implementation.paint.ContainerUI;
 import java.awt.Image;
 import java.awt.Rectangle;
+import javax.swing.BorderFactory;
 import org.netbeans.api.visual.layout.LayoutFactory;
 import org.netbeans.api.visual.model.StateModel;
@@ -10 +13 @@
 import org.openmole.ui.workflow.implementation.paint.IOType;
 import org.openmole.ui.commons.ApplicationCustomize;
+import org.openmole.ui.workflow.implementation.paint.PainterWidget;
 import org.openmole.ui.workflow.model.ITaskCapsuleModelUI;
 
@@ -29 +33 @@
 
 
-        ApplicationCustomize colorCutomize = ApplicationCustomize.getInstance(null);
+        ApplicationCustomize colorCutomize = ApplicationCustomize.getInstance();
 
         Widget selfContainer = BorderedWidgetFactory.getInstance().getBorderedWidget(scene,
@@ -69 +73 @@
 
     public static void addOutputSlotToSlotWidget(Widget wi,
-                                    MoleScene scene,
-                                    ITaskCapsuleModelUI model) {
+            MoleScene scene,
+            ITaskCapsuleModelUI model) {
         wi.addChild(new SlotWidget(scene,
-                        IOType.OUTPUT,
-                        model));
+                IOType.OUTPUT,
+                model));
 
         model.addOutputSlot();
     }
 
-     public static void addInputSlotToSlotWidget(Widget wi,
-                                    MoleScene scene,
-                                    ITaskCapsuleModelUI model) {
+    public static void addInputSlotToSlotWidget(Widget wi,
+            MoleScene scene,
+            ITaskCapsuleModelUI model) {
         wi.addChild(new SlotWidget(scene,
-                        IOType.INPUT,
-                        model));
+                IOType.INPUT,
+                model));
 
         model.addInputSlot();
@@ -99 +103 @@
             IOType type,
             Widget container) {
-        ApplicationCustomize colorCutomize = ApplicationCustomize.getInstance(null);
-        Rectangle labBounds = new Rectangle(0, 0, ApplicationCustomize.TASK_CONTAINER_WIDTH / 3, ApplicationCustomize.TASK_TITLE_HEIGHT);
+        ApplicationCustomize colorCutomize = ApplicationCustomize.getInstance();
+        Rectangle labBounds = new Rectangle(0, 0, ApplicationCustomize.TASK_CONTAINER_WIDTH / 3 - 2, ApplicationCustomize.TASK_TITLE_HEIGHT - 2);
         Image img = (type == IOType.INPUT ? ApplicationCustomize.IMAGE_INPUT_ARROW : ApplicationCustomize.IMAGE_OUTPUT_ARROW);
 
@@ -107 +111 @@
         ExpandControler controlerWidget = new ExpandControler(scene,
                 stateModel,
-                labBounds,
                 img,
                 img);
@@ -121 +124 @@
         labelContainer.setLayout(LayoutFactory.createVerticalFlowLayout());
         labelContainer.addWidget(controlerWidget, 0);
-        labelContainer.setBounds(labBounds);
-
+        // labelContainer.setBounds(labBounds);
+        //  labelContainer.setBorder(BorderFactory.createLineBorder(Color.blue));
         return labelContainer;
     }
@@ -133 +136 @@
         ExpandControler titleControlerWidget = new ExpandControler(scene,
                 titleStateModel,
-                titleBounds,
                 ApplicationCustomize.IMAGE_EXPAND,
                 ApplicationCustomize.IMAGE_COLLAPSE,
@@ -141 +143 @@
         ExpandableContainerUI titleContainer = new ExpandableContainerUI(scene,
                 titleBounds,
-                ApplicationCustomize.getInstance(null).getColor(ApplicationCustomize.TASK_HEADER_BACKGROUND_COLOR),
-                ApplicationCustomize.getInstance(null).getColor(ApplicationCustomize.TASK_HEADER_BACKGROUND_COLOR),
+                ApplicationCustomize.getInstance().getColor(ApplicationCustomize.TASK_HEADER_BACKGROUND_COLOR),
+                ApplicationCustomize.getInstance().getColor(ApplicationCustomize.TASK_HEADER_BACKGROUND_COLOR),
                 titleControlerWidget,
                 titleStateModel,
@@ -159 +161 @@
             ExpandableContainerUI outputLabelContainer) {
 
-        ApplicationCustomize colorCutomize = ApplicationCustomize.getInstance(null);
-        Rectangle labBounds = new Rectangle(0, 0, ApplicationCustomize.TASK_CONTAINER_WIDTH / 3, ApplicationCustomize.TASK_TITLE_HEIGHT);
+        ApplicationCustomize colorCutomize = ApplicationCustomize.getInstance();
+        Rectangle labBounds = new Rectangle(0, 0, ApplicationCustomize.TASK_CONTAINER_WIDTH / 3 - 2, ApplicationCustomize.TASK_TITLE_HEIGHT - 2);
         Rectangle titleBounds = new Rectangle(0, 0, ApplicationCustomize.TASK_TITLE_WIDTH, ApplicationCustomize.TASK_TITLE_HEIGHT);
 
@@ -180 +182 @@
 
     public static Widget getTaskView(MoleScene scene,
-                                     IOParameterWidget inputParameterContainer,
-                                     IOParameterWidget outputParameterContainer,
-                                     String name){
-     ExpandableContainerUI inputLabelContainer;
-     ExpandableContainerUI outputLabelContainer;
-     ExpandableContainerUI titleContainer;
-    ApplicationCustomize colorCutomize = ApplicationCustomize.getInstance(null);
+            IOParameterWidget inputParameterContainer,
+            IOParameterWidget outputParameterContainer,
+            PainterWidget selfContainer,
+            String name) {
+        ExpandableContainerUI inputLabelContainer;
+        ExpandableContainerUI outputLabelContainer;
+        ExpandableContainerUI titleContainer;
+        ApplicationCustomize colorCutomize = ApplicationCustomize.getInstance();
 
         inputLabelContainer = TaskXXFactory.buildIOControler(scene,
@@ -197 +200 @@
                 inputLabelContainer,
                 outputLabelContainer);
-
-        Rectangle taskBounds = new Rectangle(ApplicationCustomize.TASK_INPUT_WIDTH, 0, ApplicationCustomize.TASK_CONTAINER_WIDTH, ApplicationCustomize.TASK_CONTAINER_HEIGHT);
-        Rectangle capsuleBounds = new Rectangle(0,
-                0,
-                ApplicationCustomize.TASK_CONTAINER_WIDTH,
-                ApplicationCustomize.TASK_CONTAINER_HEIGHT + ApplicationCustomize.TASK_TITLE_HEIGHT);
-
-        ContainerUI taskContainer = new ContainerUI(scene,
-                taskBounds,
-                colorCutomize.getColor(ApplicationCustomize.TRANSPARENT_COLOR),
-                colorCutomize.getColor(ApplicationCustomize.TRANSPARENT_COLOR));
-
-        Widget selfContainer = BorderedWidgetFactory.getInstance().getBorderedWidget(scene,
-                capsuleBounds,
-                colorCutomize.getColor(ApplicationCustomize.TASK_BACKGROUND_COLOR),
-                colorCutomize.getColor(ApplicationCustomize.TASK_BORDER_COLOR),
-                false);
+        Rectangle taskBounds = new Rectangle(0, 0, ApplicationCustomize.TASK_CONTAINER_WIDTH, ApplicationCustomize.TASK_CONTAINER_HEIGHT);
+
+        Widget emptyWi = new Widget(scene);
+        emptyWi.setPreferredBounds(taskBounds);
 
         selfContainer.setLayout(LayoutFactory.createVerticalFlowLayout());
-        selfContainer.addChild(taskContainer);
+        selfContainer.addChild(emptyWi);
         selfContainer.addChild(IOContainer);
 
@@ -224 +214 @@
                 outputParameterContainer.getContainer());
         titleContainer.setName(name);
-        
+
         Widget midWidget = new Widget(scene);
         midWidget.setLayout(LayoutFactory.createVerticalFlowLayout());
@@ -237 +227 @@
         taskWidget.addChild(outputParameterContainer);
         return taskWidget;
-}
-
-
+    }
+
+
+    public static  PainterWidget getSelfContainer(MoleScene scene) {
+        ApplicationCustomize colorCutomize = ApplicationCustomize.getInstance();
+        Rectangle capsuleBounds = new Rectangle(0,
+                0,
+                ApplicationCustomize.TASK_CONTAINER_WIDTH,
+                ApplicationCustomize.TASK_CONTAINER_HEIGHT + ApplicationCustomize.TASK_TITLE_HEIGHT);
+
+        return BorderedWidgetFactory.getInstance().getBorderedWidget(scene,
+                capsuleBounds,
+                colorCutomize.getColor(ApplicationCustomize.TASK_BACKGROUND_COLOR),
+                colorCutomize.getColor(ApplicationCustomize.TASK_BORDER_COLOR),
+                false);
+
+    }
 
     public static TaskXXFactory getInstance() {