From chatellier@users.labs.libre-entreprise.org Mon Jun 15 00:26:45 2026
From: chatellier@users.labs.libre-entreprise.org
To: isis-fish-commits@list.isis-fish.org
Subject: [Isis-fish-commits] r3255 - in isis-fish/branches/3.3.1/src/main:
	java/fr/ifremer/isisfish/ui/input	resources/fr/ifremer/isisfish/entities
Date: Fri, 15 Apr 2011 18:41:27 +0200
Message-ID: <20110415164127.58EEE2F164@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2829207475842964396=="

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

Author: chatellier
Date: 2011-04-15 16:41:27 +0000 (Fri, 15 Apr 2011)
New Revision: 3255

Log:
Fix validation

Added:
   isis-fish/branches/3.3.1/src/main/resources/fr/ifremer/isisfish/entities/S=
trategy-basics-error-validation.xml
Modified:
   isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI=
.jaxx
   isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI=
.jaxx
   isis-fish/branches/3.3.1/src/main/resources/fr/ifremer/isisfish/entities/P=
ort-error-validation.xml
   isis-fish/branches/3.3.1/src/main/resources/fr/ifremer/isisfish/entities/P=
ort-warning-validation.xml

Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input=
/PortUI.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/input/PortU=
I.jaxx	2011-04-15 16:11:41 UTC (rev 3254)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PortU=
I.jaxx	2011-04-15 16:41:27 UTC (rev 3255)
@@ -44,7 +44,7 @@
         bean=3D'{getBean()}' beanClass=3D'fr.ifremer.isisfish.entities.Port'
         uiClass=3D"jaxx.runtime.validator.swing.ui.ImageValidationUI">
         <field name=3D"name" component=3D"fieldPortName" />
-        <field name=3D"cell" component=3D"portCell" />
+        <field name=3D"cell" component=3D"spPortCell" />
     </jaxx.runtime.validator.swing.SwingValidator>
=20
     <script><![CDATA[
@@ -142,7 +142,7 @@
                 </row>
                 <row>
                     <cell columns=3D'2' fill=3D'both' weighty=3D'0.7' weight=
x=3D'1.0'>
-                        <JScrollPane>
+                        <JScrollPane id=3D"spPortCell">
                             <JAXXList id=3D"portCell" selectedValue=3D'{getB=
ean().getCell()}' selectionMode=3D"0" onMouseClicked=3D'portChanged()' enable=
d=3D'{isActive()}' decorator=3D'boxed' />
                         </JScrollPane>
                     </cell>

Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input=
/ZoneUI.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/input/ZoneU=
I.jaxx	2011-04-15 16:11:41 UTC (rev 3254)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneU=
I.jaxx	2011-04-15 16:41:27 UTC (rev 3255)
@@ -48,7 +48,7 @@
         bean=3D'{getBean()}' beanClass=3D'fr.ifremer.isisfish.entities.Zone'
         uiClass=3D"jaxx.runtime.validator.swing.ui.ImageValidationUI">
         <field name=3D"name" component=3D"fieldZoneName" />
-        <field name=3D"cell" component=3D"zoneCells" />
+        <field name=3D"cell" component=3D"spZoneCells" />
     </jaxx.runtime.validator.swing.SwingValidator>
=20
     <script><![CDATA[
@@ -156,7 +156,7 @@
                 </row>
                 <row>
                     <cell columns=3D'2' fill=3D'both' weighty=3D'0.7' weight=
x=3D'1.0'>
-                        <JScrollPane>
+                        <JScrollPane id=3D"spZoneCells">
                             <!-- FIXME le binding genere un tas d'envenement=
 multiples ! -->
                             <JAXXList id=3D"zoneCells" enabled=3D'{isActive(=
)}' selectedValues=3D'{getBean().getCell() =3D=3D null ? null : getBean().get=
Cell().toArray()}'
                             onValueChanged=3D'zoneCellsChange(event)' decora=
tor=3D'boxed'/>

Modified: isis-fish/branches/3.3.1/src/main/resources/fr/ifremer/isisfish/ent=
ities/Port-error-validation.xml
=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/resources/fr/ifremer/isisfish/entities/=
Port-error-validation.xml	2011-04-15 16:11:41 UTC (rev 3254)
+++ isis-fish/branches/3.3.1/src/main/resources/fr/ifremer/isisfish/entities/=
Port-error-validation.xml	2011-04-15 16:41:27 UTC (rev 3255)
@@ -24,10 +24,10 @@
         "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
         "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
 <validators>
-    <field name=3D"cell">
-        <field-validator type=3D"fieldexpression">
-            <param name=3D"expression"><![CDATA[ cell !=3D null ]]></param>
-            <message>No port cell</message>
+    <field name=3D"name">
+        <field-validator type=3D"requiredstring">
+            <param name=3D"trim">true</param>
+            <message>Missing name</message>
         </field-validator>
     </field>
 </validators>

Modified: isis-fish/branches/3.3.1/src/main/resources/fr/ifremer/isisfish/ent=
ities/Port-warning-validation.xml
=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/resources/fr/ifremer/isisfish/entities/=
Port-warning-validation.xml	2011-04-15 16:11:41 UTC (rev 3254)
+++ isis-fish/branches/3.3.1/src/main/resources/fr/ifremer/isisfish/entities/=
Port-warning-validation.xml	2011-04-15 16:41:27 UTC (rev 3255)
@@ -24,10 +24,10 @@
         "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
         "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
 <validators>
-    <field name=3D"name">
-        <field-validator type=3D"requiredstring">
-            <param name=3D"trim">true</param>
-            <message>Missing name</message>
+    <field name=3D"cell">
+        <field-validator type=3D"fieldexpression">
+            <param name=3D"expression"><![CDATA[ cell !=3D null ]]></param>
+            <message>No port cell</message>
         </field-validator>
     </field>
 </validators>

Added: isis-fish/branches/3.3.1/src/main/resources/fr/ifremer/isisfish/entiti=
es/Strategy-basics-error-validation.xml
=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/resources/fr/ifremer/isisfish/entities/=
Strategy-basics-error-validation.xml	                        (rev 0)
+++ isis-fish/branches/3.3.1/src/main/resources/fr/ifremer/isisfish/entities/=
Strategy-basics-error-validation.xml	2011-04-15 16:41:27 UTC (rev 3255)
@@ -0,0 +1,33 @@
+<!--
+  #%L
+  $Id$
+  $HeadURL$
+  %%
+  Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric
+  %%
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as
+  published by the Free Software Foundation, either version 2 of the=20
+  License, or (at your option) any later version.
+ =20
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+ =20
+  You should have received a copy of the GNU General Public=20
+  License along with this program.  If not, see
+  <http://www.gnu.org/licenses/gpl-2.0.html>.
+  #L%
+  -->
+<!DOCTYPE validators PUBLIC
+        "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
+        "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+<validators>
+    <field name=3D"name">
+        <field-validator type=3D"requiredstring">
+            <param name=3D"trim">true</param>
+            <message>Missing name</message>
+        </field-validator>
+    </field>
+</validators>


--===============2829207475842964396==--