Author: chatellier Date: 2011-05-12 13:46:50 +0000 (Thu, 12 May 2011) New Revision: 3323 Log: Fix factor validation. Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanelUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanelUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanelUI.jaxx 2011-05-12 13:23:49 UTC (rev 3322) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanelUI.jaxx 2011-05-12 13:46:50 UTC (rev 3323) @@ -55,14 +55,12 @@ if (percentageTypeFactor) { Double coefficient = Double.parseDouble(coefficientField.getText().trim()); Double referenceValue = Double.parseDouble(referenceValueField.getText().trim()); - valid = coefficient != null && - referenceValue != null; + valid = coefficient != null && referenceValue != null; } else { Double minValue = Double.parseDouble(continueMin.getText().trim()); Double maxValue = Double.parseDouble(continueMax.getText().trim()); - valid = minValue != null && - maxValue != null; + valid = minValue != null && maxValue != null; } } else { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx 2011-05-12 13:23:49 UTC (rev 3322) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx 2011-05-12 13:46:50 UTC (rev 3323) @@ -236,7 +236,6 @@ || domain.getCoefficient() > 100 || domain.getCoefficient() <= 0 || domain.getVariableName() == null) { - } else { valid = false; } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx 2011-05-12 13:23:49 UTC (rev 3322) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx 2011-05-12 13:46:50 UTC (rev 3323) @@ -29,10 +29,9 @@ <script><![CDATA[ @Override public boolean isFactorValid() { - boolean valid = false; Double coefficient = Double.parseDouble(coef.getText().trim()); - valid = coefficient != null; + boolean valid = coefficient != null; return valid; }