From chatellier@users.labs.libre-entreprise.org Mon Jun 15 04:19:39 2026
From: chatellier@users.labs.libre-entreprise.org
To: coser-commits@list.forge.codelutin.com
Subject: [Coser-commits] r397 - in trunk/coser-ui/src/main:
	java/fr/ifremer/coser/ui/selection resources/i18n
Date: Mon, 13 Dec 2010 16:56:18 +0100
Message-ID: <20101213155618.660F62F23B@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6584833858177744590=="

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

Author: chatellier
Date: 2010-12-13 15:56:17 +0000 (Mon, 13 Dec 2010)
New Revision: 397

Log:
Ajout de menu contextuel sur les ann?\195?\169es et strates.
Renomage de dates en years dans le code.

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/resources/i18n/coser-ui_en_GB.properties
   trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties

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	2010-12-13 15:39:33 UTC (rev 396)
+++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetai=
lsView.jaxx	2010-12-13 15:56:17 UTC (rev 397)
@@ -113,21 +113,22 @@
                        <Table>
                             <row>
                                 <cell anchor=3D"west" columns=3D"2">
-                                    <JLabel text=3D"coser.ui.selection.detai=
ls.dates" />
+                                    <JLabel text=3D"coser.ui.selection.detai=
ls.years" />
                                 </cell>
                             </row>
                             <row>
                                 <cell weighty=3D"1" weightx=3D"1" fill=3D"bo=
th">
                                     <JScrollPane>
-                                        <YearListModel id=3D"datesListModel"=
 />
-                                        <JList id=3D"datesList" model=3D"{da=
tesListModel}"
-                                            selectionModel=3D"{new CoserList=
SelectionModel(datesList.getSelectionModel(), datesListModel)}"
+                                        <YearListModel id=3D"yearsListModel"=
 />
+                                        <JList id=3D"yearsList" model=3D"{ye=
arsListModel}"
+                                            onMouseClicked=3D"getHandler().s=
howYearsContextMenu(this, event)"
+                                            selectionModel=3D"{new CoserList=
SelectionModel(yearsList.getSelectionModel(), yearsListModel)}"
                                             onValueChanged=3D"setYearsValida=
ted(false)" />
-                                        <ListSelectionModel id=3D"datesListS=
electionModel" javaBean=3D"datesList.getSelectionModel()" />
+                                        <ListSelectionModel id=3D"yearsListS=
electionModel" javaBean=3D"yearsList.getSelectionModel()" />
                                     </JScrollPane>
                                 </cell>
                                 <cell anchor=3D"south">
-                                    <JButton id=3D"validDatesButton" text=3D=
"coser.ui.selection.details.validDates"=20
+                                    <JButton id=3D"validDatesButton" text=3D=
"coser.ui.selection.details.validYears"=20
                                         onActionPerformed=3D"getHandler().up=
dateSelectionDateData(this);setYearsValidated(true)"
                                         enabled=3D"{!isYearsValidated()}"/>
                                 </cell>
@@ -147,6 +148,7 @@
                                         <StrataListModel id=3D"strataListMod=
el"
                                             onContentsChanged=3D'strataLabel=
.setText(_("coser.ui.selection.details.strata", strataList.getSelectedIndices=
().length, strataList.getModel().getSize()))'/>
                                         <JList id=3D"strataList" model=3D"{s=
trataListModel}"
+                                            onMouseClicked=3D"getHandler().s=
howStrataContextMenu(this, event)"
                                             selectionModel=3D"{new CoserList=
SelectionModel(strataList.getSelectionModel(), strataListModel)}"
                                             onValueChanged=3D'setStrataValid=
ated(false); strataLabel.setText(_("coser.ui.selection.details.strata", strat=
aList.getSelectedIndices().length, strataList.getModel().getSize()))'/>
                                     </JScrollPane>

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	2010-12-13 15:39:33 UTC (rev 396)
+++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandl=
er.java	2010-12-13 15:56:17 UTC (rev 397)
@@ -176,9 +176,9 @@
         // initialize la liste de toutes les ann=C3=A9es
         // c'est normalement la seule initialisation a faire
         SelectionDetailsView detailView =3D view.getSelectionDetailsTab();
-        detailView.getDatesListModel().setYears(selection.getAllYears());
+        detailView.getYearsListModel().setYears(selection.getAllYears());
         // tout est selectionn=C3=A9 par defaut
-        ((CoserListSelectionModel)detailView.getDatesList().getSelectionMode=
l()).setSelectedObjects(selection.getSelectedYears());
+        ((CoserListSelectionModel)detailView.getYearsList().getSelectionMode=
l()).setSelectedObjects(selection.getSelectedYears());
        =20
         view.setCreationState(true);
=20
@@ -205,9 +205,9 @@
         SelectionDetailsView detailView =3D view.getSelectionDetailsTab();
=20
         // details view : fill details view
-        detailView.getDatesListModel().setYears(selection.getAllYears());
+        detailView.getYearsListModel().setYears(selection.getAllYears());
         List<String> selectedYears =3D selection.getSelectedYears();
-        ((CoserListSelectionModel)detailView.getDatesList().getSelectionMode=
l()).setSelectedObjects(selectedYears);
+        ((CoserListSelectionModel)detailView.getYearsList().getSelectionMode=
l()).setSelectedObjects(selectedYears);
=20
         // details view : fill strata data and selection
         updateSelectionDateData(detailView);
@@ -236,7 +236,7 @@
         ProjectService projectService =3D view.getContextValue(ProjectServic=
e.class);
=20
         // get selected zones as list
-        Object[] selectedDates =3D view.getDatesList().getSelectedValues();
+        Object[] selectedDates =3D view.getYearsList().getSelectedValues();
         List<String> years =3D new ArrayList<String>(selectedDates.length);
         for (Object selectedDate : selectedDates) {
             years.add((String)selectedDate);
@@ -333,6 +333,82 @@
     }
=20
     /**
+     * Affiche un menu contextuel lors du clic (droit) sur la liste des ann=
=C3=A9es.
+     *=20
+     * @param view view
+     * @param event mouse event
+     */
+    public void showYearsContextMenu(final SelectionDetailsView view, MouseE=
vent event) {
+
+        // clic droit
+        if (event.getButton() =3D=3D MouseEvent.BUTTON3) {
+
+            JPopupMenu popupMenu =3D new JPopupMenu();
+
+            // select all menu
+            JMenuItem selectAllMenu =3D new JMenuItem(_("coser.ui.common.sel=
ectAll"));
+            selectAllMenu.addActionListener(new ActionListener() {
+                @Override
+                public void actionPerformed(ActionEvent e) {
+                    int size =3D view.getYearsList().getModel().getSize();
+                    view.getYearsList().getSelectionModel().addSelectionInte=
rval(0, size - 1);
+                }
+            });
+            popupMenu.add(selectAllMenu);
+           =20
+            // unselect all menu
+            JMenuItem unselectAllMenu =3D new JMenuItem(_("coser.ui.common.u=
nselectAll"));
+            unselectAllMenu.addActionListener(new ActionListener() {
+                @Override
+                public void actionPerformed(ActionEvent e) {
+                    view.getYearsList().getSelectionModel().clearSelection();
+                }
+            });
+            popupMenu.add(unselectAllMenu);
+
+            popupMenu.show(view.getYearsList(), event.getX(), event.getY());
+        }
+    }
+   =20
+    /**
+     * Affiche un menu contextuel lors du clic (droit) sur la liste des stra=
tes.
+     *=20
+     * @param view view
+     * @param event mouse event
+     */
+    public void showStrataContextMenu(final SelectionDetailsView view, Mouse=
Event event) {
+
+        // clic droit
+        if (event.getButton() =3D=3D MouseEvent.BUTTON3) {
+
+            JPopupMenu popupMenu =3D new JPopupMenu();
+
+            // select all menu
+            JMenuItem selectAllMenu =3D new JMenuItem(_("coser.ui.common.sel=
ectAll"));
+            selectAllMenu.addActionListener(new ActionListener() {
+                @Override
+                public void actionPerformed(ActionEvent e) {
+                    int size =3D view.getStrataList().getModel().getSize();
+                    view.getStrataList().getSelectionModel().addSelectionInt=
erval(0, size - 1);
+                }
+            });
+            popupMenu.add(selectAllMenu);
+           =20
+            // unselect all menu
+            JMenuItem unselectAllMenu =3D new JMenuItem(_("coser.ui.common.u=
nselectAll"));
+            unselectAllMenu.addActionListener(new ActionListener() {
+                @Override
+                public void actionPerformed(ActionEvent e) {
+                    view.getStrataList().getSelectionModel().clearSelection(=
);
+                }
+            });
+            popupMenu.add(unselectAllMenu);
+
+            popupMenu.show(view.getStrataList(), event.getX(), event.getY());
+        }
+    }
+
+    /**
      * Affiche un menu contextuel lors du clic (droit) sur la liste filtr=C3=
=A9es des especes.
      *=20
      * @param view view
@@ -343,7 +419,7 @@
         // clic droit
         if (event.getButton() =3D=3D MouseEvent.BUTTON3) {
=20
-            JPopupMenu popupMenu =3D new JPopupMenu(_("coser.ui.selection.sp=
eciesMenuLabel"));
+            JPopupMenu popupMenu =3D new JPopupMenu();
=20
             // affiche le menu contextuel si au moins 2 especes selectionn=
=C3=A9es
             int[] selectedRows =3D view.getFilteredSpecyList().getSelectedIn=
dices();
@@ -418,7 +494,7 @@
         // clic droit
         if (event.getButton() =3D=3D MouseEvent.BUTTON3) {
=20
-            JPopupMenu popupMenu =3D new JPopupMenu(_("coser.ui.selection.sp=
eciesMenuLabel"));
+            JPopupMenu popupMenu =3D new JPopupMenu();
=20
             int[] selectedRows =3D view.getSelectedSpecyList().getSelectedIn=
dices();
             if (selectedRows.length > 0) {

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	2010-12-=
13 15:39:33 UTC (rev 396)
+++ trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties	2010-12-=
13 15:56:17 UTC (rev 397)
@@ -154,7 +154,6 @@
 coser.ui.selection.detail.yearAccordion=3DYears
 coser.ui.selection.details.addToSelectedListTip=3DAdd selected species to se=
lected species list.
 coser.ui.selection.details.comment=3DComments \:
-coser.ui.selection.details.dates=3DYears \:
 coser.ui.selection.details.description=3DDescription \:
 coser.ui.selection.details.displayDiffCatchLengthGraph=3DComparison catch/le=
ngth graphs
 coser.ui.selection.details.filteredSpecies=3DFiltered species (%d/%d) \:
@@ -166,10 +165,11 @@
 coser.ui.selection.details.showSpreciesTip=3DDisplay sampling effort table
 coser.ui.selection.details.strata=3DStrata (%d/%d) \:
 coser.ui.selection.details.type=3DFilter by type (%d/%d) \:
-coser.ui.selection.details.validDates=3DValid years
 coser.ui.selection.details.validFilter=3DValid filter
 coser.ui.selection.details.validSelection=3DValid selection
 coser.ui.selection.details.validStrata=3DValid strata
+coser.ui.selection.details.validYears=3DValid years
+coser.ui.selection.details.years=3DYears \:
 coser.ui.selection.filter.density=3DDensity \:
 coser.ui.selection.filter.filter=3DFilter
 coser.ui.selection.filter.occurrence=3DOccurrence \:
@@ -198,7 +198,6 @@
 coser.ui.selection.selectionValidated=3DSelection validated.
 coser.ui.selection.sizeAllYearSpecies=3DL3 \: Species with size all year (%d=
/%d)
 coser.ui.selection.speciesMenuFusion=3DMerge
-coser.ui.selection.speciesMenuLabel=3DSpecies menu
 coser.ui.selection.speciesMerged=3DSpecies merged.
 coser.ui.selection.tab.details=3DSelection details
 coser.ui.selection.tab.lists=3DSpecies lists

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	2010-12-=
13 15:39:33 UTC (rev 396)
+++ trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties	2010-12-=
13 15:56:17 UTC (rev 397)
@@ -154,7 +154,6 @@
 coser.ui.selection.detail.yearAccordion=3DAnn\u00E9es
 coser.ui.selection.details.addToSelectedListTip=3DAjoute les esp\u00E8ces s\=
u00E9lectionn\u00E9es \u00E0 la liste des especes s\u00E9lectionn\u00E9es.
 coser.ui.selection.details.comment=3DCommentaire \:
-coser.ui.selection.details.dates=3DAnn\u00E9es \:
 coser.ui.selection.details.description=3DDescription \:
 coser.ui.selection.details.displayDiffCatchLengthGraph=3DGraphiques des diff=
\u00E9rences captures/tailles
 coser.ui.selection.details.filteredSpecies=3DEsp\u00E8ces filtr\u00E9es (%d/=
%d) \:
@@ -166,10 +165,11 @@
 coser.ui.selection.details.showSpreciesTip=3DAfficher la table de l'effort d=
'\u00E9chantillonage
 coser.ui.selection.details.strata=3DStrates (%d/%d) \:
 coser.ui.selection.details.type=3DFiltrer par type (%d/%d) \:
-coser.ui.selection.details.validDates=3DValider les ann\u00E9es
 coser.ui.selection.details.validFilter=3DValider les filtres
 coser.ui.selection.details.validSelection=3DValider la s\u00E9lection
 coser.ui.selection.details.validStrata=3DValider les strates
+coser.ui.selection.details.validYears=3DValider les ann\u00E9es
+coser.ui.selection.details.years=3DAnn\u00E9es \:
 coser.ui.selection.filter.density=3DDensit\u00E9 \:
 coser.ui.selection.filter.filter=3DFiltrer
 coser.ui.selection.filter.occurrence=3DOccurence \:
@@ -198,7 +198,6 @@
 coser.ui.selection.selectionValidated=3DS\u00E9lection valid\u00E9e.
 coser.ui.selection.sizeAllYearSpecies=3DL3 \: Esp\u00E8ces avec taille pour =
toutes les ann\u00E9es (%d/%d)
 coser.ui.selection.speciesMenuFusion=3DFusion
-coser.ui.selection.speciesMenuLabel=3DMenu esp\u00E8ces
 coser.ui.selection.speciesMerged=3DEsp\u00E8ces fusionn\u00E9es.
 coser.ui.selection.tab.details=3DD\u00E9tails de la s\u00E9lection
 coser.ui.selection.tab.lists=3DListes des esp\u00E8ces


--===============6584833858177744590==--