From chatellier@users.labs.libre-entreprise.org Mon Jun 15 04:19:37 2026
From: chatellier@users.labs.libre-entreprise.org
To: coser-commits@list.forge.codelutin.com
Subject: [Coser-commits] r356 - in trunk/coser-ui/src/main:
	java/fr/ifremer/coser/ui/selection resources/i18n
Date: Fri, 03 Dec 2010 15:45:45 +0100
Message-ID: <20101203144546.0D2B82F236@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2243792738080536829=="

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

Author: chatellier
Date: 2010-12-03 14:45:45 +0000 (Fri, 03 Dec 2010)
New Revision: 356

Log:
Deplacement des ann?\195?\169es dans un accord?\195?\169on seules

Modified:
   trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetail=
sView.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

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-03 13:33:54 UTC (rev 355)
+++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetai=
lsView.jaxx	2010-12-03 14:45:45 UTC (rev 356)
@@ -92,9 +92,28 @@
                             </cell>
                         </row>
                         <row>
-                            <cell anchor=3D"west">
+                            <cell anchor=3D"northwest">
+                                <JLabel text=3D"coser.ui.selection.details.c=
omment" />
+                            </cell>
+                            <cell anchor=3D"north" fill=3D"horizontal" weigh=
ty=3D"1" columns=3D"3">
+                                <JScrollPane>
+                                    <JTextArea id=3D"detailsComment" rows=3D=
"3" />
+                                    <javax.swing.text.Document javaBean=3D"d=
etailsComment.getDocument()"
+                                        onInsertUpdate=3D'getSelection().set=
Comment(detailsComment.getText())'
+                                        onRemoveUpdate=3D'getSelection().set=
Comment(detailsComment.getText())' />
+                                </JScrollPane>
+                            </cell>
+                        </row>
+                   </Table>
+              </AccordionPaneSubPanel>
+              <AccordionPaneSubPanel title=3D"coser.ui.selection.detail.year=
Accordion">
+                   <Table>
+                        <row>
+                            <cell anchor=3D"west" columns=3D"2">
                                 <JLabel text=3D"coser.ui.selection.details.d=
ates" />
                             </cell>
+                        </row>
+                        <row>
                             <cell weighty=3D"1" weightx=3D"1" fill=3D"both">
                                 <JScrollPane>
                                     <YearListModel id=3D"datesListModel" />
@@ -104,7 +123,7 @@
                                     <ListSelectionModel id=3D"datesListSelec=
tionModel" javaBean=3D"datesList.getSelectionModel()" />
                                 </JScrollPane>
                             </cell>
-                            <cell anchor=3D"south" columns=3D"2">
+                            <cell anchor=3D"south">
                                 <JButton id=3D"validDatesButton" text=3D"cos=
er.ui.selection.details.validDates"=20
                                     onActionPerformed=3D"getHandler().update=
SelectionDateData(this);setYearsValidated(true)"
                                     enabled=3D"{!isYearsValidated()}"/>
@@ -118,17 +137,9 @@
                             <cell fill=3D"horizontal">
                                 <JLabel id=3D"strataLabel" text=3D'{_("coser=
.ui.selection.details.strata", 0, 0)}' />
                             </cell>
-                            <cell anchor=3D"east">
-                                <JButton icon=3D"map.png" toolTipText=3D"cos=
er.ui.selection.details.showMapTip"
-                                    onActionPerformed=3D'getDetailDecisionPa=
nelLayout().show(getDetailDecisionPanel(), "ZONEMAP");' />
-                            </cell>
-                            <cell>
-                                <JButton icon=3D"table.png" toolTipText=3D"c=
oser.ui.selection.details.showSpreciesTip"
-                                    onActionPerformed=3D'getDetailDecisionPa=
nelLayout().show(getDetailDecisionPanel(), "SPECIESDATA");getHandler().showSa=
mplingEffort(this);' />
-                            </cell>
                         </row>
                         <row>
-                            <cell weightx=3D"1" weighty=3D"2" fill=3D"both">
+                            <cell weightx=3D"1" weighty=3D"2" fill=3D"both" =
rows=3D"2">
                                 <JScrollPane>
                                     <StrataListModel id=3D"strataListModel"
                                         onContentsChanged=3D'strataLabel.set=
Text(_("coser.ui.selection.details.strata", strataList.getSelectedIndices().l=
ength, strataList.getModel().getSize()))'/>
@@ -137,6 +148,16 @@
                                         onValueChanged=3D'setStrataValidated=
(false); strataLabel.setText(_("coser.ui.selection.details.strata", strataLis=
t.getSelectedIndices().length, strataList.getModel().getSize()))'/>
                                 </JScrollPane>
                             </cell>
+                            <cell anchor=3D"northeast">
+                                <JButton icon=3D"map.png" toolTipText=3D"cos=
er.ui.selection.details.showMapTip"
+                                    onActionPerformed=3D'getDetailDecisionPa=
nelLayout().show(getDetailDecisionPanel(), "ZONEMAP");' />
+                            </cell>
+                            <cell anchor=3D"northeast">
+                                <JButton icon=3D"table.png" toolTipText=3D"c=
oser.ui.selection.details.showSpreciesTip"
+                                    onActionPerformed=3D'getDetailDecisionPa=
nelLayout().show(getDetailDecisionPanel(), "SPECIESDATA");getHandler().showSa=
mplingEffort(this);' />
+                            </cell>
+                        </row>
+                        <row>
                             <cell anchor=3D"south" columns=3D"2">
                                 <JButton id=3D"validStrataButton" text=3D"co=
ser.ui.selection.details.validStrata"=20
                                     onActionPerformed=3D"getHandler().strata=
ListChanged(this);setStrataValidated(true)"
@@ -236,19 +257,6 @@
                                 </Table>
                             </cell>
                         </row>
-                        <row>
-                            <cell anchor=3D"northwest">
-                                <JLabel text=3D"coser.ui.selection.details.c=
omment" />
-                            </cell>
-                            <cell fill=3D"both" columns=3D"3">
-                                <JScrollPane>
-                                    <JTextArea id=3D"detailsComment" rows=3D=
"3" />
-                                    <javax.swing.text.Document javaBean=3D"d=
etailsComment.getDocument()"
-                                        onInsertUpdate=3D'getSelection().set=
Comment(detailsComment.getText())'
-                                        onRemoveUpdate=3D'getSelection().set=
Comment(detailsComment.getText())' />
-                                </JScrollPane>
-                            </cell>
-                        </row>
                     </Table>
                 </AccordionPaneSubPanel>
             </AccordionPane>

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-=
03 13:33:54 UTC (rev 355)
+++ trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties	2010-12-=
03 14:45:45 UTC (rev 356)
@@ -144,9 +144,10 @@
 coser.ui.selection.allSpecies=3DL1 \: All species
 coser.ui.selection.comment=3DComment \:
 coser.ui.selection.createError=3DCreation error
-coser.ui.selection.detail.mainAccordion=3DDetails and years
+coser.ui.selection.detail.mainAccordion=3DDetails
 coser.ui.selection.detail.speciesAccordion=3DSpecies
 coser.ui.selection.detail.strataAccordion=3DStrata
+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 \:

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-=
03 13:33:54 UTC (rev 355)
+++ trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties	2010-12-=
03 14:45:45 UTC (rev 356)
@@ -144,9 +144,10 @@
 coser.ui.selection.allSpecies=3DL1 \: Toutes les esp\u00E8ces
 coser.ui.selection.comment=3DCommentaire \:
 coser.ui.selection.createError=3DErreur de cr\u00E9action
-coser.ui.selection.detail.mainAccordion=3DD\u00E9tails et ann\u00E9es
+coser.ui.selection.detail.mainAccordion=3DD\u00E9tails
 coser.ui.selection.detail.speciesAccordion=3DEsp\u00E8ces
 coser.ui.selection.detail.strataAccordion=3DStrates
+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 \:


--===============2243792738080536829==--