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

6 Jan 2010

Author: chatellier
Date: 2010-01-06 16:01:36 +0000 (Wed, 06 Jan 2010)
New Revision: 2880

Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx
Log:
Refactor advanced parameters (a border around 'free parameters')

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

--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx	2010-01-06 11:32:03 UTC (rev 2879)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx	2010-01-06 16:01:36 UTC (rev 2880)
@@ -1,6 +1,6 @@
 <!--
 /* *##%
- * Copyright (C) 2005 - 2009 Ifremer, Code Lutin
+ * Copyright (C) 2005 - 2010 Ifremer, Code Lutin
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -26,224 +26,215 @@
     import javax.swing.table.DefaultTableModel;
     import java.util.Map.Entry;
 
-    tableTagValue.addMouseListener(new MouseAdapter() {
+    /**
+     * Listener to enable/disable remove button.
+     */
+    tableTagValues.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
         @Override
-        public void mouseReleased(MouseEvent e) {
-            setRemove(tableTagValue.getSelectedRow() != -1);
+        public void valueChanged(ListSelectionEvent e) {
+            setRemove(tableTagValues.getSelectedRow() != -1);
         }
     });
     
     refresh();
     
-    public void refresh(){
-        setTableTagValue();
+    public void refresh() {
+        setTableTagValues();
     }
     
-    public AdvancedParamsUI (SimulAction action){
+    public AdvancedParamsUI(SimulAction action) {
         setContextValue(action);
     }
-    protected void addTagValue(){
+
+    protected void addTagValue() {
         getContextValue(SimulAction.class).addTagValue(fieldTag.getText(), fieldValue.getText());
-        setTableTagValue();
-        setRemove(true);
+        setTableTagValues();
         valueChanged(true);
     }
-    protected void removeTagValue(){
-        getContextValue(SimulAction.class).removeTagValue(tableTagValue.getValueAt(tableTagValue.getSelectedRow(),0).toString());
-        setTableTagValue();
+
+    protected void removeTagValue() {
+        getContextValue(SimulAction.class).removeTagValue(tableTagValues.getValueAt(tableTagValues.getSelectedRow(),0).toString());
+        setTableTagValues();
         valueChanged(true);
     }
-    protected void saveTagValue(){
-        if (fieldSimulAdvParamsSimulatorSelect.getSelectedIndex() != -1){
+
+    protected void saveTagValues() {
+        if (fieldSimulAdvParamsSimulatorSelect.getSelectedIndex() != -1) {
             getContextValue(SimulAction.class).saveTagValue(fieldSimulAdvParamsSimulatorSelect.getSelectedItem().toString());    
         }
         valueChanged(false);
     }
-    protected void setSimulName(){
-        if (fieldSimulAdvParamsSimulatorSelect.getSelectedIndex() != -1){
+
+    protected void setSimulatorName() {
+        if (fieldSimulAdvParamsSimulatorSelect.getSelectedIndex() != -1) {
             getContextValue(SimulAction.class).getSimulationParameter().setSimulatorName(fieldSimulAdvParamsSimulatorSelect.getSelectedItem().toString());
             valueChanged(true);
         }
     }
-    protected void setTableTagValue(){
-        Map<String, String> tagValue = getContextValue(SimulAction.class).getSimulationParameter().getTagValue();
+
+    protected void setTableTagValues() {
+        Map<String, String> tagValues = getContextValue(SimulAction.class).getSimulationParameter().getTagValue();
         
         // TODO make a table model for it
         String columnName[] = { _("isisfish.common.tag"), _("isisfish.common.value")};
-        if (tagValue != null) {
-            DefaultTableModel model = new DefaultTableModel(columnName, tagValue.size()){
+        if (tagValues != null) {
+            DefaultTableModel model = new DefaultTableModel(columnName, tagValues.size()) {
                 @Override
                 public boolean isCellEditable(int row, int column) {
                     return false;
                 }
             };
-            Set<Entry<String, String>> set = tagValue.entrySet();
+            Set<Entry<String, String>> set = tagValues.entrySet();
             int row = 0;
-            for (Iterator<String> it = tagValue.keySet().iterator(); it.hasNext();) {
+            for (Iterator<String> it = tagValues.keySet().iterator(); it.hasNext();) {
                 String name = it.next();
                 model.setValueAt(name, row, 0);
-                model.setValueAt(tagValue.get(name), row, 1);
+                model.setValueAt(tagValues.get(name), row, 1);
                 row++;
             }
-            tableTagValue.setModel(model);
+            tableTagValues.setModel(model);
         }
-        else {
-            DefaultTableModel model = new DefaultTableModel(columnName, 0);
-        }
     }
-    protected void valueChanged(boolean b){
-         save.setEnabled(b);
+
+    protected void valueChanged(boolean b) {
          setChanged(b);
     }
+
     ]]>
     </script>
     <row>
-        <cell fill="horizontal" weightx="0.16">
-            <Table>
-                <row>
-                    <cell>
-                        <JLabel text="isisfish.advancedParams.simulatorUse"/>
-                    </cell>
-                    <cell fill="horizontal" weightx="1.0">
-                        <JPanel/>
-                    </cell>
-                </row>
-            </Table>
+        <cell fill="horizontal" rows="2">
+            <JLabel text="isisfish.advancedParams.simulatorUse"/>
         </cell>
-        <cell columns="5" fill="horizontal" weightx="0.84">
-            <JComboBox id="fieldSimulAdvParamsSimulatorSelect" model='{new DefaultComboBoxModel(getContextValue(SimulAction.class).getSimulatorNames().toArray())}' onActionPerformed='setSimulName()'/>
+        <cell columns="4" fill="horizontal">
+            <JComboBox id="fieldSimulAdvParamsSimulatorSelect" model='{new DefaultComboBoxModel(getContextValue(SimulAction.class).getSimulatorNames().toArray())}' onActionPerformed='setSimulatorName()'/>
         </cell>
     </row>
     <row>
-        <cell fill="horizontal"  weightx="0.2">
-            <JPanel/>
-        </cell>
-        <cell columns="2" fill="horizontal"  weightx="0.3">
+        <cell columns="2" fill="horizontal">
             <JCheckBox id="fieldSimulationStatistique" text="isisfish.advancedParams.simulationStatistique" selected='{getContextValue(SimulAction.class).getSimulationParameter().getUseStatistic()}'
-            onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setUseStatistic(fieldSimulationStatistique.isSelected());valueChanged(true);'/>
+            onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setUseStatistic(fieldSimulationStatistique.isSelected());'/>
         </cell>
-        <cell fill="horizontal" weightx="0.2">
-            <JPanel/>
-        </cell>
-        <cell columns="2" fill="horizontal" weightx="0.3">
+        <cell columns="2" fill="horizontal">
             <JCheckBox id="fieldSimulationCache" text="isisfish.advancedParams.simulationCache" selected='{getContextValue(SimulAction.class).getSimulationParameter().getUseOptimization()}' 
-            onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setUseOptimization(fieldSimulationCache.isSelected());valueChanged(true);'/>
+            onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setUseOptimization(fieldSimulationCache.isSelected());'/>
         </cell>
     </row>
     <row>
-        <cell columns="2" fill="horizontal" weightx="0.2">
+        <cell fill="horizontal" weightx="1.0">
             <JLabel text="isisfish.advancedParams.simulLevelLogger"/>
         </cell>
-        <cell fill="horizontal" weightx="0.2">
+        <cell fill="horizontal" weightx="1.0">
             <JRadioButton id="fieldSimulAdvParamsSimulLoggerError" text="isisfish.common.error"
             buttonGroup="fieldSimulAdvParamsSimulLoggerGroup" selected='{getContextValue(SimulAction.class).getSimulationParameter().isSimulErrorLevel()}'
-            onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setSimulLogLevel("error");valueChanged(true);'/>
+            onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setSimulLogLevel("error");'/>
         </cell>
-        <cell fill="horizontal" weightx="0.2">
+        <cell fill="horizontal" weightx="1.0">
             <JRadioButton id="fieldSimulAdvParamsSimulLoggerWarn" text="isisfish.common.warn"
             buttonGroup="fieldSimulAdvParamsSimulLoggerGroup" selected='{getContextValue(SimulAction.class).getSimulationParameter().isSimulWarnLevel()}'
-            onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setSimulLogLevel("warn");valueChanged(true);'/>
+            onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setSimulLogLevel("warn");'/>
         </cell>
-        <cell fill="horizontal" weightx="0.2">
+        <cell fill="horizontal" weightx="1.0">
             <JRadioButton id="fieldSimulAdvParamsSimulLoggerInfo" text="isisfish.common.info"
             buttonGroup="fieldSimulAdvParamsSimulLoggerGroup" selected='{getContextValue(SimulAction.class).getSimulationParameter().isSimulInfoLevel()}'
-            onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setSimulLogLevel("info");valueChanged(true);'/>
+            onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setSimulLogLevel("info");'/>
         </cell>
-        <cell fill="horizontal" weightx="0.2">
+        <cell fill="horizontal" weightx="1.0">
             <JRadioButton id="fieldSimulAdvParamsSimulLoggerDebug" text="isisfish.common.debug"
             buttonGroup="fieldSimulAdvParamsSimulLoggerGroup" selected='{getContextValue(SimulAction.class).getSimulationParameter().isSimulDebugLevel()}'
-            onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setSimulLogLevel("debug");valueChanged(true);'/>
+            onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setSimulLogLevel("debug");'/>
         </cell>
     </row>
     <row>
-        <cell columns="2" fill="horizontal" weightx="0.2">
+        <cell fill="horizontal">
             <JLabel text="isisfish.advancedParams.scriptLevelLogger"/>
         </cell>
-        <cell fill="horizontal" weightx="0.2">
+        <cell fill="horizontal">
             <JRadioButton id="fieldSimulAdvParamsScriptLoggerError" text="isisfish.common.error"
             buttonGroup="fieldSimulAdvParamsScriptLoggerGroup" selected='{getContextValue(SimulAction.class).getSimulationParameter().isScriptErrorLevel()}'
-            onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setScriptLogLevel("error");valueChanged(true);'/>
+            onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setScriptLogLevel("error");'/>
         </cell>
-        <cell fill="horizontal" weightx="0.2">
+        <cell fill="horizontal">
             <JRadioButton id="fieldSimulAdvParamsScriptLoggerWarn" text="isisfish.common.warn"
             buttonGroup="fieldSimulAdvParamsScriptLoggerGroup" selected='{getContextValue(SimulAction.class).getSimulationParameter().isScriptWarnLevel()}'
-            onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setScriptLogLevel("warn");valueChanged(true);'/>
+            onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setScriptLogLevel("warn");'/>
         </cell>
-        <cell fill="horizontal" weightx="0.2">
+        <cell fill="horizontal">
             <JRadioButton id="fieldSimulAdvParamsScriptLoggerInfo" text="isisfish.common.info"
             buttonGroup="fieldSimulAdvParamsScriptLoggerGroup" selected='{getContextValue(SimulAction.class).getSimulationParameter().isScriptInfoLevel()}'
-            onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setScriptLogLevel("info");valueChanged(true);'/>
+            onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setScriptLogLevel("info");'/>
         </cell>
-        <cell fill="horizontal" weightx="0.2">
+        <cell fill="horizontal">
             <JRadioButton id="fieldSimulAdvParamsScriptLoggerDebug" text="isisfish.common.debug"
             buttonGroup="fieldSimulAdvParamsScriptLoggerGroup" selected='{getContextValue(SimulAction.class).getSimulationParameter().isScriptDebugLevel()}'
-            onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setScriptLogLevel("debug");valueChanged(true);'/>
+            onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setScriptLogLevel("debug");'/>
         </cell>
     </row>
     <row>
-        <cell columns="2" fill="horizontal" weightx="0.2">
+        <cell fill="horizontal">
             <JLabel text="isisfish.advancedParams.libLevelLogger"/>
         </cell>
-        <cell fill="horizontal" weightx="0.2">
+        <cell fill="horizontal">
             <JRadioButton id="fieldSimulAdvParamsLibLoggerError" text="isisfish.common.error"
             buttonGroup="fieldSimulAdvParamsLibLoggerGroup" selected='{getContextValue(SimulAction.class).getSimulationParameter().isLibErrorLevel()}' 
-            onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setLibLogLevel("error");valueChanged(true);'/>
+            onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setLibLogLevel("error");'/>
         </cell>
-        <cell fill="horizontal" weightx="0.2">
+        <cell fill="horizontal">
             <JRadioButton id="fieldSimulAdvParamsLibLoggerWarn" text="isisfish.common.warn"
             buttonGroup="fieldSimulAdvParamsLibLoggerGroup" selected='{getContextValue(SimulAction.class).getSimulationParameter().isLibWarnLevel()}'
-            onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setLibLogLevel("warn");valueChanged(true);'/>
+            onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setLibLogLevel("warn");'/>
         </cell>
-        <cell fill="horizontal" weightx="0.2">
+        <cell fill="horizontal">
             <JRadioButton id="fieldSimulAdvParamsLibLoggerInfo" text="isisfish.common.info"
             buttonGroup="fieldSimulAdvParamsLibLoggerGroup" selected='{getContextValue(SimulAction.class).getSimulationParameter().isLibInfoLevel()}' 
-            onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setLibLogLevel("info");valueChanged(true);'/>
+            onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setLibLogLevel("info");'/>
         </cell>
-        <cell fill="horizontal" weightx="0.2">
+        <cell fill="horizontal">
             <JRadioButton id="fieldSimulAdvParamsLibLoggerDebug" text="isisfish.common.debug"
             buttonGroup="fieldSimulAdvParamsLibLoggerGroup" selected='{getContextValue(SimulAction.class).getSimulationParameter().isLibDebugLevel()}' 
-            onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setLibLogLevel("debug");valueChanged(true);'/>
+            onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setLibLogLevel("debug");'/>
         </cell>
     </row>
     <row>
-        <cell columns="6" fill="horizontal" weightx="1.0">
-            <JLabel text="isisfish.advancedParams.freeParameters" horizontalAlignment="0"/>
+        <cell columns="5" fill="both" weighty="1" weightx="1">
+            <Table border='{BorderFactory.createTitledBorder(_("isisfish.advancedParams.freeParameters"))}'>
+                <row>
+                    <cell fill="horizontal">
+                        <JLabel text="isisfish.common.tag"/>
+                    </cell>
+                    <cell fill="horizontal" weightx="1">
+                        <JTextField id="fieldTag" onKeyTyped="setAjout(true)"/>
+                    </cell>
+                    <cell fill="horizontal">
+                        <JLabel text="isisfish.common.value"/>
+                    </cell>
+                    <cell fill="horizontal" weightx="1">
+                        <JTextField id="fieldValue" onKeyTyped="setAjout(true)"/>
+                    </cell>
+                </row>
+                <row>
+                    <cell columns="4" fill="horizontal" weightx="1.0">
+                        <JButton text="isisfish.common.add" enabled="{isAjout()}" onActionPerformed='addTagValue()'/>
+                    </cell>
+                </row>
+                <row>
+                    <cell columns="4" fill="both" weightx="1.0" weighty="1.0">
+                        <JScrollPane>
+                            <JTable id="tableTagValues"/>
+                        </JScrollPane>
+                    </cell>
+                </row>
+                <row>
+                    <cell columns="4" fill="horizontal" weightx="1.0">
+                        <JButton text="isisfish.common.remove" enabled="{isRemove()}" onActionPerformed='removeTagValue()'/>
+                    </cell> 
+                </row>
+                <row>
+                    <cell columns="5" fill="horizontal">
+                        <JButton text="isisfish.common.saveNextSimulation" enabled="{isChanged()}" onActionPerformed='saveTagValues()'/>
+                    </cell>
+                </row>
+            </Table>
         </cell>
     </row>
-    <row>
-        <cell fill="horizontal" weightx="0.25">
-            <JLabel text="isisfish.common.tag"/>
-        </cell>
-        <cell columns="2" fill="horizontal" weightx="0.25">
-            <JTextField id="fieldTag" onKeyTyped="setAjout(true)"/>
-        </cell>
-        <cell fill="horizontal" weightx="0.25">
-            <JLabel text="isisfish.common.value"/>
-        </cell>
-        <cell columns="2" fill="horizontal" weightx="0.25">
-            <JTextField id="fieldValue" onKeyTyped="setAjout(true)"/>
-        </cell>
-    </row>
-    <row>
-        <cell columns="6" fill="horizontal" weightx="1.0">
-            <JButton id='add' text="isisfish.common.add" enabled="{isAjout()}" onActionPerformed='addTagValue()'/>
-        </cell>
-    </row>
-    <row>
-        <cell columns="6" fill="both" weightx="1.0" weighty="1.0">
-            <JScrollPane>
-                <JTable id="tableTagValue"/>
-            </JScrollPane>
-        </cell>
-    </row>
-    <row>
-        <cell columns="6" fill="horizontal" weightx="1.0">
-            <JButton text="isisfish.common.remove" enabled="{isRemove()}" onActionPerformed='removeTagValue()'/>
-        </cell> 
-    </row>
-    <row>
-        <cell  columns="6" fill="horizontal" weightx="1.0">
-            <JButton id='save' text="isisfish.common.saveNextSimulation" enabled="{isChanged()}" onActionPerformed='saveTagValue()'/>
-        </cell>
-    </row>
-</Table>	     
\ No newline at end of file
+</Table>

    

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

chatellier＠users.labs.libre-entreprise.org