From scm@users.codelutin.com Tue Feb 10 10:16:51 2015
From: "codelutin.com scm" <scm@users.codelutin.com>
To: tutti-commits@list.forge.codelutin.com
Subject: [Tutti-commits] 01/02: fixes #6635
Date: Tue, 10 Feb 2015 10:16:52 +0000
Message-ID: <20150210101651.9EACF5C42F7@goh.codelutin.com>
In-Reply-To: <20150210101651.10624.78746@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4985656277516115766=="

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

This is an automated email from the git hooks/post-receive script.

New commit to branch develop in repository tutti.

See http://git.codelutin.com/tutti.git

commit 41993fdb3e9095051c0051abb010b0cec0a93b26
Author: Kevin Morin <morin@codelutin.com>
Date:   Tue Feb 10 11:12:42 2015 +0100

    fixes #6635
---
 .../operation/FishingOperationsUIHandler.java      |   2 +-
 .../content/operation/catches/EditCatchesUI.jaxx   | 388 ++++++++++---------=
--
 .../operation/catches/EditCatchesUIHandler.java    |  33 +-
 3 files changed, 211 insertions(+), 212 deletions(-)

diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/o=
peration/FishingOperationsUIHandler.java b/tutti-ui-swing/src/main/java/fr/if=
remer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java
index e11bf60..6c234c2 100644
--- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operatio=
n/FishingOperationsUIHandler.java
+++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operatio=
n/FishingOperationsUIHandler.java
@@ -174,7 +174,7 @@ public class FishingOperationsUIHandler extends AbstractT=
uttiTabContainerUIHandl
                 efoUI.getGearUseFeatureTabPane().setTitle(fishingOperationTe=
xt);
=20
                 EditCatchesUI ecUI =3D getUI().getCatchesTabContent();
-                ecUI.getCatchesCaracteristicsTabPane().setTitle(fishingOpera=
tionText);
+                ecUI.getSvgTabPane().setTitle(fishingOperationText);
                 ecUI.getSpeciesTabFishingOperationReminderLabel().setTitle(f=
ishingOperationText);
                 ecUI.getBenthosTabFishingOperationReminderLabel().setTitle(f=
ishingOperationText);
                 ecUI.getMarineLitterTabFishingOperationReminderLabel().setTi=
tle(fishingOperationText);
diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/o=
peration/catches/EditCatchesUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer=
/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx
index 7a32a2a..fc1f918 100644
--- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operatio=
n/catches/EditCatchesUI.jaxx
+++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operatio=
n/catches/EditCatchesUI.jaxx
@@ -69,7 +69,7 @@ public EditCatchesUI(FishingOperationsUI parentUI) {
                  uiClass=3D'jaxx.runtime.validator.swing.ui.ImageValidationU=
I'>
     <!--FIXME Must find a way to validate, if no field, then no validation..=
. -->
     <!--FIXME Must find a way to show validation results on svg canvas... -->
-    <field name=3D'catchTotalWeight' component=3D'catchTotalWeightField'/>
+    <!--<field name=3D'catchTotalWeight' component=3D'catchTotalWeightField'=
/>-->
=20
     <!--<field name=3D'catchTotalRejectedWeight'-->
            <!--component=3D'catchTotalRejectedWeightField'/>-->
@@ -122,199 +122,199 @@ public EditCatchesUI(FishingOperationsUI parentUI) {
       </JXTitledPanel>
     </tab>
=20
-    <tab id=3D'catchesCaracteristicsTab'>
-      <JXTitledPanel id=3D'catchesCaracteristicsTabPane'>
-        <JScrollPane id=3D'catchesCaracteristicsTabScrollPane'>
-          <JPanel layout=3D'{new BorderLayout()}'>
-            <Table id=3D"catchesForm" fill=3D'both' weightx=3D'1'
-                   constraints=3D'BorderLayout.NORTH'>
-              <row>
-                <cell>
-                  <Table id=3D'catchTable' fill=3D'both'>
-
-                    <!-- Poids total capture -->
-                    <row>
-                      <cell anchor=3D'west'>
-                        <JLabel id=3D'catchTotalWeightLabel'/>
-                      </cell>
-                      <cell columns=3D'4' weightx=3D'1.0'>
-                        <ComputableDataEditor id=3D'catchTotalWeightField'
-                                              genericType=3D"Float"
-                                              constructorParams=3D'this'/>
-                      </cell>
-                    </row>
-                    <!-- Poids total tri=C3=A9 balance tremie /  caroussel-->
-                    <row>
-                      <cell anchor=3D'west'>
-                        <JLabel id=3D'catchTotalSortedWeightLabel'/>
-                      </cell>
-                      <cell columns=3D'4' weightx=3D'1.0'>
-                        <JTextField id=3D'catchTotalSortedWeightField'/>
-                      </cell>
-                    </row>
-                    <row>
-                      <cell columns=3D'5'>
-                        <Table fill=3D'both' id=3D'tremieCarrouselRow'>
-                          <row>
-                            <cell anchor=3D'west'>
-                              <JLabel
-                                id=3D'catchTotalSortedCarousselWeightLabel'/>
-                            </cell>
-                            <cell weightx=3D'1.0'>
-                              <JTextField
-                                id=3D'catchTotalSortedCarousselWeightField'/>
-                            </cell>
-                            <cell anchor=3D'west'>
-                              <JLabel id=3D'catchTotalSortedTremisWeightLabe=
l'/>
-                            </cell>
-                            <cell weightx=3D'1.0'>
-                              <JTextField
-                                id=3D'catchTotalSortedTremisWeightField'/>
-                            </cell>
-                          </row>
-                        </Table>
-                      </cell>
-                    </row>
-                    <!--Poids total hors vrac-->
-                    <row>
-                      <cell>
-                        <JLabel id=3D'catchTotalUnsortedWeightLabel'/>
-                      </cell>
-                      <cell columns=3D'4' weightx=3D'1.0'>
-                        <JTextField id=3D'catchTotalUnsortedWeightField'/>
-                      </cell>
-                    </row>
-                    <!-- Poids total NON TRI=C3=89 (rejet=C3=A9) -->
-                    <row>
-                      <cell>
-                        <JLabel id=3D'catchTotalRejectedWeightLabel'/>
-                      </cell>
-                      <cell columns=3D'4' weightx=3D'1.0'>
-                        <ComputableDataEditor genericType=3D"Float"
-                                              id=3D'catchTotalRejectedWeight=
Field'
-                                              constructorParams=3D'this'/>
-                      </cell>
-                    </row>
-                  </Table>
-                </cell>
-              </row>
-              <row>
-                <cell>
-                  <Table id=3D'speciesTable' fill=3D'both'>
-
-                    <!-- Poids total capture -->
-                    <row>
-                      <cell anchor=3D'west'>
-                        <JLabel id=3D'speciesTotalWeightLabel'/>
-                      </cell>
-                      <cell weightx=3D'1.0'>
-                        <JTextField id=3D'speciesTotalWeightField'/>
-                      </cell>
-                    </row>
-                    <!-- Poids total vrac -->
-                    <row>
-                      <cell anchor=3D'west'>
-                        <JLabel id=3D'speciesTotalSortedWeightLabel'/>
-                      </cell>
-                      <cell weightx=3D'1.0'>
-                        <ComputableDataEditor genericType=3D"Float"
-                                              id=3D'speciesTotalSortedWeight=
Field'
-                                              constructorParams=3D'this'/>
-                      </cell>
-                    </row>
-
-                    <!-- Poids total =C3=A9chantillonn=C3=A9 vrac -->
-                    <row>
-                      <cell>
-                        <JLabel id=3D'speciesTotalSampleSortedWeightLabel'/>
-                      </cell>
-                      <cell>
-                        <JTextField id=3D'speciesTotalSampleSortedWeightFiel=
d'/>
-                      </cell>
-                    </row>
-                    <!-- Poids total hors vrac -->
-                    <row>
-                      <cell>
-                        <JLabel id=3D'speciesTotalUnsortedWeightLabel'/>
-                      </cell>
-                      <cell>
-                        <JTextField id=3D'speciesTotalUnsortedWeightField'/>
-                      </cell>
-                    </row>
-                  </Table>
-                </cell>
-              </row>
-              <row>
-                <cell>
-                  <Table id=3D'benthosTable' fill=3D'both'>
-
-                    <!-- Poids total capture -->
-                    <row>
-                      <cell anchor=3D'west'>
-                        <JLabel id=3D'benthosTotalWeightLabel'/>
-                      </cell>
-                      <cell weightx=3D'1.0'>
-                        <JTextField id=3D'benthosTotalWeightField'/>
-                      </cell>
-                    </row>
-                    <!-- Poids total vrac -->
-                    <row>
-                      <cell anchor=3D'west'>
-                        <JLabel id=3D'benthosTotalSortedWeightLabel'/>
-                      </cell>
-                      <cell weightx=3D'1.0'>
-                        <ComputableDataEditor genericType=3D"Float"
-                                              id=3D'benthosTotalSortedWeight=
Field'
-                                              constructorParams=3D'this'/>
-                      </cell>
-                    </row>
-
-                    <!-- Poids total =C3=A9chantillonn=C3=A9 vrac -->
-                    <row>
-                      <cell>
-                        <JLabel id=3D'benthosTotalSampleSortedWeightLabel'/>
-                      </cell>
-                      <cell>
-                        <JTextField id=3D'benthosTotalSampleSortedWeightFiel=
d'/>
-                      </cell>
-                    </row>
-                    <!-- Poids total hors vrac -->
-                    <row>
-                      <cell>
-                        <JLabel id=3D'benthosTotalUnsortedWeightLabel'/>
-                      </cell>
-                      <cell>
-                        <JTextField id=3D'benthosTotalUnsortedWeightField'/>
-                      </cell>
-                    </row>
-                  </Table>
-                </cell>
-              </row>
-              <row>
-                <cell columns=3D'2'>
-                  <Table id=3D'marineLitterTable' fill=3D'both'>
-
-                    <!-- Poids total Macro dechet -->
-                    <row>
-                      <cell anchor=3D'west'>
-                        <JLabel id=3D'marineLitterTotalWeightLabel'/>
-                      </cell>
-                      <cell weightx=3D'1.0'>
-                        <ComputableDataEditor genericType=3D"Float"
-                                              id=3D'marineLitterTotalWeightF=
ield'
-                                              constructorParams=3D'this'/>
-                      </cell>
-                    </row>
-
-
-                  </Table>
-                </cell>
-              </row>
-            </Table>
-          </JPanel>
-        </JScrollPane>
-      </JXTitledPanel>
-    </tab>
+    <!--<tab id=3D'catchesCaracteristicsTab'>-->
+      <!--<JXTitledPanel id=3D'catchesCaracteristicsTabPane'>-->
+        <!--<JScrollPane id=3D'catchesCaracteristicsTabScrollPane'>-->
+          <!--<JPanel layout=3D'{new BorderLayout()}'>-->
+            <!--<Table id=3D"catchesForm" fill=3D'both' weightx=3D'1'-->
+                   <!--constraints=3D'BorderLayout.NORTH'>-->
+              <!--<row>-->
+                <!--<cell>-->
+                  <!--<Table id=3D'catchTable' fill=3D'both'>-->
+
+                    <!--&lt;!&ndash; Poids total capture &ndash;&gt;-->
+                    <!--<row>-->
+                      <!--<cell anchor=3D'west'>-->
+                        <!--<JLabel id=3D'catchTotalWeightLabel'/>-->
+                      <!--</cell>-->
+                      <!--<cell columns=3D'4' weightx=3D'1.0'>-->
+                        <!--<ComputableDataEditor id=3D'catchTotalWeightFiel=
d'-->
+                                              <!--genericType=3D"Float"-->
+                                              <!--constructorParams=3D'this'=
/>-->
+                      <!--</cell>-->
+                    <!--</row>-->
+                    <!--&lt;!&ndash; Poids total tri=C3=A9 balance tremie / =
 caroussel&ndash;&gt;-->
+                    <!--<row>-->
+                      <!--<cell anchor=3D'west'>-->
+                        <!--<JLabel id=3D'catchTotalSortedWeightLabel'/>-->
+                      <!--</cell>-->
+                      <!--<cell columns=3D'4' weightx=3D'1.0'>-->
+                        <!--<JTextField id=3D'catchTotalSortedWeightField'/>=
-->
+                      <!--</cell>-->
+                    <!--</row>-->
+                    <!--<row>-->
+                      <!--<cell columns=3D'5'>-->
+                        <!--<Table fill=3D'both' id=3D'tremieCarrouselRow'>-=
->
+                          <!--<row>-->
+                            <!--<cell anchor=3D'west'>-->
+                              <!--<JLabel-->
+                                <!--id=3D'catchTotalSortedCarousselWeightLab=
el'/>-->
+                            <!--</cell>-->
+                            <!--<cell weightx=3D'1.0'>-->
+                              <!--<JTextField-->
+                                <!--id=3D'catchTotalSortedCarousselWeightFie=
ld'/>-->
+                            <!--</cell>-->
+                            <!--<cell anchor=3D'west'>-->
+                              <!--<JLabel id=3D'catchTotalSortedTremisWeight=
Label'/>-->
+                            <!--</cell>-->
+                            <!--<cell weightx=3D'1.0'>-->
+                              <!--<JTextField-->
+                                <!--id=3D'catchTotalSortedTremisWeightField'=
/>-->
+                            <!--</cell>-->
+                          <!--</row>-->
+                        <!--</Table>-->
+                      <!--</cell>-->
+                    <!--</row>-->
+                    <!--&lt;!&ndash;Poids total hors vrac&ndash;&gt;-->
+                    <!--<row>-->
+                      <!--<cell>-->
+                        <!--<JLabel id=3D'catchTotalUnsortedWeightLabel'/>-->
+                      <!--</cell>-->
+                      <!--<cell columns=3D'4' weightx=3D'1.0'>-->
+                        <!--<JTextField id=3D'catchTotalUnsortedWeightField'=
/>-->
+                      <!--</cell>-->
+                    <!--</row>-->
+                    <!--&lt;!&ndash; Poids total NON TRI=C3=89 (rejet=C3=A9)=
 &ndash;&gt;-->
+                    <!--<row>-->
+                      <!--<cell>-->
+                        <!--<JLabel id=3D'catchTotalRejectedWeightLabel'/>-->
+                      <!--</cell>-->
+                      <!--<cell columns=3D'4' weightx=3D'1.0'>-->
+                        <!--<ComputableDataEditor genericType=3D"Float"-->
+                                              <!--id=3D'catchTotalRejectedWe=
ightField'-->
+                                              <!--constructorParams=3D'this'=
/>-->
+                      <!--</cell>-->
+                    <!--</row>-->
+                  <!--</Table>-->
+                <!--</cell>-->
+              <!--</row>-->
+              <!--<row>-->
+                <!--<cell>-->
+                  <!--<Table id=3D'speciesTable' fill=3D'both'>-->
+
+                    <!--&lt;!&ndash; Poids total capture &ndash;&gt;-->
+                    <!--<row>-->
+                      <!--<cell anchor=3D'west'>-->
+                        <!--<JLabel id=3D'speciesTotalWeightLabel'/>-->
+                      <!--</cell>-->
+                      <!--<cell weightx=3D'1.0'>-->
+                        <!--<JTextField id=3D'speciesTotalWeightField'/>-->
+                      <!--</cell>-->
+                    <!--</row>-->
+                    <!--&lt;!&ndash; Poids total vrac &ndash;&gt;-->
+                    <!--<row>-->
+                      <!--<cell anchor=3D'west'>-->
+                        <!--<JLabel id=3D'speciesTotalSortedWeightLabel'/>-->
+                      <!--</cell>-->
+                      <!--<cell weightx=3D'1.0'>-->
+                        <!--<ComputableDataEditor genericType=3D"Float"-->
+                                              <!--id=3D'speciesTotalSortedWe=
ightField'-->
+                                              <!--constructorParams=3D'this'=
/>-->
+                      <!--</cell>-->
+                    <!--</row>-->
+
+                    <!--&lt;!&ndash; Poids total =C3=A9chantillonn=C3=A9 vra=
c &ndash;&gt;-->
+                    <!--<row>-->
+                      <!--<cell>-->
+                        <!--<JLabel id=3D'speciesTotalSampleSortedWeightLabe=
l'/>-->
+                      <!--</cell>-->
+                      <!--<cell>-->
+                        <!--<JTextField id=3D'speciesTotalSampleSortedWeight=
Field'/>-->
+                      <!--</cell>-->
+                    <!--</row>-->
+                    <!--&lt;!&ndash; Poids total hors vrac &ndash;&gt;-->
+                    <!--<row>-->
+                      <!--<cell>-->
+                        <!--<JLabel id=3D'speciesTotalUnsortedWeightLabel'/>=
-->
+                      <!--</cell>-->
+                      <!--<cell>-->
+                        <!--<JTextField id=3D'speciesTotalUnsortedWeightFiel=
d'/>-->
+                      <!--</cell>-->
+                    <!--</row>-->
+                  <!--</Table>-->
+                <!--</cell>-->
+              <!--</row>-->
+              <!--<row>-->
+                <!--<cell>-->
+                  <!--<Table id=3D'benthosTable' fill=3D'both'>-->
+
+                    <!--&lt;!&ndash; Poids total capture &ndash;&gt;-->
+                    <!--<row>-->
+                      <!--<cell anchor=3D'west'>-->
+                        <!--<JLabel id=3D'benthosTotalWeightLabel'/>-->
+                      <!--</cell>-->
+                      <!--<cell weightx=3D'1.0'>-->
+                        <!--<JTextField id=3D'benthosTotalWeightField'/>-->
+                      <!--</cell>-->
+                    <!--</row>-->
+                    <!--&lt;!&ndash; Poids total vrac &ndash;&gt;-->
+                    <!--<row>-->
+                      <!--<cell anchor=3D'west'>-->
+                        <!--<JLabel id=3D'benthosTotalSortedWeightLabel'/>-->
+                      <!--</cell>-->
+                      <!--<cell weightx=3D'1.0'>-->
+                        <!--<ComputableDataEditor genericType=3D"Float"-->
+                                              <!--id=3D'benthosTotalSortedWe=
ightField'-->
+                                              <!--constructorParams=3D'this'=
/>-->
+                      <!--</cell>-->
+                    <!--</row>-->
+
+                    <!--&lt;!&ndash; Poids total =C3=A9chantillonn=C3=A9 vra=
c &ndash;&gt;-->
+                    <!--<row>-->
+                      <!--<cell>-->
+                        <!--<JLabel id=3D'benthosTotalSampleSortedWeightLabe=
l'/>-->
+                      <!--</cell>-->
+                      <!--<cell>-->
+                        <!--<JTextField id=3D'benthosTotalSampleSortedWeight=
Field'/>-->
+                      <!--</cell>-->
+                    <!--</row>-->
+                    <!--&lt;!&ndash; Poids total hors vrac &ndash;&gt;-->
+                    <!--<row>-->
+                      <!--<cell>-->
+                        <!--<JLabel id=3D'benthosTotalUnsortedWeightLabel'/>=
-->
+                      <!--</cell>-->
+                      <!--<cell>-->
+                        <!--<JTextField id=3D'benthosTotalUnsortedWeightFiel=
d'/>-->
+                      <!--</cell>-->
+                    <!--</row>-->
+                  <!--</Table>-->
+                <!--</cell>-->
+              <!--</row>-->
+              <!--<row>-->
+                <!--<cell columns=3D'2'>-->
+                  <!--<Table id=3D'marineLitterTable' fill=3D'both'>-->
+
+                    <!--&lt;!&ndash; Poids total Macro dechet &ndash;&gt;-->
+                    <!--<row>-->
+                      <!--<cell anchor=3D'west'>-->
+                        <!--<JLabel id=3D'marineLitterTotalWeightLabel'/>-->
+                      <!--</cell>-->
+                      <!--<cell weightx=3D'1.0'>-->
+                        <!--<ComputableDataEditor genericType=3D"Float"-->
+                                              <!--id=3D'marineLitterTotalWei=
ghtField'-->
+                                              <!--constructorParams=3D'this'=
/>-->
+                      <!--</cell>-->
+                    <!--</row>-->
+
+
+                  <!--</Table>-->
+                <!--</cell>-->
+              <!--</row>-->
+            <!--</Table>-->
+          <!--</JPanel>-->
+        <!--</JScrollPane>-->
+      <!--</JXTitledPanel>-->
+    <!--</tab>-->
     <tab id=3D'speciesTab'>
       <JPanel id=3D'speciesTabPanel'>
         <JXTitledPanel id=3D'speciesTabFishingOperationReminderLabel'
diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/o=
peration/catches/EditCatchesUIHandler.java b/tutti-ui-swing/src/main/java/fr/=
ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java
index 1e1b92c..f2951b2 100644
--- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operatio=
n/catches/EditCatchesUIHandler.java
+++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operatio=
n/catches/EditCatchesUIHandler.java
@@ -228,12 +228,11 @@ public class EditCatchesUIHandler extends AbstractTutti=
TabContainerUIHandler<Edi
         listenValidationTableHasNoFatalError(getValidator(), model);
=20
         setCustomTab(0, model);
-        setCustomTab(1, model);
-        setCustomTab(2, ui.getSpeciesTabContent().getModel());
-        setCustomTab(3, ui.getBenthosTabContent().getModel());
-        setCustomTab(4, ui.getMarineLitterTabContent().getModel());
-        setCustomTab(5, ui.getIndividualObservationTabContent().getModel());
-        setCustomTab(6, ui.getAccidentalTabContent().getModel());
+        setCustomTab(1, ui.getSpeciesTabContent().getModel());
+        setCustomTab(2, ui.getBenthosTabContent().getModel());
+        setCustomTab(3, ui.getMarineLitterTabContent().getModel());
+        setCustomTab(4, ui.getIndividualObservationTabContent().getModel());
+        setCustomTab(5, ui.getAccidentalTabContent().getModel());
=20
         getTabPanel().setSelectedIndex(1);
         // when internal tab change, close any attachments popup
@@ -257,17 +256,17 @@ public class EditCatchesUIHandler extends AbstractTutti=
TabContainerUIHandler<Edi
=20
     @Override
     protected JComponent getComponentToFocus() {
-        JComponent result;
-        //TODO remove when svg resume is done?
-        if (getModel().getCatchTotalComputedWeight() !=3D null) {
-            // if there is a computed value, never focus inside the component
-            // see http://forge.codelutin.com/issues/4151
-            result =3D null;
-        } else {
-
-            result =3D getUI().getCatchTotalWeightField();
-        }
-        return result;
+//        JComponent result;
+//        //TODO remove when svg resume is done?
+//        if (getModel().getCatchTotalComputedWeight() !=3D null) {
+//            // if there is a computed value, never focus inside the compon=
ent
+//            // see http://forge.codelutin.com/issues/4151
+//            result =3D null;
+//        } else {
+//
+//            result =3D getUI().getCatchTotalWeightField();
+//        }
+        return null;
     }
=20
     @Override

--=20
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@codelutin.com>.

--===============4985656277516115766==--


From scm@users.codelutin.com Tue Feb 10 10:16:51 2015
From: "codelutin.com scm" <scm@users.codelutin.com>
To: tutti-commits@list.forge.codelutin.com
Subject: [Tutti-commits] branch develop updated (eeb11ba -> afcb41b)
Date: Tue, 10 Feb 2015 10:16:51 +0000
Message-ID: <20150210101651.10624.78746@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1890717884191166027=="

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

This is an automated email from the git hooks/post-receive script.

New change to branch develop in repository tutti.

See http://git.codelutin.com/tutti.git

      from  eeb11ba   fixes #6636
       new  41993fd   fixes #6635
       new  afcb41b   Merge branch 'develop' of https://git.codelutin.com/tut=
ti into develop

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Detailed log of new commits:

commit afcb41b3a798cdc5ac197cca85feddd9b4620f38
Merge: 41993fd eeb11ba
Author: Kevin Morin <morin@codelutin.com>
Date:   Tue Feb 10 11:15:58 2015 +0100

    Merge branch 'develop' of https://git.codelutin.com/tutti into develop

commit 41993fdb3e9095051c0051abb010b0cec0a93b26
Author: Kevin Morin <morin@codelutin.com>
Date:   Tue Feb 10 11:12:42 2015 +0100

    fixes #6635

Summary of changes:
 .../operation/FishingOperationsUIHandler.java      |   2 +-
 .../content/operation/catches/EditCatchesUI.jaxx   | 388 ++++++++++---------=
--
 .../operation/catches/EditCatchesUIHandler.java    |  33 +-
 3 files changed, 211 insertions(+), 212 deletions(-)

--=20
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@codelutin.com>.

--===============1890717884191166027==--


From scm@users.codelutin.com Tue Feb 10 10:16:51 2015
From: "codelutin.com scm" <scm@users.codelutin.com>
To: tutti-commits@list.forge.codelutin.com
Subject: [Tutti-commits] 02/02: Merge branch 'develop' of
 https://git.codelutin.com/tutti into develop
Date: Tue, 10 Feb 2015 10:16:53 +0000
Message-ID: <20150210101651.C07355C4318@goh.codelutin.com>
In-Reply-To: <20150210101651.10624.78746@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2545157081199784009=="

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

This is an automated email from the git hooks/post-receive script.

New commit to branch develop in repository tutti.

See http://git.codelutin.com/tutti.git

commit afcb41b3a798cdc5ac197cca85feddd9b4620f38
Merge: 41993fd eeb11ba
Author: Kevin Morin <morin@codelutin.com>
Date:   Tue Feb 10 11:15:58 2015 +0100

    Merge branch 'develop' of https://git.codelutin.com/tutti into develop

 .../content/referential/replace/AbstractReplaceTemporaryUIModel.java    | 2 =
+-
 1 file changed, 1 insertion(+), 1 deletion(-)

--=20
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@codelutin.com>.

--===============2545157081199784009==--