From chatellier@users.labs.libre-entreprise.org Mon Jun 15 00:26:47 2026
From: chatellier@users.labs.libre-entreprise.org
To: isis-fish-commits@list.isis-fish.org
Subject: [Isis-fish-commits] r3323 -
	isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity
Date: Thu, 12 May 2011 15:46:50 +0200
Message-ID: <20110512134650.912702F186@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7253870304574674752=="

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

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/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-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 =3D Double.parseDouble(coefficientField.g=
etText().trim());
                 Double referenceValue =3D Double.parseDouble(referenceValueF=
ield.getText().trim());
-                valid =3D coefficient !=3D null &&
-                    referenceValue !=3D null;
+                valid =3D coefficient !=3D null && referenceValue !=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;
+                valid =3D minValue !=3D null && maxValue !=3D null;
             }
         }
         else {

Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensi=
tivity/EquationContinuousPanelUI.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=
/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() <=3D 0
                 || domain.getVariableName() =3D=3D null) {
-        } else {
             valid =3D false;
         }
     }

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-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 =3D false;
=20
     Double coefficient =3D Double.parseDouble(coef.getText().trim());
-    valid =3D coefficient !=3D null;
+    boolean valid =3D coefficient !=3D null;
=20
     return valid;
 }


--===============7253870304574674752==--