Author: chatellier Date: 2011-04-26 15:52:55 +0000 (Tue, 26 Apr 2011) New Revision: 3292 Log: Add some validation check when creating need factors 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/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-04-26 15:52:05 UTC (rev 3291) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanelUI.jaxx 2011-04-26 15:52:55 UTC (rev 3292) @@ -49,7 +49,36 @@ @Override public boolean isFactorValid() { - return true; + boolean valid = false; + + try { + if (continueSelected) { + if (percentageTypeFactor) { + Double coefficient = Double.parseDouble(coefficientField.getText().trim()); + Double referenceValue = Double.parseDouble(referenceValueField.getText().trim()); + String operator = (String)operatorField.getSelectedItem(); + valid = coefficient != null && + referenceValue != null && + operator != null; + } + else { + Double minValue = Double.parseDouble(continueMin.getText().trim()); + Double maxValue = Double.parseDouble(continueMax.getText().trim()); + valid = minValue != null && + maxValue != null; + } + } + else { + valid = true; + } + } + catch (NumberFormatException eee) { + if (log.isWarnEnabled()) { + log.warn("Double parse error", eee); + } + } + + return valid; } ]]></script> <JPanel id="content"> 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-04-26 15:52:05 UTC (rev 3291) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx 2011-04-26 15:52:55 UTC (rev 3292) @@ -29,7 +29,14 @@ <script><![CDATA[ @Override public boolean isFactorValid() { - return true; + boolean valid = false; + + Double coefficient = Double.parseDouble(coef.getText().trim()); + String selectedOperator = (String)operator.getSelectedItem(); + valid = coefficient != null && + selectedOperator != null; + + return valid; } ]]></script> <JPanel id='content'>