From chatellier@users.labs.libre-entreprise.org Mon Jun 15 04:19:30 2026
From: chatellier@users.labs.libre-entreprise.org
To: coser-commits@list.forge.codelutin.com
Subject: [Coser-commits] r139 - in trunk/coser-ui/src/main:
	java/fr/ifremer/coser/ui/result	java/fr/ifremer/coser/ui/selection
 resources/i18n
Date: Fri, 29 Oct 2010 19:14:40 +0200
Message-ID: <20101029171441.0C3032F223@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============9153396438923843024=="

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

Author: chatellier
Date: 2010-10-29 17:14:40 +0000 (Fri, 29 Oct 2010)
New Revision: 139

Log:
Add form to add new rsufi result

Modified:
   trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultTableModel.j=
ava
   trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionResult=
View.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/result/ResultTable=
Model.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/result/ResultTableModel.=
java	2010-10-29 16:36:04 UTC (rev 138)
+++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultTableModel.=
java	2010-10-29 17:14:40 UTC (rev 139)
@@ -50,26 +50,14 @@
         header =3D new ArrayList<String>();
         header.add("Nom du r\u00E9sultat :");
         header.add("Version RSufi");
-        header.add("Fichier data captures");
-        header.add("Fichier graph captures");
-        header.add("Fichier data taille");
-        header.add("Fichier graph taille");
-        header.add("Fichier data strates");
-        header.add("Fichier graph strates");
-        header.add("Fichier data traits");
-        header.add("Fichier graph traits");
+        header.add("Fichier donn=C3=A9es 1");
+        header.add("Fichier donn=C3=A9es 2");
        =20
         data =3D new ArrayList<String>();
         data.add("R\u00E9sultat de test");
         data.add("1.0.0");
-        data.add("ListEspecesEVHOE_TOT_occ5_dens5.txt");
-        data.add("NombEspeceGroupL2EVHOE_TOT.wmf");
-        data.add("ListEspecesEVHOE_TOT_occ5_dens5.txt");
-        data.add("NombEspeceGroupL2EVHOE_TOT.wmf");
-        data.add("ListEspecesEVHOE_TOT_occ5_dens5.txt");
-        data.add("NombEspeceGroupL2EVHOE_TOT.wmf");
-        data.add("ListEspecesEVHOE_TOT_occ5_dens5.txt");
-        data.add("NombEspeceGroupL2EVHOE_TOT.wmf");
+        data.add("EstComInd_IBTS.txt");
+        data.add("EstPopInd_IBTS.txt");
     }
=20
     /*

Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/Selectio=
nResultView.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/SelectionResul=
tView.jaxx	2010-10-29 16:36:04 UTC (rev 138)
+++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionResul=
tView.jaxx	2010-10-29 17:14:40 UTC (rev 139)
@@ -57,8 +57,75 @@
                     </cell>
                 </row>
                 <row>
-                    <cell>
-                       =20
+                    <cell weighty=3D"1" fill=3D"both">
+                        <Table border=3D'{BorderFactory.createTitledBorder(_=
("coser.ui.result.newDataTitle"))}'>
+                            <row>
+                                <cell anchor=3D"west">
+                                    <JLabel text=3D"coser.ui.result.resultNa=
me" />
+                                </cell>
+                                <cell fill=3D"horizontal" columns=3D"2">
+                                    <JTextField />
+                                </cell>
+                            </row>
+                            <row>
+                                <cell anchor=3D"west">
+                                    <JLabel text=3D"coser.ui.result.rsufiVer=
sion" />
+                                </cell>
+                                <cell fill=3D"horizontal" columns=3D"2">
+                                    <JTextField />
+                                </cell>
+                            </row>
+                            <row>
+                                <cell anchor=3D"west">
+                                    <JLabel text=3D"coser.ui.result.rsufiVer=
sion" />
+                                </cell>
+                                <cell fill=3D"horizontal" columns=3D"2">
+                                    <JTextField />
+                                </cell>
+                            </row>
+                            <row>
+                                <cell anchor=3D"west">
+                                    <JLabel text=3D"coser.ui.result.dataFile=
1" />
+                                </cell>
+                                <cell weightx=3D"1" fill=3D"horizontal">
+                                    <JTextField />
+                                </cell>
+                                <cell fill=3D"horizontal">
+                                    <JButton text=3D"coser.ui.common.selectF=
ile" />
+                                </cell>
+                            </row>
+                            <row>
+                                <cell anchor=3D"west">
+                                    <JLabel text=3D"coser.ui.result.dataFile=
2" />
+                                </cell>
+                                <cell fill=3D"horizontal">
+                                    <JTextField />
+                                </cell>
+                                <cell fill=3D"horizontal">
+                                    <JButton text=3D"coser.ui.common.selectF=
ile" />
+                                </cell>
+                            </row>
+                            <row>
+                                <cell anchor=3D"west" columns=3D"3">
+                                    <JLabel text=3D"coser.ui.result.otherDat=
aFile" />
+                                </cell>
+                            </row>
+                            <row>
+                                <cell columns=3D"3" weighty=3D"1" fill=3D"bo=
th">
+                                    <JScrollPane>
+                                        <JList />
+                                    </JScrollPane>
+                                </cell>
+                            </row>
+                            <row>
+                                <cell weightx=3D"1" columns=3D"2" anchor=3D"=
east">
+                                    <JButton text=3D"coser.ui.result.addOthe=
rDataFile" />
+                                </cell>
+                                <cell anchor=3D"east">
+                                    <JButton text=3D"coser.ui.result.addNewR=
esult" />
+                                </cell>
+                            </row>
+                        </Table>
                     </cell>
                 </row>
             </Table>

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-10-=
29 16:36:04 UTC (rev 138)
+++ trunk/coser-ui/src/main/resources/i18n/coser-ui-en_GB.properties	2010-10-=
29 17:14:40 UTC (rev 139)
@@ -61,10 +61,18 @@
 coser.ui.project.traitsFile=3DTraits file \:
 coser.ui.project.useCustomReferenceSpeciesFile=3DUse custom reference file
 coser.ui.project.usedReferenceSpeciesFile=3DCurrent reference file \:
+coser.ui.result.addNewResult=3DSave result
+coser.ui.result.addOtherDataFile=3DAdd file
 coser.ui.result.availableDataTitle=3DAvailable results \:
+coser.ui.result.dataFile1=3DData file 1 \:
+coser.ui.result.dataFile2=3DData file 2 \:
 coser.ui.result.extractDataButton=3DExtract
 coser.ui.result.extractDataLabel=3DExtraction directory
 coser.ui.result.extractDataTitle=3DExtract RSufi data
+coser.ui.result.newDataTitle=3DNew result
+coser.ui.result.otherDataFile=3DOther files \:
+coser.ui.result.resultName=3DResult name \:
+coser.ui.result.rsufiVersion=3DRSufi version
 coser.ui.selection.allSpecies=3DAll species
 coser.ui.selection.createError=3DCreation error
 coser.ui.selection.details.beginDate=3DBegin date \:

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-10-=
29 16:36:04 UTC (rev 138)
+++ trunk/coser-ui/src/main/resources/i18n/coser-ui-fr_FR.properties	2010-10-=
29 17:14:40 UTC (rev 139)
@@ -61,10 +61,18 @@
 coser.ui.project.traitsFile=3DFichiers des traits \:
 coser.ui.project.useCustomReferenceSpeciesFile=3DUtiliser un autre fichier d=
e r\u00E9f\u00E9rence
 coser.ui.project.usedReferenceSpeciesFile=3DFichier de r\u00E9f\u00E9rence u=
tilis\u00E9 \:
+coser.ui.result.addNewResult=3DEnregistrer le r\u00E9sultat
+coser.ui.result.addOtherDataFile=3DAjouter un fichier
 coser.ui.result.availableDataTitle=3DR\u00E9sultats disponibles \:
+coser.ui.result.dataFile1=3DFichier r\u00E9sultat 1 \:
+coser.ui.result.dataFile2=3DFichier r\u00E9sultat 2 \:
 coser.ui.result.extractDataButton=3DExtraire
 coser.ui.result.extractDataLabel=3DDossier d'extraction \:
 coser.ui.result.extractDataTitle=3DExtraction des donn\u00E9es d'entr\u00E9e=
 de RSufi
+coser.ui.result.newDataTitle=3DNouveau r\u00E9sultat
+coser.ui.result.otherDataFile=3DAutre fichiers \:
+coser.ui.result.resultName=3DNom du r\u00E9sultat \:
+coser.ui.result.rsufiVersion=3DVersion de RSufi \:
 coser.ui.selection.allSpecies=3DToutes les esp\u00E8ces
 coser.ui.selection.createError=3DErreur de cr\u00E9action
 coser.ui.selection.details.beginDate=3DDate de d\u00E9but \:


--===============9153396438923843024==--