From chatellier@users.labs.libre-entreprise.org Mon Jun 15 00:26:46 2026
From: chatellier@users.labs.libre-entreprise.org
To: isis-fish-commits@list.isis-fish.org
Subject: [Isis-fish-commits] r3292 -
	isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity
Date: Tue, 26 Apr 2011 17:52:56 +0200
Message-ID: <20110426155256.312CC2F17D@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5763315703679189437=="

--===============5763315703679189437==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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/sensi=
tivity/DefaultContinuousPanelUI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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 @@
=20
 @Override
 public boolean isFactorValid() {
-    return true;
+    boolean valid =3D false;
+   =20
+    try {
+        if (continueSelected) {
+            if (percentageTypeFactor) {
+                Double coefficient =3D Double.parseDouble(coefficientField.g=
etText().trim());
+                Double referenceValue =3D Double.parseDouble(referenceValueF=
ield.getText().trim());
+                String operator =3D (String)operatorField.getSelectedItem();
+                valid =3D coefficient !=3D null &&
+                    referenceValue !=3D null &&
+                    operator !=3D null;
+            }
+            else {
+                Double minValue =3D Double.parseDouble(continueMin.getText()=
.trim());
+                Double maxValue =3D Double.parseDouble(continueMax.getText()=
.trim());
+                valid =3D minValue !=3D null &&
+                    maxValue !=3D null;
+            }
+        }
+        else {
+            valid =3D true;
+        }
+    }
+    catch (NumberFormatException eee) {
+        if (log.isWarnEnabled()) {
+            log.warn("Double parse error", eee);
+        }
+    }
+   =20
+    return valid;
 }
     ]]></script>
     <JPanel id=3D"content">

Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensi=
tivity/MatrixContinuousPanelUI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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 =3D false;
+
+    Double coefficient =3D Double.parseDouble(coef.getText().trim());
+    String selectedOperator =3D (String)operator.getSelectedItem();
+    valid =3D coefficient !=3D null &&
+        selectedOperator !=3D null;
+
+    return valid;
 }
     ]]></script>
     <JPanel id=3D'content'>


--===============5763315703679189437==--