[Isis-fish-commits] r2254 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator

19 May 2009

Author: bpoussin
Date: 2009-05-19 15:25:54 +0000 (Tue, 19 May 2009)
New Revision: 2254

Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx
Log:
creation d'une variable SimulAction que l'on utilise dans tout le fichier jaxx, c tout de meme beaucoup plus propre que de le rechercher a chaque fois qu'on en a besoin

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx
===================================================================

--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx	2009-05-19 15:24:57 UTC (rev 2253)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx	2009-05-19 15:25:54 UTC (rev 2254)
@@ -49,6 +49,7 @@
 
 // instances variables déclaration
 SimulationServiceListener simulationListener;
+SimulAction simulAction = getContextValue(SimulAction.class);
 
 // end constructor code
 simulationListener = new SimulationServiceListener() {
@@ -77,10 +78,10 @@
     //SimulationService.getService().removeSimulationServiceListener(simulationListener);
     //SimulationService.getService().addSimulationServiceListener(simulationListener);
     
-    if (getContextValue(SimulAction.class).getSimulationStorage() != null) {
-        fieldSimulParamsName.setText(getContextValue(SimulAction.class).getSimulationStorage().getName());
+    if (simulAction.getSimulationStorage() != null) {
+        fieldSimulParamsName.setText(simulAction.getSimulationStorage().getName());
     }
-    fieldSimulParamsDesc.setText(getContextValue(SimulAction.class).getSimulationParameter().getDescription());
+    fieldSimulParamsDesc.setText(simulAction.getSimulationParameter().getDescription());
     setListSimulParamsStrategiesItems();
     setListSimulParamsPopulationsItems();
     setRulesItems();
@@ -97,7 +98,7 @@
             SwingUtilities.invokeLater(new Runnable() {
                 @Override
                 public void run() {
-                    getContextValue(SimulAction.class).regionChange(selected);
+                    simulAction.regionChange(selected);
                     refresh();
                     setFactorRegion();
                     getParentContainer(WelcomePanelUI.class).setInfoText(_("isisfish.message.region.loaded"));
@@ -108,7 +109,7 @@
 }
 protected void setPreScript() {
     if (!isSensitivity()){
-        String preScript = getContextValue(SimulAction.class).getSimulationParameter().getPreScript();
+        String preScript = simulAction.getSimulationParameter().getPreScript();
         fieldUseSimulPreScripts.setSelected(preScript != null && !preScript.isEmpty());
         getParentContainer(SimulUI.class).getPreSciptUI().getFieldSimulPreScript().setText(preScript);
     }
@@ -116,7 +117,7 @@
 protected void setFactorRegion() {
     if (isSensitivity()){
         try {
-            getParentContainer(SensitivityUI.class).getSensitivityTabUI().setRegion((FisheryRegionImpl) getContextValue(SimulAction.class).getSimulationParameter().getRegion().getFisheryRegion());
+            getParentContainer(SensitivityUI.class).getSensitivityTabUI().setRegion((FisheryRegionImpl) simulAction.getSimulationParameter().getRegion().getFisheryRegion());
             getParentContainer(SensitivityUI.class).getSensitivityTabUI().setTreeModel();
         } catch (StorageException ex) {
             if (log.isErrorEnabled()) {
@@ -141,7 +142,7 @@
     }
 }
 public void setSimulationParameter(SimulAction simulAction){
-   getContextValue(SimulAction.class).setSimulationParameter(simulAction.getSimulationParameter());
+   simulAction.setSimulationParameter(simulAction.getSimulationParameter());
 }
 protected void loadOldSimulation() {
     final String selected = fieldSimulParamsSelect.getSelectedItem().toString();
@@ -151,11 +152,11 @@
             SwingUtilities.invokeLater(new Runnable() {
             @Override
             public void run() {
-                getContextValue(SimulAction.class).loadOldSimulation(selected);
+                simulAction.loadOldSimulation(selected);
                 refresh();
                 fieldSimulParamsRegion.setSelectedItem(getContextValue(SimulAction.class).getSimulationParameter().getRegionName());
                 // mise a jour des années
-                fieldSimulParamsNbAnnees.setText(String.valueOf(getContextValue(SimulAction.class).getNumberOfYear()));
+                fieldSimulParamsNbAnnees.setText(String.valueOf(simulAction.getNumberOfYear()));
                 setPreScript();
                 setFactorRegion();
                 setExportSens();
@@ -167,35 +168,35 @@
     }
 }
 protected void addRules(){
-   getContextValue(SimulAction.class).addRules(fieldSimulParamsMesuresSelect.getSelectedItem().toString());
+   simulAction.addRules(fieldSimulParamsMesuresSelect.getSelectedItem().toString());
    setRulesItems();
 }
 protected void removeRules(){
-   getContextValue(SimulAction.class).removeRules(listSimulParamsMesuresList.getSelectedValue().toString());
+   simulAction.removeRules(listSimulParamsMesuresList.getSelectedValue().toString());
    setRulesItems();
 }
 protected void clearRules(){
-   getContextValue(SimulAction.class).getSimulationParameter().clearRules();
+   simulAction.getSimulationParameter().clearRules();
    setRulesItems();
 }
 protected void simul(){
     if (!isSensitivity()){
-        getContextValue(SimulAction.class).launchSimulation(fieldSimulParamsName.getText(), (SimulatorLauncher)comboSelLauncher.getSelectedItem());
+        simulAction.launchSimulation(fieldSimulParamsName.getText(), (SimulatorLauncher)comboSelLauncher.getSelectedItem());
     }
     else{
-        getContextValue(SimulAction.class).launchSimulationWhithSensibility(fieldSimulParamsName.getText(), (SimulatorLauncher)comboSelLauncher.getSelectedItem());
+        simulAction.launchSimulationWhithSensibility(fieldSimulParamsName.getText(), (SimulatorLauncher)comboSelLauncher.getSelectedItem());
     }
     getParentContainer(WelcomeTabUI.class).selTab(5);
 }
 protected void enablePreSimul(){
-    getContextValue(SimulAction.class).getSimulationParameter().setUsePreScript(fieldUseSimulPreScripts.isSelected());
+    simulAction.getSimulationParameter().setUsePreScript(fieldUseSimulPreScripts.isSelected());
     if (!isSensitivity()){
         SimulUI simul = getParentContainer(SimulUI.class);
         simul.enablePreSimul(fieldUseSimulPreScripts.isSelected());
     }
 }
 protected void enableAnalysePlan(){
-    getContextValue(SimulAction.class).getSimulationParameter().setUseAnalysePlan(fieldSimulUseAnalysePlan.isSelected());
+    simulAction.getSimulationParameter().setUseAnalysePlan(fieldSimulUseAnalysePlan.isSelected());
     if (!isSensitivity()){
         SimulUI simul = getParentContainer(SimulUI.class);
         simul.enableAnalysePlan(fieldSimulUseAnalysePlan.isSelected());
@@ -209,23 +210,23 @@
 }
 protected void enableOnlyExport(){
     if (fieldSimulOnlyExport.isSelected()){
-        getContextValue(SimulAction.class).getSimulationParameter().setOnlyExport(true);
+        simulAction.getSimulationParameter().setOnlyExport(true);
     }
     else {
-        getContextValue(SimulAction.class).getSimulationParameter().setOnlyExport(false);
+        simulAction.getSimulationParameter().setOnlyExport(false);
     }
 }
 protected void setNbAnnees(){
-    getContextValue(SimulAction.class).setNumberOfYear(fieldSimulParamsNbAnnees.getText());
+    simulAction.setNumberOfYear(fieldSimulParamsNbAnnees.getText());
 }
 protected void setListSimulParamsStrategiesItems(){
     DefaultListModel listSimulParamsStrategiesModel = new DefaultListModel();
-    java.util.List<Strategy> strategies = getContextValue(SimulAction.class).getStrategies();
+    java.util.List<Strategy> strategies = simulAction.getStrategies();
     for (Strategy s : strategies){
         listSimulParamsStrategiesModel.addElement(s);
     }
     listSimulParamsStrategies.setModel(listSimulParamsStrategiesModel);
-    java.util.List<Strategy> strategiesSelected = getContextValue(SimulAction.class).getSimulationParameter().getStrategies();
+    java.util.List<Strategy> strategiesSelected = simulAction.getSimulationParameter().getStrategies();
     if (listSimulParamsStrategiesModel.size() != 0){
         int[] indexs = new int[listSimulParamsStrategiesModel.size()];
         int i = 0;
@@ -239,12 +240,12 @@
 }
 protected void setListSimulParamsPopulationsItems(){
     DefaultListModel listSimulParamsPopulationsModel = new DefaultListModel();
-    java.util.List<Population> populations = getContextValue(SimulAction.class).getPopulations();
+    java.util.List<Population> populations = simulAction.getPopulations();
     for (Population p : populations){
         listSimulParamsPopulationsModel.addElement(p);
     }
     listSimulParamsPopulations.setModel(listSimulParamsPopulationsModel);
-    java.util.List<Population> populationsSelected = getContextValue(SimulAction.class).getSimulationParameter().getPopulations();
+    java.util.List<Population> populationsSelected = simulAction.getSimulationParameter().getPopulations();
     if (listSimulParamsPopulationsModel.size() != 0){
         int[] indexs = new int[listSimulParamsPopulationsModel.size()];
         int i = 0;
@@ -257,25 +258,25 @@
     }
 }
 protected void setRulesItems(){
-   listSimulParamsMesuresList.setListData(getContextValue(SimulAction.class).getRules().toArray());
-   listSimulParamsMesuresList.setCellRenderer(new SimpleToolTipComboBoxRenderer(ToolTipListModelFactory.createRuleDescriptionsModel2(getContextValue(SimulAction.class).getSimulationParameter().getRules(),buttonSimulParamsMesuresClear,listSimulParamsMesuresList)));
+   listSimulParamsMesuresList.setListData(simulAction.getRules().toArray());
+   listSimulParamsMesuresList.setCellRenderer(new SimpleToolTipComboBoxRenderer(ToolTipListModelFactory.createRuleDescriptionsModel2(simulAction.getSimulationParameter().getRules(),buttonSimulParamsMesuresClear,listSimulParamsMesuresList)));
 
    setRulesButton();
 }
 protected void populationSelected(){
     if (listSimulParamsPopulations.getSelectedIndex() != -1){
-        getContextValue(SimulAction.class).setPopulations(listSimulParamsPopulations.getSelectedValues());
-        simulParamsNumbers.setMatrix(getContextValue(SimulAction.class).getSimulationParameter().getNumberOf((Population) listSimulParamsPopulations.getSelectedValue()));
+        simulAction.setPopulations(listSimulParamsPopulations.getSelectedValues());
+        simulParamsNumbers.setMatrix(simulAction.getSimulationParameter().getNumberOf((Population) listSimulParamsPopulations.getSelectedValue()));
     }
 }
 protected void strategySelected(){
-    getContextValue(SimulAction.class).setStrategies(listSimulParamsStrategies.getSelectedValues());
+    simulAction.setStrategies(listSimulParamsStrategies.getSelectedValues());
 }
 protected void saveDescription(){
-    getContextValue(SimulAction.class).getSimulationParameter().setDescription(fieldSimulParamsDesc.getText());
+    simulAction.getSimulationParameter().setDescription(fieldSimulParamsDesc.getText());
 }
 protected void setRulesButton(){
-   if (getContextValue(SimulAction.class).getRules().toArray().length == 0){
+   if (simulAction.getRules().toArray().length == 0){
        buttonSimulParamsMesuresClear.setEnabled(false);
        buttonSimulParamsMesuresRemove.setEnabled(false);
    }
@@ -291,7 +292,7 @@
     DefaultTableModel model = new DefaultTableModel();
     Map<String, Class> values;
     if (listSimulParamsMesuresList.getSelectedIndex() != -1){
-        values = getContextValue(SimulAction.class).getRuleParameterName(listSimulParamsMesuresList.getSelectedValue().toString());
+        values = simulAction.getRuleParameterName(listSimulParamsMesuresList.getSelectedValue().toString());
         model = new DefaultTableModel(){
                 @Override
                 public boolean isCellEditable(int row, int column) {
@@ -306,7 +307,7 @@
         java.util.List<GenericCell> cells = new ArrayList<GenericCell>();
         for (Iterator<String> it = values.keySet().iterator(); it.hasNext();) {
             String name = it.next();
-            Object propertie = getContextValue(SimulAction.class).getRuleParameterValue(name, listSimulParamsMesuresList.getSelectedValue().toString());
+            Object propertie = simulAction.getRuleParameterValue(name, listSimulParamsMesuresList.getSelectedValue().toString());
             GenericCell value = new GenericCell(name, values.get(name), null);
             properties.add(propertie);
             cells.add(value);
@@ -316,7 +317,7 @@
     }
     simulParamsRules.setModel(model);
     ParameterColumnEditor cellEditor = new ParameterColumnEditor();
-    cellEditor.setRegion(getContextValue(SimulAction.class).getRegionStorage());
+    cellEditor.setRegion(simulAction.getRegionStorage());
     simulParamsRules.getColumnModel().getColumn(1).setCellEditor(cellEditor);
     simulParamsRules.getModel().addTableModelListener(new TableModelListener() {
         @Override
@@ -324,14 +325,14 @@
             int row = e.getFirstRow();
             TableModel model = (TableModel)e.getSource();
             GenericCell data = (GenericCell) model.getValueAt(row, 0);
-            getContextValue(SimulAction.class).setRuleParameterValue(data.getName(), listSimulParamsMesuresList.getSelectedValue().toString(), model.getValueAt(row, 1));
+            simulAction.setRuleParameterValue(data.getName(), listSimulParamsMesuresList.getSelectedValue().toString(), model.getValueAt(row, 1));
         }
     });
     simulParamsRules.getColumnModel().getColumn(0).setCellRenderer(new SimpleToolTipTableColumnRenderer(ToolTipListModelFactory.createRuleParamsModel(listSimulParamsMesuresList.getSelectedValue().toString())));
 }
 protected void selectFilter(){
     try {
-        getContextValue(SimulAction.class).setOldSimulatorNames(fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterUtil.filterSimulation(getContextValue(SimulAction.class).getOldSimulationItem()));
+        simulAction.setOldSimulatorNames(fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterUtil.filterSimulation(simulAction.getOldSimulationItem()));
         refresh();
     } catch (ParseException ex) {
         if (log.isErrorEnabled()) {
@@ -347,7 +348,7 @@
     return getSimulParamsSelectModel(false);
 }
 protected ComboBoxModel getSimulParamsSelectModel(boolean force) {
-    java.util.List<String> items = getContextValue(SimulAction.class).getFilteredOldSimulatorNames(force);
+    java.util.List<String> items = simulAction.getFilteredOldSimulatorNames(force);
     DefaultComboBoxModel result = new DefaultComboBoxModel();
     if (items != null){
         for (String s : items){
@@ -357,16 +358,16 @@
     return result;
 }
 protected ComboBoxModel getParamsMesuresSelectModel(){
-    java.util.List values = getContextValue(SimulAction.class).getRuleNames();
+    java.util.List values = simulAction.getRuleNames();
     DefaultComboBoxModel model = new DefaultComboBoxModel(values.toArray());
     fieldSimulParamsMesuresSelect.setRenderer(new SimpleToolTipComboBoxRenderer(ToolTipListModelFactory.createRuleDescriptionsModel(values)));
     return model;
 }
 protected void resetFilter(){
-    getContextValue(SimulAction.class).resetOldSimulatorNames();
+    simulAction.resetOldSimulatorNames();
 }
 protected void saveName(){
-    getContextValue(SimulAction.class).setName(fieldSimulParamsName.getText());
+    simulAction.setName(fieldSimulParamsName.getText());
 }
 public Element save(){
     Element result = DocumentHelper.createElement("paramsUI");
@@ -425,7 +426,7 @@
         if (returnVal == JFileChooser.APPROVE_OPTION) {
             File file = fc.getSelectedFile();
             //This is where a real application would open the file.
-            getContextValue(SimulAction.class).saveSimulation(file);
+            simulAction.saveSimulation(file);
         }
     }
 
@@ -499,7 +500,7 @@
                 <row>
                     <cell columns="4" fill="both" weightx="1.0" weighty="0.3">
                         <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'>
-                            <JTextArea id="fieldSimulParamsDesc" text='{getContextValue(SimulAction.class).getSimulationParameter().getDescription()}' onFocusLost='saveDescription()'/>
+                            <JTextArea id="fieldSimulParamsDesc" text='{simulAction.getSimulationParameter().getDescription()}' onFocusLost='saveDescription()'/>
                         </JScrollPane>
                     </cell>
                 </row>
@@ -511,7 +512,7 @@
                                     <JLabel text="isisfish.params.numberYear" minimumSize='{new Dimension(140,25)}' preferredSize='{new Dimension(140,25)}'/>
                                 </cell>
                                 <cell fill="both" weightx="1.0">
-                                    <JTextField id="fieldSimulParamsNbAnnees" text='{getContextValue(SimulAction.class).getSimulationParameter().getNumberOfYear()}' onFocusLost='setNbAnnees()'/>
+                                    <JTextField id="fieldSimulParamsNbAnnees" text='{simulAction.getSimulationParameter().getNumberOfYear()}' onFocusLost='setNbAnnees()'/>
                                 </cell>
                             </row>
                         </Table>
@@ -568,7 +569,7 @@
                             <row>
                                 <cell fill="both"  weightx="1.0" weighty="1.0">
                                     <JScrollPane  minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'>
-                                        <JList id="listSimulParamsMesuresList" selectionMode="0" model='{new DefaultComboBoxModel(getContextValue(SimulAction.class).getRules().toArray())}' onMouseClicked='setRulesButton()'/>
+                                        <JList id="listSimulParamsMesuresList" selectionMode="0" model='{new DefaultComboBoxModel(simulAction.getRules().toArray())}' onMouseClicked='setRulesButton()'/>
                                     </JScrollPane>
                                 </cell>
                             </row>
@@ -627,12 +628,12 @@
                 <row>
                     <cell fill="horizontal" weightx="0.3">
                         <JCheckBox text="isisfish.params.usePreSimulationScript" id="fieldUseSimulPreScripts"
-                        selected='{getContextValue(SimulAction.class).getSimulationParameter().getUsePreScript()}'
+                        selected='{simulAction.getSimulationParameter().getUsePreScript()}'
                         visible='{!isSensitivity()}' onItemStateChanged='enablePreSimul()' onMouseReleased='selTab(event, 1)'/>
                     </cell>
                     <cell fill="horizontal" weightx="0.3">
                         <JCheckBox text="isisfish.params.useAnalysePlan" id="fieldSimulUseAnalysePlan"
-                        selected='{getContextValue(SimulAction.class).getSimulationParameter().getUseAnalysePlan()}'
+                        selected='{simulAction.getSimulationParameter().getUseAnalysePlan()}'
                         visible='{!isSensitivity()}' onItemStateChanged='enableAnalysePlan()' onMouseReleased='selTab(event, 2)'/>
                     </cell>
                     <cell fill="horizontal" weightx="0.3">
@@ -650,7 +651,7 @@
                         <JLabel id="lblLauncher" text="isisfish.params.lblLauncher"/>
                     </cell>
                     <cell fill="horizontal" weightx="0.4">
-                        <JComboBox id="comboSelLauncher" model='{new DefaultComboBoxModel(getContextValue(SimulAction.class).getSimulationLauncher().toArray())}'/>
+                        <JComboBox id="comboSelLauncher" model='{new DefaultComboBoxModel(simulAction.getSimulationLauncher().toArray())}'/>
                     </cell>
                     <cell fill="horizontal" weightx="0.4">
                         <JButton id="buttonSimulParamsSimulate" text="isisfish.common.simulate" onActionPerformed='simul()'/>

    

[Isis-fish-commits] r2254 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator

bpoussin＠users.labs.libre-entreprise.org