[Isis-fish-commits] r3172 - in isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish: simulator/sensitivity ui/result ui/simulator/filter ui/vcs ui/widget/filter

17 Mar 2011

Author: chatellier
Date: 2011-03-17 10:34:09 +0000 (Thu, 17 Mar 2011)
New Revision: 3172

Log:
Fix code style, import...

Modified:
   isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java
   isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/InfoPanelable.java
   isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java
   isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultViewUI.java
   isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialog.java
   isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterPanelUI.jaxx
   isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateDialogUI.jaxx
   isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx
   isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterPanelUI.jaxx

Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java
===================================================================

--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java	2011-03-17 10:33:07 UTC (rev 3171)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java	2011-03-17 10:34:09 UTC (rev 3172)
@@ -30,25 +30,29 @@
 import java.util.Collection;
 import java.util.List;
 
-import fr.ifremer.isisfish.datastore.SimulationStorage;
-import fr.ifremer.isisfish.export.SensitivityExport;
+import javax.swing.Box;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JScrollPane;
+import javax.swing.JTextPane;
+
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.j2r.REngine;
 import org.nuiton.j2r.RException;
 import org.nuiton.j2r.RProxy;
+import org.nuiton.topia.TopiaContext;
+import org.nuiton.topia.persistence.TopiaEntity;
+import org.nuiton.util.FileUtil;
 
+import fr.ifremer.isisfish.datastore.SimulationStorage;
+import fr.ifremer.isisfish.export.SensitivityExport;
 import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain;
 import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain;
 import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain;
 import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDomain;
-import org.nuiton.topia.TopiaContext;
-import org.nuiton.topia.persistence.TopiaEntity;
-import org.nuiton.util.FileUtil;
 
-import javax.swing.*;
-
 public abstract class AbstractSensitivityCalculator implements
         SensitivityCalculator {
 

Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/InfoPanelable.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/InfoPanelable.java	2011-03-17 10:33:07 UTC (rev 3171)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/InfoPanelable.java	2011-03-17 10:34:09 UTC (rev 3172)
@@ -24,7 +24,8 @@
  */
 package fr.ifremer.isisfish.ui.result;
 
-import javax.swing.*;
+import javax.swing.JLabel;
+import javax.swing.JList;
 
 /**
  * InfoPanelable.

Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java	2011-03-17 10:33:07 UTC (rev 3171)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java	2011-03-17 10:34:09 UTC (rev 3172)
@@ -26,6 +26,19 @@
 
 import static org.nuiton.i18n.I18n._;
 
+import java.awt.Dimension;
+import java.awt.event.ItemEvent;
+import java.beans.PropertyVetoException;
+import java.io.IOException;
+import java.text.ParseException;
+import java.util.List;
+
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.JInternalFrame;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 import fr.ifremer.isisfish.datastore.SimulationStorage;
 import fr.ifremer.isisfish.logging.SimulationLoggerUtil;
 import fr.ifremer.isisfish.simulator.SimulationProperties;
@@ -35,17 +48,7 @@
 import fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterUtil;
 import fr.ifremer.isisfish.ui.util.ErrorHelper;
 import fr.ifremer.isisfish.ui.widget.filter.FilterModel;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.ItemEvent;
-import java.beans.PropertyVetoException;
-import java.io.IOException;
-import java.text.ParseException;
-import java.util.List;
-
 /**
  * ResultView.java
  *

Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultViewUI.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultViewUI.java	2011-03-17 10:33:07 UTC (rev 3171)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultViewUI.java	2011-03-17 10:34:09 UTC (rev 3172)
@@ -27,8 +27,12 @@
 
 import static org.nuiton.i18n.I18n._;
 
-import javax.swing.*;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.ItemEvent;
@@ -38,6 +42,19 @@
 import java.util.HashMap;
 import java.util.Vector;
 
+import javax.swing.AbstractButton;
+import javax.swing.Box;
+import javax.swing.ButtonGroup;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.JPanel;
+
 public abstract class ResultViewUI extends JPanel implements ResultViewUICallback{
 
     public ResultViewUI(){

Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialog.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialog.java	2011-03-17 10:33:07 UTC (rev 3171)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialog.java	2011-03-17 10:34:09 UTC (rev 3172)
@@ -71,7 +71,7 @@
         if ($binding.equals("reset.enabled")) {
             if (comboResult != null) {
                 $bindingSources.put("comboResult", comboResult);
-                this.comboResult.addItemListener((java.awt.event.ItemListener) jaxx.runtime.Util.getEventListener(java.awt.event.ItemListener.class, this, "$pr$u10"));
+                this.comboResult.addItemListener((java.awt.event.ItemListener) jaxx.runtime.JAXXUtil.getEventListener(java.awt.event.ItemListener.class, this, "$pr$u10"));
             }
             processDataBinding($binding);
         } else super.applyDataBinding($binding);
@@ -80,7 +80,7 @@
     public void removeDataBinding(String $binding) {
         if ($binding.equals("reset.enabled")) {
             if (comboResult != null) {
-                ((jaxx.runtime.swing.JAXXComboBox) $bindingSources.remove("comboResult")).removeItemListener((java.awt.event.ItemListener) jaxx.runtime.Util.getEventListener(java.awt.event.ItemListener.class, this, "$pr$u10"));
+                ((jaxx.runtime.swing.JAXXComboBox) $bindingSources.remove("comboResult")).removeItemListener((java.awt.event.ItemListener) jaxx.runtime.JAXXUtil.getEventListener(java.awt.event.ItemListener.class, this, "$pr$u10"));
             }
         } else super.removeDataBinding($binding);
     }

Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterPanelUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterPanelUI.jaxx	2011-03-17 10:33:07 UTC (rev 3171)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterPanelUI.jaxx	2011-03-17 10:34:09 UTC (rev 3172)
@@ -23,11 +23,15 @@
   #L%
   -->
 <fr.ifremer.isisfish.ui.widget.filter.FilterPanelUI>
-     <script>    
-    import fr.ifremer.isisfish.simulator.SimulationMeta;
-         
-    protected static java.text.SimpleDateFormat simpleDateFormat =
-        new java.text.SimpleDateFormat("dd/MM/yyyy");
+<import>
+    fr.ifremer.isisfish.simulator.SimulationMeta
+    fr.ifremer.isisfish.ui.widget.filter.FilterDialogUI
+    org.jdesktop.swingx.JXDatePicker
+
+    java.text.SimpleDateFormat
+</import>
+<script>    
+    protected static SimpleDateFormat simpleDateFormat = new SimpleDateFormat("dd/MM/yyyy");
     
     public SimulationFilterPanelUI(fr.ifremer.isisfish.ui.widget.filter.FilterDialogUI dialog) {
            super(dialog);

Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateDialogUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateDialogUI.jaxx	2011-03-17 10:33:07 UTC (rev 3171)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateDialogUI.jaxx	2011-03-17 10:34:09 UTC (rev 3172)
@@ -26,7 +26,6 @@
     <script><![CDATA[
         // FIXME a refaire
 
-//    import static org.nuiton.vcs.VCSState.*;
 //    import org.nuiton.vcs.VCSState;
 
 //    protected org.nuiton.vcs.VCSRepositoryState model;

Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx	2011-03-17 10:33:07 UTC (rev 3171)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx	2011-03-17 10:34:09 UTC (rev 3172)
@@ -23,19 +23,22 @@
   #L%
   -->
 <JDialog>
-    <script>    
-    import jaxx.runtime.JAXXObject;        
-    import javax.swing.text.html.HTMLEditorKit;
-    import javax.swing.text.html.HTMLDocument;
-    import javax.swing.event.HyperlinkListener;
-    import javax.swing.text.html.HTMLFrameHyperlinkEvent;
-    import javax.swing.event.HyperlinkEvent;
-    import java.io.PrintWriter;
-    import java.io.StringWriter;
+    <import>
+    jaxx.runtime.JAXXObject
+    javax.swing.text.html.HTMLEditorKit
+    javax.swing.text.html.HTMLDocument
+    javax.swing.event.HyperlinkListener
+    javax.swing.text.html.HTMLFrameHyperlinkEvent
+    javax.swing.event.HyperlinkEvent
+    java.io.PrintWriter
+    java.io.StringWriter
 
-    import org.nuiton.widget.DatePicker;
-    import org.nuiton.widget.InvalidDateException;
-
+    fr.ifremer.isisfish.ui.widget.filter.FilterModel
+    fr.ifremer.isisfish.ui.widget.filter.FilterParamModel
+    fr.ifremer.isisfish.ui.widget.filter.FilterPanelUI
+    java.util.List
+    </import>
+    <script>
     /** filter model */
     protected fr.ifremer.isisfish.ui.widget.filter.FilterModel model;
 

Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterPanelUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterPanelUI.jaxx	2011-03-17 10:33:07 UTC (rev 3171)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterPanelUI.jaxx	2011-03-17 10:34:09 UTC (rev 3172)
@@ -23,18 +23,20 @@
   #L%
   -->
 <JPanel>
-    <script>
-    import org.nuiton.widget.DatePicker;
-    import org.nuiton.widget.InvalidDateException;
-
-    protected fr.ifremer.isisfish.ui.widget.filter.FilterDialogUI dialog;
+<import>
+    org.jdesktop.swingx.JXDatePicker
+    fr.ifremer.isisfish.ui.widget.filter.FilterDialogUI
+    java.text.SimpleDateFormat
+    fr.ifremer.isisfish.ui.widget.filter.FilterParamModel
+    fr.ifremer.isisfish.ui.util.JaxxUtil
+</import>
+<script>
+    protected FilterDialogUI dialog;
     
-    protected static java.text.SimpleDateFormat simpleDateFormat =
-        new java.text.SimpleDateFormat("dd/MM/yyyy");
+    protected static SimpleDateFormat simpleDateFormat = new SimpleDateFormat("dd/MM/yyyy");
 
     protected FilterPanelUI(fr.ifremer.isisfish.ui.widget.filter.FilterDialogUI dialog) {
-           this.dialog = dialog;
-            
+           this.dialog = dialog; 
     }
     
     /**
@@ -50,39 +52,29 @@
     }
     @SuppressWarnings({"unchecked"})
     public void doReset() {
-        fr.ifremer.isisfish.ui.util.JaxxUtil.doReset(get$objectMap());        
+        JaxxUtil.doReset(get$objectMap());        
     }
     
     protected void extractTextFieldParam(String paramKey) {
         JTextField field = (JTextField) getObjectById(paramKey);
-        fr.ifremer.isisfish.ui.widget.filter.FilterParamModel paramModel = dialog.getParamModel(paramKey);
+        FilterParamModel paramModel = dialog.getParamModel(paramKey);
         if (paramModel.canUse(field.getText()))
             paramModel.extractParam(field.getText());
     }
     protected void extractCheckBoxParam(String paramKey) {
         JCheckBox field = (JCheckBox) getObjectById(paramKey);
-        fr.ifremer.isisfish.ui.widget.filter.FilterParamModel paramModel = dialog.getParamModel(paramKey);
+        FilterParamModel paramModel = dialog.getParamModel(paramKey);
         if (field.isSelected())
             paramModel.extractParam("true");
     }
     protected void extractDateInterval(String name, String paramKey, String paramKey2) {
-        DatePicker field = (DatePicker) getObjectById(paramKey);
-        DatePicker field2 = (DatePicker) getObjectById(paramKey2);
-        fr.ifremer.isisfish.ui.widget.filter.FilterParamModel paramModel = dialog.getParamModel(name);
-        if (paramModel.canUse(field.getText(), field2.getText())) {
-            java.util.Date d0,d1;
-            try {
-                d0 = field.getDate();
-            } catch (InvalidDateException e) {
-                d0=null;
-            }
-            try {
-                d1 = field2.getDate();
-            } catch (InvalidDateException e) {
-                d1=null;
-            }
-            paramModel.extractParam(d0==null?null:d0.getTime()+"",d1==null?null:d1.getTime()+"");
-        }
+        JXDatePicker field = (JXDatePicker) getObjectById(paramKey);
+        JXDatePicker field2 = (JXDatePicker) getObjectById(paramKey2);
+        FilterParamModel paramModel = dialog.getParamModel(name);
+        java.util.Date d0,d1;
+        d0 = field.getDate();
+        d1 = field2.getDate();
+        paramModel.extractParam(d0==null?null:d0.getTime()+"",d1==null?null:d1.getTime()+"");
     }
     </script>    
 </JPanel>

    

[Isis-fish-commits] r3172 - in isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish: simulator/sensitivity ui/result ui/simulator/filter ui/vcs ui/widget/filter

chatellier＠users.labs.libre-entreprise.org