Changeset 3142

Show
Ignore:
Timestamp:
03/04/10 12:19:02 (2 years ago)
Author:
mathieu.leclaire
Message:

Task selection and preference class implementation.

Location:
trunk/simexplorer-ide/simexplorer-ide-ant/org.openmole.ui/src
Files:
5 added
40 modified
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/simexplorer-ide/simexplorer-ide-ant/org.openmole.ui/src/org/openmole/ui/commons/ApplicationCustomize.java

    r3127 r3142  
    5757    public static final Image IMAGE_OUTPUT_SLOT = ImageUtilities.loadImage("resources/outputSlot.png"); 
    5858 
     59    public ApplicationCustomize() { 
     60        setDefaultColors(); 
     61    } 
    5962 
    60     public ApplicationCustomize(Preferences prefs) { 
    61     loadFromPreferences(prefs); 
    62     } 
    6363 
    6464    private void loadFromPreferences(Preferences prefs) { 
    … …  
    8686    } 
    8787 
    88     public static ApplicationCustomize getInstance(Preferences prefs) { 
     88    public static ApplicationCustomize getInstance() { 
    8989        if (instance == null) { 
    90             instance = new ApplicationCustomize(prefs); 
     90            instance = new ApplicationCustomize(); 
    9191        } 
    9292        return instance; 

  • trunk/simexplorer-ide/simexplorer-ide-ant/org.openmole.ui/src/org/openmole/ui/control/ControlPanel.java

    r3129 r3142  
    66import javax.swing.JSplitPane; 
    77import javax.swing.JTabbedPane; 
     8import org.openmole.ui.workflow.implementation.Preferences; 
    89 
    910/** 
    … …  
    2122        super(new BorderLayout()); 
    2223 
    23         
    24          
    2524        moleTabbedPane = new JTabbedPane(); 
    2625        tableTabbedPane = new JTabbedPane(); 

  • trunk/simexplorer-ide/simexplorer-ide-ant/org.openmole.ui/src/org/openmole/ui/control/GenericTableView.java

    r3137 r3142  
    2121 
    2222        setAutoResizeMode(JTable.AUTO_RESIZE_ALL_COLUMNS); 
    23         getTableHeader().setBackground(ApplicationCustomize.getInstance(null).getColor(ApplicationCustomize.TABLE_HEADER_COLOR)); 
     23        getTableHeader().setBackground(ApplicationCustomize.getInstance().getColor(ApplicationCustomize.TABLE_HEADER_COLOR)); 
    2424    } 
    2525 
    … …  
    3333            int Index_row, 
    3434            int Index_col) { 
    35         Color col = ApplicationCustomize.getInstance(null).getColor(ApplicationCustomize.TABLE_ROW_COLOR); 
     35        Color col = ApplicationCustomize.getInstance().getColor(ApplicationCustomize.TABLE_ROW_COLOR); 
    3636        Component comp = super.prepareRenderer(renderer, Index_row, Index_col); 
    3737        if (Index_row % 2 == 0 && !isCellSelected(Index_row, Index_col)) { 

  • trunk/simexplorer-ide/simexplorer-ide-ant/org.openmole.ui/src/org/openmole/ui/control/TableMapping.java

    r3137 r3142  
    1919    public static final String VALUE = "Value"; 
    2020    public static final String OPTIONAL = "Optional"; 
     21    public static final String FACTOR = "Factor"; 
     22    public static final String BOUND_MIN = "Bound inf"; 
     23    public static final String BOUND_MAX = "Bound sup"; 
    2124     
    2225    private Map<Name, Collection<String>> tableMap = new HashMap(); 
    … …  
    3841        //output parmaters 
    3942        tableMap.put(Name.OUTPUT_PARAMETER, li); 
     43 
     44        //design of experiment 
     45        Collection<String> lidod = new ArrayList<String>(); 
     46        lidod.add(FACTOR); 
     47        lidod.add(BOUND_MIN); 
     48        lidod.add(BOUND_MAX); 
     49        tableMap.put(Name.DESIGN_OF_EXPERIMENT, lidod); 
     50 
    4051    } 
    4152 

  • trunk/simexplorer-ide/simexplorer-ide-ant/org.openmole.ui/src/org/openmole/ui/control/TableType.java

    r3130 r3142  
    99    public enum Name { 
    1010        INPUT_PARAMETER, 
    11         OUTPUT_PARAMETER 
     11        OUTPUT_PARAMETER, 
     12        DESIGN_OF_EXPERIMENT 
    1213    } 
    1314 
    … …  
    1516        if (tn == Name.INPUT_PARAMETER) return "Input parameters"; 
    1617        else if (tn == Name.OUTPUT_PARAMETER) return "Output parameters"; 
     18        else if (tn == Name.DESIGN_OF_EXPERIMENT) return "Design of experiment"; 
    1719         
    1820        return ""; 

  • trunk/simexplorer-ide/simexplorer-ide-ant/org.openmole.ui/src/org/openmole/ui/example/MoleExample.java

    r2939 r3142  
    66package org.openmole.ui.example; 
    77 
     8import java.math.BigDecimal; 
    89import org.simexplorer.core.commons.exception.InternalProcessingError; 
    910import org.simexplorer.core.commons.exception.UserBadDataError; 
    … …  
    1112import org.simexplorer.core.workflow.methods.task.JavaTask; 
    1213import org.simexplorer.core.commons.tools.IVisitor; 
     14import org.simexplorer.core.workflow.implementation.capsule.ExplorationTaskCapsule; 
    1315import org.simexplorer.core.workflow.implementation.mole.Mole; 
    1416import org.simexplorer.core.workflow.implementation.mole.TransitionFactory; 
     17import org.simexplorer.core.workflow.implementation.task.ExplorationTask; 
    1518import org.simexplorer.core.workflow.model.capsule.IGenericTaskCapsule; 
     19import org.simexplorer.core.workflow.model.data.Prototype; 
    1620import org.simexplorer.core.workflow.model.mole.IMole; 
    1721import org.simexplorer.core.workflow.model.transition.ITransition; 
    … …  
    2832    static public IMole buildMole() throws UserBadDataError, InternalProcessingError, InterruptedException, InstantiationException { 
    2933        JavaTask t1 = new JavaTask("t1"); 
    30         JavaTask t2 = new JavaTask("t2"); 
     34        ExplorationTask t2 = new ExplorationTask("expl"); 
    3135        JavaTask t3 = new JavaTask("t3"); 
    3236        JavaTask t4 = new JavaTask("t4"); 
    … …  
    4145        JavaTask t13 = new JavaTask("t13"); 
    4246 
     47        Prototype<BigDecimal> i = new Prototype<BigDecimal>("i", BigDecimal.class); 
     48        t2.addInput(i,true); 
     49        t2.addOutput(i,true); 
     50 
    4351        TaskCapsule t1Caps = new TaskCapsule(t1); 
    44         TaskCapsule t2Caps = new TaskCapsule(t2); 
     52        ExplorationTaskCapsule t2Caps = new ExplorationTaskCapsule(t2); 
    4553        TaskCapsule t3Caps = new TaskCapsule(t3); 
    4654        TaskCapsule t4Caps = new TaskCapsule(t4); 
    4755        TaskCapsule t5Caps = new TaskCapsule(t5); 
    4856        TaskCapsule t6Caps = new TaskCapsule(t6); 
    49         TaskCapsule t7Caps = new TaskCapsule(t7); 
     57        TaskCapsule t7Caps = new TaskCapsule(); 
    5058        TaskCapsule t8Caps = new TaskCapsule(t8); 
    5159        TaskCapsule t9Caps = new TaskCapsule(t9); 
    … …  
    6270                TransitionFactory.buildChain(t4Caps, t8Caps), 
    6371                TransitionFactory.build(t10Caps));*/ 
    64       /*  TransitionFactory.buildDiamond(TransitionFactory.build(t1Caps), 
    65                                         TransitionFactory.buildChain(t2Caps,t7Caps,t12Caps), 
     72   /*     TransitionFactory.buildDiamond(TransitionFactory.build(t1Caps), 
     73                                        TransitionFactory.buildChain(t7Caps,t12Caps), 
    6674                                        TransitionFactory.buildChain(t3Caps,t8Caps), 
    6775                                        TransitionFactory.buildChain(t4Caps,t9Caps), 
    … …  
    6977                                        TransitionFactory.buildChain(t6Caps,t11Caps), 
    7078                                        TransitionFactory.build(t13Caps));*/ 
    71  
    72         TransitionFactory.build(t1Caps); 
     79     /*   TransitionFactory.buildChain(TransitionFactory.build(t1Caps), 
     80                                     TransitionFactory.buildExploration(t2Caps, 
     81                                                        TransitionFactory.buildChain(t3Caps,t4Caps), 
     82                                                        t5Caps));*/ 
     83        TransitionFactory.buildChain(t1Caps,t7Caps); 
    7384        IMole mole = new Mole(t1Caps); 
    7485 
    75         printWorkflow(mole); 
     86      //  printWorkflow(mole); 
    7687        //mole.run(); 
    7788        return mole; 

  • trunk/simexplorer-ide/simexplorer-ide-ant/org.openmole.ui/src/org/openmole/ui/example/MoleExampleStarter.java

    r3131 r3142  
    2929import org.openmole.ui.control.TableMapping; 
    3030import org.openmole.ui.workflow.implementation.MoleSceneFactory; 
     31import org.openmole.ui.workflow.implementation.Preferences; 
    3132import org.simexplorer.core.commons.exception.InternalProcessingError; 
    3233import org.simexplorer.core.commons.exception.UserBadDataError; 
    … …  
    5152 
    5253        TableMapping.getInstance().initialize(); 
     54        Preferences.getInstance().initialize(); 
    5355 
    5456        JTabbedPane moleTabbedPane = new JTabbedPane(); 

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

    r3132 r3142  
    4040    public ExpandControler(MoleScene scene, 
    4141                           StateModel stateModel, 
    42                            Rectangle clientArea, 
    4342                           Image imageE, 
    4443                           Image imageC, 
    … …  
    5251        titleWidget.setLayout(LayoutFactory.createHorizontalFlowLayout(align, 5)); 
    5352        Widget emptyWidget = new Widget(scene); //Placeholder to place MinimizeIcon inside rounded rectangle 
    54         emptyWidget.setPreferredBounds(new Rectangle(TaskViewUI.ARROW_PIN_WIDTH, 0)); 
     53        emptyWidget.setPreferredBounds(new Rectangle(12, 0)); 
    5554        titleWidget.addChild(emptyWidget); 
    5655 
    … …  
    8079    public ExpandControler(MoleScene scene, 
    8180                           StateModel stateModel, 
    82                            Rectangle clientArea, 
    8381                           Image imageE, 
    8482                           Image imageC) { 
    … …  
    8987        minimizeWidget.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); 
    9088        minimizeWidget.getActions().addAction(new ToggleMinimizedAction(stateModel)); 
    91         setPreferredBounds(clientArea); 
    9289        addChild(minimizeWidget); 
    9390    } 

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

    r3122 r3142  
    1717package org.openmole.ui.workflow.implementation; 
    1818 
     19import org.openmole.ui.workflow.implementation.paint.ContainerUI; 
    1920import java.awt.Color; 
    2021import java.awt.Rectangle; 
    … …  
    4041    private StateModel stateModel; 
    4142 
    42     @SuppressWarnings("LeakingThisInConstructor") 
    4343    public ExpandableContainerUI(MoleScene scene, 
    4444            Rectangle clientArea, 

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

    r3122 r3142  
    1111import org.openmole.ui.workflow.model.IGenericMenuProvider; 
    1212import org.openmole.ui.workflow.model.IObjectModelUI; 
     13import org.simexplorer.core.workflow.model.task.IGenericTask; 
    1314 
    1415/** 
    … …  
    1617 * @author mathieu 
    1718 */ 
    18 public class GenericMenuProvider<T> implements IGenericMenuProvider { 
     19public class GenericMenuProvider implements IGenericMenuProvider { 
    1920    Collection<JMenuItem> items = new ArrayList<JMenuItem>() ; 
    2021    Collection<JMenu> menus = new ArrayList<JMenu>() ; 
    21     IObjectModelUI<T> model; 
     22    IObjectModelUI model; 
    2223 
    23     public GenericMenuProvider(IObjectModelUI<T> m){ 
     24    public GenericMenuProvider(IObjectModelUI m){ 
    2425        model = m; 
    2526    } 
     27     
     28/* 
     29public class GenericMenuProvider implements IGenericMenuProvider { 
     30    Collection<JMenuItem> items = new ArrayList<JMenuItem>() ; 
     31    Collection<JMenu> menus = new ArrayList<JMenu>() ; 
     32    IObjectModelUI model; 
     33 
     34    public GenericMenuProvider(IObjectModelUI m){ 
     35        model = m; 
     36    }*/ 
    2637 
    2738    @Override 

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

    r3088 r3142  
    1212public class JobModelUI implements IJobModelUI<IJob> { 
    1313 
    14     @Override 
    15     public void objectChanged(IJob obj) { 
    16         System.out.println("The Job " + obj + "has been modified"); 
    17     } 
    18  
    19     @Override 
    20     public void setName(String jobName) { 
    21         System.out.println("TNAME:"+ jobName); 
    22     } 
    2314} 

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

    r3135 r3142  
    1717import org.openmole.ui.workflow.model.IMoleScene; 
    1818import org.openmole.ui.workflow.model.IObjectViewUI; 
     19import org.openmole.ui.workflow.model.ITaskModelUI; 
    1920import org.openmole.ui.workflow.model.ITaskViewUI; 
    2021import org.simexplorer.core.commons.exception.InternalProcessingError; 
    … …  
    3839        setPreferredSize(new Dimension((int)(ApplicationCustomize.SCREEN_WIDTH*0.8),(int)(ApplicationCustomize.SCREEN_HEIGHT*0.8))); 
    3940        view = createView(); 
     41 
    4042    } 
    4143 
    … …  
    4446        return view; 
    4547    } 
    46  
    4748    public IObjectViewUI createXXTask(IGenericTaskCapsule obj, 
    4849            String n, 
    4950            boolean composite) throws InternalProcessingError { 
    5051        if (composite) { 
    51          //   IObjectViewUI itxx = UIFactory.getInstance().create(obj.getAssignedTask(), this); 
    5252           obUI = new TaskCompositeViewUI(this, 
     53                                          (ITaskModelUI) UIFactory.getInstance().create(obj.getAssignedTask()), 
    5354                                          n); 
     55          // obUI = new TaskViewUI(this, (ITaskModelUI) UIFactory.getInstance().create(obj.getAssignedTask()), n); 
    5456            addNode(n); 
    5557        } else { 

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

    r3135 r3142  
    66 
    77import java.util.Iterator; 
    8 import java.util.Random; 
    98import org.simexplorer.core.commons.exception.InternalProcessingError; 
    109import org.simexplorer.core.commons.exception.UserBadDataError; 
    … …  
    1312import org.simexplorer.core.workflow.model.transition.ITransition; 
    1413import org.simexplorer.core.commons.tools.IVisitor; 
    15 import org.simexplorer.core.workflow.methods.task.JavaTask; 
    1614import org.simexplorer.core.workflow.model.mole.IMole; 
    1715 
    … …  
    6462            IGenericTaskCapsule tCapsule) throws InternalProcessingError { 
    6563        if (tCapsule.getTask() != null) { 
    66             String nodeID = "node" + String.valueOf(tCapsule.getTask().getName()); 
     64            String nodeID = String.valueOf(tCapsule.getTask().getName()); 
    6765            if (!scene.getNodes().contains(nodeID)) { 
    6866                scene.createXXTask(tCapsule, nodeID, true); 

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

    r3135 r3142  
    33 
    44import org.openmole.ui.workflow.model.IObjectModelUI; 
     5import org.simexplorer.core.workflow.model.task.IGenericTask; 
    56 
    67/** 
    … …  
    89 * @author mathieu 
    910 */ 
    10 public abstract class ObjectModelUI<T> implements IObjectModelUI{ 
     11public abstract class ObjectModelUI implements IObjectModelUI{ 
    1112 
    1213  //  VisualizationRank rank; 
    1314  //  private Class businessClass; 
    14      
    15     @Override 
    16     public abstract void setName(String objectName); 
    1715} 

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

    r3135 r3142  
    11package org.openmole.ui.workflow.implementation; 
    22 
    3 import javax.swing.JTabbedPane; 
     3import java.awt.Color; 
     4import java.awt.Point; 
     5import javax.swing.JOptionPane; 
     6import org.netbeans.api.visual.action.ActionFactory; 
     7import org.netbeans.api.visual.action.SelectProvider; 
     8import org.netbeans.api.visual.widget.Scene; 
    49import org.netbeans.api.visual.widget.Widget; 
     10import org.openmole.ui.workflow.implementation.paint.PainterWidget; 
    511import org.openmole.ui.workflow.model.IObjectViewUI; 
     12import org.openmole.ui.workflow.model.ITaskModelUI; 
    613 
    714/** 
    … …  
    916 * @author mathieu 
    1017 */ 
    11 public abstract class ObjectViewUI<T> extends Widget implements IObjectViewUI { 
     18public class ObjectViewUI extends Widget implements IObjectViewUI { 
    1219 
    13     MoleScene scene; 
    14     protected JTabbedPane tableTabbedPane; 
     20    protected MoleScene scene; 
     21    protected  PainterWidget pWidget; 
     22    private Color defaultBorderColor; 
     23    private Color defaultBackgroundColor; 
    1524 
    16     public ObjectViewUI(MoleScene sc) { 
    17         super(sc); 
    18         scene = sc; 
     25    public ObjectViewUI(MoleScene scene, 
     26                        Color defaultBackgroundColor, 
     27                        Color defaultBorderColor) { 
     28        super(scene); 
     29        this.scene = scene; 
     30        this.defaultBorderColor = defaultBorderColor; 
     31        this.defaultBackgroundColor = defaultBackgroundColor; 
     32        pWidget = TaskXXFactory.getSelfContainer(scene); 
     33        setDefaultBackgroundColor(); 
     34        setDefaultBorderColor(); 
     35        getActions().addAction(ActionFactory.createMoveAction()); 
     36    } 
     37 
     38 
     39    public ObjectViewUI(MoleScene scene, 
     40                        ITaskModelUI m, 
     41                        Color dbac, 
     42                        Color dboc) { 
     43        this(scene,dbac,dboc); 
     44        getActions().addAction(new TaskActions(m,this)); 
     45 
     46      //  getActions().addAction(ActionFactory.createPopupMenuAction(gmp)); 
     47    } 
     48 
     49    @Override 
     50    public void setBackgroundColor(Color col) { 
     51        pWidget.setBackgroundColor(col); 
     52    } 
     53 
     54    @Override 
     55    public void setDefaultBackgroundColor() { 
     56        pWidget.setBackgroundColor(defaultBackgroundColor); 
     57    } 
     58 
     59 
     60    @Override 
     61    public void setBorderColor(Color col) { 
     62        pWidget.setBorderColor(col); 
     63    } 
     64 
     65    @Override 
     66    public void setDefaultBorderColor() { 
     67        pWidget.setBorderColor(defaultBorderColor); 
    1968    } 
    2069} 

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

    r3135 r3142  
    66import org.openmole.ui.control.ControlPanel; 
    77import org.openmole.ui.control.TableModelMapping; 
     8import org.openmole.ui.workflow.implementation.paint.SelectionManager; 
     9import org.openmole.ui.workflow.model.IObjectViewUI; 
    810import org.openmole.ui.workflow.model.ITaskModelUI; 
    911 
    … …  
    1517 
    1618   private ITaskModelUI model; 
    17     public TaskActions(ITaskModelUI m) { 
     19   private IObjectViewUI view; 
     20 
     21    public TaskActions(ITaskModelUI m, 
     22                       IObjectViewUI v) { 
    1823        model = m; 
     24        view = v; 
    1925    } 
    2026 
    2127    @Override 
    22     public State mousePressed(Widget widget, WidgetMouseEvent event) { 
     28    public State mouseClicked(Widget widget, 
     29                              WidgetMouseEvent event) { 
    2330        try { 
     31            SelectionManager.getInstance().setSelected(view); 
    2432            ControlPanel.getInstance().switchTableTabbedPane(TableModelMapping.getInstance().getTabbedPane(model)); 
    2533            model.updateData(); 
    … …  
    3139        return State.REJECTED; 
    3240    } 
     41 
     42    @Override 
     43    public State mouseMoved(Widget widget, 
     44                            WidgetAction.WidgetMouseEvent event){ 
     45        mouseClicked(widget, event); 
     46        return State.REJECTED; 
     47    } 
    3348} 

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

    r3135 r3142  
    2222        nbSlots.put(IOType.OUTPUT, 0); 
    2323    } 
    24  
    25     @Override 
    26     public void setName(String objectName) {} 
    27  
    28     @Override 
    29     public void objectChanged(IGenericTaskCapsule obj) { 
    30         System.out.println("The Task capsule" + obj + "has been modified"); 
    31     } 
    32  
     24     
    3325    @Override 
    3426    public int getNbInputslots(){ 
    … …  
    6759    } 
    6860 
     61    @Override 
     62    public void objectChanged(T obj) { 
     63        throw new UnsupportedOperationException("Not supported yet."); 
     64    } 
     65 
     66    @Override 
     67    public void updateData() { 
     68        throw new UnsupportedOperationException("Not supported yet."); 
     69    } 
     70 
    6971} 

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

    r3135 r3142  
    99import org.netbeans.api.visual.layout.LayoutFactory; 
    1010import org.netbeans.api.visual.widget.Widget; 
     11import org.openmole.ui.commons.ApplicationCustomize; 
    1112import org.openmole.ui.workflow.model.ITaskCapsuleModelUI; 
    1213import org.openmole.ui.workflow.model.ITaskCapsuleViewUI; 
    … …  
    1617 * @author mathieu 
    1718 */ 
    18 public class TaskCapsuleViewUI<T> extends ObjectViewUI<T> implements ITaskCapsuleViewUI { 
     19public class TaskCapsuleViewUI extends ObjectViewUI implements ITaskCapsuleViewUI{ 
    1920 
    2021    private Widget inputSlotWidget; 
    … …  
    2223    private Widget widContainer; 
    2324    private ITaskCapsuleModelUI model; 
    24     TaskCapsuleMenuProvider tmp; 
    2525 
    2626    public TaskCapsuleViewUI(MoleScene sc) { 
    27         super(sc); 
     27        super(sc, 
     28              ApplicationCustomize.getInstance().getColor(ApplicationCustomize.TASK_BACKGROUND_COLOR), 
     29              ApplicationCustomize.getInstance().getColor(ApplicationCustomize.TASK_BORDER_COLOR)); 
     30 
    2831        model = new TaskCapsuleModelUI(); 
    29  
    3032        inputSlotWidget = TaskXXFactory.buildInputSlotWidget(scene); 
    3133        outputSlotWidget = TaskXXFactory.buildOutputSlotWidget(scene); 
    … …  
    3638        addChild(widContainer); 
    3739 
    38  
    39         tmp = new TaskCapsuleMenuProvider(inputSlotWidget, 
    40                                           outputSlotWidget, 
    41                                           sc, 
    42                                           model); 
    43         getActions().addAction(ActionFactory.createMoveAction()); 
    44         getActions().addAction(ActionFactory.createPopupMenuAction(tmp)); 
    45         getActions().addAction(ActionFactory.createMoveAction()); 
     40        getActions().addAction(ActionFactory.createPopupMenuAction(new TaskCapsuleMenuProvider(inputSlotWidget, 
     41                                                                   outputSlotWidget, 
     42                                                                   sc, 
     43                                                                   model))); 
    4644        addInputSlot(); 
    4745        addOutputSlot(); 
    48     } 
    49  
    50     public TaskCapsuleMenuProvider getTaskCapsuleMenuProvider() { 
    51         return tmp; 
    52     } 
    53  
    54     @Override 
    55     public void setOutputSlotWidget(Widget wi) { 
    56         outputSlotWidget = wi; 
    57     } 
    58  
    59     @Override 
    60     public void setIntputSlotWidget(Widget wi) { 
    61         inputSlotWidget = wi; 
    62     } 
    63  
    64     @Override 
    65     public Widget getOutputSlotWidget() { 
    66         return outputSlotWidget; 
    67     } 
    68  
    69     @Override 
    70     public Widget getInputSlotWidget() { 
    71         return inputSlotWidget; 
    7246    } 
    7347 

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

    r3135 r3142  
    1313 * @author mathieu 
    1414 */ 
    15 public class TaskCompositeModelUI  extends ObjectModelUI implements ITaskCapsuleModelUI, ITaskModelUI{ 
     15public class TaskCompositeModelUI implements ITaskCapsuleModelUI, ITaskModelUI{ 
    1616 
    1717    ITaskModelUI<IGenericTask> tModel; 
    … …  
    2222        tModel = tm; 
    2323        tcModel = tcm; 
    24     } 
    25  
    26  
    27     @Override 
    28     public void setName(String objectName) { 
    29         tModel.setName(objectName); 
    30     } 
    31  
    32     @Override 
    33     public void objectChanged(Object obj) { 
    34         System.out.println("The object "+obj+" has been modified"); 
    3524    } 
    3625 
    … …  
    7968        return tModel.getFields(); 
    8069    } 
     70 
     71    @Override 
     72    public void setFields() { 
     73        tModel.setFields(); 
     74    } 
     75 
     76    @Override 
     77    public void objectChanged(Object t) { 
     78        throw new UnsupportedOperationException("Not supported yet."); 
     79    } 
    8180} 

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

    r3135 r3142  
    55import org.netbeans.api.visual.layout.LayoutFactory; 
    66import org.netbeans.api.visual.widget.Widget; 
     7import org.openmole.ui.commons.ApplicationCustomize; 
    78import org.openmole.ui.workflow.implementation.paint.IOParameterWidget; 
    89import org.openmole.ui.workflow.model.IObjectModelUI; 
     10import org.openmole.ui.workflow.model.ITaskModelUI; 
     11import org.simexplorer.core.workflow.model.task.IGenericTask; 
    912 
    1013/** 
    … …  
    1417public class TaskCompositeViewUI extends ObjectViewUI{ 
    1518 
    16     private GenericMenuProvider gmp; 
    1719    Widget inputSlotWidget; 
    1820    Widget outputSlotWidget; 
     21 
    1922    TaskCapsuleModelUI taskCapsuleModel; 
    20     TaskModelUI taskModel; 
     23    ITaskModelUI<IGenericTask> taskModel; 
    2124    private IObjectModelUI model; 
    2225 
    23     public TaskCompositeViewUI(MoleScene sc, 
     26    public TaskCompositeViewUI(MoleScene scene, 
     27                               ITaskModelUI<IGenericTask> m, 
    2428                               String st){ 
    25         super(sc); 
     29        super(scene, 
     30              m, 
     31              ApplicationCustomize.getInstance().getColor(ApplicationCustomize.TASK_BACKGROUND_COLOR), 
     32              ApplicationCustomize.getInstance().getColor(ApplicationCustomize.TASK_BORDER_COLOR)); 
     33 
     34        taskModel = m; 
     35        taskCapsuleModel = new TaskCapsuleModelUI(); 
    2636 
    2737        inputSlotWidget = TaskXXFactory.buildInputSlotWidget(scene); 
    … …  
    4151 
    4252        setLayout(LayoutFactory.createOverlayLayout()); 
     53 
     54 
    4355        addChild(TaskXXFactory.getTaskView(scene, 
    4456                                           in, 
    4557                                           out, 
     58                                           pWidget, 
    4659                                           st)); 
    4760         
    48         taskModel = new TaskModelUI(); 
    49         taskCapsuleModel = new TaskCapsuleModelUI(); 
    5061        model = new TaskCompositeModelUI(taskModel,taskCapsuleModel); 
    5162 
    … …  
    5869                                               taskCapsuleModel); 
    5970 
    60         gmp = PopupMenuProviderFactory.merge(new TaskMenuProvider(taskModel), 
     71        GenericMenuProvider gmp = PopupMenuProviderFactory.merge(new TaskMenuProvider(taskModel), 
    6172                                             new TaskCapsuleMenuProvider(inputSlotWidget, 
    6273                                                                         outputSlotWidget, 
    … …  
    6475                                                                         taskCapsuleModel), 
    6576                                             model); 
    66  
     77           
    6778        getActions().addAction(ActionFactory.createPopupMenuAction(gmp)); 
    68         getActions ().addAction (new TaskActions(taskModel)); 
    69         getActions().addAction(ActionFactory.createMoveAction()); 
    7079    } 
    7180} 

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

    r3135 r3142  
    55import org.openmole.ui.control.TableType; 
    66import org.openmole.ui.control.TableType.Name; 
     7import org.openmole.ui.workflow.model.IObjectModelUI; 
    78import org.openmole.ui.workflow.model.ITaskModelUI; 
    89import org.simexplorer.core.workflow.model.task.IGenericTask; 
    … …  
    1415public class TaskModelUI<T extends IGenericTask> implements ITaskModelUI<T> { 
    1516 
    16     IGenericTask task; 
    17     Collection<TableType.Name> fields = new ArrayList<TableType.Name>(); 
    18  
    19     public TaskModelUI() { 
    20         fields.add(Name.INPUT_PARAMETER); 
    21         fields.add(Name.OUTPUT_PARAMETER); 
    22     } 
    23     String name; 
     17    private IGenericTask task; 
     18    protected  transient Collection<TableType.Name> fields; 
    2419 
    2520    @Override 
    … …  
    2924 
    3025    @Override 
    31     public void setName(String tName) { 
    32         name = tName; 
     26    public void updateData() { 
    3327    } 
    3428 
    35     @Override 
    36     public void updateData() { 
    37         System.out.println("Update data "); 
     29    public synchronized void setFields() { 
     30        if (fields == null) { 
     31            fields = new ArrayList<TableType.Name>(); 
     32            fields.add(Name.INPUT_PARAMETER); 
     33            fields.add(Name.OUTPUT_PARAMETER); 
     34        } 
    3835    } 
    3936 
    4037    @Override 
    4138    public Collection<TableType.Name> getFields() { 
     39        setFields(); 
    4240        return fields; 
    4341    } 

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

    r3135 r3142  
    55package org.openmole.ui.workflow.implementation; 
    66 
     7import java.awt.Color; 
    78import org.netbeans.api.visual.action.ActionFactory; 
    8 import org.netbeans.api.visual.widget.*; 
     9import org.openmole.ui.commons.ApplicationCustomize; 
     10import org.openmole.ui.workflow.implementation.paint.PainterWidget; 
    911import org.openmole.ui.workflow.model.ITaskModelUI; 
    1012import org.openmole.ui.workflow.model.ITaskViewUI; 
    … …  
    1416 * @author mathieu 
    1517 */ 
    16 public class TaskViewUI<T> extends ObjectViewUI<T> implements ITaskViewUI { 
     18//public class TaskViewUI extends ObjectViewUI implements ITaskViewUI { 
     19public class TaskViewUI extends ObjectViewUI{ 
    1720 
    1821    protected ITaskModelUI model; 
    19     public static final int ARROW_PIN_WIDTH = 15; 
    20     public static final int MARGIN_SE_ROUNDED_RECTANGLE = ARROW_PIN_WIDTH * 77 / 100; 
    21     Widget taskWidget; 
    2222 
    2323    public TaskViewUI(MoleScene sc, 
    24             String name) { 
    25         super(sc); 
     24                      ITaskModelUI m, 
     25                      String name) { 
     26        super(sc, 
     27              ApplicationCustomize.getInstance().getColor(ApplicationCustomize.TASK_BACKGROUND_COLOR), 
     28              ApplicationCustomize.getInstance().getColor(ApplicationCustomize.TASK_BORDER_COLOR)); 
     29        model = m; 
    2630 
    2731        addChild(TaskXXFactory.getTaskView(sc, 
    2832                TaskXXFactory.buildInputParameterContainer(scene), 
    2933                TaskXXFactory.buildOutputParameterContainer(scene), 
     34                pWidget, 
    3035                name)); 
    31         getActions().addAction(ActionFactory.createMoveAction()); 
    32  
    33         model = new TaskModelUI(); 
    34         getActions().addAction(ActionFactory.createMoveAction()); 
    35         getActions().addAction(ActionFactory.createPopupMenuAction(new TaskMenuProvider(model))); 
    36         getActions().addAction(new TaskActions(model)); 
     36    //    getActions().addAction(ActionFactory.createMoveAction()); 
     37      //  getActions().addAction(ActionFactory.createPopupMenuAction(new TaskMenuProvider(model))); 
     38        getActions().addAction(new TaskActions(model,this)); 
    3739    } 
    3840} 

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

    r3135 r3142  
    11package org.openmole.ui.workflow.implementation; 
    22 
     3import java.awt.Color; 
     4import org.openmole.ui.workflow.implementation.paint.ContainerUI; 
    35import java.awt.Image; 
    46import java.awt.Rectangle; 
     7import javax.swing.BorderFactory; 
    58import org.netbeans.api.visual.layout.LayoutFactory; 
    69import org.netbeans.api.visual.model.StateModel; 
    … …  
    1013import org.openmole.ui.workflow.implementation.paint.IOType; 
    1114import org.openmole.ui.commons.ApplicationCustomize; 
     15import org.openmole.ui.workflow.implementation.paint.PainterWidget; 
    1216import org.openmole.ui.workflow.model.ITaskCapsuleModelUI; 
    1317 
    … …  
    2933 
    3034 
    31         ApplicationCustomize colorCutomize = ApplicationCustomize.getInstance(null); 
     35        ApplicationCustomize colorCutomize = ApplicationCustomize.getInstance(); 
    3236 
    3337        Widget selfContainer = BorderedWidgetFactory.getInstance().getBorderedWidget(scene, 
    … …  
    6973 
    7074    public static void addOutputSlotToSlotWidget(Widget wi, 
    71                                     MoleScene scene, 
    72                                     ITaskCapsuleModelUI model) { 
     75            MoleScene scene, 
     76            ITaskCapsuleModelUI model) { 
    7377        wi.addChild(new SlotWidget(scene, 
    74                         IOType.OUTPUT, 
    75                         model)); 
     78                IOType.OUTPUT, 
     79                model)); 
    7680 
    7781        model.addOutputSlot(); 
    7882    } 
    7983 
    80      public static void addInputSlotToSlotWidget(Widget wi, 
    81                                     MoleScene scene, 
    82                                     ITaskCapsuleModelUI model) { 
     84    public static void addInputSlotToSlotWidget(Widget wi, 
     85            MoleScene scene, 
     86            ITaskCapsuleModelUI model) { 
    8387        wi.addChild(new SlotWidget(scene, 
    84                         IOType.INPUT, 
    85                         model)); 
     88                IOType.INPUT, 
     89                model)); 
    8690 
    8791        model.addInputSlot(); 
    … …  
    99103            IOType type, 
    100104            Widget container) { 
    101         ApplicationCustomize colorCutomize = ApplicationCustomize.getInstance(null); 
    102         Rectangle labBounds = new Rectangle(0, 0, ApplicationCustomize.TASK_CONTAINER_WIDTH / 3, ApplicationCustomize.TASK_TITLE_HEIGHT); 
     105        ApplicationCustomize colorCutomize = ApplicationCustomize.getInstance(); 
     106        Rectangle labBounds = new Rectangle(0, 0, ApplicationCustomize.TASK_CONTAINER_WIDTH / 3 - 2, ApplicationCustomize.TASK_TITLE_HEIGHT - 2); 
    103107        Image img = (type == IOType.INPUT ? ApplicationCustomize.IMAGE_INPUT_ARROW : ApplicationCustomize.IMAGE_OUTPUT_ARROW); 
    104108 
    … …  
    107111        ExpandControler controlerWidget = new ExpandControler(scene, 
    108112                stateModel, 
    109                 labBounds, 
    110113                img, 
    111114                img); 
    … …  
    121124        labelContainer.setLayout(LayoutFactory.createVerticalFlowLayout()); 
    122125        labelContainer.addWidget(controlerWidget, 0); 
    123         labelContainer.setBounds(labBounds); 
    124  
     126        // labelContainer.setBounds(labBounds); 
     127        //  labelContainer.setBorder(BorderFactory.createLineBorder(Color.blue)); 
    125128        return labelContainer; 
    126129    } 
    … …  
    133136        ExpandControler titleControlerWidget = new ExpandControler(scene, 
    134137                titleStateModel, 
    135                 titleBounds, 
    136138                ApplicationCustomize.IMAGE_EXPAND, 
    137139                ApplicationCustomize.IMAGE_COLLAPSE, 
    … …  
    141143        ExpandableContainerUI titleContainer = new ExpandableContainerUI(scene, 
    142144                titleBounds, 
    143                 ApplicationCustomize.getInstance(null).getColor(ApplicationCustomize.TASK_HEADER_BACKGROUND_COLOR), 
    144                 ApplicationCustomize.getInstance(null).getColor(ApplicationCustomize.TASK_HEADER_BACKGROUND_COLOR), 
     145                ApplicationCustomize.getInstance().getColor(ApplicationCustomize.TASK_HEADER_BACKGROUND_COLOR), 
     146                ApplicationCustomize.getInstance().getColor(ApplicationCustomize.TASK_HEADER_BACKGROUND_COLOR), 
    145147                titleControlerWidget, 
    146148                titleStateModel, 
    … …  
    159161            ExpandableContainerUI outputLabelContainer) { 
    160162 
    161         ApplicationCustomize colorCutomize = ApplicationCustomize.getInstance(null); 
    162         Rectangle labBounds = new Rectangle(0, 0, ApplicationCustomize.TASK_CONTAINER_WIDTH / 3, ApplicationCustomize.TASK_TITLE_HEIGHT); 
     163        ApplicationCustomize colorCutomize = ApplicationCustomize.getInstance(); 
     164        Rectangle labBounds = new Rectangle(0, 0, ApplicationCustomize.TASK_CONTAINER_WIDTH / 3 - 2, ApplicationCustomize.TASK_TITLE_HEIGHT - 2); 
    163165        Rectangle titleBounds = new Rectangle(0, 0, ApplicationCustomize.TASK_TITLE_WIDTH, ApplicationCustomize.TASK_TITLE_HEIGHT); 
    164166 
    … …  
    180182 
    181183    public static Widget getTaskView(MoleScene scene, 
    182                                      IOParameterWidget inputParameterContainer, 
    183                                      IOParameterWidget outputParameterContainer, 
    184                                      String name){ 
    185      ExpandableContainerUI inputLabelContainer; 
    186      ExpandableContainerUI outputLabelContainer; 
    187      ExpandableContainerUI titleContainer; 
    188     ApplicationCustomize colorCutomize = ApplicationCustomize.getInstance(null); 
     184            IOParameterWidget inputParameterContainer, 
     185            IOParameterWidget outputParameterContainer, 
     186            PainterWidget selfContainer, 
     187            String name) { 
     188        ExpandableContainerUI inputLabelContainer; 
     189        ExpandableContainerUI outputLabelContainer; 
     190        ExpandableContainerUI titleContainer; 
     191        ApplicationCustomize colorCutomize = ApplicationCustomize.getInstance(); 
    189192 
    190193        inputLabelContainer = TaskXXFactory.buildIOControler(scene, 
    … …  
    197200                inputLabelContainer, 
    198201                outputLabelContainer); 
    199  
    200         Rectangle taskBounds = new Rectangle(ApplicationCustomize.TASK_INPUT_WIDTH, 0, ApplicationCustomize.TASK_CONTAINER_WIDTH, ApplicationCustomize.TASK_CONTAINER_HEIGHT); 
    201         Rectangle capsuleBounds = new Rectangle(0, 
    202                 0, 
    203                 ApplicationCustomize.TASK_CONTAINER_WIDTH, 
    204                 ApplicationCustomize.TASK_CONTAINER_HEIGHT + ApplicationCustomize.TASK_TITLE_HEIGHT); 
    205  
    206         ContainerUI taskContainer = new ContainerUI(scene, 
    207                 taskBounds, 
    208                 colorCutomize.getColor(ApplicationCustomize.TRANSPARENT_COLOR), 
    209                 colorCutomize.getColor(ApplicationCustomize.TRANSPARENT_COLOR)); 
    210  
    211         Widget selfContainer = BorderedWidgetFactory.getInstance().getBorderedWidget(scene, 
    212                 capsuleBounds, 
    213                 colorCutomize.getColor(ApplicationCustomize.TASK_BACKGROUND_COLOR), 
    214                 colorCutomize.getColor(ApplicationCustomize.TASK_BORDER_COLOR), 
    215                 false); 
     202        Rectangle taskBounds = new Rectangle(0, 0, ApplicationCustomize.TASK_CONTAINER_WIDTH, ApplicationCustomize.TASK_CONTAINER_HEIGHT); 
     203 
     204        Widget emptyWi = new Widget(scene); 
     205        emptyWi.setPreferredBounds(taskBounds); 
    216206 
    217207        selfContainer.setLayout(LayoutFactory.createVerticalFlowLayout()); 
    218         selfContainer.addChild(taskContainer); 
     208        selfContainer.addChild(emptyWi); 
    219209        selfContainer.addChild(IOContainer); 
    220210 
    … …  
    224214                outputParameterContainer.getContainer()); 
    225215        titleContainer.setName(name); 
    226          
     216 
    227217        Widget midWidget = new Widget(scene); 
    228218        midWidget.setLayout(LayoutFactory.createVerticalFlowLayout()); 
    … …  
    237227        taskWidget.addChild(outputParameterContainer); 
    238228        return taskWidget; 
    239 } 
    240  
    241  
     229    } 
     230 
     231 
     232    public static  PainterWidget getSelfContainer(MoleScene scene) { 
     233        ApplicationCustomize colorCutomize = ApplicationCustomize.getInstance(); 
     234        Rectangle capsuleBounds = new Rectangle(0, 
     235                0, 
     236                ApplicationCustomize.TASK_CONTAINER_WIDTH, 
     237                ApplicationCustomize.TASK_CONTAINER_HEIGHT + ApplicationCustomize.TASK_TITLE_HEIGHT); 
     238 
     239        return BorderedWidgetFactory.getInstance().getBorderedWidget(scene, 
     240                capsuleBounds, 
     241                colorCutomize.getColor(ApplicationCustomize.TASK_BACKGROUND_COLOR), 
     242                colorCutomize.getColor(ApplicationCustomize.TASK_BORDER_COLOR), 
     243                false); 
     244 
     245    } 
    242246 
    243247    public static TaskXXFactory getInstance() { 

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

    r3099 r3142  
    1010import java.util.HashMap; 
    1111import java.util.Map; 
    12 import org.openmole.ui.workflow.model.IObjectViewUI; 
     12import org.openmole.ui.workflow.model.IObjectModelUI; 
    1313import org.openmole.ui.workflow.model.IUIFactory; 
    1414import org.simexplorer.core.commons.tools.Instanciator; 
    15 import org.simexplorer.core.workflow.implementation.capsule.GenericTaskCapsule; 
    1615import org.simexplorer.core.workflow.model.task.ITask; 
    1716import org.simexplorer.core.workflow.methods.task.*; 
    18 import org.simexplorer.core.workflow.model.capsule.ITaskCapsule; 
     17import org.simexplorer.core.workflow.implementation.task.ExplorationTask; 
    1918 
    2019/** 
    … …  
    2726 
    2827    private static UIFactory instance = null; 
    29     Map<Class<?>, Class<? extends IObjectViewUI>> businessToUIMap = new HashMap(); 
    3028 
    31     public UIFactory() { 
    32       //  ServiceProxy.getEventDispatcher().registerListner(IJob.class,this); 
    33       //  ServiceProxy.getEventDispatcher().registerListner(IGenericTask.class,this); 
     29    Map<Class<?>, Class<? extends IObjectModelUI>> businessToUIMap = new HashMap<Class<?>, Class<? extends IObjectModelUI>>(); 
     30 
     31   /* public UIFactory() { 
    3432        setHashMap(); 
    3533    } 
    3634 
    37     private <T> void add(Class<? extends T> business, Class<? extends IObjectViewUI> visualisation) { 
     35    private <T> void add(Class<? extends T> business, Class<? extends IObjectModelUI> visualisation) { 
    3836        businessToUIMap.put(business, visualisation); 
    39     } 
     37    }*/ 
    4038 
    4139    /** 
    … …  
    4341     * Stub: to be changed by a config file reading mechanism 
    4442     */ 
    45     private void setHashMap() { 
    46         add(GroovyTask.class, TaskViewUI.class); 
    47         add(ITask.class, TaskViewUI.class); 
    48         add(JavaTask.class, TaskViewUI.class); 
    49      //   add(ITaskCapsule.class,TaskCapsuleViewUI.class); 
    50        // add(GenericTaskCapsule.class,TaskCapsuleViewUI.class); 
     43 /*  private void setHashMap() { 
     44        //add(GroovyTask.class, TaskViewUI.class); 
     45        //add(ITask.class, TaskViewUI.class); 
     46        //add(JavaTask.class, TaskViewUI.class); 
     47        add(GroovyTask.class, TaskModelUI.class); 
     48        add(ITask.class, TaskModelUI.class); 
     49        add(JavaTask.class, TaskModelUI.class); 
     50        add(ExplorationTask.class, ExplorationTaskModelUI.class); 
    5151 
    52     } 
     52    }*/ 
    5353 
    5454    @Override 
    55     public <T> IObjectViewUI create(T obj, MoleScene scene) { 
     55    public <T> IObjectModelUI create(T obj) { 
    5656        Class superClass = obj.getClass(); 
    5757 
    5858        while (superClass != Object.class) { 
    59             if (businessToUIMap.containsKey(superClass)) { 
     59           // if (businessToUIMap.containsKey(superClass)) { 
     60            if (Preferences.getInstance().containsBusinessKey(superClass)) { 
    6061                try { 
    61                     return Instanciator.instanciate(businessToUIMap.get(superClass),scene); 
     62                 //   return Instanciator.instanciate(businessToUIMap.get(superClass)); 
     63                    return Instanciator.instanciate(Preferences.getInstance().getModelClass(superClass)); 
    6264                } catch (IllegalArgumentException illE) { 
    6365                    MoleExceptionManagement.showException(illE); 

  • trunk/simexplorer-ide/simexplorer-ide-ant/org.openmole.ui/src/org/openmole/ui/workflow/implementation/paint/BorderedRectangularPainter.java

    r2914 r3142  
    8686                    bounds.height); 
    8787        } 
    88          
     88 
    8989        if (provider.getBackgroundColor() != null) { 
    9090            graphics.setColor(provider.getBackgroundColor()); 

  • trunk/simexplorer-ide/simexplorer-ide-ant/org.openmole.ui/src/org/openmole/ui/workflow/implementation/paint/BorderedRectangularProvider.java

    r2972 r3142  
    1515 *  along with this program.  If not, see <http://www.gnu.org/licenses/>. 
    1616 */ 
    17  
    1817package org.openmole.ui.workflow.implementation.paint; 
    1918 
    … …  
    2524 * @author mathieu 
    2625 */ 
    27 public class BorderedRectangularProvider implements IBorderedRectangularProvider{ 
     26public class BorderedRectangularProvider implements IBorderedRectangularProvider { 
    2827 
    2928    public static final int ARROW_PIN_WIDTH = 15; 
    30    // public static final int MARGIN_SE_ROUNDED_RECTANGLE = ARROW_PIN_WIDTH * 77 / 100; 
     29    // public static final int MARGIN_SE_ROUNDED_RECTANGLE = ARROW_PIN_WIDTH * 77 / 100; 
    3130    public static final int MARGIN_SE_ROUNDED_RECTANGLE = -1; 
    32  
    3331    private Rectangle clipRect; 
    3432    private Color backgroundColor; 
    … …  
    3735    boolean roundBorder; 
    3836 
    39     public BorderedRectangularProvider(Rectangle rArea,Color baColor, Color boColor, boolean rBorder) { 
     37    public BorderedRectangularProvider(Rectangle rArea, Color baColor, Color boColor, boolean rBorder) { 
    4038        backgroundColor = baColor; 
    4139        borderColor = boColor; 
    … …  
    4644    @Override 
    4745    public Color getBorderColor() { 
    48                 return borderColor; 
     46        return borderColor; 
    4947    } 
    5048 
    5149    @Override 
    5250    public Color getBackgroundColor() { 
    53                 return backgroundColor; 
     51          return backgroundColor; 
     52    } 
     53 
     54    @Override 
     55    public void setBackgroundColor(Color col) { 
     56 
     57        backgroundColor = col; 
     58    } 
     59 
     60    @Override 
     61    public void setBorderColor(Color col) { 
     62        borderColor = col; 
    5463    } 
    5564 
    … …  
    6170    @Override 
    6271    public Rectangle getClipRect() { 
    63                // Rectangle clientArea = containerWidget.getClientArea(); 
    64                 Rectangle gradientRect = new Rectangle(); 
     72        // Rectangle clientArea = containerWidget.getClientArea(); 
     73        Rectangle gradientRect = new Rectangle(); 
    6574 
    66                 gradientRect.x = clientArea.x + MARGIN_SE_ROUNDED_RECTANGLE; 
    67                 gradientRect.y = clientArea.y; 
    68                 gradientRect.width = clientArea.width - MARGIN_SE_ROUNDED_RECTANGLE - MARGIN_SE_ROUNDED_RECTANGLE; 
    69                 gradientRect.height = clientArea.height; 
     75        gradientRect.x = clientArea.x + MARGIN_SE_ROUNDED_RECTANGLE; 
     76        gradientRect.y = clientArea.y; 
     77        gradientRect.width = clientArea.width - MARGIN_SE_ROUNDED_RECTANGLE - MARGIN_SE_ROUNDED_RECTANGLE; 
     78        gradientRect.height = clientArea.height; 
    7079 
    71                 clipRect = gradientRect; 
    72                 return gradientRect; 
    73             } 
     80        clipRect = gradientRect; 
     81        return gradientRect; 
     82    } 
    7483 
    75     public Rectangle getClientArea(){ 
     84    public Rectangle getClientArea() { 
    7685        return clientArea; 
    7786    } 
    78      
    79     } 
     87} 

  • trunk/simexplorer-ide/simexplorer-ide-ant/org.openmole.ui/src/org/openmole/ui/workflow/implementation/paint/BorderedWidgetFactory.java

    r2982 r3142  
    2020import java.awt.Graphics2D; 
    2121import java.awt.Rectangle; 
    22 import org.netbeans.api.visual.layout.LayoutFactory; 
    23 import org.netbeans.api.visual.widget.Widget; 
    2422import org.openmole.ui.workflow.implementation.MoleScene; 
    2523 
    … …  
    2927 */ 
    3028public class BorderedWidgetFactory { 
    31     Widget containerWidget; 
     29    PainterWidget containerWidget; 
    3230    private static BorderedWidgetFactory instance = null; 
    3331     
    3432   // private static final int PIN_VERTICAL_GAP = 5; 
    3533     
    36     public Widget getBorderedWidget(MoleScene scene, Rectangle rArea,Color baColor, Color boColor, boolean roundBorder) { 
     34    public PainterWidget getBorderedWidget(MoleScene scene, Rectangle rArea,Color baColor, Color boColor, boolean roundBorder) { 
    3735 
    3836        final BorderedRectangularProvider provider = new BorderedRectangularProvider(rArea, baColor, boColor, roundBorder); 

  • trunk/simexplorer-ide/simexplorer-ide-ant/org.openmole.ui/src/org/openmole/ui/workflow/implementation/paint/ContainerUI.java

    r3088 r3142  
    33 * and open the template in the editor. 
    44 */ 
    5 package org.openmole.ui.workflow.implementation; 
     5package org.openmole.ui.workflow.implementation.paint; 
    66 
    77import java.awt.Color; 
    88import java.awt.Rectangle; 
    99import org.netbeans.api.visual.widget.Widget; 
    10 import org.openmole.ui.workflow.implementation.paint.BorderedWidgetFactory; 
     10import org.openmole.ui.workflow.implementation.MoleScene; 
    1111import org.openmole.ui.workflow.model.IContainerUI; 
    1212 
    … …  
    1717public class ContainerUI extends Widget implements IContainerUI{ 
    1818 
    19     protected Widget containerWidget; 
     19    protected PainterWidget containerWidget; 
    2020 
    2121    public ContainerUI(MoleScene scene, Rectangle clientArea, Color baColor, Color boColor) { 

  • trunk/simexplorer-ide/simexplorer-ide-ant/org.openmole.ui/src/org/openmole/ui/workflow/implementation/paint/IBorderedRectangularProvider.java

    r2915 r3142  
    5454    //Rectangle getHeaderRect(); 
    5555    //Color getHeaderColor(); 
    56     Color getBorderColor(); 
    57     Color getBackgroundColor(); 
    58     boolean isRounded(); 
    59     Rectangle getClipRect(); 
     56    public Color getBorderColor(); 
     57    public Color getBackgroundColor(); 
     58    public void setBackgroundColor(Color col); 
     59    public void setBorderColor(Color col); 
     60 
     61    public boolean isRounded(); 
     62    public Rectangle getClipRect(); 
    6063     
    6164} 

  • trunk/simexplorer-ide/simexplorer-ide-ant/org.openmole.ui/src/org/openmole/ui/workflow/implementation/paint/IOParameterWidget.java

    r3132 r3142  
    88import org.netbeans.api.visual.layout.LayoutFactory; 
    99import org.netbeans.api.visual.widget.Widget; 
    10 import org.openmole.ui.workflow.implementation.ContainerUI; 
    1110import org.openmole.ui.workflow.implementation.MoleScene; 
    1211 
    … …  
    2524        scene = sc; 
    2625 
    27         ApplicationCustomize colorCutomize = ApplicationCustomize.getInstance(null); 
     26        ApplicationCustomize colorCutomize = ApplicationCustomize.getInstance(); 
    2827 
    2928        Rectangle bounds =  new Rectangle(type == IOType.INPUT ? 0 : 2, 

  • trunk/simexplorer-ide/simexplorer-ide-ant/org.openmole.ui/src/org/openmole/ui/workflow/implementation/paint/PainterWidget.java

    r2897 r3142  
    4242package org.openmole.ui.workflow.implementation.paint; 
    4343 
     44import java.awt.Color; 
    4445import org.netbeans.api.visual.widget.Scene; 
    4546import org.netbeans.api.visual.widget.Widget; 
    … …  
    5960    } 
    6061 
     62    public void setBackgroundColor(Color col){ 
     63        mPainter.getProvider().setBackgroundColor(col); 
     64    } 
     65 
     66    public void setBorderColor(Color col){ 
     67        mPainter.getProvider().setBorderColor(col); 
     68    } 
     69 
     70    @Override 
    6171    protected void paintWidget () { 
    6272        super.paintWidget(); 

  • trunk/simexplorer-ide/simexplorer-ide-ant/org.openmole.ui/src/org/openmole/ui/workflow/model/IContainerUI.java

    r2930 r3142  
    1818package org.openmole.ui.workflow.model; 
    1919 
    20 import java.awt.Rectangle; 
    2120import org.netbeans.api.visual.widget.Widget; 
    2221 

  • trunk/simexplorer-ide/simexplorer-ide-ant/org.openmole.ui/src/org/openmole/ui/workflow/model/IJobModelUI.java

    r3090 r3142  
    1212 * @author mathieu 
    1313 */ 
    14 public interface IJobModelUI <T extends IJob> extends IObjectModelUI<T>{ 
     14public interface IJobModelUI <T extends IJob> { 
    1515} 

  • trunk/simexplorer-ide/simexplorer-ide-ant/org.openmole.ui/src/org/openmole/ui/workflow/model/IObjectModelUI.java

    r3091 r3142  
    22package org.openmole.ui.workflow.model; 
    33 
     4import java.util.Collection; 
     5import org.openmole.ui.control.TableType; 
    46import org.simexplorer.core.commons.eventdispatcher.IObjectChangedAsynchronousListener; 
     7import org.simexplorer.core.workflow.model.task.IGenericTask; 
    58 
    69/** 
    … …  
    912 */ 
    1013public interface IObjectModelUI <T> extends IObjectChangedAsynchronousListener<T>{ 
    11  
    12     //Class<? extends T> getVisualised(); 
    13     //VisualizationRank getRank(); 
    14     public void setName(String objectName); 
    1514    @Override 
    1615    public void objectChanged(T obj); 
     16    public void updateData(); 
    1717} 

  • trunk/simexplorer-ide/simexplorer-ide-ant/org.openmole.ui/src/org/openmole/ui/workflow/model/IObjectViewUI.java

    r3136 r3142  
    11package org.openmole.ui.workflow.model; 
    22 
    3 import javax.swing.JTabbedPane; 
     3import java.awt.Color; 
    44 
    55/** 
    … …  
    77 * @author mathieu 
    88 */ 
    9 public interface IObjectViewUI<T>{ 
     9public interface IObjectViewUI{ 
     10 
     11    public void setBackgroundColor(Color col); 
     12    public void setBorderColor(Color col); 
     13    public void setDefaultBackgroundColor(); 
     14    public void setDefaultBorderColor(); 
    1015    //public void initialize(String name); 
    1116    //public JTabbedPane getTableTabbed(); 

  • trunk/simexplorer-ide/simexplorer-ide-ant/org.openmole.ui/src/org/openmole/ui/workflow/model/ITaskCapsuleModelUI.java

    r3101 r3142  
    1212 * @author mathieu 
    1313 */ 
    14 //public interface ITaskCapsuleModelUI<T extends IGenericTaskCapsule> extends IObjectModelUI<T>, ITaskXXModelUI { 
    1514public interface ITaskCapsuleModelUI<T extends IGenericTaskCapsule> extends IObjectModelUI<T> { 
    1615    public void addOutputSlot(); 

  • trunk/simexplorer-ide/simexplorer-ide-ant/org.openmole.ui/src/org/openmole/ui/workflow/model/ITaskCapsuleViewUI.java

    r3136 r3142  
    11package org.openmole.ui.workflow.model; 
    2  
    3 import java.awt.event.ActionListener; 
    4 import org.netbeans.api.visual.widget.Widget; 
    5 import org.simexplorer.core.workflow.model.capsule.IGenericTaskCapsule; 
    62 
    73/** 
    … …  
    95 * @author mathieu 
    106 */ 
    11 public interface ITaskCapsuleViewUI<T extends IGenericTaskCapsule> extends IObjectViewUI{ 
    12  
    13   //  public ITaskCapsuleModelUI getTaskCapsuleModel(); 
    14    // public ITaskCapsuleModelUI<T> getModel(); 
    15   //  public ActionListener getInputAction(); 
    16   //  public ActionListener getOutputAction(); 
    17     public void setIntputSlotWidget(Widget wi); 
    18     public void setOutputSlotWidget(Widget wi); 
    19     public Widget getInputSlotWidget(); 
    20     public Widget getOutputSlotWidget(); 
    21    // public void addInputSlot(); 
    22    // public void addOutputSlot(); 
    23 } 
     7public interface ITaskCapsuleViewUI extends IObjectViewUI{} 

  • trunk/simexplorer-ide/simexplorer-ide-ant/org.openmole.ui/src/org/openmole/ui/workflow/model/ITaskModelUI.java

    r3136 r3142  
    1616    public void updateData(); 
    1717    public Collection<TableType.Name> getFields(); 
     18    public void setFields(); 
    1819} 

  • trunk/simexplorer-ide/simexplorer-ide-ant/org.openmole.ui/src/org/openmole/ui/workflow/model/ITaskViewUI.java

    r3136 r3142  
    11package org.openmole.ui.workflow.model; 
    22 
    3 import java.util.Collection; 
    4 import org.netbeans.api.visual.widget.Widget; 
    5 import org.openmole.ui.control.model.ITableView; 
    6 import org.simexplorer.core.workflow.model.task.IGenericTask; 
     3import java.awt.Color; 
    74 
    85/** 
    … …  
    107 * @author mathieu 
    118 */ 
    12 public interface ITaskViewUI<T extends IGenericTask> extends IObjectViewUI<T> { 
    13 //public interface ITaskViewUI<T extends IGenericTask> { 
    14  
    15   //  public void initialize(String na, IGenericTask genTask); 
    16    // public ITaskModelUI getTaskModel(); 
    17   //  public void setName(String s); 
    18    // public Widget getWidget(); 
    19   //  public Widget getInputParameterContainer(); 
    20   //  public Widget getOutputParameterContainer(); 
    21   //  public Collection<ITableView> getAssociatedTables() throws IllegalAccessException; 
    22 } 
     9public interface ITaskViewUI extends IObjectViewUI{} 

  • trunk/simexplorer-ide/simexplorer-ide-ant/org.openmole.ui/src/org/openmole/ui/workflow/model/IUIFactory.java

    r3101 r3142  
    66package org.openmole.ui.workflow.model; 
    77 
    8 import org.openmole.ui.workflow.implementation.MoleScene; 
    98import org.simexplorer.core.commons.eventdispatcher.IObjectConstructedAsynchronousListener; 
    109 
    … …  
    1514public interface IUIFactory<T> extends IObjectConstructedAsynchronousListener<T> { 
    1615 
    17     <T> IObjectViewUI create(T obj,MoleScene scene); 
     16    <T> IObjectModelUI create(T obj); 
    1817     
    1918} 

logo cemagref

logo iscpif

logo lifegrid

logo region auvergne

logo patres project