- Tutti-commits - mailman.cloud.codelutin.com

r1055 - trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/sumatra
by kmorin＠users.forge.codelutin.com May 30, 2013

May 30, 2013

Author: kmorin Date: 2013-05-30 17:47:02 +0200 (Thu, 30 May 2013) New Revision: 1055 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1055 Log: fixes #2539 [SUMATRA] erreur de g?\195?\169n?\195?\169ration du rapport si des traits n'ont pas de benthos Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/sumatra/TuttiCatchesSumatraExportService.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/sumatra/TuttiCatchesSumatraExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/sumatra/TuttiCatchesSumatraExportService.java 2013-05-30 15:43:16 UTC (rev 1054) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/sumatra/TuttiCatchesSumatraExportService.java 2013-05-30 15:47:02 UTC (rev 1055) @@ -142,36 +142,38 @@ tuttiWeightComputingService.getComputedBenthosBatches(operation); rowMap.clear(); - List<BenthosBatch> benthosBatches = benthosBatchContainer.getChildren(); - for (BenthosBatch batch : benthosBatches) { - Species sp = batch.getSpecies(); + if (benthosBatchContainer != null) { + List<BenthosBatch> benthosBatches = benthosBatchContainer.getChildren(); + for (BenthosBatch batch : benthosBatches) { + Species sp = batch.getSpecies(); - Float weight = batch.getSampleCategoryWeight(); - if (weight == null) { - weight = batch.getSampleCategoryComputedWeight(); - } + Float weight = batch.getSampleCategoryWeight(); + if (weight == null) { + weight = batch.getSampleCategoryComputedWeight(); + } - Integer nb = batch.getNumber(); - if (nb == null) { - nb = batch.getComputedNumber(); - } - if (nb == null) { - nb = 0; - } + Integer nb = batch.getNumber(); + if (nb == null) { + nb = batch.getComputedNumber(); + } + if (nb == null) { + nb = 0; + } - CatchRow row = rowMap.get(sp); - if (row == null) { - row = new CatchRow(); - row.setFishingOperation(operation); - row.setSpecies(sp); - row.setWeight(weight); - row.setNumber(nb); + CatchRow row = rowMap.get(sp); + if (row == null) { + row = new CatchRow(); + row.setFishingOperation(operation); + row.setSpecies(sp); + row.setWeight(weight); + row.setNumber(nb); - } else { - row.setWeight(row.getWeight() + weight); - row.setNumber(row.getNumber() + nb); + } else { + row.setWeight(row.getWeight() + weight); + row.setNumber(row.getNumber() + nb); + } + rowMap.put(sp, row); } - rowMap.put(sp, row); } rows.addAll(rowMap.values());

1 0

r1054 - in trunk: tutti-service/src/test/resources tutti-ui-swing/src/main/filtered-resources
by kmorin＠users.forge.codelutin.com May 30, 2013

May 30, 2013

Author: kmorin Date: 2013-05-30 17:43:16 +0200 (Thu, 30 May 2013) New Revision: 1054 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1054 Log: revert some commited files Modified: trunk/tutti-service/src/test/resources/tutti-test-read-dbCGFS.properties trunk/tutti-ui-swing/src/main/filtered-resources/log4j.properties Modified: trunk/tutti-service/src/test/resources/tutti-test-read-dbCGFS.properties =================================================================== --- trunk/tutti-service/src/test/resources/tutti-test-read-dbCGFS.properties 2013-05-30 15:41:32 UTC (rev 1053) +++ trunk/tutti-service/src/test/resources/tutti-test-read-dbCGFS.properties 2013-05-30 15:43:16 UTC (rev 1054) @@ -21,7 +21,7 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -tutti.persistence.db.directory=/home/kmorin/Projects/tutti/tutti-service/src/test/dbCGFS -tutti.persistence.jdbc.url=jdbc:hsqldb:file:/home/kmorin/Projects/tutti/tutti-service/src/test/dbCGFS/allegro +tutti.persistence.db.directory=src/test/dbCGFS +tutti.persistence.jdbc.url=jdbc:hsqldb:file:src/test/dbCGFS/allegro #tutti.persistence.jdbc.url=jdbc:hsqldb:hsql://localhost/allegro #tutti.persistence.jdbc.createScript=src/test/dbEmpty/allegro.script \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/filtered-resources/log4j.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/log4j.properties 2013-05-30 15:41:32 UTC (rev 1053) +++ trunk/tutti-ui-swing/src/main/filtered-resources/log4j.properties 2013-05-30 15:43:16 UTC (rev 1054) @@ -36,8 +36,6 @@ #log4j.logger.fr.ifremer.tutti.ui.swing.util.action=INFO #log4j.logger.fr.ifremer.tutti.ui.swing.util.attachment=INFO -log4j.logger.jaxx.runtime.editor=DEBUG - log4j.appender.file=org.apache.log4j.RollingFileAppender log4j.appender.file.file=${tutti.log.file} log4j.appender.file.MaxFileSize=10MB

1 0

r1053 - in trunk: tutti-service/src/test/resources tutti-ui-swing/src/main/filtered-resources tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species
by kmorin＠users.forge.codelutin.com May 30, 2013

May 30, 2013

Author: kmorin Date: 2013-05-30 17:41:32 +0200 (Thu, 30 May 2013) New Revision: 1053 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1053 Log: fixes #2470 [CAPTURE] modification des caract?\195?\169ristiques du trait non pris en compte dans les identifiants affich?\195?\169s Modified: trunk/tutti-service/src/test/resources/tutti-test-read-dbCGFS.properties trunk/tutti-ui-swing/src/main/filtered-resources/log4j.properties trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractImportMultiPostAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriAction.java Modified: trunk/tutti-service/src/test/resources/tutti-test-read-dbCGFS.properties =================================================================== --- trunk/tutti-service/src/test/resources/tutti-test-read-dbCGFS.properties 2013-05-30 14:41:16 UTC (rev 1052) +++ trunk/tutti-service/src/test/resources/tutti-test-read-dbCGFS.properties 2013-05-30 15:41:32 UTC (rev 1053) @@ -21,7 +21,7 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -tutti.persistence.db.directory=src/test/dbCGFS -tutti.persistence.jdbc.url=jdbc:hsqldb:file:src/test/dbCGFS/allegro +tutti.persistence.db.directory=/home/kmorin/Projects/tutti/tutti-service/src/test/dbCGFS +tutti.persistence.jdbc.url=jdbc:hsqldb:file:/home/kmorin/Projects/tutti/tutti-service/src/test/dbCGFS/allegro #tutti.persistence.jdbc.url=jdbc:hsqldb:hsql://localhost/allegro #tutti.persistence.jdbc.createScript=src/test/dbEmpty/allegro.script \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/filtered-resources/log4j.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/log4j.properties 2013-05-30 14:41:16 UTC (rev 1052) +++ trunk/tutti-ui-swing/src/main/filtered-resources/log4j.properties 2013-05-30 15:41:32 UTC (rev 1053) @@ -36,6 +36,8 @@ #log4j.logger.fr.ifremer.tutti.ui.swing.util.action=INFO #log4j.logger.fr.ifremer.tutti.ui.swing.util.attachment=INFO +log4j.logger.jaxx.runtime.editor=DEBUG + log4j.appender.file=org.apache.log4j.RollingFileAppender log4j.appender.file.file=${tutti.log.file} log4j.appender.file.MaxFileSize=10MB Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java 2013-05-30 14:41:16 UTC (rev 1052) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java 2013-05-30 15:41:32 UTC (rev 1053) @@ -331,12 +331,10 @@ // now fishing operation is edited model.setEditFishingOperation(fishingOperation); - String fishingOperationText = getFishingOperationTitle(fishingOperation); + loadFishingOperation(fishingOperation); - loadFishingOperation(fishingOperation, fishingOperationText); + loadCatchBatch(fishingOperation, true); - loadCatchBatch(fishingOperation, fishingOperationText, true); - JTabbedPane form = ui.getTabPane(); JLabel noContentPane = ui.getNoTraitPane(); @@ -373,8 +371,7 @@ getUI().repaint(); } - public void loadFishingOperation(FishingOperation bean, - String fishingOperationText) { + public void loadFishingOperation(FishingOperation bean) { EditFishingOperationUI ui = getUI().getFishingOperationTabContent(); @@ -465,34 +462,26 @@ editFishingOperationUIModel.setLoadingData(false); - ui.getTraitGeneralTabPane().setTitle(fishingOperationText); - ui.getVesselUseFeatureTabPane().setTitle(fishingOperationText); - ui.getGearUseFeatureTabPane().setTitle(fishingOperationText); - handler.installStartDateListener(); handler.installCoordinatesListener(); } - public String getFishingOperationTitle(FishingOperation bean) { - Decorator<FishingOperation> decorator = - getDecorator(FishingOperation.class, null); +// public String getFishingOperationTitle(FishingOperation bean) { +// String fishingOperationText; +// +// if (bean == null) { +// fishingOperationText = null; +// } else if (TuttiEntities.isNew(bean)) { +// fishingOperationText = _("tutti.editFishingOperation.label.traitReminder", +// _("tutti.editFishingOperation.label.traitReminder.inCreation")); +// } else { +// fishingOperationText = _("tutti.editFishingOperation.label.traitReminder", +// decorate(bean)); +// } +// return fishingOperationText; +// } - String fishingOperationText; - - if (bean == null) { - fishingOperationText = null; - } else if (TuttiEntities.isNew(bean)) { - fishingOperationText = _("tutti.editFishingOperation.label.traitReminder", - _("tutti.editFishingOperation.label.traitReminder.inCreation")); - } else { - fishingOperationText = _("tutti.editFishingOperation.label.traitReminder", - decorator.toString(bean)); - } - return fishingOperationText; - } - public void loadCatchBatch(FishingOperation bean, - String fishingOperationText, boolean loadOtherTabs) { boolean empty = bean == null || TuttiEntities.isNew(bean); @@ -580,14 +569,6 @@ catchesUIModel.setModify(false); catchBatchMonitor.clearModified(); - // 3) Propagate title to others tabs - ui.getCatchesCaracteristicsTabPane().setTitle(fishingOperationText); - ui.getSpeciesTabFishingOperationReminderLabel().setTitle(fishingOperationText); - ui.getBenthosTabFishingOperationReminderLabel().setTitle(fishingOperationText); - ui.getMarineLitterTabFishingOperationReminderLabel().setTitle(fishingOperationText); - ui.getAccidentalTabFishingOperationReminderLabel().setTitle(fishingOperationText); - ui.getIndividualObservationTabFishingOperationReminderLabel().setTitle(fishingOperationText); - if (loadOtherTabs) { // 4) Propagate new selected fishingoperation to others tabs Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2013-05-30 14:41:16 UTC (rev 1052) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2013-05-30 15:41:32 UTC (rev 1053) @@ -25,11 +25,13 @@ */ import com.google.common.collect.Lists; +import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.ui.swing.TuttiUIContext; +import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiTabContainerUIHandler; import fr.ifremer.tutti.ui.swing.util.CloseableUI; @@ -140,12 +142,11 @@ log.debug("propertyChange " + FishingOperationsUIModel.PROPERTY_SELECTED_FISHING_OPERATION); } + // selected fishing operation is now the editing one + FishingOperation newValue = (FishingOperation) evt.getNewValue(); + if (!getModel().isEditionAdjusting()) { - // selected fishing operation is now the editing one - - FishingOperation newValue = (FishingOperation) evt.getNewValue(); - FishingOperation operation; if (newValue == null) { operation = null; @@ -165,6 +166,23 @@ TuttiActionHelper.runInternalAction(editFishingOperationAction); } } + + // done here instead of in the action in order to update the headers + // when the operation is saved + String fishingOperationText = getFishingOperationTitle(newValue); + + EditFishingOperationUI efoUI = getUI().getFishingOperationTabContent(); + efoUI.getTraitGeneralTabPane().setTitle(fishingOperationText); + efoUI.getVesselUseFeatureTabPane().setTitle(fishingOperationText); + efoUI.getGearUseFeatureTabPane().setTitle(fishingOperationText); + + EditCatchesUI ecUI = getUI().getCatchesTabContent(); + ecUI.getCatchesCaracteristicsTabPane().setTitle(fishingOperationText); + ecUI.getSpeciesTabFishingOperationReminderLabel().setTitle(fishingOperationText); + ecUI.getBenthosTabFishingOperationReminderLabel().setTitle(fishingOperationText); + ecUI.getMarineLitterTabFishingOperationReminderLabel().setTitle(fishingOperationText); + ecUI.getAccidentalTabFishingOperationReminderLabel().setTitle(fishingOperationText); + ecUI.getIndividualObservationTabFishingOperationReminderLabel().setTitle(fishingOperationText); } }); @@ -286,4 +304,19 @@ return getModel().getEditFishingOperation() != null && getUI().getCatchesTabContent().getModel().isValid(); } + + public String getFishingOperationTitle(FishingOperation bean) { + String fishingOperationText; + + if (bean == null) { + fishingOperationText = null; + } else if (TuttiEntities.isNew(bean)) { + fishingOperationText = _("tutti.editFishingOperation.label.traitReminder", + _("tutti.editFishingOperation.label.traitReminder.inCreation")); + } else { + fishingOperationText = _("tutti.editFishingOperation.label.traitReminder", + decorate(bean)); + } + return fishingOperationText; + } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractImportMultiPostAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractImportMultiPostAction.java 2013-05-30 14:41:16 UTC (rev 1052) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractImportMultiPostAction.java 2013-05-30 15:41:32 UTC (rev 1053) @@ -107,9 +107,7 @@ importBatches(operation); - String fishingOperationText = getEditAction().getFishingOperationTitle(operation); - - getEditAction().loadCatchBatch(operation, fishingOperationText, true); + getEditAction().loadCatchBatch(operation, true); } protected abstract void importBatches(FishingOperation operation); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriAction.java 2013-05-30 14:41:16 UTC (rev 1052) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriAction.java 2013-05-30 15:41:32 UTC (rev 1053) @@ -121,10 +121,8 @@ operation, catchBatch); - String fishingOperationText = getEditAction().getFishingOperationTitle(operation); + getEditAction().loadCatchBatch(operation, true); - getEditAction().loadCatchBatch(operation, fishingOperationText, true); - sendMessage(_("tutti.editSpeciesBatch.action.importPupitri.success", getModel().getRootNumber(), rejectedSpeciesNb)); }

1 0

r1052 - in trunk: . tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com May 30, 2013

May 30, 2013

Author: maven-release Date: 2013-05-30 16:41:16 +0200 (Thu, 30 May 2013) New Revision: 1052 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1052 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/tutti-persistence/pom.xml trunk/tutti-service/pom.xml trunk/tutti-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-05-30 14:41:00 UTC (rev 1051) +++ trunk/pom.xml 2013-05-30 14:41:16 UTC (rev 1052) @@ -33,7 +33,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.3-rc-2</version> + <version>2.3-rc-3-SNAPSHOT</version> <modules> <module>tutti-persistence</module> @@ -89,12 +89,12 @@ </developers> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.3-rc-2</url> + <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.3-rc-2 + scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.3-rc-2 + scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk </developerConnection> </scm> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-05-30 14:41:00 UTC (rev 1051) +++ trunk/tutti-persistence/pom.xml 2013-05-30 14:41:16 UTC (rev 1052) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.3-rc-2</version> + <version>2.3-rc-3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-05-30 14:41:00 UTC (rev 1051) +++ trunk/tutti-service/pom.xml 2013-05-30 14:41:16 UTC (rev 1052) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.3-rc-2</version> + <version>2.3-rc-3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-05-30 14:41:00 UTC (rev 1051) +++ trunk/tutti-ui-swing/pom.xml 2013-05-30 14:41:16 UTC (rev 1052) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.3-rc-2</version> + <version>2.3-rc-3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r1051 - tags
by maven-release＠users.forge.codelutin.com May 30, 2013

May 30, 2013

Author: maven-release Date: 2013-05-30 16:41:00 +0200 (Thu, 30 May 2013) New Revision: 1051 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1051 Log: [maven-release-plugin] copy for tag tutti-2.3-rc-2 Added: tags/tutti-2.3-rc-2/

1 0

r1050 - in trunk: . tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com May 30, 2013

May 30, 2013

Author: maven-release Date: 2013-05-30 16:40:49 +0200 (Thu, 30 May 2013) New Revision: 1050 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1050 Log: [maven-release-plugin] prepare release tutti-2.3-rc-2 Modified: trunk/pom.xml trunk/tutti-persistence/pom.xml trunk/tutti-service/pom.xml trunk/tutti-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-05-30 14:39:36 UTC (rev 1049) +++ trunk/pom.xml 2013-05-30 14:40:49 UTC (rev 1050) @@ -33,7 +33,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.3-rc-2-SNAPSHOT</version> + <version>2.3-rc-2</version> <modules> <module>tutti-persistence</module> @@ -89,12 +89,12 @@ </developers> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> + <url>http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.3-rc-2</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.3-rc-2 </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.3-rc-2 </developerConnection> </scm> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-05-30 14:39:36 UTC (rev 1049) +++ trunk/tutti-persistence/pom.xml 2013-05-30 14:40:49 UTC (rev 1050) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.3-rc-2-SNAPSHOT</version> + <version>2.3-rc-2</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-05-30 14:39:36 UTC (rev 1049) +++ trunk/tutti-service/pom.xml 2013-05-30 14:40:49 UTC (rev 1050) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.3-rc-2-SNAPSHOT</version> + <version>2.3-rc-2</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-05-30 14:39:36 UTC (rev 1049) +++ trunk/tutti-ui-swing/pom.xml 2013-05-30 14:40:49 UTC (rev 1050) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.3-rc-2-SNAPSHOT</version> + <version>2.3-rc-2</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r1049 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise
by kmorin＠users.forge.codelutin.com May 30, 2013

May 30, 2013

Author: kmorin Date: 2013-05-30 16:39:36 +0200 (Thu, 30 May 2013) New Revision: 1049 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1049 Log: fixes #2445 [CAMPAGNE] Raccourcis clavier pour l'?\195?\169dition des caract?\195?\169ristiques des engins Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2013-05-30 14:27:49 UTC (rev 1048) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2013-05-30 14:39:36 UTC (rev 1049) @@ -272,12 +272,12 @@ // get the point in the middle lower of the cell Point p = new Point(r.x + r.width / 2, r.y + r.height); - Gear[] gears = (Gear[]) source.getSelectedValues(); + Object[] gears = source.getSelectedValues(); boolean editMenuEnabled = false; boolean viewMenuEnabled = false; if (gears != null && gears.length == 1) { - Gear gear = gears[0]; + Gear gear = (Gear) gears[0]; editMenuEnabled = !getModel().isCreate() && !getModel().isModify() && (!gear.isScientificGear() || persistenceService.isTemporary(gear)); viewMenuEnabled = true;

1 0

r1048 - in trunk/tutti-service/src: main/java/fr/ifremer/tutti/service/referential test/java/fr/ifremer/tutti/service/referential
by tchemit＠users.forge.codelutin.com May 30, 2013

May 30, 2013

Author: tchemit Date: 2013-05-30 16:27:49 +0200 (Thu, 30 May 2013) New Revision: 1048 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1048 Log: fixes #2535: [REFERENTIEL] - Message d'erreur difficilement compr?\195?\169hensible sur import navire Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportService.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportServiceTest.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportService.java 2013-05-30 14:27:22 UTC (rev 1047) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportService.java 2013-05-30 14:27:49 UTC (rev 1048) @@ -141,6 +141,16 @@ List<Vessel> existingVessels = Lists.newArrayList(persistenceService.getAllFishingVessel()); existingVessels.addAll(persistenceService.getAllScientificVessel()); + Function<Vessel, String> vesselToId = new Function<Vessel, String>() { + @Override + public String apply(Vessel input) { + return input.getName()+"#"+input.getInternationalRegistrationCode(); + } + }; + + Set<String> existingIds = Sets.newHashSet( + Lists.transform(existingVessels, vesselToId)); + List<Vessel> toImport = Lists.newArrayList(); Reader reader = Files.newReader(file, Charsets.UTF_8); @@ -151,20 +161,16 @@ try { for (final Vessel bean : importer) { - Optional<Vessel> found = Iterables.tryFind(existingVessels, new Predicate<Vessel>() { - @Override - public boolean apply(Vessel input) { - String name1 = input.getName(); - String name2 = bean.getName(); - String code1 = input.getInternationalRegistrationCode(); - String code2 = bean.getInternationalRegistrationCode(); - boolean result = StringUtils.equals(name1, name2) && StringUtils.equals(code1, code2); - return result; - } - }); - if (found.isPresent()) { - throw new TuttiTechnicalException(_("tutti.service.referential.import.vessels.existingValue.error", - bean.getName(), bean.getInternationalRegistrationCode())); + + String currentId = vesselToId.apply(bean); + + if (!existingIds.add(currentId)) { + + // id was already in universe + throw new TuttiTechnicalException( + _("tutti.service.referential.import.vessels.existingValue.error", + bean.getName(), + bean.getInternationalRegistrationCode())); } toImport.add(bean); } Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportServiceTest.java 2013-05-30 14:27:22 UTC (rev 1047) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportServiceTest.java 2013-05-30 14:27:49 UTC (rev 1048) @@ -79,6 +79,14 @@ "Temporary scientific vessel name 3;International registration code S3;Y;\n" + "Temporary scientific vessel name 4;International registration code S4;Y;"; + public static final String DUPLICATE_VESSEL_FILE_CONTENT = + "name;internationalRegistrationCode;scientificVessel\n" + + "Temporary fishing vessel name 1;International registration code F1;N;\n" + + "Temporary fishing vessel name 1;International registration code F1;N;\n" + + "Temporary fishing vessel name 2;International registration code F2;N;\n" + + "Temporary scientific vessel name 3;International registration code S3;Y;\n" + + "Temporary scientific vessel name 4;International registration code S4;Y;"; + protected TuttiReferentialImportExportService service; @Before @@ -136,7 +144,7 @@ for (int i = 1; i <= 2; i++) { Vessel actual = result.get(i - 1); Assert.assertNotNull(actual); - Assert.assertEquals("#TEMP¿"+actual.getInternationalRegistrationCode(), actual.getId()); + Assert.assertEquals("#TEMP¿" + actual.getInternationalRegistrationCode(), actual.getId()); Assert.assertEquals("Temporary fishing vessel name " + i, actual.getName()); Assert.assertEquals("International registration code F" + i, actual.getInternationalRegistrationCode()); Assert.assertFalse(actual.isScientificVessel()); @@ -144,7 +152,7 @@ for (int i = 3; i <= 4; i++) { Vessel actual = result.get(i - 1); Assert.assertNotNull(actual); - Assert.assertEquals("#TEMP¿"+actual.getInternationalRegistrationCode(), actual.getId()); + Assert.assertEquals("#TEMP¿" + actual.getInternationalRegistrationCode(), actual.getId()); Assert.assertEquals("Temporary scientific vessel name " + i, actual.getName()); Assert.assertEquals("International registration code S" + i, actual.getInternationalRegistrationCode()); Assert.assertTrue(actual.isScientificVessel()); @@ -159,6 +167,22 @@ } @Test + public void importDuplicateTemporaryVessel() throws Exception { + File file = new File(dataDirectory, "importVessel.csv"); + + Files.createParentDirs(file); + + Files.write(DUPLICATE_VESSEL_FILE_CONTENT, file, Charsets.UTF_8); + + try { + service.importTemporaryVessel(file); + Assert.fail(); + } catch (TuttiTechnicalException e) { + // good duplicate vessel + } + } + + @Test public void importTemporaryPerson() throws Exception { File file = new File(dataDirectory, "importPerson.csv");

1 0

r1047 - trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test
by tchemit＠users.forge.codelutin.com May 30, 2013

May 30, 2013

Author: tchemit Date: 2013-05-30 16:27:22 +0200 (Thu, 30 May 2013) New Revision: 1047 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1047 Log: fix db test check Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseResource.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseResource.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseResource.java 2013-05-30 14:23:43 UTC (rev 1046) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseResource.java 2013-05-30 14:27:22 UTC (rev 1047) @@ -220,12 +220,25 @@ config = new TuttiPersistenceConfig(applicationConfig); - File db = config.getDbDirectory(); + File db; + + if (writeDb) { + + // check db exist in src/test/dbName + + db = new File("src/test/" + dbName); + + } else { + // check config.dbDirectory exist + + db = config.getDbDirectory(); + } + if (!db.exists()) { if (log.isWarnEnabled()) { log.warn("Could not find db at " + db + ", test [" + - testClass + "] is skipped."); + testClass + "] is skipped."); } Assume.assumeTrue(false); }

1 0

r1046 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics
by kmorin＠users.forge.codelutin.com May 30, 2013

May 30, 2013

Author: kmorin Date: 2013-05-30 16:23:43 +0200 (Thu, 30 May 2013) New Revision: 1046 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1046 Log: fixes #2533 [CAPTURE] - Capture accidentelle / autres caract?\195?\169ristiques : impossible de sauvegarder si une ligne n'a pas de valeur Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java 2013-05-30 13:57:07 UTC (rev 1045) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java 2013-05-30 14:23:43 UTC (rev 1046) @@ -205,15 +205,12 @@ } public void validateEdition(CaracteristicMapEditorUIModel caracteristicMapEditorModel) { - if (caracteristicMapEditorModel.isValid()) { + CaracteristicMap map = caracteristicMapEditorModel.getCaracteristicMap(); + component.setText(map); + component.setToolTipText(map); + editRow.setCaracteristics(map); + caracteristicsUsed.addAll(map.keySet()); - CaracteristicMap map = caracteristicMapEditorModel.getCaracteristicMap(); - component.setText(map); - component.setToolTipText(map); - editRow.setCaracteristics(map); - caracteristicsUsed.addAll(map.keySet()); - } - int r = rowIndex; int c = columnIndex; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUI.css 2013-05-30 13:57:07 UTC (rev 1045) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUI.css 2013-05-30 14:23:43 UTC (rev 1046) @@ -62,6 +62,5 @@ text: "tutti.editIndividualObservationCaracteristics.action.save"; toolTipText: "tutti.editIndividualObservationCaracteristics.action.save.tip"; i18nMnemonic: "tutti.editIndividualObservationCaracteristics.action.save.mnemonic"; - enabled: {model.isValid()}; _help: {"tutti.editIndividualObservationCaracteristics.action.save.help"}; } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIHandler.java 2013-05-30 13:57:07 UTC (rev 1045) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIHandler.java 2013-05-30 14:23:43 UTC (rev 1046) @@ -172,9 +172,6 @@ log.debug("closing: " + ui); } - // when canceling always invalid model (in that way) - getModel().setValid(false); - caracteristicMapCellEditor.closeEditor(); }

1 0