r2213 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish: simulator/sensitivity/domain ui/sensitivity - Isis-fish-commits

12 May 2009

Author: bpoussin
Date: 2009-05-12 07:34:09 +0000 (Tue, 12 May 2009)
New Revision: 2213

Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.java
Log:
- ajout d'un message d'erreur (warn) dans les logs pour savoir pourquoi il n'accepte pas un facteur
- modification du LogFactory.get pour mettre le bon nom de classe (le copier/coller c mal)


Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java
===================================================================

--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java	2009-05-12 05:33:42 UTC (rev 2212)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java	2009-05-12 07:34:09 UTC (rev 2213)
@@ -66,6 +66,14 @@
 
     }
 
+    @Override
+    public String toString() {
+        String result = "variableName=" + variableName + " operator=" + operator +
+                " coefficient=" + coefficient + " referenceValue=" + referenceValue +
+                " value=" + value;
+        return result;
+    }
+
     /**
      * Get variable name.
      * 

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx	2009-05-12 05:33:42 UTC (rev 2212)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx	2009-05-12 07:34:09 UTC (rev 2213)
@@ -169,7 +169,7 @@
 }
 protected void setTable(){
     params.setModel(getTableModel());
-    params.getColumnModel().getColumn(3).setCellEditor(new DefaultCellEditor(getOperateur()));
+    // FIXME poussin 20090512, marche pas, impossible d'affiche la combo dans l'interface:    params.getColumnModel().getColumn(3).setCellEditor(new DefaultCellEditor(getOperateur()));
     params.getColumnModel().getColumn(4).setCellEditor(new TableCellEditor() {
 
         @Override

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.java	2009-05-12 05:33:42 UTC (rev 2212)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.java	2009-05-12 07:34:09 UTC (rev 2213)
@@ -40,7 +40,7 @@
 public class FactorAction {
 
     /** to use log facility, just put in your code: log.info(\"...\"); */
-    private static Log log = LogFactory.getLog(SimulAction.class);
+    private static Log log = LogFactory.getLog(FactorAction.class);
 
     public static void saveContinue(JComponent cOrigine, String name, String comment, String path, ContinuousPanelContainerUI panel, SimulAction action, boolean exist){
         DefaultContinuousPanelUI defaultPanel = null;
@@ -66,10 +66,29 @@
 
                 List<EquationContinuousDomain> domains = equationPanel.getDomains();
                 for (EquationContinuousDomain domain : domains) {
-                    if (domain.getReferenceValue() != null && domain.getCoefficient() != null && domain.getCoefficient() <= 100 && domain.getCoefficient() > 0 && domain.getOperator() != null && domain.getVariableName() != null ){
+                    if (domain.getReferenceValue() != null 
+                            && domain.getCoefficient() != null
+                            && domain.getCoefficient() <= 100
+                            && domain.getCoefficient() > 0
+                            && domain.getOperator() != null
+                            && domain.getVariableName() != null ){
                         action.addContinuousEquationFactor(name, comment, path, domain, cOrigine, exist);
-                    }
-                    else {
+                    } else {
+                        log.warn("domain: " + domain);
+                        log.warn("domain invalid: " +
+                                "domain.getReferenceValue() != null(" +
+                                (domain.getReferenceValue()) +
+                                ") domain.getCoefficient() != null(" +
+                                (domain.getCoefficient()) +
+                                ") domain.getCoefficient() <= 100 (" +
+                                (domain.getCoefficient()) +
+                                ") domain.getCoefficient() > 0 (" +
+                                (domain.getCoefficient()) +
+                                ") domain.getOperator() != null (" +
+                                (domain.getOperator()) +
+                                ") domain.getVariableName() != null(" +
+                                (domain.getVariableName()) +
+                                ")");
                         JOptionPane.showMessageDialog(equationPanel, _("isisfish.error.factor.invalid") + domain.getVariableName());
                     }
                 }

    

r2213 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish: simulator/sensitivity/domain ui/sensitivity

bpoussin＠users.labs.libre-entreprise.org

tags

participants (1)