From echatellier@users.forge.codelutin.com Mon Aug  6 12:48:10 2012
From: echatellier@users.forge.codelutin.com
To: coser-commits@list.forge.codelutin.com
Subject: [Coser-commits] r1028 - in trunk: .
	coser-ui/src/main/java/fr/ifremer/coser/ui/selection
	coser-ui/src/main/resources/i18n coser-ui/src/main/resources/icons
Date: Mon, 06 Aug 2012 12:48:10 +0200
Message-ID: <20120806104810.94B7316358@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5818679283457402522=="

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

Author: echatellier
Date: 2012-08-06 12:48:10 +0200 (Mon, 06 Aug 2012)
New Revision: 1028

Url: http://forge.codelutin.com/repositories/revision/coser/1028

Log:
fixes #1322 : Ajouter des boutons suppl?\195?\169mentaires correspondant au a=
ction du menu contextuel


Added:
   trunk/coser-ui/src/main/resources/icons/arrow_jion_up.png
   trunk/coser-ui/src/main/resources/icons/stock_select_clear.png
   trunk/coser-ui/src/main/resources/icons/stock_select_table.png
Modified:
   trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetail=
sView.jaxx
   trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandle=
r.java
   trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsV=
iew.jaxx
   trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties
   trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties
   trunk/pom.xml

Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/Selectio=
nDetailsView.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/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetai=
lsView.jaxx	2012-07-19 14:07:21 UTC (rev 1027)
+++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetai=
lsView.jaxx	2012-08-06 10:48:10 UTC (rev 1028)
@@ -171,7 +171,7 @@
                                         onActionPerformed=3D'getDetailDecisi=
onPanelLayout().show(getDetailDecisionPanel(), "ZONEMAP");getHandler().showSt=
ataOnMap(this);' />
                                 </cell>
                                 <cell anchor=3D"northeast">
-                                    <JButton icon=3D"table.png" toolTipText=
=3D"coser.ui.selection.details.showSpreciesTip"
+                                    <JButton icon=3D"table.png" toolTipText=
=3D"coser.ui.selection.details.showSpeciesTip"
                                         onActionPerformed=3D'getDetailDecisi=
onPanelLayout().show(getDetailDecisionPanel(), "SPECIESDATA");getHandler().sh=
owSamplingEffort(this);' />
                                 </cell>
                             </row>
@@ -233,10 +233,10 @@
                                                     <ListSelectionModel id=
=3D"filteredSpeciesListSelectionModel" javaBean=3D"filteredSpeciesList.getSel=
ectionModel()" />
                                                 </JScrollPane>
                                             </cell>
-                                            <cell anchor=3D"north">
+                                            <cell anchor=3D"north" insets=3D=
"2">
                                                 <Table>
                                                     <row>
-                                                        <cell>
+                                                        <cell insets=3D"0">
                                                             <JButton icon=3D=
"arrow_right.png"
                                                                 toolTipText=
=3D"coser.ui.selection.details.addToSelectedListTip"
                                                                 onActionPerf=
ormed=3D"getHandler().addSelectedFilteredSpecies(this)"
@@ -244,13 +244,49 @@
                                                         </cell>
                                                     </row>
                                                     <row>
-                                                        <cell>
+                                                        <cell insets=3D"0">
                                                             <JButton icon=3D=
"arrow_left.png"
                                                                 toolTipText=
=3D"coser.ui.selection.details.removeFromSelectedListTip"
                                                                 onActionPerf=
ormed=3D"getHandler().removeSelectedSpecies(this)"
                                                                 enabled=3D"{=
getSelectedSpeciesList().getSelectedIndex() !=3D -1 &amp;&amp; isYearsValidat=
ed() &amp;&amp; isStrataValidated()}"/>
                                                         </cell>
                                                     </row>
+                                                    <row>
+                                                        <cell>
+                                                            <JSeparator />
+                                                        </cell>
+                                                    </row>
+                                                    <row>
+                                                        <cell insets=3D"0">
+                                                            <JButton icon=3D=
"stock_select_table.png"
+                                                                toolTipText=
=3D"coser.ui.selection.details.selectAllSpeciesTip"
+                                                                onActionPerf=
ormed=3D"getHandler().selectAllListSpecies(this)" />
+                                                        </cell>
+                                                    </row>
+                                                    <row>
+                                                        <cell insets=3D"0">
+                                                            <JButton icon=3D=
"stock_select_clear.png"
+                                                                toolTipText=
=3D"coser.ui.selection.details.unSelectAllSpeciesTip"
+                                                                onActionPerf=
ormed=3D"getHandler().unSelectAllListSpecies(this)" />
+                                                        </cell>
+                                                    </row>
+                                                    <row>
+                                                        <cell insets=3D"0">
+                                                            <JButton icon=3D=
"chart_curve.png"
+                                                                toolTipText=
=3D"coser.ui.selection.details.displayDiffCatchLengthGraphTip"
+                                                                onActionPerf=
ormed=3D"getHandler().showSelectedSpeciesGraph(this, null)"
+                                                                enabled=3D"{=
isYearsValidated() &amp;&amp; isStrataValidated() &amp;&amp; (getSelectedSpec=
iesList().getSelectedIndex() !=3D -1 || getFilteredSpeciesList().getSelectedI=
ndex() !=3D -1)}" />
+                                                        </cell>
+                                                    </row>
+                                                   =20
+                                                    <row>
+                                                        <cell insets=3D"0">
+                                                            <JButton icon=3D=
"arrow_jion_up.png"
+                                                                toolTipText=
=3D"coser.ui.selection.details.mergeSpeciesTip"
+                                                                onActionPerf=
ormed=3D"getHandler().showSpeciesMergeDialog(this)"
+                                                                enabled=3D"{=
getFilteredSpeciesList().getSelectedIndex() !=3D -1 &amp;&amp; isYearsValidat=
ed() &amp;&amp; isStrataValidated()}"/>
+                                                        </cell>
+                                                    </row>
                                                 </Table>
                                             </cell>
                                             <cell weightx=3D"1" weighty=3D"1=
" fill=3D"both">

Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/Selectio=
nHandler.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/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandl=
er.java	2012-07-19 14:07:21 UTC (rev 1027)
+++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandl=
er.java	2012-08-06 10:48:10 UTC (rev 1028)
@@ -623,15 +623,7 @@
                 fusionMenu.addActionListener(new ActionListener() {
                     @Override
                     public void actionPerformed(ActionEvent e) {
-                        SpeciesFusionDialog speciesFusionDialog =3D new Spec=
iesFusionDialog(view);
-                        speciesFusionDialog.setHandler(SelectionHandler.this=
);
-
-                        // pre fill new speci name with first selected speci=
es name
-                        String firstSelected =3D (String)view.getFilteredSpe=
ciesList().getSelectedValue();
-                        speciesFusionDialog.getNewSpeciesNameField().setText=
(firstSelected);
-
-                        speciesFusionDialog.setLocationRelativeTo(view);
-                        speciesFusionDialog.setVisible(true);
+                        showSpeciesMergeDialog(view);
                     }
                 });
                 popupMenu.add(fusionMenu);
@@ -675,7 +667,7 @@
             popupMenu.show(view.getFilteredSpeciesList(), event.getX(), even=
t.getY());
         }
     }
-   =20
+
     /**
      * Affiche un menu contextuel lors du clic (droit) sur la liste des espe=
ces
      * s=C3=A9lectionn=C3=A9es.
@@ -729,6 +721,56 @@
     }
=20
     /**
+     * Show species merge dialog. Called from view action or context menu.
+     *=20
+     * @param view parent view
+     */
+    protected void showSpeciesMergeDialog(SelectionDetailsView view) {
+        SpeciesFusionDialog speciesFusionDialog =3D new SpeciesFusionDialog(=
view);
+        speciesFusionDialog.setHandler(SelectionHandler.this);
+
+        // pre fill new speci name with first selected species name
+        String firstSelected =3D (String)view.getFilteredSpeciesList().getSe=
lectedValue();
+        speciesFusionDialog.getNewSpeciesNameField().setText(firstSelected);
+
+        speciesFusionDialog.setLocationRelativeTo(view);
+        speciesFusionDialog.setVisible(true);
+       =20
+    }
+
+    /**
+     * Clic sur le bouton selectionner tout.
+     * Selectionne toutes les esp=C3=A8ces dans les 2 listes contrairement au
+     * menu contextuel qui ne selectionne que dans une seule liste.
+     *=20
+     * @param view parent view
+     * @since 1.3
+     */
+    public void selectAllListSpecies(SelectionDetailsView view) {
+        // available
+        int size =3D view.getFilteredSpeciesList().getModel().getSize();
+        view.getFilteredSpeciesList().getSelectionModel().addSelectionInterv=
al(0, size - 1);
+        // selected
+        size =3D view.getSelectedSpeciesList().getModel().getSize();
+        view.getSelectedSpeciesList().getSelectionModel().addSelectionInterv=
al(0, size - 1);
+    }
+
+    /**
+     * Clic sur le bouton selectionner tout.
+     * Selectionne toutes les esp=C3=A8ces dans les 2 listes contrairement au
+     * menu contextuel qui ne selectionne que dans une seule liste.
+     *=20
+     * @param view parent view
+     * @since 1.3
+     */
+    public void unSelectAllListSpecies(SelectionDetailsView view) {
+        // available
+        view.getFilteredSpeciesList().getSelectionModel().clearSelection();
+        // selected
+        view.getSelectedSpeciesList().getSelectionModel().clearSelection();
+    }
+
+    /**
      * Sauvegarde (ou creer) la s=C3=A9lection (partie details).
      *=20
      * @param view parent view
@@ -1186,7 +1228,7 @@
      * sur laquelle porte l'appel.
      *=20
      * @param view view
-     * @param source
+     * @param source source list to choose selected values (can be {@code nu=
ll}, read both lists)
      */
     public void showSelectedSpeciesGraph(SelectionDetailsView view, JList so=
urce) {
=20
@@ -1194,11 +1236,25 @@
         Project project =3D view.getContextValue(Project.class);
         Selection selection =3D view.getContextValue(Selection.class);
=20
-        Object[] selectedSpecies =3D source.getSelectedValues();
         Set<String> graphSpecies =3D new HashSet<String>();
-        for (Object selectedSingleSpecies : selectedSpecies) {
-            graphSpecies.add((String)selectedSingleSpecies);
+        // specific list given (context menu)
+        if (source !=3D null) {
+            Object[] selectedSpecies =3D source.getSelectedValues();
+            for (Object selectedSingleSpecies : selectedSpecies) {
+                graphSpecies.add((String)selectedSingleSpecies);
+            }
         }
+        else {
+            // merge both lists
+            Object[] selectedSpecies =3D view.getFilteredSpeciesList().getSe=
lectedValues();
+            for (Object selectedSingleSpecies : selectedSpecies) {
+                graphSpecies.add((String)selectedSingleSpecies);
+            }
+            selectedSpecies =3D view.getSelectedSpeciesList().getSelectedVal=
ues();
+            for (Object selectedSingleSpecies : selectedSpecies) {
+                graphSpecies.add((String)selectedSingleSpecies);
+            }
+        }
        =20
         Map<String, JFreeChart> chartsMap =3D publicationService.getCompareC=
atchLengthGraph(project, selection, graphSpecies);
         Collection<JFreeChart> charts =3D chartsMap.values();

Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/Selectio=
nListsView.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/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionLists=
View.jaxx	2012-07-19 14:07:21 UTC (rev 1027)
+++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionLists=
View.jaxx	2012-08-06 10:48:10 UTC (rev 1028)
@@ -53,7 +53,7 @@
     ]]></script>
=20
     <row>
-        <cell columns=3D"8" weightx=3D"1" fill=3D"horizontal">
+        <cell columns=3D"8" weightx=3D"1" insets=3D"0" fill=3D"horizontal">
             <JToolBar floatable=3D"false">
                 <Component initializer=3D"javax.swing.Box.createHorizontalGl=
ue()" />
                 <JButton id=3D"validSelectionButton" text=3D"coser.ui.select=
ion.details.validSelection"

Modified: trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties	2012-07-=
19 14:07:21 UTC (rev 1027)
+++ trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties	2012-08-=
06 10:48:10 UTC (rev 1028)
@@ -41,12 +41,12 @@
 coser.ui.control.globalErrorMenuSelectAll=3DSelect all lines
 coser.ui.control.graph.species=3DSpecies \:
 coser.ui.control.progressStep=3DStep %d/%d \: %s
-coser.ui.control.project.requiredauthor=3DAuthor field is required
-coser.ui.control.project.requiredcatchFile=3DCatch file is required
-coser.ui.control.project.requiredhaulFile=3DHaul file is required
-coser.ui.control.project.requiredlengthFile=3DLength file is required
-coser.ui.control.project.requiredname=3DProject name is required
-coser.ui.control.project.requiredstrataFile=3DStrata file is required
+coser.ui.control.project.requiredauthor=3D
+coser.ui.control.project.requiredcatchFile=3D
+coser.ui.control.project.requiredhaulFile=3D
+coser.ui.control.project.requiredlengthFile=3D
+coser.ui.control.project.requiredname=3D
+coser.ui.control.project.requiredstrataFile=3D
 coser.ui.control.replace.find=3DFind \:
 coser.ui.control.replace.inField=3DIn field \:
 coser.ui.control.replace.replace=3DReplace \:
@@ -156,10 +156,10 @@
 coser.ui.result.newResult=3DNew Result
 coser.ui.result.otherDataFile=3DOther files \:
 coser.ui.result.publiableResult=3DPubliable \:
-coser.ui.result.requiredestComIndPath=3DESTCOMind file is required
-coser.ui.result.requiredestPopIndPath=3DESTPOPind file is required
-coser.ui.result.requiredname=3DResult name is required
-coser.ui.result.requiredrsufiVersion=3DRsufi version is required
+coser.ui.result.requiredestComIndPath=3D
+coser.ui.result.requiredestPopIndPath=3D
+coser.ui.result.requiredname=3D
+coser.ui.result.requiredrsufiVersion=3D
 coser.ui.result.resultName=3DResult name \:
 coser.ui.result.rsufiVersion=3DRSufi version \:
 coser.ui.result.saveError=3DSave error
@@ -189,17 +189,21 @@
 coser.ui.selection.details.comment=3DComments \:
 coser.ui.selection.details.description=3DDescription \:
 coser.ui.selection.details.displayDiffCatchLengthGraph=3DComparison catch/le=
ngth graphs
+coser.ui.selection.details.displayDiffCatchLengthGraphTip=3DComparison catch=
/length graphs
 coser.ui.selection.details.filteredSpecies=3DFiltered species (%d/%d) \:
+coser.ui.selection.details.mergeSpeciesTip=3DMerge
 coser.ui.selection.details.name=3DSelection name \:
 coser.ui.selection.details.removeFromSelectedListTip=3DRemove selected speci=
es from selected species list
 coser.ui.selection.details.saveSelection=3DSave selection
+coser.ui.selection.details.selectAllSpeciesTip=3DSelect all
 coser.ui.selection.details.selectedSpecies=3DL1 \: Selected species (%d/%d) =
\:
 coser.ui.selection.details.showMapTip=3DDisplay strata map
-coser.ui.selection.details.showSpreciesTip=3DDisplay sampling effort table
+coser.ui.selection.details.showSpeciesTip=3D
 coser.ui.selection.details.speciesDataDescription=3DHaul count by strata and=
 year \:
 coser.ui.selection.details.speciescontextmenu=3DFor more options, use specie=
s lists contextual menu
 coser.ui.selection.details.strata=3DStrata (%d/%d) \:
 coser.ui.selection.details.type=3DFilter by type (%d/%d) \:
+coser.ui.selection.details.unSelectAllSpeciesTip=3DUnselect all
 coser.ui.selection.details.validFilter=3DValid filter
 coser.ui.selection.details.validSelection=3DValid selection
 coser.ui.selection.details.validSpecies=3DValid species
@@ -240,8 +244,8 @@
 coser.ui.selection.replay.selectioninfos=3DSelection information \:
 coser.ui.selection.rsufidataextracted=3DRSufi data extracted.
 coser.ui.selection.saveError=3DSave error
-coser.ui.selection.selection.requiredDescription=3DSelection description is =
required
-coser.ui.selection.selection.requiredName=3DSelection name is required
+coser.ui.selection.selection.requiredDescription=3D
+coser.ui.selection.selection.requiredName=3D
 coser.ui.selection.selectionCreated=3DSelection created.
 coser.ui.selection.selectionFilterDescription=3DCoser selection (*.selection)
 coser.ui.selection.selectionSaved=3DSelection saved.

Modified: trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties	2012-07-=
19 14:07:21 UTC (rev 1027)
+++ trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties	2012-08-=
06 10:48:10 UTC (rev 1028)
@@ -41,12 +41,12 @@
 coser.ui.control.globalErrorMenuSelectAll=3DS=C3=A9lectionner toutes les lig=
nes
 coser.ui.control.graph.species=3DEsp=C3=A8ces \:
 coser.ui.control.progressStep=3D=C3=89tape %d/%d \: %s
-coser.ui.control.project.requiredauthor=3DLe champ 'auteur' est requis
-coser.ui.control.project.requiredcatchFile=3DLe fichier 'capture' est requis
-coser.ui.control.project.requiredhaulFile=3DLe fichier 'traits' est requis
-coser.ui.control.project.requiredlengthFile=3DLe fichier 'taille' est requis
-coser.ui.control.project.requiredname=3DLe nom du project est requis
-coser.ui.control.project.requiredstrataFile=3DLe fichier 'strates' est requis
+coser.ui.control.project.requiredauthor=3D
+coser.ui.control.project.requiredcatchFile=3D
+coser.ui.control.project.requiredhaulFile=3D
+coser.ui.control.project.requiredlengthFile=3D
+coser.ui.control.project.requiredname=3D
+coser.ui.control.project.requiredstrataFile=3D
 coser.ui.control.replace.find=3DChercher \:
 coser.ui.control.replace.inField=3DDans le champ \:
 coser.ui.control.replace.replace=3DRemplacer \:
@@ -156,10 +156,10 @@
 coser.ui.result.newResult=3DNouveau r=C3=A9sultat
 coser.ui.result.otherDataFile=3DAutre fichiers \:
 coser.ui.result.publiableResult=3DPubliable \:
-coser.ui.result.requiredestComIndPath=3DLe fichier ESTCOMind est requis
-coser.ui.result.requiredestPopIndPath=3DLe fichier ESTPOPind est requis
-coser.ui.result.requiredname=3DLe nom du r=C3=A9sultat est requis
-coser.ui.result.requiredrsufiVersion=3DLe champ 'rsufiVersion' est requis
+coser.ui.result.requiredestComIndPath=3D
+coser.ui.result.requiredestPopIndPath=3D
+coser.ui.result.requiredname=3D
+coser.ui.result.requiredrsufiVersion=3D
 coser.ui.result.resultName=3DNom du r=C3=A9sultat \:
 coser.ui.result.rsufiVersion=3DVersion de RSufi \:
 coser.ui.result.saveError=3DErreur de sauvegarde
@@ -189,17 +189,21 @@
 coser.ui.selection.details.comment=3DCommentaire \:
 coser.ui.selection.details.description=3DDescription \:
 coser.ui.selection.details.displayDiffCatchLengthGraph=3DGraphiques des diff=
=C3=A9rences captures/tailles
+coser.ui.selection.details.displayDiffCatchLengthGraphTip=3DGraphiques des d=
iff=C3=A9rences captures/tailles
 coser.ui.selection.details.filteredSpecies=3DEsp=C3=A8ces filtr=C3=A9es (%d/=
%d) \:
+coser.ui.selection.details.mergeSpeciesTip=3DFusion
 coser.ui.selection.details.name=3DNom de la s=C3=A9lection \:
 coser.ui.selection.details.removeFromSelectedListTip=3DRetire les esp=C3=A8c=
es s=C3=A9lectionn=C3=A9es de la liste des esp=C3=A8ces s=C3=A9lectionn=C3=A9=
es
 coser.ui.selection.details.saveSelection=3DSauvegarder la s=C3=A9lection
+coser.ui.selection.details.selectAllSpeciesTip=3DS=C3=A9lectionner tout
 coser.ui.selection.details.selectedSpecies=3DL1 \: Esp=C3=A8ces s=C3=A9lecti=
onn=C3=A9es (%d/%d) \:
 coser.ui.selection.details.showMapTip=3DAfficher la carte des strates
-coser.ui.selection.details.showSpreciesTip=3DAfficher la table de l'effort d=
'=C3=A9chantillonage
+coser.ui.selection.details.showSpeciesTip=3DAfficher la table de l'effort d'=
=C3=A9chantillonage
 coser.ui.selection.details.speciesDataDescription=3DNombre de traits par str=
ate par ann=C3=A9e \:
 coser.ui.selection.details.speciescontextmenu=3DPour plus d'options, utilise=
z le menu contextuel sur les listes d'esp=C3=A8ces
 coser.ui.selection.details.strata=3DStrates (%d/%d) \:
 coser.ui.selection.details.type=3DFiltrer par type (%d/%d) \:
+coser.ui.selection.details.unSelectAllSpeciesTip=3DD=C3=A9s=C3=A9lectionner =
tout
 coser.ui.selection.details.validFilter=3DValider les filtres
 coser.ui.selection.details.validSelection=3DValider la s=C3=A9lection
 coser.ui.selection.details.validSpecies=3DValider les esp=C3=A8ces
@@ -240,8 +244,8 @@
 coser.ui.selection.replay.selectioninfos=3DInformation sur la s=C3=A9lection=
 \:
 coser.ui.selection.rsufidataextracted=3DDonn=C3=A9es RSufi extraites.
 coser.ui.selection.saveError=3DErreur de sauvegarde
-coser.ui.selection.selection.requiredDescription=3DLa description de la s=C3=
=A9lection est requise
-coser.ui.selection.selection.requiredName=3DLe nom de la s=C3=A9lection est =
requis
+coser.ui.selection.selection.requiredDescription=3D
+coser.ui.selection.selection.requiredName=3D
 coser.ui.selection.selectionCreated=3DS=C3=A9lection cr=C3=A9=C3=A9e.
 coser.ui.selection.selectionFilterDescription=3DCoser s=C3=A9lection (*.sele=
ction)
 coser.ui.selection.selectionSaved=3DS=C3=A9lection sauv=C3=A9e.

Added: trunk/coser-ui/src/main/resources/icons/arrow_jion_up.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: trunk/coser-ui/src/main/resources/icons/arrow_jion_up.png
___________________________________________________________________
Added: svn:mime-type
   + image/png

Added: trunk/coser-ui/src/main/resources/icons/stock_select_clear.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: trunk/coser-ui/src/main/resources/icons/stock_select_cle=
ar.png
___________________________________________________________________
Added: svn:mime-type
   + image/png

Added: trunk/coser-ui/src/main/resources/icons/stock_select_table.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: trunk/coser-ui/src/main/resources/icons/stock_select_tab=
le.png
___________________________________________________________________
Added: svn:mime-type
   + image/png

Modified: trunk/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/pom.xml	2012-07-19 14:07:21 UTC (rev 1027)
+++ trunk/pom.xml	2012-08-06 10:48:10 UTC (rev 1028)
@@ -117,13 +117,13 @@
             <dependency>
                 <groupId>org.nuiton</groupId>
                 <artifactId>nuiton-utils</artifactId>
-                <version>2.5.2-SNAPSHOT</version>
+                <version>2.5.2</version>
                 <scope>compile</scope>
             </dependency>
             <dependency>
                 <groupId>org.nuiton</groupId>
                 <artifactId>nuiton-validator</artifactId>
-                <version>2.5.2-SNAPSHOT</version>
+                <version>2.5.2</version>
                 <scope>compile</scope>
             </dependency>
=20
@@ -172,7 +172,7 @@
             <dependency>
                 <groupId>org.swinglabs.swingx</groupId>
                 <artifactId>swingx-core</artifactId>
-                <version>1.6.3</version>
+                <version>1.6.4</version>
                 <scope>compile</scope>
             </dependency>
=20
@@ -346,7 +346,7 @@
         <license.organizationName>Ifremer, Codelutin</license.organizationNa=
me>
=20
         <!-- Versions -->
-        <jaxx.version>2.5.2</jaxx.version>
+        <jaxx.version>2.5.3</jaxx.version>
         <i18n.version>2.4.1</i18n.version>
         <!-- 2.3.1.1 fails to validate fields in jnlp -->
         <struts.version>2.3.4</struts.version>


--===============5818679283457402522==--