From scm@users.codelutin.com Tue Aug 23 15:22:25 2016
From: "codelutin.com scm" <scm@users.codelutin.com>
To: observe-commits@list.forge.codelutin.com
Subject: [Observe-commits]  01/10: =?utf-8?q?Cr=C3=A9e?= le composant
 BeanTreeHeader visant =?utf-8?q?=C3=A0?= offrir un group d'actions facilitant
 l'utilisation des composants arbre par l'utilisateur
Date: Tue, 23 Aug 2016 15:22:25 +0200
Message-ID: <20160823132225.33A7D5C3569@goh.codelutin.com>
In-Reply-To: <20160823132224.16936.85388@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8083086300339704321=="

--===============8083086300339704321==
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 feature/7553_ajoute_un_widget_pour_les_arbres in reposit=
ory observe.

See https://gitlab.nuiton.org/codelutin/observe.git

commit c96b601134811f93539b6fcaf676d105be93dd7a
Author: Samuel Maisonneuve <maisonneuve@codelutin.com>
Date:   Sun Aug 21 23:45:16 2016 +0200

    Cr=C3=A9e le composant BeanTreeHeader visant =C3=A0 offrir un group d'act=
ions facilitant l'utilisation des composants arbre par l'utilisateur
   =20
    refs #7553
---
 .../ird/observe/ui/util/tree/BeanTreeHeader.jaxx   | 50 ++++++++++++++++
 .../ird/observe/ui/util/tree/BeanTreeHeader.jcss   | 67 ++++++++++++++++++++=
++
 .../ui/util/tree/BeanTreeHeaderHandler.java        | 45 +++++++++++++++
 .../observe-application-swing_en_GB.properties     | 11 ++--
 .../observe-application-swing_es_ES.properties     | 11 ++--
 .../observe-application-swing_fr_FR.properties     |  8 +--
 6 files changed, 178 insertions(+), 14 deletions(-)

diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/t=
ree/BeanTreeHeader.jaxx b/observe-application-swing/src/main/java/fr/ird/obse=
rve/ui/util/tree/BeanTreeHeader.jaxx
new file mode 100644
index 0000000..6110ef1
--- /dev/null
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/Bea=
nTreeHeader.jaxx
@@ -0,0 +1,50 @@
+<!--
+  #%L
+  ObServe :: Swing
+  %%
+  Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit
+  %%
+  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 3 of the
+  License, or (at your option) any later version.
+
+  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.
+
+  You should have received a copy of the GNU General Public
+  License along with this program.  If not, see
+  <http://www.gnu.org/licenses/gpl-3.0.html>.
+  #L%
+  -->
+<JPanel id=3D"beanTreeHeader"
+        layout=3D'{new BorderLayout()}'>
+
+  <BeanTreeHeaderHandler id=3D'handler' constructorParams=3D'this'/>
+
+  <script><![CDATA[
+
+void $afterCompleteSetup() {
+    getHandler().initUI();
+}
+
+]]>
+  </script>
+
+  <JLabel id=3D"label" constraints=3D'BorderLayout.CENTER'/>
+
+  <JToolBar id=3D'toolbar' constraints=3D'BorderLayout.EAST'>
+
+    <!-- les boutons pour grouper/d=C3=A9plier tout l'arbre -->
+    <JButton id=3D'colapseAll'/>
+    <JButton id=3D'expandAll'/>
+
+    <!-- les boutons pour s=C3=A9lectionner/d=C3=A9selctionner tout l'arbre =
-->
+    <JButton id=3D'selectAll'/>
+    <JButton id=3D'deselectAll'/>
+
+  </JToolBar>
+
+</JPanel>
\ No newline at end of file
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/t=
ree/BeanTreeHeader.jcss b/observe-application-swing/src/main/java/fr/ird/obse=
rve/ui/util/tree/BeanTreeHeader.jcss
new file mode 100644
index 0000000..8b8c11d
--- /dev/null
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/Bea=
nTreeHeader.jcss
@@ -0,0 +1,67 @@
+/*
+ * #%L
+ * ObServe :: Swing
+ * %%
+ * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit
+ * %%
+ * 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 3 of the
+ * License, or (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program.  If not, see
+ * <http://www.gnu.org/licenses/gpl-3.0.html>.
+ * #L%
+ */
+
+#label {
+  opaque:false;
+  text:{""};
+}
+
+#toolbar {
+  floatable:false;
+  borderPainted:false;
+}
+
+#colapseAll {
+  actionIcon:"combobox-reset";
+  toolTipText:"observe.tree.action.collapseAll.tip";
+  focusable:false;
+  focusPainted:false;
+  visible:{true};
+  enabled:{true};
+}
+
+#expandAll {
+  actionIcon:"add";
+  toolTipText:"observe.tree.action.expandAll.tip";
+  focusable:false;
+  focusPainted:false;
+  visible:{true};
+  enabled:{true};
+}
+
+#selectAll {
+  actionIcon:"add";
+  toolTipText:"observe.tree.action.selectAll.tip";
+  focusable:false;
+  focusPainted:false;
+  visible:{true};
+  enabled:{true};
+}
+
+#deselectAll {
+  actionIcon:"combobox-reset";
+  toolTipText:"observe.tree.action.deselectAll.tip";
+  focusable:false;
+  focusPainted:false;
+  visible:{true};
+  enabled:{true};
+}
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/t=
ree/BeanTreeHeaderHandler.java b/observe-application-swing/src/main/java/fr/i=
rd/observe/ui/util/tree/BeanTreeHeaderHandler.java
new file mode 100644
index 0000000..e9d09a4
--- /dev/null
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/Bea=
nTreeHeaderHandler.java
@@ -0,0 +1,45 @@
+package fr.ird.observe.ui.util.tree;
+
+/*
+ * #%L
+ * ObServe :: Swing
+ * %%
+ * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit
+ * %%
+ * 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 3 of the
+ * 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
+ * License along with this program.  If not, see
+ * <http://www.gnu.org/licenses/gpl-3.0.html>.
+ * #L%
+ */
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * @author Samuel Maisonneuve- maisonneuve@codelutin.com
+ */
+public class BeanTreeHeaderHandler {
+
+    private static final Log log =3D LogFactory.getLog(BeanTreeHeaderHandler=
.class);
+
+    private final BeanTreeHeader ui;
+
+    public BeanTreeHeaderHandler(BeanTreeHeader ui) {
+        this.ui =3D ui;
+    }
+
+    public void initUI() {
+
+    }
+
+}
diff --git a/observe-application-swing/src/main/resources/i18n/observe-applic=
ation-swing_en_GB.properties b/observe-application-swing/src/main/resources/i=
18n/observe-application-swing_en_GB.properties
index 7ccf536..37f022f 100644
--- a/observe-application-swing/src/main/resources/i18n/observe-application-s=
wing_en_GB.properties
+++ b/observe-application-swing/src/main/resources/i18n/observe-application-s=
wing_en_GB.properties
@@ -340,6 +340,7 @@ observe.admin.resume.operation.failed=3D
 observe.admin.resume.operation.need.fix=3D
 observe.admin.resume.operation.not.started=3D
 observe.admin.resume.operation.running=3D
+observe.application.config=3DObServe Configuration
 observe.catchAcquisitionModeEnum.GROUPED=3DBatch
 observe.catchAcquisitionModeEnum.INDIVIDUAL=3DIndividual
 observe.choice.cancel=3DCancel
@@ -602,7 +603,6 @@ observe.config.map.layer7.description=3D
 observe.config.map.layer8.description=3D
 observe.config.map.layer9.description=3D
 observe.config.map.style.description=3D
-observe.config.name=3D
 observe.config.observation.activitysDetaillees=3D
 observe.config.observation.fauneAssociee=3D
 observe.config.observation.floatingObject=3D
@@ -639,6 +639,7 @@ observe.config.ui.showNumberEditorButton=3DFlag sets to t=
rue to show button to inv
 observe.config.ui.showTimeEditorSlider=3DShow timer slider
 observe.config.ui.storeRemoteStorage=3DFlag sets to true to store in config =
a remote connexion (except passwords)
 observe.config.ui.treeOpenNodes=3D
+observe.configuration.description=3D
 observe.content.action.activity=3DCreate a new activity
 observe.content.action.activity.tip=3DCreate a new activity
 observe.content.action.baitHaulingStatus.create.tip=3D
@@ -2116,10 +2117,10 @@ observe.title.storage.info=3DStorage details
 observe.title.technical.informations=3DTechnical information of %1$s
 observe.title.unique.key=3DUnique keys used in a referentiel
 observe.title.welcome.admin=3DObserve Admin
-observe.tree.action.collapseAll.tip=3D
-observe.tree.action.expandAll.tip=3D
-observe.tree.action.selectAll.tip=3D
-observe.tree.action.unselectAll.tip=3D
+observe.tree.action.collapseAll.tip=3DCollapse all
+observe.tree.action.deselectAll.tip=3DDeselect All
+observe.tree.action.expandAll.tip=3DExpand all
+observe.tree.action.selectAll.tip=3DSelect All
 observe.tree.activityLongline=3DActivity
 observe.tree.activityLongline.unsaved=3DNew activity
 observe.tree.activitySeine=3DActivity
diff --git a/observe-application-swing/src/main/resources/i18n/observe-applic=
ation-swing_es_ES.properties b/observe-application-swing/src/main/resources/i=
18n/observe-application-swing_es_ES.properties
index 35fc99f..27110cd 100644
--- a/observe-application-swing/src/main/resources/i18n/observe-application-s=
wing_es_ES.properties
+++ b/observe-application-swing/src/main/resources/i18n/observe-application-s=
wing_es_ES.properties
@@ -340,6 +340,7 @@ observe.admin.resume.operation.failed=3Dla operaci=C3=B3n=
 no realizada
 observe.admin.resume.operation.need.fix=3Dla operaci=C3=B3n nesista correcci=
ones
 observe.admin.resume.operation.not.started=3Doperaci=C3=B3n no empezada
 observe.admin.resume.operation.running=3Doperaci=C3=B3n en curso...
+observe.config.name=3DConfiguraci=C3=B3n de ObServe
 observe.catchAcquisitionModeEnum.GROUPED=3D
 observe.catchAcquisitionModeEnum.INDIVIDUAL=3D
 observe.choice.cancel=3DCancelar
@@ -602,7 +603,6 @@ observe.config.map.layer7.description=3D
 observe.config.map.layer8.description=3D
 observe.config.map.layer9.description=3D
 observe.config.map.style.description=3D
-observe.config.name=3D
 observe.config.observation.activitysDetaillees=3DObservaci=C3=B3n de activid=
ades detalladas
 observe.config.observation.fauneAssociee=3DObservaci=C3=B3n de Fauna asociada
 observe.config.observation.floatingObject=3DObservaci=C3=B3n de objetos flot=
antes
@@ -639,6 +639,7 @@ observe.config.ui.showNumberEditorButton=3DPara mostrar e=
l bot=C3=B3n que permite usar
 observe.config.ui.showTimeEditorSlider=3D
 observe.config.ui.storeRemoteStorage=3DPara activar la copia de seguridad de=
 la configuraci=C3=B3n del origen de datos remota
 observe.config.ui.treeOpenNodes=3D
+observe.configuration.description=3D
 observe.content.action.activity=3DCrear una nueva actividad
 observe.content.action.activity.tip=3DCrear una nueva actividad para la ruta=
 actual
 observe.content.action.baitHaulingStatus.create.tip=3D
@@ -2116,10 +2117,10 @@ observe.title.storage.info=3D
 observe.title.technical.informations=3D
 observe.title.unique.key=3D
 observe.title.welcome.admin=3D
-observe.tree.action.collapseAll.tip=3D
-observe.tree.action.expandAll.tip=3D
-observe.tree.action.selectAll.tip=3D
-observe.tree.action.unselectAll.tip=3D
+observe.tree.action.collapseAll.tip=3DCerrar los nudos
+observe.tree.action.deselectAll.tip=3DDeseleccionar todo
+observe.tree.action.expandAll.tip=3DAbrir los nudos
+observe.tree.action.selectAll.tip=3DSeleccionar todo
 observe.tree.activityLongline=3DActividad
 observe.tree.activityLongline.unsaved=3DNueva actividad
 observe.tree.activitySeine=3DActividad
diff --git a/observe-application-swing/src/main/resources/i18n/observe-applic=
ation-swing_fr_FR.properties b/observe-application-swing/src/main/resources/i=
18n/observe-application-swing_fr_FR.properties
index 5348eda..ef8ba97 100644
--- a/observe-application-swing/src/main/resources/i18n/observe-application-s=
wing_fr_FR.properties
+++ b/observe-application-swing/src/main/resources/i18n/observe-application-s=
wing_fr_FR.properties
@@ -2116,10 +2116,10 @@ observe.title.storage.info=3DInformation sur la sourc=
e de donn=C3=A9es
 observe.title.technical.informations=3DInformations techniques du r=C3=A9f=
=C3=A9rentiel %1$s
 observe.title.unique.key=3DClefs m=C3=A9tier du r=C3=A9f=C3=A9rentiel %1$s
 observe.title.welcome.admin=3DObserve Administrateur
-observe.tree.action.collapseAll.tip=3D
-observe.tree.action.expandAll.tip=3D
-observe.tree.action.selectAll.tip=3D
-observe.tree.action.unselectAll.tip=3D
+observe.tree.action.collapseAll.tip=3DTout grouper
+observe.tree.action.deselectAll.tip=3DTout d=C3=A9s=C3=A9lectionner
+observe.tree.action.expandAll.tip=3DTout d=C3=A9plier
+observe.tree.action.selectAll.tip=3DTout s=C3=A9lectionner
 observe.tree.activityLongline=3DActivit=C3=A9s
 observe.tree.activityLongline.unsaved=3DNouvelle activit=C3=A9
 observe.tree.activitySeine=3DActivit=C3=A9s

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

--===============8083086300339704321==--


From scm@users.codelutin.com Tue Aug 23 15:22:25 2016
From: "codelutin.com scm" <scm@users.codelutin.com>
To: observe-commits@list.forge.codelutin.com
Subject: [Observe-commits] branch
 feature/7553_ajoute_un_widget_pour_les_arbres updated (6cc7137 -> ceac497)
Date: Tue, 23 Aug 2016 15:22:24 +0200
Message-ID: <20160823132224.16936.85388@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6276309661638316439=="

--===============6276309661638316439==
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 feature/7553_ajoute_un_widget_pour_les_arbres in reposit=
ory observe.

See https://gitlab.nuiton.org/codelutin/observe.git

     omits  6cc7137   Add tree header in other places in application
     omits  1dc22bc   Rename tree header id
     omits  396fd07   Be able to show or not actions (fold or select) of the =
tree header
     omits  2e10ca6   Optimize css
     omits  b9d55aa   merge i18n
     omits  69b37f6   Configure le label du BeanTreeHeader avec un attibut de=
 composant 'labelText'
     omits  8b2e0c5   Ajoute le BeanTreeHeader au panneau de s=C3=A9lection d=
es donn=C3=A9es
     omits  c3f84f9   Ajoute des icones sur les boutons du BeanTreeHeader
     omits  80c8169   Implementation du comportement des boutons de la toolba=
r du BeanTreeHeader dans le handler
     omits  168834f   Cr=C3=A9e le composant BeanTreeHeader visant =C3=A0 off=
rir un group d'actions facilitant l'utilisation des composants arbre par l'ut=
ilisateur
      adds  564cc54   optimize dependencies (bis)
       new  c96b601   Cr=C3=A9e le composant BeanTreeHeader visant =C3=A0 off=
rir un group d'actions facilitant l'utilisation des composants arbre par l'ut=
ilisateur
       new  a1edb9b   Implementation du comportement des boutons de la toolba=
r du BeanTreeHeader dans le handler
       new  e73f1bb   Ajoute des icones sur les boutons du BeanTreeHeader
       new  654b8a6   Ajoute le BeanTreeHeader au panneau de s=C3=A9lection d=
es donn=C3=A9es
       new  b3fb781   Configure le label du BeanTreeHeader avec un attibut de=
 composant 'labelText'
       new  24dad06   merge i18n
       new  408b37e   Optimize css
       new  abffbce   Be able to show or not actions (fold or select) of the =
tree header
       new  1b3452f   Rename tree header id
       new  ceac497   Add tree header in other places in application

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (6cc7137)
            \
             N -- N -- N   refs/heads/feature/7553_ajoute_un_widget_pour_les_=
arbres (ceac497)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omits" are not gone; other references still
refer to them.  Any revisions marked "discards" are gone forever.

The 10 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 ceac497490e48eb3b71ca05f99df16142ec5c0c1
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Tue Aug 23 13:11:51 2016 +0200

    Add tree header in other places in application

commit 1b3452f2f6dce263de8a7e59dd1f6fe2e12f3b7d
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Tue Aug 23 12:55:38 2016 +0200

    Rename tree header id

commit abffbce9bb8463d3897c54fd383a75a15fa985c2
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Tue Aug 23 12:45:40 2016 +0200

    Be able to show or not actions (fold or select) of the tree header

commit 408b37e0e8dfa826a8af4577fc116ea996b5f5e7
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Tue Aug 23 12:32:24 2016 +0200

    Optimize css

commit 24dad0694c1ae293d75a4eed0e1dc2ee0216117e
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Tue Aug 23 12:32:11 2016 +0200

    merge i18n

commit b3fb7819005a95cf77b04d808e9b747fc395bdbd
Author: Samuel Maisonneuve <maisonneuve@codelutin.com>
Date:   Tue Aug 23 10:14:52 2016 +0200

    Configure le label du BeanTreeHeader avec un attibut de composant 'labelT=
ext'
   =20
    refs #7553

commit 654b8a626edd0a40a7a0e9439cf68887cab3d0c1
Author: Samuel Maisonneuve <maisonneuve@codelutin.com>
Date:   Mon Aug 22 23:24:52 2016 +0200

    Ajoute le BeanTreeHeader au panneau de s=C3=A9lection des donn=C3=A9es

commit e73f1bb01d4640f8b1a1a2015107e7e5ece0862d
Author: Samuel Maisonneuve <maisonneuve@codelutin.com>
Date:   Mon Aug 22 23:20:15 2016 +0200

    Ajoute des icones sur les boutons du BeanTreeHeader
   =20
    refs #7553

commit a1edb9b471073a8b2996f57bd49e914cb4d0cb3d
Author: Samuel Maisonneuve <maisonneuve@codelutin.com>
Date:   Mon Aug 22 20:10:11 2016 +0200

    Implementation du comportement des boutons de la toolbar du BeanTreeHeade=
r dans le handler
   =20
    refs #7553

commit c96b601134811f93539b6fcaf676d105be93dd7a
Author: Samuel Maisonneuve <maisonneuve@codelutin.com>
Date:   Sun Aug 21 23:45:16 2016 +0200

    Cr=C3=A9e le composant BeanTreeHeader visant =C3=A0 offrir un group d'act=
ions facilitant l'utilisation des composants arbre par l'utilisateur
   =20
    refs #7553

Summary of changes:
 observe-services-topia-validation/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

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

--===============6276309661638316439==--


From scm@users.codelutin.com Tue Aug 23 15:22:26 2016
From: "codelutin.com scm" <scm@users.codelutin.com>
To: observe-commits@list.forge.codelutin.com
Subject: [Observe-commits] 02/10: Implementation du comportement des boutons
 de la toolbar du BeanTreeHeader dans le handler
Date: Tue, 23 Aug 2016 15:22:26 +0200
Message-ID: <20160823132225.66AF05D4CC6@goh.codelutin.com>
In-Reply-To: <20160823132224.16936.85388@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4085163231372638897=="

--===============4085163231372638897==
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 feature/7553_ajoute_un_widget_pour_les_arbres in reposit=
ory observe.

See https://gitlab.nuiton.org/codelutin/observe.git

commit a1edb9b471073a8b2996f57bd49e914cb4d0cb3d
Author: Samuel Maisonneuve <maisonneuve@codelutin.com>
Date:   Mon Aug 22 20:10:11 2016 +0200

    Implementation du comportement des boutons de la toolbar du BeanTreeHeade=
r dans le handler
   =20
    refs #7553
---
 observe-application-swing/pom.xml                  |  1 +
 .../ird/observe/ui/util/tree/BeanTreeHeader.jaxx   | 24 +++-----
 .../ui/util/tree/BeanTreeHeaderHandler.java        | 68 ++++++++++++++++++++=
--
 3 files changed, 71 insertions(+), 22 deletions(-)

diff --git a/observe-application-swing/pom.xml b/observe-application-swing/po=
m.xml
index ed97561..56611b8 100644
--- a/observe-application-swing/pom.xml
+++ b/observe-application-swing/pom.xml
@@ -52,6 +52,7 @@
       ${project.basedir}/src/main/java/fr/ird/observe/ui/ObserveCommon.jcss
     </jaxx.commonCss>
     <jaxx.cssExtension>jcss</jaxx.cssExtension>
+    <jaxx.addAutoHandlerUI>true</jaxx.addAutoHandlerUI>
=20
     <!-- main class in JAR -->
     <maven.jar.main.class>fr.ird.observe.ObserveAdminCLI</maven.jar.main.cla=
ss>
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/t=
ree/BeanTreeHeader.jaxx b/observe-application-swing/src/main/java/fr/ird/obse=
rve/ui/util/tree/BeanTreeHeader.jaxx
index 6110ef1..4cf27ed 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/Bea=
nTreeHeader.jaxx
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/Bea=
nTreeHeader.jaxx
@@ -19,31 +19,21 @@
   <http://www.gnu.org/licenses/gpl-3.0.html>.
   #L%
   -->
-<JPanel id=3D"beanTreeHeader"
-        layout=3D'{new BorderLayout()}'>
+<JPanel layout=3D'{new BorderLayout()}'>
=20
-  <BeanTreeHeaderHandler id=3D'handler' constructorParams=3D'this'/>
-
-  <script><![CDATA[
-
-void $afterCompleteSetup() {
-    getHandler().initUI();
-}
-
-]]>
-  </script>
+  <JTree id=3D'tree' javaBean=3D'new JTree()'/>
=20
   <JLabel id=3D"label" constraints=3D'BorderLayout.CENTER'/>
=20
   <JToolBar id=3D'toolbar' constraints=3D'BorderLayout.EAST'>
=20
     <!-- les boutons pour grouper/d=C3=A9plier tout l'arbre -->
-    <JButton id=3D'colapseAll'/>
-    <JButton id=3D'expandAll'/>
+    <JButton id=3D'colapseAll' onActionPerformed=3D'handler.collapseAll()'/>
+    <JButton id=3D'expandAll' onActionPerformed=3D'handler.expandAll()'/>
=20
-    <!-- les boutons pour s=C3=A9lectionner/d=C3=A9selctionner tout l'arbre =
-->
-    <JButton id=3D'selectAll'/>
-    <JButton id=3D'deselectAll'/>
+    <!-- les boutons pour s=C3=A9lectionner/d=C3=A9selectionner tout l'arbre=
 -->
+    <JButton id=3D'selectAll' onActionPerformed=3D'handler.selectAll()'/>
+    <JButton id=3D'deselectAll' onActionPerformed=3D'handler.deselectAll()'/>
=20
   </JToolBar>
=20
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/t=
ree/BeanTreeHeaderHandler.java b/observe-application-swing/src/main/java/fr/i=
rd/observe/ui/util/tree/BeanTreeHeaderHandler.java
index e9d09a4..5dc51b8 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/Bea=
nTreeHeaderHandler.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/Bea=
nTreeHeaderHandler.java
@@ -22,24 +22,82 @@ package fr.ird.observe.ui.util.tree;
  * #L%
  */
=20
+import jaxx.runtime.spi.UIHandler;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
=20
+import javax.swing.JTree;
+import javax.swing.tree.TreePath;
+import javax.swing.tree.TreeSelectionModel;
+
 /**
  * @author Samuel Maisonneuve- maisonneuve@codelutin.com
  */
-public class BeanTreeHeaderHandler {
+public class BeanTreeHeaderHandler implements UIHandler<BeanTreeHeader> {
=20
     private static final Log log =3D LogFactory.getLog(BeanTreeHeaderHandler=
.class);
=20
-    private final BeanTreeHeader ui;
+    public BeanTreeHeader getUi() {
+        return ui;
+    }
+
+    private BeanTreeHeader ui;
+
+    private JTree getTree() {
+        return getUi().getTree();
+    }
+
+    @Override
+    public void beforeInit(BeanTreeHeader beanTreeHeader) {
+        this.ui =3D beanTreeHeader;
+    }
+
+    @Override
+    public void afterInit(BeanTreeHeader beanTreeHeader) {}
=20
-    public BeanTreeHeaderHandler(BeanTreeHeader ui) {
-        this.ui =3D ui;
+    public void collapseAll() {
+        // Let's deselect the nodes before collapsing them
+        deselectAll();
+
+        JTree tree =3D getTree();
+        for (int i =3D 0; i < tree.getRowCount(); i++) {
+            tree.collapseRow(i);
+        }
+    }
+
+    public void expandAll() {
+        JTree tree =3D getTree();
+        for (int i =3D 0; i < tree.getRowCount(); i++) {
+            tree.expandRow(i);
+        }
     }
=20
-    public void initUI() {
+    public void selectAll() {
+        // To be selected, nodes need to be expanded
+        expandAll();
+
+        JTree tree =3D getTree();
+        TreeSelectionModel selectionModel =3D tree.getSelectionModel();
=20
+        for (int i =3D 0, l =3D tree.getRowCount(); i < l; i++) {
+
+            TreePath path =3D tree.getPathForRow(i);
+            if (!selectionModel.isPathSelected(path)) {
+                tree.setSelectionPath(path);
+            }
+        }
     }
=20
+    public void deselectAll() {
+        JTree tree =3D getTree();
+        TreeSelectionModel selectionModel =3D tree.getSelectionModel();
+
+        for (int i =3D 0, l =3D tree.getRowCount(); i < l; i++) {
+
+            TreePath path =3D tree.getPathForRow(i);
+            if (selectionModel.isPathSelected(path)) {
+                tree.setSelectionPath(path);
+            }
+        }
+    }
 }

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

--===============4085163231372638897==--


From scm@users.codelutin.com Tue Aug 23 15:22:26 2016
From: "codelutin.com scm" <scm@users.codelutin.com>
To: observe-commits@list.forge.codelutin.com
Subject:
 [Observe-commits] 03/10: Ajoute des icones sur les boutons du	BeanTreeHeader
Date: Tue, 23 Aug 2016 15:22:27 +0200
Message-ID: <20160823132226.114385D4CC9@goh.codelutin.com>
In-Reply-To: <20160823132224.16936.85388@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6608547255390781964=="

--===============6608547255390781964==
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 feature/7553_ajoute_un_widget_pour_les_arbres in reposit=
ory observe.

See https://gitlab.nuiton.org/codelutin/observe.git

commit e73f1bb01d4640f8b1a1a2015107e7e5ece0862d
Author: Samuel Maisonneuve <maisonneuve@codelutin.com>
Date:   Mon Aug 22 23:20:15 2016 +0200

    Ajoute des icones sur les boutons du BeanTreeHeader
   =20
    refs #7553
---
 .../src/main/filters/observe-ui.properties                |   5 +++++
 .../java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jaxx  |   2 +-
 .../java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jcss  |  12 ++++++------
 .../ird/observe/ui/util/tree/BeanTreeHeaderHandler.java   |   6 +++---
 .../i18n/observe-application-swing_en_GB.properties       |   2 +-
 .../i18n/observe-application-swing_es_ES.properties       |   2 +-
 .../i18n/observe-application-swing_fr_FR.properties       |   2 +-
 .../src/main/resources/icons/action-collapse.png          | Bin 0 -> 372 byt=
es
 .../src/main/resources/icons/action-expand.png            | Bin 0 -> 371 byt=
es
 .../src/main/resources/icons/action-select.png            | Bin 0 -> 392 byt=
es
 .../src/main/resources/icons/action-unselect.png          | Bin 0 -> 311 byt=
es
 11 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/observe-application-swing/src/main/filters/observe-ui.properties=
 b/observe-application-swing/src/main/filters/observe-ui.properties
index 84c9f1c..308e53a 100644
--- a/observe-application-swing/src/main/filters/observe-ui.properties
+++ b/observe-application-swing/src/main/filters/observe-ui.properties
@@ -190,6 +190,11 @@ icon.action.generate=3Daction-generate.png
 icon.action.insert-before=3Daction-insert-before.png
 icon.action.insert-after=3Daction-insert-after.png
=20
+icon.action.expand=3Daction-expand.png
+icon.action.collapse=3Daction-collapse.png
+icon.action.select=3Daction-select.png
+icon.action.unselect=3Daction-unselect.png
+
 icon.action.wizard-state-pending=3Daction-wizard-state-pending-16.png
 icon.action.wizard-state-running=3Daction-wizard-state-running-16.png
 icon.action.wizard-state-need_fix=3Daction-wizard-state-need_fix-16.png
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/t=
ree/BeanTreeHeader.jaxx b/observe-application-swing/src/main/java/fr/ird/obse=
rve/ui/util/tree/BeanTreeHeader.jaxx
index 4cf27ed..4579ce1 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/Bea=
nTreeHeader.jaxx
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/Bea=
nTreeHeader.jaxx
@@ -33,7 +33,7 @@
=20
     <!-- les boutons pour s=C3=A9lectionner/d=C3=A9selectionner tout l'arbre=
 -->
     <JButton id=3D'selectAll' onActionPerformed=3D'handler.selectAll()'/>
-    <JButton id=3D'deselectAll' onActionPerformed=3D'handler.deselectAll()'/>
+    <JButton id=3D'unselectAll' onActionPerformed=3D'handler.unselectAll()'/>
=20
   </JToolBar>
=20
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/t=
ree/BeanTreeHeader.jcss b/observe-application-swing/src/main/java/fr/ird/obse=
rve/ui/util/tree/BeanTreeHeader.jcss
index 8b8c11d..06d1a49 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/Bea=
nTreeHeader.jcss
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/Bea=
nTreeHeader.jcss
@@ -31,7 +31,7 @@
 }
=20
 #colapseAll {
-  actionIcon:"combobox-reset";
+  actionIcon:"collapse";
   toolTipText:"observe.tree.action.collapseAll.tip";
   focusable:false;
   focusPainted:false;
@@ -40,7 +40,7 @@
 }
=20
 #expandAll {
-  actionIcon:"add";
+  actionIcon:"expand";
   toolTipText:"observe.tree.action.expandAll.tip";
   focusable:false;
   focusPainted:false;
@@ -49,7 +49,7 @@
 }
=20
 #selectAll {
-  actionIcon:"add";
+  actionIcon:"select";
   toolTipText:"observe.tree.action.selectAll.tip";
   focusable:false;
   focusPainted:false;
@@ -57,9 +57,9 @@
   enabled:{true};
 }
=20
-#deselectAll {
-  actionIcon:"combobox-reset";
-  toolTipText:"observe.tree.action.deselectAll.tip";
+#unselectAll {
+  actionIcon:"unselect";
+  toolTipText:"observe.tree.action.unselectAll.tip";
   focusable:false;
   focusPainted:false;
   visible:{true};
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/t=
ree/BeanTreeHeaderHandler.java b/observe-application-swing/src/main/java/fr/i=
rd/observe/ui/util/tree/BeanTreeHeaderHandler.java
index 5dc51b8..97016be 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/Bea=
nTreeHeaderHandler.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/Bea=
nTreeHeaderHandler.java
@@ -56,8 +56,8 @@ public class BeanTreeHeaderHandler implements UIHandler<Bea=
nTreeHeader> {
     public void afterInit(BeanTreeHeader beanTreeHeader) {}
=20
     public void collapseAll() {
-        // Let's deselect the nodes before collapsing them
-        deselectAll();
+        // Let's unselect the nodes before collapsing them
+        unselectAll();
=20
         JTree tree =3D getTree();
         for (int i =3D 0; i < tree.getRowCount(); i++) {
@@ -88,7 +88,7 @@ public class BeanTreeHeaderHandler implements UIHandler<Bea=
nTreeHeader> {
         }
     }
=20
-    public void deselectAll() {
+    public void unselectAll() {
         JTree tree =3D getTree();
         TreeSelectionModel selectionModel =3D tree.getSelectionModel();
=20
diff --git a/observe-application-swing/src/main/resources/i18n/observe-applic=
ation-swing_en_GB.properties b/observe-application-swing/src/main/resources/i=
18n/observe-application-swing_en_GB.properties
index 37f022f..0f60c6e 100644
--- a/observe-application-swing/src/main/resources/i18n/observe-application-s=
wing_en_GB.properties
+++ b/observe-application-swing/src/main/resources/i18n/observe-application-s=
wing_en_GB.properties
@@ -2118,9 +2118,9 @@ observe.title.technical.informations=3DTechnical inform=
ation of %1$s
 observe.title.unique.key=3DUnique keys used in a referentiel
 observe.title.welcome.admin=3DObserve Admin
 observe.tree.action.collapseAll.tip=3DCollapse all
-observe.tree.action.deselectAll.tip=3DDeselect All
 observe.tree.action.expandAll.tip=3DExpand all
 observe.tree.action.selectAll.tip=3DSelect All
+observe.tree.action.unselectAll.tip=3DUnselect All
 observe.tree.activityLongline=3DActivity
 observe.tree.activityLongline.unsaved=3DNew activity
 observe.tree.activitySeine=3DActivity
diff --git a/observe-application-swing/src/main/resources/i18n/observe-applic=
ation-swing_es_ES.properties b/observe-application-swing/src/main/resources/i=
18n/observe-application-swing_es_ES.properties
index 27110cd..2732801 100644
--- a/observe-application-swing/src/main/resources/i18n/observe-application-s=
wing_es_ES.properties
+++ b/observe-application-swing/src/main/resources/i18n/observe-application-s=
wing_es_ES.properties
@@ -2118,9 +2118,9 @@ observe.title.technical.informations=3D
 observe.title.unique.key=3D
 observe.title.welcome.admin=3D
 observe.tree.action.collapseAll.tip=3DCerrar los nudos
-observe.tree.action.deselectAll.tip=3DDeseleccionar todo
 observe.tree.action.expandAll.tip=3DAbrir los nudos
 observe.tree.action.selectAll.tip=3DSeleccionar todo
+observe.tree.action.unselectAll.tip=3DDeseleccionar todo
 observe.tree.activityLongline=3DActividad
 observe.tree.activityLongline.unsaved=3DNueva actividad
 observe.tree.activitySeine=3DActividad
diff --git a/observe-application-swing/src/main/resources/i18n/observe-applic=
ation-swing_fr_FR.properties b/observe-application-swing/src/main/resources/i=
18n/observe-application-swing_fr_FR.properties
index ef8ba97..3ebf942 100644
--- a/observe-application-swing/src/main/resources/i18n/observe-application-s=
wing_fr_FR.properties
+++ b/observe-application-swing/src/main/resources/i18n/observe-application-s=
wing_fr_FR.properties
@@ -2117,9 +2117,9 @@ observe.title.technical.informations=3DInformations tec=
hniques du r=C3=A9f=C3=A9rentiel %1
 observe.title.unique.key=3DClefs m=C3=A9tier du r=C3=A9f=C3=A9rentiel %1$s
 observe.title.welcome.admin=3DObserve Administrateur
 observe.tree.action.collapseAll.tip=3DTout grouper
-observe.tree.action.deselectAll.tip=3DTout d=C3=A9s=C3=A9lectionner
 observe.tree.action.expandAll.tip=3DTout d=C3=A9plier
 observe.tree.action.selectAll.tip=3DTout s=C3=A9lectionner
+observe.tree.action.unselectAll.tip=3DTout d=C3=A9s=C3=A9lectionner
 observe.tree.activityLongline=3DActivit=C3=A9s
 observe.tree.activityLongline.unsaved=3DNouvelle activit=C3=A9
 observe.tree.activitySeine=3DActivit=C3=A9s
diff --git a/observe-application-swing/src/main/resources/icons/action-collap=
se.png b/observe-application-swing/src/main/resources/icons/action-collapse.p=
ng
new file mode 100644
index 0000000..f88a24a
Binary files /dev/null and b/observe-application-swing/src/main/resources/ico=
ns/action-collapse.png differ
diff --git a/observe-application-swing/src/main/resources/icons/action-expand=
.png b/observe-application-swing/src/main/resources/icons/action-expand.png
new file mode 100644
index 0000000..3c19e48
Binary files /dev/null and b/observe-application-swing/src/main/resources/ico=
ns/action-expand.png differ
diff --git a/observe-application-swing/src/main/resources/icons/action-select=
.png b/observe-application-swing/src/main/resources/icons/action-select.png
new file mode 100644
index 0000000..bbee129
Binary files /dev/null and b/observe-application-swing/src/main/resources/ico=
ns/action-select.png differ
diff --git a/observe-application-swing/src/main/resources/icons/action-unsele=
ct.png b/observe-application-swing/src/main/resources/icons/action-unselect.p=
ng
new file mode 100644
index 0000000..3b49008
Binary files /dev/null and b/observe-application-swing/src/main/resources/ico=
ns/action-unselect.png differ

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

--===============6608547255390781964==--


From scm@users.codelutin.com Tue Aug 23 15:22:26 2016
From: "codelutin.com scm" <scm@users.codelutin.com>
To: observe-commits@list.forge.codelutin.com
Subject: [Observe-commits]  04/10: Ajoute le BeanTreeHeader au panneau de 
 =?utf-8?q?s=C3=A9lection?= des =?utf-8?q?donn=C3=A9es?=
Date: Tue, 23 Aug 2016 15:22:28 +0200
Message-ID: <20160823132226.8397E5D4CAF@goh.codelutin.com>
In-Reply-To: <20160823132224.16936.85388@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5672834569266531620=="

--===============5672834569266531620==
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 feature/7553_ajoute_un_widget_pour_les_arbres in reposit=
ory observe.

See https://gitlab.nuiton.org/codelutin/observe.git

commit 654b8a626edd0a40a7a0e9439cf68887cab3d0c1
Author: Samuel Maisonneuve <maisonneuve@codelutin.com>
Date:   Mon Aug 22 23:24:52 2016 +0200

    Ajoute le BeanTreeHeader au panneau de s=C3=A9lection des donn=C3=A9es
---
 .../main/java/fr/ird/observe/ui/admin/config/SelectDataUI.jaxx    | 8 ++++++=
+-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/=
config/SelectDataUI.jaxx b/observe-application-swing/src/main/java/fr/ird/obs=
erve/ui/admin/config/SelectDataUI.jaxx
index d6e5b71..cfe9a52 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/config/=
SelectDataUI.jaxx
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/config/=
SelectDataUI.jaxx
@@ -35,6 +35,8 @@
     fr.ird.observe.ui.tree.DataSelectionTreeSelectionModel
     fr.ird.observe.ui.storage.tabs.DataSelectionModel
=20
+    fr.ird.observe.ui.util.tree.BeanTreeHeader
+
     jaxx.runtime.SwingUtil
=20
     javax.swing.tree.TreeSelectionModel
@@ -76,11 +78,15 @@ public void destroy() {
   <JPanel id=3D'PENDING_content'>
=20
     <JScrollPane id=3D'selectTreePane' constraints=3D'BorderLayout.CENTER'
-                 decorator=3D'boxed'>
+                 decorator=3D'boxed' columnHeaderView=3D'{treeHeader}'>
=20
       <!-- arbre de selection des exports -->
       <JTree id=3D'selectTree'/>
+
+      <BeanTreeHeader id=3D'treeHeader' tree=3D'{selectTree}'/>
+
     </JScrollPane>
+
   </JPanel>
=20
=20

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

--===============5672834569266531620==--


From scm@users.codelutin.com Tue Aug 23 15:22:27 2016
From: "codelutin.com scm" <scm@users.codelutin.com>
To: observe-commits@list.forge.codelutin.com
Subject: [Observe-commits] 06/10: merge i18n
Date: Tue, 23 Aug 2016 15:22:30 +0200
Message-ID: <20160823132227.0A8C45D4CC6@goh.codelutin.com>
In-Reply-To: <20160823132224.16936.85388@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5104157685590973622=="

--===============5104157685590973622==
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 feature/7553_ajoute_un_widget_pour_les_arbres in reposit=
ory observe.

See https://gitlab.nuiton.org/codelutin/observe.git

commit 24dad0694c1ae293d75a4eed0e1dc2ee0216117e
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Tue Aug 23 12:32:11 2016 +0200

    merge i18n
---
 .../src/main/resources/i18n/observe-application-swing_en_GB.properties  | 1 +
 .../src/main/resources/i18n/observe-application-swing_es_ES.properties  | 2 =
+-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/observe-application-swing/src/main/resources/i18n/observe-applic=
ation-swing_en_GB.properties b/observe-application-swing/src/main/resources/i=
18n/observe-application-swing_en_GB.properties
index 0f60c6e..c41c73c 100644
--- a/observe-application-swing/src/main/resources/i18n/observe-application-s=
wing_en_GB.properties
+++ b/observe-application-swing/src/main/resources/i18n/observe-application-s=
wing_en_GB.properties
@@ -603,6 +603,7 @@ observe.config.map.layer7.description=3D
 observe.config.map.layer8.description=3D
 observe.config.map.layer9.description=3D
 observe.config.map.style.description=3D
+observe.config.name=3D
 observe.config.observation.activitysDetaillees=3D
 observe.config.observation.fauneAssociee=3D
 observe.config.observation.floatingObject=3D
diff --git a/observe-application-swing/src/main/resources/i18n/observe-applic=
ation-swing_es_ES.properties b/observe-application-swing/src/main/resources/i=
18n/observe-application-swing_es_ES.properties
index 2732801..9aed392 100644
--- a/observe-application-swing/src/main/resources/i18n/observe-application-s=
wing_es_ES.properties
+++ b/observe-application-swing/src/main/resources/i18n/observe-application-s=
wing_es_ES.properties
@@ -340,7 +340,6 @@ observe.admin.resume.operation.failed=3Dla operaci=C3=B3n=
 no realizada
 observe.admin.resume.operation.need.fix=3Dla operaci=C3=B3n nesista correcci=
ones
 observe.admin.resume.operation.not.started=3Doperaci=C3=B3n no empezada
 observe.admin.resume.operation.running=3Doperaci=C3=B3n en curso...
-observe.config.name=3DConfiguraci=C3=B3n de ObServe
 observe.catchAcquisitionModeEnum.GROUPED=3D
 observe.catchAcquisitionModeEnum.INDIVIDUAL=3D
 observe.choice.cancel=3DCancelar
@@ -603,6 +602,7 @@ observe.config.map.layer7.description=3D
 observe.config.map.layer8.description=3D
 observe.config.map.layer9.description=3D
 observe.config.map.style.description=3D
+observe.config.name=3DConfiguraci=C3=B3n de ObServe
 observe.config.observation.activitysDetaillees=3DObservaci=C3=B3n de activid=
ades detalladas
 observe.config.observation.fauneAssociee=3DObservaci=C3=B3n de Fauna asociada
 observe.config.observation.floatingObject=3DObservaci=C3=B3n de objetos flot=
antes

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

--===============5104157685590973622==--


From scm@users.codelutin.com Tue Aug 23 15:22:27 2016
From: "codelutin.com scm" <scm@users.codelutin.com>
To: observe-commits@list.forge.codelutin.com
Subject: [Observe-commits] 05/10: Configure le label du BeanTreeHeader avec un
 attibut de composant 'labelText'
Date: Tue, 23 Aug 2016 15:22:29 +0200
Message-ID: <20160823132226.B2B785C3569@goh.codelutin.com>
In-Reply-To: <20160823132224.16936.85388@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2088939843289562962=="

--===============2088939843289562962==
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 feature/7553_ajoute_un_widget_pour_les_arbres in reposit=
ory observe.

See https://gitlab.nuiton.org/codelutin/observe.git

commit b3fb7819005a95cf77b04d808e9b747fc395bdbd
Author: Samuel Maisonneuve <maisonneuve@codelutin.com>
Date:   Tue Aug 23 10:14:52 2016 +0200

    Configure le label du BeanTreeHeader avec un attibut de composant 'labelT=
ext'
   =20
    refs #7553
---
 .../src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jaxx     | 4 ++=
++
 .../src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jcss     | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/t=
ree/BeanTreeHeader.jaxx b/observe-application-swing/src/main/java/fr/ird/obse=
rve/ui/util/tree/BeanTreeHeader.jaxx
index 4579ce1..9419d8e 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/Bea=
nTreeHeader.jaxx
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/Bea=
nTreeHeader.jaxx
@@ -21,8 +21,12 @@
   -->
 <JPanel layout=3D'{new BorderLayout()}'>
=20
+  <!-- label -->
+  <String id=3D'labelText' javaBean=3D'null'/>
+  <!-- tree -->
   <JTree id=3D'tree' javaBean=3D'new JTree()'/>
=20
+
   <JLabel id=3D"label" constraints=3D'BorderLayout.CENTER'/>
=20
   <JToolBar id=3D'toolbar' constraints=3D'BorderLayout.EAST'>
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/t=
ree/BeanTreeHeader.jcss b/observe-application-swing/src/main/java/fr/ird/obse=
rve/ui/util/tree/BeanTreeHeader.jcss
index 06d1a49..3b253f6 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/Bea=
nTreeHeader.jcss
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/Bea=
nTreeHeader.jcss
@@ -22,7 +22,7 @@
=20
 #label {
   opaque:false;
-  text:{""};
+  text:{SwingUtil.getStringValue(getLabelText())};
 }
=20
 #toolbar {

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

--===============2088939843289562962==--


From scm@users.codelutin.com Tue Aug 23 15:22:28 2016
From: "codelutin.com scm" <scm@users.codelutin.com>
To: observe-commits@list.forge.codelutin.com
Subject: [Observe-commits] 07/10: Optimize css
Date: Tue, 23 Aug 2016 15:22:31 +0200
Message-ID: <20160823132228.3CA575C3569@goh.codelutin.com>
In-Reply-To: <20160823132224.16936.85388@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6742476109477839810=="

--===============6742476109477839810==
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 feature/7553_ajoute_un_widget_pour_les_arbres in reposit=
ory observe.

See https://gitlab.nuiton.org/codelutin/observe.git

commit 408b37e0e8dfa826a8af4577fc116ea996b5f5e7
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Tue Aug 23 12:32:24 2016 +0200

    Optimize css
---
 .../ird/observe/ui/util/tree/BeanTreeHeader.jcss   | 35 +++++++-------------=
--
 1 file changed, 10 insertions(+), 25 deletions(-)

diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/t=
ree/BeanTreeHeader.jcss b/observe-application-swing/src/main/java/fr/ird/obse=
rve/ui/util/tree/BeanTreeHeader.jcss
index 3b253f6..46d0bdf 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/Bea=
nTreeHeader.jcss
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/Bea=
nTreeHeader.jcss
@@ -21,47 +21,32 @@
  */
=20
 #label {
-  opaque:false;
-  text:{SwingUtil.getStringValue(getLabelText())};
+  text:{getLabelText()};
 }
=20
-#toolbar {
-  floatable:false;
-  borderPainted:false;
+JButton {
+  focusable:false;
+  focusPainted:false;
+  visible:true;
+  enabled:true;
 }
=20
 #colapseAll {
-  actionIcon:"collapse";
+  actionIcon:collapse;
   toolTipText:"observe.tree.action.collapseAll.tip";
-  focusable:false;
-  focusPainted:false;
-  visible:{true};
-  enabled:{true};
 }
=20
 #expandAll {
-  actionIcon:"expand";
+  actionIcon:expand;
   toolTipText:"observe.tree.action.expandAll.tip";
-  focusable:false;
-  focusPainted:false;
-  visible:{true};
-  enabled:{true};
 }
=20
 #selectAll {
-  actionIcon:"select";
+  actionIcon:select;
   toolTipText:"observe.tree.action.selectAll.tip";
-  focusable:false;
-  focusPainted:false;
-  visible:{true};
-  enabled:{true};
 }
=20
 #unselectAll {
-  actionIcon:"unselect";
+  actionIcon:unselect;
   toolTipText:"observe.tree.action.unselectAll.tip";
-  focusable:false;
-  focusPainted:false;
-  visible:{true};
-  enabled:{true};
 }

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

--===============6742476109477839810==--


From scm@users.codelutin.com Tue Aug 23 15:22:29 2016
From: "codelutin.com scm" <scm@users.codelutin.com>
To: observe-commits@list.forge.codelutin.com
Subject: [Observe-commits] 08/10: Be able to show or not actions (fold or
 select) of the tree header
Date: Tue, 23 Aug 2016 15:22:32 +0200
Message-ID: <20160823132228.EB8435D4CC9@goh.codelutin.com>
In-Reply-To: <20160823132224.16936.85388@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6809599604695427289=="

--===============6809599604695427289==
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 feature/7553_ajoute_un_widget_pour_les_arbres in reposit=
ory observe.

See https://gitlab.nuiton.org/codelutin/observe.git

commit abffbce9bb8463d3897c54fd383a75a15fa985c2
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Tue Aug 23 12:45:40 2016 +0200

    Be able to show or not actions (fold or select) of the tree header
---
 .../main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jaxx | 11 +++++++--=
--
 .../main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jcss | 10 ++++++++--
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/t=
ree/BeanTreeHeader.jaxx b/observe-application-swing/src/main/java/fr/ird/obse=
rve/ui/util/tree/BeanTreeHeader.jaxx
index 9419d8e..eb502c5 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/Bea=
nTreeHeader.jaxx
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/Bea=
nTreeHeader.jaxx
@@ -23,6 +23,9 @@
=20
   <!-- label -->
   <String id=3D'labelText' javaBean=3D'null'/>
+  <Boolean id=3D'showFoldActions' javaBean=3D'true'/>
+  <Boolean id=3D'showSelectActions' javaBean=3D'true'/>
+
   <!-- tree -->
   <JTree id=3D'tree' javaBean=3D'new JTree()'/>
=20
@@ -32,12 +35,12 @@
   <JToolBar id=3D'toolbar' constraints=3D'BorderLayout.EAST'>
=20
     <!-- les boutons pour grouper/d=C3=A9plier tout l'arbre -->
-    <JButton id=3D'colapseAll' onActionPerformed=3D'handler.collapseAll()'/>
-    <JButton id=3D'expandAll' onActionPerformed=3D'handler.expandAll()'/>
+    <JButton id=3D'colapseAll' styleClass=3D'showFoldActions' onActionPerfor=
med=3D'handler.collapseAll()'/>
+    <JButton id=3D'expandAll' styleClass=3D'showFoldActions' onActionPerform=
ed=3D'handler.expandAll()'/>
=20
     <!-- les boutons pour s=C3=A9lectionner/d=C3=A9selectionner tout l'arbre=
 -->
-    <JButton id=3D'selectAll' onActionPerformed=3D'handler.selectAll()'/>
-    <JButton id=3D'unselectAll' onActionPerformed=3D'handler.unselectAll()'/>
+    <JButton id=3D'selectAll' styleClass=3D'showSelectActions' onActionPerfo=
rmed=3D'handler.selectAll()'/>
+    <JButton id=3D'unselectAll' styleClass=3D'showSelectActions' onActionPer=
formed=3D'handler.unselectAll()'/>
=20
   </JToolBar>
=20
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/t=
ree/BeanTreeHeader.jcss b/observe-application-swing/src/main/java/fr/ird/obse=
rve/ui/util/tree/BeanTreeHeader.jcss
index 46d0bdf..267aee1 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/Bea=
nTreeHeader.jcss
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/Bea=
nTreeHeader.jcss
@@ -27,8 +27,14 @@
 JButton {
   focusable:false;
   focusPainted:false;
-  visible:true;
-  enabled:true;
+}
+
+.showFoldActions {
+  visible:{isShowFoldActions()};
+}
+
+.showSelectActions {
+  visible:{isShowSelectActions()};
 }
=20
 #colapseAll {

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

--===============6809599604695427289==--


From scm@users.codelutin.com Tue Aug 23 15:22:30 2016
From: "codelutin.com scm" <scm@users.codelutin.com>
To: observe-commits@list.forge.codelutin.com
Subject: [Observe-commits] 09/10: Rename tree header id
Date: Tue, 23 Aug 2016 15:22:33 +0200
Message-ID: <20160823132229.C2F545D4CCA@goh.codelutin.com>
In-Reply-To: <20160823132224.16936.85388@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3382254036146248969=="

--===============3382254036146248969==
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 feature/7553_ajoute_un_widget_pour_les_arbres in reposit=
ory observe.

See https://gitlab.nuiton.org/codelutin/observe.git

commit 1b3452f2f6dce263de8a7e59dd1f6fe2e12f3b7d
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Tue Aug 23 12:55:38 2016 +0200

    Rename tree header id
---
 .../src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.jaxx    | 4 ++=
--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/=
config/SelectDataUI.jaxx b/observe-application-swing/src/main/java/fr/ird/obs=
erve/ui/admin/config/SelectDataUI.jaxx
index cfe9a52..ab0da89 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/config/=
SelectDataUI.jaxx
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/config/=
SelectDataUI.jaxx
@@ -78,12 +78,12 @@ public void destroy() {
   <JPanel id=3D'PENDING_content'>
=20
     <JScrollPane id=3D'selectTreePane' constraints=3D'BorderLayout.CENTER'
-                 decorator=3D'boxed' columnHeaderView=3D'{treeHeader}'>
+                 decorator=3D'boxed' columnHeaderView=3D'{selectTreeHeader}'>
=20
       <!-- arbre de selection des exports -->
       <JTree id=3D'selectTree'/>
=20
-      <BeanTreeHeader id=3D'treeHeader' tree=3D'{selectTree}'/>
+      <BeanTreeHeader id=3D'selectTreeHeader' tree=3D'{selectTree}'/>
=20
     </JScrollPane>
=20

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

--===============3382254036146248969==--


From scm@users.codelutin.com Tue Aug 23 15:22:30 2016
From: "codelutin.com scm" <scm@users.codelutin.com>
To: observe-commits@list.forge.codelutin.com
Subject:
 [Observe-commits] 10/10: Add tree header in other places in	application
Date: Tue, 23 Aug 2016 15:22:34 +0200
Message-ID: <20160823132230.41B665D4CAF@goh.codelutin.com>
In-Reply-To: <20160823132224.16936.85388@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============9118538268597043502=="

--===============9118538268597043502==
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 feature/7553_ajoute_un_widget_pour_les_arbres in reposit=
ory observe.

See https://gitlab.nuiton.org/codelutin/observe.git

commit ceac497490e48eb3b71ca05f99df16142ec5c0c1
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Tue Aug 23 13:11:51 2016 +0200

    Add tree header in other places in application
---
 .../main/java/fr/ird/observe/ui/ObserveMainUI.jaxx |  4 +++-
 .../main/java/fr/ird/observe/ui/ObserveMainUI.jcss | 24 +++++++++++++-------=
--
 .../ui/admin/synchronize/data/DataSynchroUI.jaxx   |  7 +++++--
 .../referential/ng/ReferentialSynchroUI.jaxx       |  7 +++++--
 4 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/Observ=
eMainUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/Obse=
rveMainUI.jaxx
index 4aad01d..53bcefc 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI=
.jaxx
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI=
.jaxx
@@ -46,6 +46,7 @@
     fr.ird.observe.ui.content.ContentUIManager
     fr.ird.observe.ui.tree.ObserveTreeHelper
     fr.ird.observe.ui.tree.NavigationTreeCellRenderer
+    fr.ird.observe.ui.util.tree.BeanTreeHeader
=20
     jaxx.runtime.swing.CardLayout2
     jaxx.runtime.swing.CardLayout2Ext
@@ -255,8 +256,9 @@ void $afterCompleteSetup() {
       <!-- left : navigation -->
=20
       <JXTitledPanel id=3D'navigationView'>
-        <JScrollPane id=3D'navigationScrollPane'>
+        <JScrollPane id=3D'navigationScrollPane' columnHeaderView=3D'{naviga=
tionTreeHeader}'>
           <JTree id=3D"navigation"/>
+          <BeanTreeHeader id=3D'navigationTreeHeader' tree=3D'{navigation}'/>
         </JScrollPane>
       </JXTitledPanel>
=20
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/Observ=
eMainUI.jcss b/observe-application-swing/src/main/java/fr/ird/observe/ui/Obse=
rveMainUI.jcss
index d9bed5c..1acfc0b 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI=
.jcss
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI=
.jcss
@@ -361,16 +361,6 @@ JSplitPane {
   acceptedComponentNames: {UIHelper.ACCEPTABLE_COMPONENTS};
 }
=20
-#navigation {
-  rootVisible: false;
-  largeModel: true;
-  minimumSize: {UIHelper.newMinDimension()};
-  font-size:11;
-  model: {getTreeHelper().getModel()};
-  selectionModel: {getTreeHelper().newNavigationSelectionModel()};
-  cellRenderer: {new NavigationTreeCellRenderer()};
-}
-
 #splitpane {
   orientation: {JSplitPane.HORIZONTAL_SPLIT};
   resizeWeight: 1.0;
@@ -389,6 +379,20 @@ JSplitPane {
   title: "observe.view.navigation";
 }
=20
+#navigation {
+  rootVisible: false;
+  largeModel: true;
+  minimumSize: {UIHelper.newMinDimension()};
+  font-size:11;
+  model: {getTreeHelper().getModel()};
+  selectionModel: {getTreeHelper().newNavigationSelectionModel()};
+  cellRenderer: {new NavigationTreeCellRenderer()};
+}
+
+#navigationTreeHeader {
+  showSelectActions: false;
+}
+
 #messageView {
   title: "observe.view.message";
 }
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/=
synchronize/data/DataSynchroUI.jaxx b/observe-application-swing/src/main/java=
/fr/ird/observe/ui/admin/synchronize/data/DataSynchroUI.jaxx
index 014ed8c..b7222a5 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchro=
nize/data/DataSynchroUI.jaxx
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchro=
nize/data/DataSynchroUI.jaxx
@@ -34,6 +34,7 @@
     fr.ird.observe.ui.tree.DataSelectionTreeCellRenderer
     fr.ird.observe.ui.tree.DataSelectionTreeSelectionModel
     fr.ird.observe.ui.storage.tabs.DataSelectionModel
+    fr.ird.observe.ui.util.tree.BeanTreeHeader
=20
     jaxx.runtime.SwingUtil
=20
@@ -94,8 +95,9 @@ public void destroy() {
       <Table id=3D'contentNorth' fill=3D"both" weighty=3D"1">
         <row>
           <cell weightx=3D"0.45">
-            <JScrollPane id=3D'leftTreePane' decorator=3D'boxed'>
+            <JScrollPane id=3D'leftTreePane' decorator=3D'boxed' columnHeade=
rView=3D'{leftTreeHeader}'>
               <JTree id=3D'leftTree'/>
+              <BeanTreeHeader id=3D'leftTreeHeader' tree=3D'{leftTree}'/>
             </JScrollPane>
           </cell>
           <cell weightx=3D"0.1">
@@ -109,8 +111,9 @@ public void destroy() {
             </JPanel>
           </cell>
           <cell weightx=3D"0.45">
-            <JScrollPane id=3D'rightTreePane' decorator=3D'boxed'>
+            <JScrollPane id=3D'rightTreePane' decorator=3D'boxed' columnHead=
erView=3D'{rightTreeHeader}'>
               <JTree id=3D'rightTree'/>
+              <BeanTreeHeader id=3D'rightTreeHeader' tree=3D'{rightTree}'/>
             </JScrollPane>
           </cell>
         </row>
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/=
synchronize/referential/ng/ReferentialSynchroUI.jaxx b/observe-application-sw=
ing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/Referent=
ialSynchroUI.jaxx
index 2c08573..28296b9 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchro=
nize/referential/ng/ReferentialSynchroUI.jaxx
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchro=
nize/referential/ng/ReferentialSynchroUI.jaxx
@@ -39,6 +39,7 @@
     fr.ird.observe.ui.admin.synchronize.referential.ng.tree.ReferentialSynch=
ronizeTreeModel
     fr.ird.observe.ui.admin.synchronize.referential.ng.tree.ReferentialSynch=
ronizeTreeCellRenderer
     fr.ird.observe.ui.tree.ObserveTreeHelper
+    fr.ird.observe.ui.util.tree.BeanTreeHeader
=20
     javax.swing.ListSelectionModel
=20
@@ -92,8 +93,9 @@ public void destroy() {
       <Table id=3D'contentNorth' fill=3D"both" weighty=3D"1">
         <row>
           <cell weightx=3D"0.5">
-            <JScrollPane id=3D'leftTreePane'>
+            <JScrollPane id=3D'leftTreePane'  columnHeaderView=3D'{leftTreeH=
eader}'>
               <JTree id=3D'leftTree'/>
+              <BeanTreeHeader id=3D'leftTreeHeader' tree=3D'{leftTree}'/>
             </JScrollPane>
           </cell>
           <cell>
@@ -115,8 +117,9 @@ public void destroy() {
             </JPanel>
           </cell>
           <cell weightx=3D"0.5">
-            <JScrollPane id=3D'rightTreePane'>
+            <JScrollPane id=3D'rightTreePane' columnHeaderView=3D'{rightTree=
Header}'>
               <JTree id=3D'rightTree'/>
+              <BeanTreeHeader id=3D'rightTreeHeader' tree=3D'{rightTree}'/>
             </JScrollPane>
           </cell>
         </row>

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

--===============9118538268597043502==--