From kmorin@users.forge.codelutin.com Mon Jan 28 19:29:58 2013
From: kmorin@users.forge.codelutin.com
To: tutti-commits@list.forge.codelutin.com
Subject: [Tutti-commits] r253 - in trunk/tutti-ui-swing/src/main:
	java/fr/ifremer/tutti/ui/swing/content/operation
	java/fr/ifremer/tutti/ui/swing/content/operation/catches
	java/fr/ifremer/tutti/ui/swing/content/operation/catches/species
	java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency
	java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split
	resources/i18n
Date: Mon, 28 Jan 2013 19:29:58 +0100
Message-ID: <20130128182958.B946E15950@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1255874601508306505=="

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

Author: kmorin
Date: 2013-01-28 19:29:58 +0100 (Mon, 28 Jan 2013)
New Revision: 253

Url: http://forge.codelutin.com/projects/tutti/repository/revisions/253

Log:
debug + replace popups by cardlayouts

Modified:
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/opera=
tion/EditFishingOperationUI.css
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/opera=
tion/EditFishingOperationUI.jaxx
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/opera=
tion/catches/EditCatchesUI.css
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/opera=
tion/catches/EditCatchesUI.jaxx
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/opera=
tion/catches/species/SpeciesBatchUIHandler.java
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/opera=
tion/catches/species/frequency/SpeciesFrequencyUIHandler.java
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/opera=
tion/catches/species/split/AddSpeciesAction.java
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/opera=
tion/catches/species/split/CreateSpeciesBatchUI.jaxx
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/opera=
tion/catches/species/split/CreateSpeciesBatchUIHandler.java
   trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properti=
es

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/conten=
t/operation/EditFishingOperationUI.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/oper=
ation/EditFishingOperationUI.css	2013-01-28 17:50:07 UTC (rev 252)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/oper=
ation/EditFishingOperationUI.css	2013-01-28 18:29:58 UTC (rev 253)
@@ -52,6 +52,10 @@
   bean: {model};
 }
=20
+/*#fishingOperationTabScrollPane {
+  horizontalScrollBarPolicy: {javax.swing.ScrollPaneConstants.HORIZONTAL_SCR=
OLLBAR_NEVER};
+}*/
+
 #stationNumberLabel {
   text: "tutti.label.fishingOperation.stationNumber";
   labelFor: {stationNumberField};

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/conten=
t/operation/EditFishingOperationUI.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
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/oper=
ation/EditFishingOperationUI.jaxx	2013-01-28 17:50:07 UTC (rev 252)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/oper=
ation/EditFishingOperationUI.jaxx	2013-01-28 18:29:58 UTC (rev 253)
@@ -157,345 +157,347 @@
=20
     <JTabbedPane id=3D'fishingOperationTabPane' constraints=3D'BorderLayout.=
CENTER'>
       <tab id=3D'traitGeneralTab'>
-        <Table fill=3D'both' id=3D'generalForm'>
+<!--        <JScrollPane id=3D'fishingOperationTabScrollPane'>-->
+          <Table fill=3D'both' id=3D'generalForm'>
=20
-          <!-- Numero station / Num=C3=A9ro trait / Num=C3=A9ro de poche -->
-          <row>
-            <cell>
-              <JLabel id=3D'stationNumberLabel'/>
-            </cell>
-            <cell weightx=3D'0.3'>
-              <JTextField id=3D'stationNumberField'
-                          onKeyReleased=3D'handler.setText(event, "stationNu=
mber")'/>
-            </cell>
-            <cell>
-              <JLabel id=3D'fishingOperationNumberLabel'/>
-            </cell>
-            <cell weightx=3D'0.3'>
-              <NumberEditor id=3D'fishingOperationNumberField'
-                            constructorParams=3D'this'/>
-            </cell>
-            <cell>
-              <JLabel id=3D'trawlNetNumberLabel'/>
-            </cell>
-            <cell weightx=3D'0.3'>
-              <NumberEditor id=3D'trawlNetNumberField' constructorParams=3D'=
this'/>
-            </cell>
-          </row>
+            <!-- Numero station / Num=C3=A9ro trait / Num=C3=A9ro de poche -=
->
+            <row>
+              <cell>
+                <JLabel id=3D'stationNumberLabel'/>
+              </cell>
+              <cell weightx=3D'0.3'>
+                <JTextField id=3D'stationNumberField'
+                            onKeyReleased=3D'handler.setText(event, "station=
Number")'/>
+              </cell>
+              <cell>
+                <JLabel id=3D'fishingOperationNumberLabel'/>
+              </cell>
+              <cell weightx=3D'0.3'>
+                <NumberEditor id=3D'fishingOperationNumberField'
+                              constructorParams=3D'this'/>
+              </cell>
+              <cell>
+                <JLabel id=3D'trawlNetNumberLabel'/>
+              </cell>
+              <cell weightx=3D'0.3'>
+                <NumberEditor id=3D'trawlNetNumberField' constructorParams=
=3D'this'/>
+              </cell>
+            </row>
=20
-          <!-- Strate d'association / Sous Strate / Localit=C3=A9 -->
-          <row>
-            <cell>
-              <JLabel id=3D'strataLabel'/>
-            </cell>
-            <cell weightx=3D'0.3'>
-              <BeanComboBox id=3D'strataComboBox' constructorParams=3D'this'
-                            genericType=3D'FishingOperationLocation'/>
-            </cell>
-            <cell>
-              <JLabel id=3D'subStrataLabel'/>
-            </cell>
-            <cell weightx=3D'0.3'>
-              <BeanComboBox id=3D'subStrataComboBox' constructorParams=3D'th=
is'
-                            genericType=3D'FishingOperationLocation'/>
-            </cell>
-            <cell>
-              <JLabel id=3D'locationLabel'/>
-            </cell>
-            <cell weightx=3D'0.3'>
-              <BeanComboBox id=3D'locationComboBox' constructorParams=3D'thi=
s'
-                            genericType=3D'FishingOperationLocation'/>
-            </cell>
-          </row>
+            <!-- Strate d'association / Sous Strate / Localit=C3=A9 -->
+            <row>
+              <cell>
+                <JLabel id=3D'strataLabel'/>
+              </cell>
+              <cell weightx=3D'0.3'>
+                <BeanComboBox id=3D'strataComboBox' constructorParams=3D'thi=
s'
+                              genericType=3D'FishingOperationLocation'/>
+              </cell>
+              <cell>
+                <JLabel id=3D'subStrataLabel'/>
+              </cell>
+              <cell weightx=3D'0.3'>
+                <BeanComboBox id=3D'subStrataComboBox' constructorParams=3D'=
this'
+                              genericType=3D'FishingOperationLocation'/>
+              </cell>
+              <cell>
+                <JLabel id=3D'locationLabel'/>
+              </cell>
+              <cell weightx=3D'0.3'>
+                <BeanComboBox id=3D'locationComboBox' constructorParams=3D't=
his'
+                              genericType=3D'FishingOperationLocation'/>
+              </cell>
+            </row>
=20
-          <!--  d=C3=A9but de traine long-lat-date-heure
-                fin de traine   long-lat-date-heure -->
-          <row>
-            <cell columns=3D'6'>
-              <JPanel layout=3D"{new BorderLayout()}">
-                <Table id=3D"gearCaracteristicsTable" fill=3D"both" weightx=
=3D'1'
-                       constraints=3D'BorderLayout.CENTER'>
-                  <row>
-                    <cell>
-                      <JPanel/>
-                    </cell>
-                    <cell>
-                      <JLabel id=3D'gearLatitudeLabel'/>
-                    </cell>
-                    <cell>
-                      <JLabel id=3D'gearLongitudeLabel'/>
-                    </cell>
-                    <cell>
-                      <JLabel id=3D'gearDateLabel'/>
-                    </cell>
-                    <cell>
-                      <JLabel id=3D'gearTimeLabel'/>
-                    </cell>
-                  </row>
+            <!--  d=C3=A9but de traine long-lat-date-heure
+                  fin de traine   long-lat-date-heure -->
+            <row>
+              <cell columns=3D'6'>
+                <JPanel layout=3D"{new BorderLayout()}">
+                  <Table id=3D"gearCaracteristicsTable" fill=3D"both" weight=
x=3D'1'
+                         constraints=3D'BorderLayout.CENTER'>
+                    <row>
+                      <cell>
+                        <JPanel/>
+                      </cell>
+                      <cell>
+                        <JLabel id=3D'gearLatitudeLabel'/>
+                      </cell>
+                      <cell>
+                        <JLabel id=3D'gearLongitudeLabel'/>
+                      </cell>
+                      <cell>
+                        <JLabel id=3D'gearDateLabel'/>
+                      </cell>
+                      <cell>
+                        <JLabel id=3D'gearTimeLabel'/>
+                      </cell>
+                    </row>
=20
-                  <row>
-                    <cell>
-                      <JLabel id=3D'gearShootingStartLabel'/>
-                    </cell>
-                    <cell weightx=3D'1'>
-                      <JPanel id=3D'gearShootingStartLatitudePanel'>
-                        <NumberEditor id=3D'gearShootingStartLatitudeDDField'
-                                      constraints=3D'"DD"'
-                                      constructorParams=3D'this'/>
-                        <JPanel layout=3D"{new GridLayout(1,0)}"
-                                constraints=3D'"DMS"'>
-                          <NumberEditor
-                            id=3D'gearShootingStartLatitudeDMSDegreeField'
-                            constructorParams=3D'this' styleClass=3D'degree'=
/>
+                    <row>
+                      <cell>
+                        <JLabel id=3D'gearShootingStartLabel'/>
+                      </cell>
+                      <cell weightx=3D'1'>
+                        <JPanel id=3D'gearShootingStartLatitudePanel'>
+                          <NumberEditor id=3D'gearShootingStartLatitudeDDFie=
ld'
+                                        constraints=3D'"DD"'
+                                        constructorParams=3D'this'/>
+                          <JPanel layout=3D"{new GridLayout(1,0)}"
+                                  constraints=3D'"DMS"'>
+                            <NumberEditor
+                              id=3D'gearShootingStartLatitudeDMSDegreeField'
+                              constructorParams=3D'this' styleClass=3D'degre=
e'/>
=20
-                          <NumberEditor
-                            id=3D'gearShootingStartLatitudeDMSMinuteField'
-                            constructorParams=3D'this' styleClass=3D'minute'=
/>
+                            <NumberEditor
+                              id=3D'gearShootingStartLatitudeDMSMinuteField'
+                              constructorParams=3D'this' styleClass=3D'minut=
e'/>
=20
-                          <NumberEditor
-                            id=3D'gearShootingStartLatitudeDMSSecondField'
-                            constructorParams=3D'this' styleClass=3D'second'=
/>
-                        </JPanel>
-                        <JPanel layout=3D"{new GridLayout(1,0)}"
-                                constraints=3D'"DMD"'>
-                          <NumberEditor
-                            id=3D'gearShootingStartLatitudeDMDDegreeField'
-                            constructorParams=3D'this' styleClass=3D'degree'=
/>
+                            <NumberEditor
+                              id=3D'gearShootingStartLatitudeDMSSecondField'
+                              constructorParams=3D'this' styleClass=3D'secon=
d'/>
+                          </JPanel>
+                          <JPanel layout=3D"{new GridLayout(1,0)}"
+                                  constraints=3D'"DMD"'>
+                            <NumberEditor
+                              id=3D'gearShootingStartLatitudeDMDDegreeField'
+                              constructorParams=3D'this' styleClass=3D'degre=
e'/>
=20
-                          <NumberEditor
-                            id=3D'gearShootingStartLatitudeDMDMinuteField'
-                            constructorParams=3D'this' styleClass=3D'decimal=
Minute'/>
+                            <NumberEditor
+                              id=3D'gearShootingStartLatitudeDMDMinuteField'
+                              constructorParams=3D'this' styleClass=3D'decim=
alMinute'/>
+                          </JPanel>
                         </JPanel>
-                      </JPanel>
-                    </cell>
-                    <cell weightx=3D'1'>
-                      <JPanel id=3D'gearShootingStartLongitudePanel'>
-                        <NumberEditor id=3D'gearShootingStartLongitudeDDFiel=
d'
-                                      constraints=3D'"DD"'
-                                      constructorParams=3D'this'/>
-                        <JPanel layout=3D"{new GridLayout(1,0)}"
-                                constraints=3D'"DMS"'>
-                          <NumberEditor
-                            id=3D'gearShootingStartLongitudeDMSDegreeField'
-                            constructorParams=3D'this' styleClass=3D'degree'=
/>
+                      </cell>
+                      <cell weightx=3D'1'>
+                        <JPanel id=3D'gearShootingStartLongitudePanel'>
+                          <NumberEditor id=3D'gearShootingStartLongitudeDDFi=
eld'
+                                        constraints=3D'"DD"'
+                                        constructorParams=3D'this'/>
+                          <JPanel layout=3D"{new GridLayout(1,0)}"
+                                  constraints=3D'"DMS"'>
+                            <NumberEditor
+                              id=3D'gearShootingStartLongitudeDMSDegreeField'
+                              constructorParams=3D'this' styleClass=3D'degre=
e'/>
=20
-                          <NumberEditor
-                            id=3D'gearShootingStartLongitudeDMSMinuteField'
-                            constructorParams=3D'this' styleClass=3D'minute'=
/>
+                            <NumberEditor
+                              id=3D'gearShootingStartLongitudeDMSMinuteField'
+                              constructorParams=3D'this' styleClass=3D'minut=
e'/>
=20
-                          <NumberEditor
-                            id=3D'gearShootingStartLongitudeDMSSecondField'
-                            constructorParams=3D'this' styleClass=3D'second'=
/>
-                        </JPanel>
-                        <JPanel layout=3D"{new GridLayout(1,0)}"
-                                constraints=3D'"DMD"'>
-                          <NumberEditor
-                            id=3D'gearShootingStartLongitudeDMDDegreeField'
-                            constructorParams=3D'this' styleClass=3D'degree'=
/>
+                            <NumberEditor
+                              id=3D'gearShootingStartLongitudeDMSSecondField'
+                              constructorParams=3D'this' styleClass=3D'secon=
d'/>
+                          </JPanel>
+                          <JPanel layout=3D"{new GridLayout(1,0)}"
+                                  constraints=3D'"DMD"'>
+                            <NumberEditor
+                              id=3D'gearShootingStartLongitudeDMDDegreeField'
+                              constructorParams=3D'this' styleClass=3D'degre=
e'/>
=20
-                          <NumberEditor
-                            id=3D'gearShootingStartLongitudeDMDMinuteField'
-                            constructorParams=3D'this' styleClass=3D'decimal=
Minute'/>
+                            <NumberEditor
+                              id=3D'gearShootingStartLongitudeDMDMinuteField'
+                              constructorParams=3D'this' styleClass=3D'decim=
alMinute'/>
+                          </JPanel>
                         </JPanel>
-                      </JPanel>
-                    </cell>
-                    <cell>
-                      <JXDatePicker id=3D'gearShootingStartDateField'
-                                    onActionPerformed=3D'handler.setDate(eve=
nt, "gearShootingStartDate")'/>
-                    </cell>
-                    <cell>
-                      <SimpleTimeEditor id=3D'gearShootingStartTimeField'
+                      </cell>
+                      <cell>
+                        <JXDatePicker id=3D'gearShootingStartDateField'
+                                      onActionPerformed=3D'handler.setDate(e=
vent, "gearShootingStartDate")'/>
+                      </cell>
+                      <cell>
+                        <SimpleTimeEditor id=3D'gearShootingStartTimeField'
+                                          constructorParams=3D'this'/>
+                      </cell>
+                    </row>
+                    <row>
+                      <cell>
+                        <JLabel id=3D'gearShootingEndLabel'/>
+                      </cell>
+                      <cell weightx=3D'1'>
+                        <JPanel id=3D'gearShootingEndLatitudePanel'>
+                          <NumberEditor id=3D'gearShootingEndLatitudeDDField'
+                                        constraints=3D'"DD"'
                                         constructorParams=3D'this'/>
-                    </cell>
-                  </row>
-                  <row>
-                    <cell>
-                      <JLabel id=3D'gearShootingEndLabel'/>
-                    </cell>
-                    <cell weightx=3D'1'>
-                      <JPanel id=3D'gearShootingEndLatitudePanel'>
-                        <NumberEditor id=3D'gearShootingEndLatitudeDDField'
-                                      constraints=3D'"DD"'
-                                      constructorParams=3D'this'/>
-                        <JPanel layout=3D"{new GridLayout(1,0)}"
-                                constraints=3D'"DMS"'>
-                          <NumberEditor
-                            id=3D'gearShootingEndLatitudeDMSDegreeField'
-                            constructorParams=3D'this' styleClass=3D'degree'=
/>
+                          <JPanel layout=3D"{new GridLayout(1,0)}"
+                                  constraints=3D'"DMS"'>
+                            <NumberEditor
+                              id=3D'gearShootingEndLatitudeDMSDegreeField'
+                              constructorParams=3D'this' styleClass=3D'degre=
e'/>
=20
-                          <NumberEditor
-                            id=3D'gearShootingEndLatitudeDMSMinuteField'
-                            constructorParams=3D'this' styleClass=3D'minute'=
/>
+                            <NumberEditor
+                              id=3D'gearShootingEndLatitudeDMSMinuteField'
+                              constructorParams=3D'this' styleClass=3D'minut=
e'/>
=20
-                          <NumberEditor
-                            id=3D'gearShootingEndLatitudeDMSSecondField'
-                            constructorParams=3D'this' styleClass=3D'second'=
/>
-                        </JPanel>
-                        <JPanel layout=3D"{new GridLayout(1,0)}"
-                                constraints=3D'"DMD"'>
-                          <NumberEditor
-                            id=3D'gearShootingEndLatitudeDMDDegreeField'
-                            constructorParams=3D'this' styleClass=3D'degree'=
/>
+                            <NumberEditor
+                              id=3D'gearShootingEndLatitudeDMSSecondField'
+                              constructorParams=3D'this' styleClass=3D'secon=
d'/>
+                          </JPanel>
+                          <JPanel layout=3D"{new GridLayout(1,0)}"
+                                  constraints=3D'"DMD"'>
+                            <NumberEditor
+                              id=3D'gearShootingEndLatitudeDMDDegreeField'
+                              constructorParams=3D'this' styleClass=3D'degre=
e'/>
=20
-                          <NumberEditor
-                            id=3D'gearShootingEndLatitudeDMDMinuteField'
-                            constructorParams=3D'this' styleClass=3D'decimal=
Minute'/>
+                            <NumberEditor
+                              id=3D'gearShootingEndLatitudeDMDMinuteField'
+                              constructorParams=3D'this' styleClass=3D'decim=
alMinute'/>
+                          </JPanel>
                         </JPanel>
-                      </JPanel>
-                    </cell>
-                    <cell weightx=3D'1'>
-                      <JPanel id=3D'gearShootingEndLongitudePanel'>
-                        <NumberEditor id=3D'gearShootingEndLongitudeDDField'
-                                      constraints=3D'"DD"'
-                                      constructorParams=3D'this'/>
-                        <JPanel layout=3D"{new GridLayout(1,0)}"
-                                constraints=3D'"DMS"'>
-                          <NumberEditor
-                            id=3D'gearShootingEndLongitudeDMSDegreeField'
-                            constructorParams=3D'this' styleClass=3D'degree'=
/>
+                      </cell>
+                      <cell weightx=3D'1'>
+                        <JPanel id=3D'gearShootingEndLongitudePanel'>
+                          <NumberEditor id=3D'gearShootingEndLongitudeDDFiel=
d'
+                                        constraints=3D'"DD"'
+                                        constructorParams=3D'this'/>
+                          <JPanel layout=3D"{new GridLayout(1,0)}"
+                                  constraints=3D'"DMS"'>
+                            <NumberEditor
+                              id=3D'gearShootingEndLongitudeDMSDegreeField'
+                              constructorParams=3D'this' styleClass=3D'degre=
e'/>
=20
-                          <NumberEditor
-                            id=3D'gearShootingEndLongitudeDMSMinuteField'
-                            constructorParams=3D'this' styleClass=3D'minute'=
/>
+                            <NumberEditor
+                              id=3D'gearShootingEndLongitudeDMSMinuteField'
+                              constructorParams=3D'this' styleClass=3D'minut=
e'/>
=20
-                          <NumberEditor
-                            id=3D'gearShootingEndLongitudeDMSSecondField'
-                            constructorParams=3D'this' styleClass=3D'second'=
/>
+                            <NumberEditor
+                              id=3D'gearShootingEndLongitudeDMSSecondField'
+                              constructorParams=3D'this' styleClass=3D'secon=
d'/>
+                          </JPanel>
+                          <JPanel layout=3D"{new GridLayout(1,0)}"
+                                  constraints=3D'"DMD"'>
+                            <NumberEditor
+                              id=3D'gearShootingEndLongitudeDMDDegreeField'
+                              constructorParams=3D'this' styleClass=3D'degre=
e'/>
+
+                            <NumberEditor
+                              id=3D'gearShootingEndLongitudeDMDMinuteField'
+                              constructorParams=3D'this' styleClass=3D'decim=
alMinute'/>
+                          </JPanel>
                         </JPanel>
-                        <JPanel layout=3D"{new GridLayout(1,0)}"
-                                constraints=3D'"DMD"'>
-                          <NumberEditor
-                            id=3D'gearShootingEndLongitudeDMDDegreeField'
-                            constructorParams=3D'this' styleClass=3D'degree'=
/>
+                      </cell>
+                      <cell>
+                        <JXDatePicker id=3D'gearShootingEndDateField'
+                                      onActionPerformed=3D'handler.setDate(e=
vent, "gearShootingEndDate")'/>
+                      </cell>
+                      <cell>
+                        <SimpleTimeEditor id=3D'gearShootingEndTimeField'
+                                          constructorParams=3D'this'/>
+                      </cell>
+                    </row>
=20
-                          <NumberEditor
-                            id=3D'gearShootingEndLongitudeDMDMinuteField'
-                            constructorParams=3D'this' styleClass=3D'decimal=
Minute'/>
+                    <!-- FishingOperation rectiligne / distance chalutee / d=
ur=C3=A9e -->
+                    <row>
+                      <cell>
+                        <JLabel/>
+                      </cell>
+                      <cell>
+                        <JCheckBox id=3D'fishingOperationRectiligneCheckBox'
+                                   onItemStateChanged=3D'handler.setBoolean(=
event, "fishingOperationRectiligne")'/>
+                      </cell>
+                      <cell>
+                        <JPanel layout=3D"{new BorderLayout()}">
+                          <JLabel id=3D'trawlDistanceLabel'
+                                  constraints=3D'BorderLayout.WEST'/>
+                          <NumberEditor id=3D'trawlDistanceField'
+                                        constraints=3D'BorderLayout.CENTER'
+                                        constructorParams=3D'this'/>
                         </JPanel>
-                      </JPanel>
-                    </cell>
-                    <cell>
-                      <JXDatePicker id=3D'gearShootingEndDateField'
-                                    onActionPerformed=3D'handler.setDate(eve=
nt, "gearShootingEndDate")'/>
-                    </cell>
-                    <cell>
-                      <SimpleTimeEditor id=3D'gearShootingEndTimeField'
-                                        constructorParams=3D'this'/>
-                    </cell>
-                  </row>
+                      </cell>
+                      <cell>
+                        <JLabel/>
+                      </cell>
+                      <cell>
+                        <JPanel layout=3D"{new BorderLayout()}">
+                          <JLabel id=3D'durationLabel'
+                                  constraints=3D'BorderLayout.WEST'/>
+                          <JTextField id=3D'durationField'
+                                      constraints=3D'BorderLayout.CENTER'/>
+                        </JPanel>
+                      </cell>
+                    </row>
=20
-                  <!-- FishingOperation rectiligne / distance chalutee / dur=
=C3=A9e -->
-                  <row>
-                    <cell>
-                      <JLabel/>
-                    </cell>
-                    <cell>
-                      <JCheckBox id=3D'fishingOperationRectiligneCheckBox'
-                                 onItemStateChanged=3D'handler.setBoolean(ev=
ent, "fishingOperationRectiligne")'/>
-                    </cell>
-                    <cell>
-                      <JPanel layout=3D"{new BorderLayout()}">
-                        <JLabel id=3D'trawlDistanceLabel'
-                                constraints=3D'BorderLayout.WEST'/>
-                        <NumberEditor id=3D'trawlDistanceField'
-                                      constraints=3D'BorderLayout.CENTER'
-                                      constructorParams=3D'this'/>
-                      </JPanel>
-                    </cell>
-                    <cell>
-                      <JLabel/>
-                    </cell>
-                    <cell>
-                      <JPanel layout=3D"{new BorderLayout()}">
-                        <JLabel id=3D'durationLabel'
-                                constraints=3D'BorderLayout.WEST'/>
-                        <JTextField id=3D'durationField'
-                                    constraints=3D'BorderLayout.CENTER'/>
-                      </JPanel>
-                    </cell>
-                  </row>
+                    <!-- Fishing operation valid / invalid-->
+                    <row>
+                      <cell>
+                        <JToolBar id=3D'fishingOperationValidPanel'
+                                  layout=3D'{new BorderLayout()}'>
+                          <JButton id=3D'resetValidStateButton'
+                                   constraints=3D'BorderLayout.WEST'
+                                   onActionPerformed=3D"model.setFishingOper=
ationValid(null)"/>
+                          <JRadioButton id=3D'fishingOperationResetRadio'
+                                        constraints=3D'BorderLayout.EAST'/>
+                        </JToolBar>
+                      </cell>
+                      <cell>
+                        <HBox>
+                          <JRadioButton id=3D'fishingOperationValidRadio'
+                                        onActionPerformed=3D'model.setFishin=
gOperationValid(Boolean.TRUE)'/>
+                          <JRadioButton id=3D'fishingOperationInvalidRadio'
+                                        onActionPerformed=3D'model.setFishin=
gOperationValid(Boolean.FALSE)'/>
+                        </HBox>
+                      </cell>
+                      <cell columns=3D"4">
+                        <JPanel/>
+                      </cell>
+                    </row>
+                  </Table>
+                </JPanel>
+              </cell>
+            </row>
=20
-                  <!-- Fishing operation valid / invalid-->
-                  <row>
-                    <cell>
-                      <JToolBar id=3D'fishingOperationValidPanel'
-                                layout=3D'{new BorderLayout()}'>
-                        <JButton id=3D'resetValidStateButton'
-                                 constraints=3D'BorderLayout.WEST'
-                                 onActionPerformed=3D"model.setFishingOperat=
ionValid(null)"/>
-                        <JRadioButton id=3D'fishingOperationResetRadio'
-                                      constraints=3D'BorderLayout.EAST'/>
-                      </JToolBar>
-                    </cell>
-                    <cell>
-                      <HBox>
-                        <JRadioButton id=3D'fishingOperationValidRadio'
-                                      onActionPerformed=3D'model.setFishingO=
perationValid(Boolean.TRUE)'/>
-                        <JRadioButton id=3D'fishingOperationInvalidRadio'
-                                      onActionPerformed=3D'model.setFishingO=
perationValid(Boolean.FALSE)'/>
-                      </HBox>
-                    </cell>
-                    <cell columns=3D"4">
-                      <JPanel/>
-                    </cell>
-                  </row>
-                </Table>
-              </JPanel>
-            </cell>
-          </row>
+            <!-- Actions d'import -->
+            <row>
+              <cell columns=3D'6'>
+                <JPanel layout=3D'{new GridLayout(1,0)}'>
+                  <JButton id=3D'importCasinoButton'
+                           onActionPerformed=3D'handler.importCasino()'/>
+                </JPanel>
+              </cell>
+            </row>
=20
-          <!-- Actions d'import -->
-          <row>
-            <cell columns=3D'6'>
-              <JPanel layout=3D'{new GridLayout(1,0)}'>
-                <JButton id=3D'importCasinoButton'
-                         onActionPerformed=3D'handler.importCasino()'/>
-              </JPanel>
-            </cell>
-          </row>
+            <!-- Saisisseur -->
+            <row weighty=3D'0.2'>
+              <cell columns=3D'6'>
+                <JPanel layout=3D'{new GridLayout(1,0)}'>
+                  <BeanDoubleList id=3D'saisisseurList' genericType=3D'Perso=
n'/>
+                  <Table fill=3D"both" weightx=3D'1' id=3D'traitVesselPanel'>
+                    <row>
+                      <cell anchor=3D'west'>
+                        <JLabel id=3D'vesselLabel'/>
+                      </cell>
+                      <cell weightx=3D"1.0" fill=3D"both">
+                        <BeanComboBox id=3D'vesselComboBox'
+                                      constructorParams=3D'this'
+                                      genericType=3D'Vessel'/>
+                      </cell>
+                    </row>
+                    <row>
+                      <cell anchor=3D'west'>
+                        <JLabel id=3D'gearLabel'/>
+                      </cell>
+                      <cell>
+                        <BeanComboBox id=3D'gearComboBox'
+                                      constructorParams=3D'this'
+                                      genericType=3D'Gear'/>
+                      </cell>
+                    </row>
+                  </Table>
+                </JPanel>
+              </cell>
+            </row>
=20
-          <!-- Saisisseur -->
-          <row weighty=3D'0.2'>
-            <cell columns=3D'6'>
-              <JPanel layout=3D'{new GridLayout(1,0)}'>
-                <BeanDoubleList id=3D'saisisseurList' genericType=3D'Person'=
/>
-                <Table fill=3D"both" weightx=3D'1' id=3D'traitVesselPanel'>
-                  <row>
-                    <cell anchor=3D'west'>
-                      <JLabel id=3D'vesselLabel'/>
-                    </cell>
-                    <cell weightx=3D"1.0" fill=3D"both">
-                      <BeanComboBox id=3D'vesselComboBox'
-                                    constructorParams=3D'this'
-                                    genericType=3D'Vessel'/>
-                    </cell>
-                  </row>
-                  <row>
-                    <cell anchor=3D'west'>
-                      <JLabel id=3D'gearLabel'/>
-                    </cell>
-                    <cell>
-                      <BeanComboBox id=3D'gearComboBox'
-                                    constructorParams=3D'this'
-                                    genericType=3D'Gear'/>
-                    </cell>
-                  </row>
-                </Table>
-              </JPanel>
-            </cell>
-          </row>
-
-          <!-- Commentaire -->
-          <row weighty=3D'0.8'>
-            <cell columns=3D'6'>
-              <JScrollPane id=3D'commentPane'
-                           onFocusGained=3D'commentField.requestFocus()'>
-                <JTextArea id=3D'commentField'
-                           onKeyReleased=3D'handler.setText(event, "comment"=
)'/>
-              </JScrollPane>
-            </cell>
-          </row>
-        </Table>
+            <!-- Commentaire -->
+            <row weighty=3D'0.8'>
+              <cell columns=3D'6'>
+                <JScrollPane id=3D'commentPane'
+                             onFocusGained=3D'commentField.requestFocus()'>
+                  <JTextArea id=3D'commentField'
+                             onKeyReleased=3D'handler.setText(event, "commen=
t")'/>
+                </JScrollPane>
+              </cell>
+            </row>
+          </Table>
+        <!--</JScrollPane>-->
       </tab>
=20
       <tab id=3D'traitGearShootingTab'>

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/conten=
t/operation/catches/EditCatchesUI.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/oper=
ation/catches/EditCatchesUI.css	2013-01-28 17:50:07 UTC (rev 252)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/oper=
ation/catches/EditCatchesUI.css	2013-01-28 18:29:58 UTC (rev 253)
@@ -102,6 +102,14 @@
   text: "tutti.label.catches.catchThalassa";
 }
=20
+#speciesTabPanel {
+  layout:{speciesTabPanelLayout};
+}
+
+#speciesTabCreateBatchReminderLabel {
+  title: {_("tutti.title.createBatch")};
+}
+
 #speciesTable {
   border: {BorderFactory.createTitledBorder(_("tutti.legend.catch.species"))=
};
 }

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/conten=
t/operation/catches/EditCatchesUI.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
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/oper=
ation/catches/EditCatchesUI.jaxx	2013-01-28 17:50:07 UTC (rev 252)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/oper=
ation/catches/EditCatchesUI.jaxx	2013-01-28 18:29:58 UTC (rev 253)
@@ -31,12 +31,14 @@
     fr.ifremer.tutti.ui.swing.content.operation.catches.macrowaste.MacroWast=
eBatchUI
     fr.ifremer.tutti.ui.swing.content.operation.catches.plankton.PlanktonBat=
chUI
     fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatch=
UI
+    fr.ifremer.tutti.ui.swing.content.operation.catches.species.split.Create=
SpeciesBatchUI
     fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI
=20
     org.jdesktop.swingx.JXTitledPanel
-
+   =20
+    jaxx.runtime.swing.CardLayout2Ext
     jaxx.runtime.swing.editor.NumberEditor
-
+   =20
     jaxx.runtime.validator.swing.SwingValidatorUtil
     jaxx.runtime.validator.swing.SwingValidatorMessageTableModel
=20
@@ -92,6 +94,9 @@
            component=3D'macroWasteTotalWeightField'/>
   </BeanValidator>
=20
+  <CardLayout2Ext id=3D'speciesTabPanelLayout'
+                  constructorParams=3D'this, "speciesTabPanel"'/>
+
   <JTabbedPane id=3D'tabPane' constraints=3D'BorderLayout.CENTER'>
     <tab id=3D'catchesCaracteristicsTab'>
       <JXTitledPanel id=3D'catchesCaracteristicsTabPane'>
@@ -288,9 +293,14 @@
       </JXTitledPanel>
     </tab>
     <tab id=3D'speciesTab' title=3D'tutti.label.tab.species'>
-      <JXTitledPanel id=3D'speciesTabFishingOperationReminderLabel'>
-        <SpeciesBatchUI id=3D'speciesTabContent' constructorParams=3D'this'/>
-      </JXTitledPanel>
+      <JPanel id=3D'speciesTabPanel'>
+        <JXTitledPanel id=3D'speciesTabFishingOperationReminderLabel' constr=
aints=3D'"main"'>
+          <SpeciesBatchUI id=3D'speciesTabContent' constructorParams=3D'this=
'/>
+        </JXTitledPanel>
+        <JXTitledPanel id=3D'speciesTabCreateBatchReminderLabel' constraints=
=3D'"createBatch"'>
+          <CreateSpeciesBatchUI id=3D'speciesTabCreateBatch' constructorPara=
ms=3D'this'/>
+        </JXTitledPanel>
+      </JPanel>
     </tab>
     <tab id=3D'benthosTab' title=3D'tutti.label.tab.benthos'>
       <JXTitledPanel id=3D'benthosTabFishingOperationReminderLabel'>

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/conten=
t/operation/catches/species/SpeciesBatchUIHandler.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/oper=
ation/catches/species/SpeciesBatchUIHandler.java	2013-01-28 17:50:07 UTC (rev=
 252)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/oper=
ation/catches/species/SpeciesBatchUIHandler.java	2013-01-28 18:29:58 UTC (rev=
 253)
@@ -43,6 +43,7 @@
 import fr.ifremer.tutti.service.PersistenceService;
 import fr.ifremer.tutti.ui.swing.TuttiUI;
 import fr.ifremer.tutti.ui.swing.content.operation.AbstractTuttiBatchTableUI=
Handler;
+import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI;
 import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIMode=
l;
 import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency=
.FrequencyCellComponent;
 import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency=
.SpeciesFrequencyRowModel;
@@ -58,8 +59,6 @@
 import fr.ifremer.tutti.ui.swing.util.editor.LongTextCellComponent;
 import fr.ifremer.tutti.ui.swing.util.table.AbstractSelectTableAction;
 import fr.ifremer.tutti.ui.swing.util.table.ColumnIdentifier;
-import java.awt.Color;
-import java.awt.Component;
 import jaxx.runtime.JAXXUtil;
 import jaxx.runtime.context.JAXXContextEntryDef;
 import jaxx.runtime.swing.ErrorDialogUI;
@@ -79,9 +78,8 @@
 import java.util.EnumMap;
 import java.util.List;
 import java.util.Set;
-import org.jdesktop.swingx.decorator.ComponentAdapter;
-import org.jdesktop.swingx.decorator.HighlightPredicate;
-import org.jdesktop.swingx.decorator.Highlighter;
+import jaxx.runtime.SwingUtil;
+import jaxx.runtime.swing.CardLayout2Ext;
=20
 import static org.nuiton.i18n.I18n._;
 import static org.nuiton.i18n.I18n.n_;
@@ -658,18 +656,16 @@
=20
     public void createSpeciesBatch() {
=20
-        CreateSpeciesBatchUI createBatchEditor =3D
-                getCreateSpeciesBatchEditor();
+        EditCatchesUI parent =3D SwingUtil.getParentContainer(ui, EditCatche=
sUI.class);
+        CreateSpeciesBatchUI createBatchEditor =3D parent.getSpeciesTabCreat=
eBatch();
=20
         createBatchEditor.getHandler().openUI(getModel());
-
-        openDialog(ui,
-                   createBatchEditor,
-                   _("tutti.title.createBatch"),
-                   ui.getPreferredSize());
-
-        CreateSpeciesBatchUIModel createModel =3D createBatchEditor.getModel=
();
-
+       =20
+        CardLayout2Ext card =3D (CardLayout2Ext) parent.getSpeciesTabPanel()=
.getLayout();
+        card.setSelected("createBatch");
+    }
+   =20
+    public void addSpeciesBatch(CreateSpeciesBatchUIModel createModel) {
         if (createModel.isValid()) {
=20
             SpeciesBatchTableModel tableModel =3D getTableModel();
@@ -694,9 +690,6 @@
             addToSpeciesUsed(newRow);
         }
=20
-        // reset create ui
-        createBatchEditor.getHandler().openUI(null);
-
         recomputeBatchActionEnable();
     }
=20

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/conten=
t/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/oper=
ation/catches/species/frequency/SpeciesFrequencyUIHandler.java	2013-01-28 17:=
50:07 UTC (rev 252)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/oper=
ation/catches/species/frequency/SpeciesFrequencyUIHandler.java	2013-01-28 18:=
29:58 UTC (rev 253)
@@ -26,6 +26,7 @@
=20
 import com.ezware.oxbow.swingbits.util.Preconditions;
 import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 import fr.ifremer.tutti.persistence.entities.TuttiEntities;
 import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol;
 import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol;
@@ -176,7 +177,13 @@
             Preconditions.checkNotNull(protocol,
                                        "Could not find protocol in ui contex=
t");
=20
-            speciesProtocol =3D TuttiEntities.splitById(protocol.getSpecies(=
));
+            // FIXME 20130128 kmorin: the species have no technical id
+            speciesProtocol =3D Maps.newHashMap();
+            for (SpeciesProtocol sp : protocol.getSpecies()) {
+                speciesProtocol.put(sp.getSpeciesId(), sp);
+            }
+//            speciesProtocol =3D TuttiEntities.splitById(protocol.getSpecie=
s());
+           =20
         }
=20
         //TODO Use protocol to have lengthStepCaracteristic to use (if any p=
rotocol)

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/conten=
t/operation/catches/species/split/AddSpeciesAction.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/oper=
ation/catches/species/split/AddSpeciesAction.java	2013-01-28 17:50:07 UTC (re=
v 252)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/oper=
ation/catches/species/split/AddSpeciesAction.java	2013-01-28 18:29:58 UTC (re=
v 253)
@@ -69,7 +69,7 @@
         SwingUtilities.invokeLater(new Runnable() {
                 @Override
                 public void run() {
-                    getHandler().openDialog(popup, _("tutti.title.createBatc=
h"));
+//                    getHandler().openDialog(popup, _("tutti.title.createBa=
tch"));
                    =20
                     Species species =3D popup.getModel().getSelectedSpecies(=
);
                     if (species !=3D null) {

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/conten=
t/operation/catches/species/split/CreateSpeciesBatchUI.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
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/oper=
ation/catches/species/split/CreateSpeciesBatchUI.jaxx	2013-01-28 17:50:07 UTC=
 (rev 252)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/oper=
ation/catches/species/split/CreateSpeciesBatchUI.jaxx	2013-01-28 18:29:58 UTC=
 (rev 253)
@@ -29,7 +29,7 @@
     fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitati=
veValue
=20
     fr.ifremer.tutti.ui.swing.content.operation.catches.species.SampleCatego=
ryType
-    fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatch=
UI
+    fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI
=20
     fr.ifremer.tutti.ui.swing.TuttiUI
     fr.ifremer.tutti.ui.swing.TuttiUIContext
@@ -52,7 +52,7 @@
=20
   <script><![CDATA[
=20
-public CreateSpeciesBatchUI(SpeciesBatchUI parentUI) {
+public CreateSpeciesBatchUI(EditCatchesUI parentUI) {
     JAXXUtil.initContext(this, parentUI);
     CreateSpeciesBatchUIHandler handler =3D new CreateSpeciesBatchUIHandler(=
parentUI, this);
     setContextValue(handler);
@@ -80,63 +80,50 @@
     <field name=3D'batchWeight' component=3D'batchWeightField'/>
   </BeanValidator>
=20
-  <JSplitPane id=3D'splitPane' constraints=3D'BorderLayout.NORTH'>
+  <Table id=3D'configurationPanel' constraints=3D'BorderLayout.CENTER' fill=
=3D'both'>
=20
-    <Table id=3D'configurationPanel' fill=3D'both'>
+    <!-- Species -->
+    <row>
+      <cell anchor=3D'west'>
+        <JLabel id=3D'speciesLabel'/>
+      </cell>
+      <cell weightx=3D'1.0'>
+        <BeanComboBox id=3D'speciesComboBox' constructorParams=3D'this'
+                      genericType=3D'Species'/>
+      </cell>
+      <cell>
+        <JButton id=3D'addSpeciesButton'/>
+      </cell>
+    </row>
=20
-      <!-- Species -->
-      <row>
-        <cell anchor=3D'west'>
-          <JLabel id=3D'speciesLabel'/>
-        </cell>
-        <cell weightx=3D'1.0'>
-          <BeanComboBox id=3D'speciesComboBox' constructorParams=3D'this'
-                        genericType=3D'Species'/>
-        </cell>
-        <cell>
-          <JButton id=3D'addSpeciesButton'/>
-        </cell>
-      </row>
+    <!-- Sorted / Unsorted Category -->
+    <row>
+      <cell anchor=3D'west'>
+        <JLabel id=3D'sortedUnsortedCategoryLabel'/>
+      </cell>
+      <cell weightx=3D'1.0' columns=3D'2'>
+        <BeanComboBox id=3D'sortedUnsortedCategoryComboBox'
+                      constructorParams=3D'this'
+                      genericType=3D'CaracteristicQualitativeValue'/>
+      </cell>
+    </row>
=20
-      <!-- Sorted / Unsorted Category -->
-      <row>
-        <cell anchor=3D'west'>
-          <JLabel id=3D'sortedUnsortedCategoryLabel'/>
-        </cell>
-        <cell weightx=3D'1.0' columns=3D'2'>
-          <BeanComboBox id=3D'sortedUnsortedCategoryComboBox'
-                        constructorParams=3D'this'
-                        genericType=3D'CaracteristicQualitativeValue'/>
-        </cell>
-      </row>
+    <!-- Species batch weight -->
+    <row>
+      <cell anchor=3D'west'>
+        <JLabel id=3D'batchWeightLabel'/>
+      </cell>
+      <cell weightx=3D'1.0' columns=3D'2'>
+        <NumberEditor id=3D'batchWeightField' constructorParams=3D'this'/>
+      </cell>
+    </row>
=20
-      <!-- Species batch weight -->
-      <row>
-        <cell anchor=3D'west'>
-          <JLabel id=3D'batchWeightLabel'/>
-        </cell>
-        <cell weightx=3D'1.0' columns=3D'2'>
-          <NumberEditor id=3D'batchWeightField' constructorParams=3D'this'/>
-        </cell>
-      </row>
-
-      <!-- Form Actions -->
-      <row>
-        <cell columns=3D'3'>
-          <JPanel layout=3D'{new GridLayout(1, 0)}'>
-            <JButton id=3D'cancelButton' onActionPerformed=3D'handler.cancel=
()'/>
-            <JButton id=3D'saveButton' onActionPerformed=3D'handler.save()'/>
-          </JPanel>
-        </cell>
-      </row>
-    </Table>
-
-    <!-- Messages report -->
-    <JPanel id=3D'messagePanel' layout=3D'{new GridLayout()}'>
-      <JScrollPane columnHeaderView=3D'{errorTable.getTableHeader()}'>
-        <JTable id=3D'errorTable'/>
-      </JScrollPane>
-    </JPanel>
-  </JSplitPane>
-
+   =20
+  </Table>
+ =20
+  <!-- Form Actions -->
+  <JPanel layout=3D'{new GridLayout(1, 0)}' constraints=3D'BorderLayout.SOUT=
H'>
+    <JButton id=3D'cancelButton' onActionPerformed=3D'handler.cancel()'/>
+    <JButton id=3D'saveButton' onActionPerformed=3D'handler.save()'/>
+  </JPanel>
 </JPanel>

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/conten=
t/operation/catches/species/split/CreateSpeciesBatchUIHandler.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/oper=
ation/catches/species/split/CreateSpeciesBatchUIHandler.java	2013-01-28 17:50=
:07 UTC (rev 252)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/oper=
ation/catches/species/split/CreateSpeciesBatchUIHandler.java	2013-01-28 18:29=
:58 UTC (rev 253)
@@ -33,6 +33,7 @@
 import fr.ifremer.tutti.service.PersistenceService;
 import fr.ifremer.tutti.ui.swing.AbstractTuttiUIHandler;
 import fr.ifremer.tutti.ui.swing.TuttiUI;
+import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI;
 import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBa=
tchUI;
 import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBa=
tchUIModel;
 import fr.ifremer.tutti.ui.swing.util.Cancelable;
@@ -45,6 +46,8 @@
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.util.List;
+import jaxx.runtime.SwingUtil;
+import jaxx.runtime.swing.CardLayout2Ext;
=20
 /**
  * Handler of {@link CreateSpeciesBatchUI}.
@@ -69,7 +72,7 @@
=20
     private final CaracteristicQualitativeValue sortedValue;
=20
-    public CreateSpeciesBatchUIHandler(SpeciesBatchUI parentUi,
+    public CreateSpeciesBatchUIHandler(TuttiUI parentUi,
                                        CreateSpeciesBatchUI ui) {
         super(parentUi.getHandler().getContext());
         this.ui =3D ui;
@@ -155,8 +158,8 @@
             }
         });
=20
-        SwingValidatorUtil.installUI(ui.getErrorTable(),
-                                     new SwingValidatorMessageTableRenderer(=
));
+//        SwingValidatorUtil.installUI(ui.getErrorTable(),
+//                                     new SwingValidatorMessageTableRendere=
r());
=20
         listenValidatorValid(ui.getValidator(), getModel());
     }
@@ -168,6 +171,17 @@
             log.info("closing: " + ui);
         }
=20
+        // evict model from validator
+        ui.getValidator().setBean(null);
+
+        // when canceling always invalid model
+        getModel().setValid(false);
+
+        EditCatchesUI parent =3D SwingUtil.getParentContainer(ui, EditCatche=
sUI.class);
+       =20
+        CardLayout2Ext card =3D (CardLayout2Ext) parent.getSpeciesTabPanel()=
.getLayout();
+        card.setSelected("main");
+
     }
=20
     @Override
@@ -181,25 +195,12 @@
=20
     @Override
     public void cancel() {
-
         if (log.isInfoEnabled()) {
             log.info("Cancel UI " + ui);
         }
-
-        // evict model from validator
-        ui.getValidator().setBean(null);
-
-        // when canceling always invalid model
-        getModel().setValid(false);
-
-        // close dialog
-        closeDialog(ui);
+        closeUI(ui);
     }
=20
-    public void openDialog(TuttiUI dialogContent, String title) {
-        openDialog(ui, dialogContent, title, ui.getPreferredSize());
-    }
-   =20
     //----------------------------------------------------------------------=
--//
     //-- Public methods                                                     =
--//
     //----------------------------------------------------------------------=
--//
@@ -241,8 +242,11 @@
             log.info("Save UI " + ui);
         }
=20
+        EditCatchesUI parent =3D SwingUtil.getParentContainer(ui, EditCatche=
sUI.class);
+        parent.getSpeciesTabContent().getHandler().addSpeciesBatch(getModel(=
));
+       =20
         // close dialog
-        closeDialog(ui);
+        closeUI(ui);
     }
=20
     public CreateSpeciesBatchUI getUi() {

Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.p=
roperties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.propert=
ies	2013-01-28 17:50:07 UTC (rev 252)
+++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.propert=
ies	2013-01-28 18:29:58 UTC (rev 253)
@@ -91,6 +91,7 @@
 tutti.config.programId=3DIdentifiant de la derni=C3=A8re s=C3=A9rie de campa=
gne utilis=C3=A9e
 tutti.config.protocolId=3DIdentifiant du dernier protocole utilis=C3=A9
 tutti.config.ui.autoPopupNumberEditor=3DToujours afficher le pav=C3=A9 num=
=C3=A9rique lors de l'=C3=A9dition d'un nombre
+tutti.config.ui.color.cellWithValue=3D
 tutti.config.ui.color.rowInvalid=3DLigne invalide
 tutti.config.ui.color.rowReadOnly=3DCellule non =C3=A9ditable
 tutti.config.ui.config=3DChemin du fichier de configuration des interfaces g=
raphiques


--===============1255874601508306505==--