Author: chatellier Date: 2010-12-23 13:45:50 +0000 (Thu, 23 Dec 2010) New Revision: 442 Log: Rename datafile1 et datafile2 to estPopInd and estComInd Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/bean/RSufiResult.java trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultTableModel.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/SelectionAddResultDialog.jaxx trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/RSufiResult-error-validation.xml 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-business/src/main/java/fr/ifremer/coser/bean/RSufiResult.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/bean/RSufiResult.java 2010-12-22 15:27:46 UTC (rev 441) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/bean/RSufiResult.java 2010-12-23 13:45:50 UTC (rev 442) @@ -48,14 +48,14 @@ protected String zone; /** Utilisé seulement pour la validation (sinon, non valorisé). */ - protected String dataFile1Path; + protected String estComIndPath; /** Utilisé seulement pour la validation (sinon, non valorisé). */ - protected String dataFile2Path; + protected String estPopIndPath; - protected String dataFile1Name; + protected String estComIndName; - protected String dataFile2Name; + protected String estPopIndName; public String getName() { return name; @@ -87,44 +87,44 @@ getPropertyChangeSupport().firePropertyChange("zone", oldValue, zone); } - public String getDataFile1Path() { - return dataFile1Path; + public String getEstComIndPath() { + return estComIndPath; } - public void setDataFile1Path(String dataFile1Path) { - String oldValue = this.dataFile1Path; - this.dataFile1Path = dataFile1Path; - getPropertyChangeSupport().firePropertyChange("dataFile1Path", oldValue, dataFile1Path); + public void setEstComIndPath(String estComIndPath) { + String oldValue = this.estComIndPath; + this.estComIndPath = estComIndPath; + getPropertyChangeSupport().firePropertyChange("estComIndPath", oldValue, estComIndPath); } - public String getDataFile2Path() { - return dataFile2Path; + public String getEstPopIndPath() { + return estPopIndPath; } - public void setDataFile2Path(String dataFile2Path) { - String oldValue = this.dataFile2Path; - this.dataFile2Path = dataFile2Path; - getPropertyChangeSupport().firePropertyChange("dataFile2Path", oldValue, dataFile2Path); + public void setEstPopIndPath(String estPopIndPath) { + String oldValue = this.estPopIndPath; + this.estPopIndPath = estPopIndPath; + getPropertyChangeSupport().firePropertyChange("estPopIndPath", oldValue, estPopIndPath); } - public String getDataFile1Name() { - return dataFile1Name; + public String getEstComIndName() { + return estComIndName; } - public void setDataFile1Name(String dataFile1Name) { - String oldValue = this.dataFile1Name; - this.dataFile1Name = dataFile1Name; - getPropertyChangeSupport().firePropertyChange("dataFile1Name", oldValue, dataFile1Name); + public void setEstComIndName(String estComIndName) { + String oldValue = this.estComIndName; + this.estComIndName = estComIndName; + getPropertyChangeSupport().firePropertyChange("estComIndName", oldValue, estComIndName); } - public String getDataFile2Name() { - return dataFile2Name; + public String getEstPopIndName() { + return estPopIndName; } - public void setDataFile2Name(String dataFile2Name) { - String oldValue = this.dataFile2Name; - this.dataFile2Name = dataFile2Name; - getPropertyChangeSupport().firePropertyChange("dataFile2Name", oldValue, dataFile2Name); + public void setEstPopIndName(String estPopIndName) { + String oldValue = this.estPopIndName; + this.estPopIndName = estPopIndName; + getPropertyChangeSupport().firePropertyChange("estPopIndName", oldValue, estPopIndName); } public Properties toProperties() { @@ -135,11 +135,11 @@ if (getZone() != null) { props.setProperty("result.zone", getZone()); } - if (getDataFile1Name() != null) { - props.setProperty("result.datafile1name", getDataFile1Name()); + if (getEstComIndName() != null) { + props.setProperty("result.estComIndName", getEstComIndName()); } - if (getDataFile2Name() != null) { - props.setProperty("result.datafile2name", getDataFile2Name()); + if (getEstPopIndName() != null) { + props.setProperty("result.estPopIndName", getEstPopIndName()); } return props; } @@ -151,11 +151,11 @@ if (props.containsKey("result.zone")) { setZone(props.getProperty("result.zone")); } - if (props.containsKey("result.datafile1name")) { - setDataFile1Name(props.getProperty("result.datafile1name")); + if (props.containsKey("result.estComIndName")) { + setEstComIndName(props.getProperty("result.estComIndName")); } - if (props.containsKey("result.datafile2name")) { - setDataFile2Name(props.getProperty("result.datafile2name")); + if (props.containsKey("result.estPopIndName")) { + setEstPopIndName(props.getProperty("result.estPopIndName")); } } } Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2010-12-22 15:27:46 UTC (rev 441) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2010-12-23 13:45:50 UTC (rev 442) @@ -1041,12 +1041,12 @@ OutputStream outputStream = null; try { // sauvegarde des 2 fichiers obligatoires - File dataFile1 = new File(rsufiResult.getDataFile1Path()); - File dataFile2 = new File(rsufiResult.getDataFile2Path()); - rsufiResult.setDataFile1Name(dataFile1.getName()); - rsufiResult.setDataFile2Name(dataFile2.getName()); - FileUtils.copyFileToDirectory(dataFile1, rsufiResultDirectory); - FileUtils.copyFileToDirectory(dataFile2, rsufiResultDirectory); + File estComIndFile = new File(rsufiResult.getEstComIndPath()); + File estPopIndFile = new File(rsufiResult.getEstPopIndPath()); + rsufiResult.setEstComIndName(estComIndFile.getName()); + rsufiResult.setEstPopIndName(estPopIndFile.getName()); + FileUtils.copyFileToDirectory(estComIndFile, rsufiResultDirectory); + FileUtils.copyFileToDirectory(estPopIndFile, rsufiResultDirectory); // sauvegarde des fichiers autre File otherFilesDirectory = new File(rsufiResultDirectory, "others"); Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultTableModel.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultTableModel.java 2010-12-22 15:27:46 UTC (rev 441) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultTableModel.java 2010-12-23 13:45:50 UTC (rev 442) @@ -85,10 +85,10 @@ name = _("coser.ui.result.table.rsufiVersion"); break; case 2: - name = _("coser.ui.result.table.dataFile1"); + name = _("coser.ui.result.table.estComIndFile"); break; case 3: - name = _("coser.ui.result.table.dataFile2"); + name = _("coser.ui.result.table.estPopIndFile"); break; } return name; @@ -110,10 +110,10 @@ result = rsufiResult.getRsufiVersion(); break; case 2: - result = rsufiResult.getDataFile1Name(); + result = rsufiResult.getEstComIndName(); break; case 3: - result = rsufiResult.getDataFile2Name(); + result = rsufiResult.getEstPopIndName(); break; } Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/SelectionAddResultDialog.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/SelectionAddResultDialog.jaxx 2010-12-22 15:27:46 UTC (rev 441) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/SelectionAddResultDialog.jaxx 2010-12-23 13:45:50 UTC (rev 442) @@ -34,8 +34,8 @@ errorTableModel="errorsTableModel"> <field name="name" component="resultNameField" /> <field name="rsufiVersion" component="resultRsufiVersion" /> - <field name="dataFile1Path" component="dataFile1TextField" /> - <field name="dataFile2Path" component="dataFile2TextField" /> + <field name="estComIndPath" component="estComIndFileTextField" /> + <field name="estPopIndPath" component="estPopIndFileTextField" /> </BeanValidator> <row> @@ -62,32 +62,43 @@ </row> <row> <cell anchor="west"> - <JLabel text="coser.ui.result.dataFile1" /> + <JLabel text="coser.ui.result.zone" /> </cell> + <cell fill="horizontal" columns="2"> + <JTextField id="resultZone" /> + <javax.swing.text.Document javaBean="resultZone.getDocument()" + onInsertUpdate='getRsufiResult().setZone(resultZone.getText())' + onRemoveUpdate='getRsufiResult().setZone(resultZone.getText())' /> + </cell> + </row> + <row> + <cell anchor="west"> + <JLabel text="coser.ui.result.estComIndFile" /> + </cell> <cell weightx="1" fill="horizontal"> - <JTextField id="dataFile1TextField" /> - <javax.swing.text.Document javaBean="dataFile1TextField.getDocument()" - onInsertUpdate='getRsufiResult().setDataFile1Path(dataFile1TextField.getText())' - onRemoveUpdate='getRsufiResult().setDataFile1Path(dataFile1TextField.getText())' /> + <JTextField id="estComIndFileTextField" /> + <javax.swing.text.Document javaBean="estComIndFileTextField.getDocument()" + onInsertUpdate='getRsufiResult().setEstComIndPath(estComIndFileTextField.getText())' + onRemoveUpdate='getRsufiResult().setEstComIndPath(estComIndFileTextField.getText())' /> </cell> <cell fill="horizontal"> <JButton text="coser.ui.common.selectFile" - onActionPerformed="getHandler().selectResultFile(this, dataFile1TextField)" /> + onActionPerformed="getHandler().selectResultFile(this, estComIndFileTextField)" /> </cell> </row> <row> <cell anchor="west"> - <JLabel text="coser.ui.result.dataFile2" /> + <JLabel text="coser.ui.result.estPopIndFile" /> </cell> <cell fill="horizontal"> - <JTextField id="dataFile2TextField" /> - <javax.swing.text.Document javaBean="dataFile2TextField.getDocument()" - onInsertUpdate='getRsufiResult().setDataFile2Path(dataFile2TextField.getText())' - onRemoveUpdate='getRsufiResult().setDataFile2Path(dataFile2TextField.getText())' /> + <JTextField id="estPopIndFileTextField" /> + <javax.swing.text.Document javaBean="estPopIndFileTextField.getDocument()" + onInsertUpdate='getRsufiResult().setEstPopIndPath(estPopIndFileTextField.getText())' + onRemoveUpdate='getRsufiResult().setEstPopIndPath(estPopIndFileTextField.getText())' /> </cell> <cell fill="horizontal"> <JButton text="coser.ui.common.selectFile" - onActionPerformed="getHandler().selectResultFile(this, dataFile2TextField)" /> + onActionPerformed="getHandler().selectResultFile(this, estPopIndFileTextField)" /> </cell> </row> <row> Modified: trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/RSufiResult-error-validation.xml =================================================================== --- trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/RSufiResult-error-validation.xml 2010-12-22 15:27:46 UTC (rev 441) +++ trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/RSufiResult-error-validation.xml 2010-12-23 13:45:50 UTC (rev 442) @@ -39,16 +39,16 @@ <message>coser.ui.result.requiredrsufiVersion</message> </field-validator> </field> - <field name="dataFile1Path"> + <field name="estComIndPath"> <field-validator type="requiredstring"> <param name="trim">true</param> - <message>coser.ui.result.requireddataFile1Path</message> + <message>coser.ui.result.requiredestComIndPath</message> </field-validator> </field> - <field name="dataFile2Path"> + <field name="estPopIndPath"> <field-validator type="requiredstring"> <param name="trim">true</param> - <message>coser.ui.result.requireddataFile2Path</message> + <message>coser.ui.result.requiredestPopIndPath</message> </field-validator> </field> </validators> Modified: trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties =================================================================== --- trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2010-12-22 15:27:46 UTC (rev 441) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2010-12-23 13:45:50 UTC (rev 442) @@ -128,25 +128,26 @@ coser.ui.result.addOtherDataFile=Add file coser.ui.result.availableDataTitle=Available results \: coser.ui.result.cancel=Cancel -coser.ui.result.dataFile1=ESTPOPind file \: -coser.ui.result.dataFile2=ESTCOMind file \: +coser.ui.result.estComIndFile=ESTCOMind file \: +coser.ui.result.estPopIndFile=ESTPOPind file \: coser.ui.result.extractDataButton=Extract as Rsufi format coser.ui.result.extractDataLabel=Extraction directory \: coser.ui.result.extractDataTitle=Extract RSufi data coser.ui.result.newResult=New Result coser.ui.result.otherDataFile=Other files \: -coser.ui.result.requireddataFile1Path=ESTPOPind file is required -coser.ui.result.requireddataFile2Path=ESTCOMind file is required +coser.ui.result.requiredestComIndPath=ESTCOMind file is required +coser.ui.result.requiredestPopIndPath=ESTPOPind file is required coser.ui.result.requiredname=Result name is required coser.ui.result.requiredrsufiVersion=Rsufi version is required coser.ui.result.resultName=Result name \: coser.ui.result.rsufiVersion=RSufi version \: coser.ui.result.saveError=Save error -coser.ui.result.table.dataFile1=ESTPOPind file -coser.ui.result.table.dataFile2=ESTCOMind file +coser.ui.result.table.estComIndFile=ESTCOMind file +coser.ui.result.table.estPopIndFile=ESTPOPind file coser.ui.result.table.resultName=Result name coser.ui.result.table.rsufiVersion=RSufi Version coser.ui.result.validNewResult=Add this result +coser.ui.result.zone=Zone \: coser.ui.selection.allSpecies=L1 \: All species (%d/%d) coser.ui.selection.comment=Comment \: coser.ui.selection.createError=Creation error Modified: trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties =================================================================== --- trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2010-12-22 15:27:46 UTC (rev 441) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2010-12-23 13:45:50 UTC (rev 442) @@ -128,25 +128,26 @@ coser.ui.result.addOtherDataFile=Ajouter un fichier coser.ui.result.availableDataTitle=R\u00E9sultats disponibles coser.ui.result.cancel=Annuler -coser.ui.result.dataFile1=Fichier ESTPOPind \: -coser.ui.result.dataFile2=Fichier ESTCOMind \: +coser.ui.result.estComIndFile=Fichier ESTCOMind \: +coser.ui.result.estPopIndFile=Fichier ESTPOPind \: coser.ui.result.extractDataButton=Extraire au format RSufi coser.ui.result.extractDataLabel=Dossier d'extraction \: coser.ui.result.extractDataTitle=Extraction des donn\u00E9es RSufi coser.ui.result.newResult=Nouveau r\u00E9sultat coser.ui.result.otherDataFile=Autre fichiers \: -coser.ui.result.requireddataFile1Path=Le fichier ESTPOPind est requis -coser.ui.result.requireddataFile2Path=le fichier ESTCOMind est requis +coser.ui.result.requiredestComIndPath=Le fichier ESTCOMind est requis +coser.ui.result.requiredestPopIndPath=Le fichier ESTPOPind est requis coser.ui.result.requiredname=Le nom du r\u00E9sultat est requis coser.ui.result.requiredrsufiVersion=Le champ 'rsufiVersion' est requis coser.ui.result.resultName=Nom du r\u00E9sultat \: coser.ui.result.rsufiVersion=Version de RSufi \: coser.ui.result.saveError=Erreur de sauvegarde -coser.ui.result.table.dataFile1=Fichier ESTPOPind -coser.ui.result.table.dataFile2=Fichier ESTCOMind +coser.ui.result.table.estComIndFile=Fichier ESTCOMind +coser.ui.result.table.estPopIndFile=Fichier ESTPOPind coser.ui.result.table.resultName=Nom du r\u00E9sultat coser.ui.result.table.rsufiVersion=Version de RSufi coser.ui.result.validNewResult=Ajouter le r\u00E9sultat +coser.ui.result.zone=Zone \: coser.ui.selection.allSpecies=L1 \: Toutes les esp\u00E8ces (%d/%d) coser.ui.selection.comment=Commentaire \: coser.ui.selection.createError=Erreur de cr\u00E9action