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

r803 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches: accidental/create individualobservation/create
by kmorin＠users.forge.codelutin.com 16 Apr '13

16 Apr '13

Author: kmorin Date: 2013-04-16 15:50:07 +0200 (Tue, 16 Apr 2013) New Revision: 803 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/803 Log: fixes #2305 [CAPTURE ACCIDENTELLE] ?\195?\160 la cr?\195?\169ation d'une deuxi?\195?\168me ligne dans le tableau les champs poids et taille sont pr?\195?\169-renseign?\195?\169s avec la ligne pr?\195?\169c?\195?\169dente fixes #2307 [OBSERVATION INDIVIDUELLE] ?\195?\160 la cr?\195?\169ation d'une nouvelle ligne, les champs poids et taille sont renseign?\195?\169s avec la ligne pr?\195?\169c?\195?\169dente Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.css Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.css 2013-04-16 13:43:20 UTC (rev 802) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.css 2013-04-16 13:50:07 UTC (rev 803) @@ -71,6 +71,7 @@ useFloat: true; numberPattern: {DECIMAL3_PATTERN}; bean: {model}; + model: {model.getWeight()}; } #accidentalSizeLabel { @@ -85,6 +86,7 @@ useFloat: true; numberPattern: {DECIMAL3_PATTERN}; bean: {model}; + model: {model.getSize()}; } #accidentalLengthStepCaracteristicLabel { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.css 2013-04-16 13:43:20 UTC (rev 802) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.css 2013-04-16 13:50:07 UTC (rev 803) @@ -59,6 +59,7 @@ useFloat: true; numberPattern: {DECIMAL3_PATTERN}; bean: {model}; + model: {model.getWeight()}; } #individualObservationSizeLabel { @@ -73,6 +74,7 @@ useFloat: true; numberPattern: {DECIMAL3_PATTERN}; bean: {model}; + model: {model.getSize()}; } #individualObservationLengthStepCaracteristicLabel {

1 0

r802 - in trunk/tutti-ui-swing/src/main: java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/caracteristics resources/i18n
by kmorin＠users.forge.codelutin.com 16 Apr '13

16 Apr '13

Author: kmorin Date: 2013-04-16 15:43:20 +0200 (Tue, 16 Apr 2013) New Revision: 802 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/802 Log: fixes #2309 [OBSERVATION INDIVIDUELLE] saisie des autres caract?\195?\169ristiques, impossible de supprimer une ligne (clic droit ne fonctionne pas) Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/caracteristics/CaracteristicMapEditorUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/caracteristics/CaracteristicMapEditorUIHandler.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/caracteristics/CaracteristicMapEditorUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/caracteristics/CaracteristicMapEditorUI.css 2013-04-16 13:39:58 UTC (rev 801) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/caracteristics/CaracteristicMapEditorUI.css 2013-04-16 13:43:20 UTC (rev 802) @@ -41,6 +41,14 @@ sortable: false; } +#removeCaracteristicMenu { + actionIcon: batch-delete; + text: "tutti.editIndividualObservationCaracteristics.action.removeCaracteristic"; + toolTipText: "tutti.editIndividualObservationCaracteristics.action.removeCaracteristic.tip"; + i18nMnemonic: "tutti.editIndividualObservationCaracteristics.action.removeCaracteristic.mnemonic"; + enabled: {model.isRemoveCaracteristicEnabled()}; +} + #cancelButton { actionIcon: cancel; text: "tutti.editIndividualObservationCaracteristics.action.cancel"; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/caracteristics/CaracteristicMapEditorUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/caracteristics/CaracteristicMapEditorUIHandler.java 2013-04-16 13:39:58 UTC (rev 801) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/caracteristics/CaracteristicMapEditorUIHandler.java 2013-04-16 13:43:20 UTC (rev 802) @@ -94,6 +94,12 @@ } @Override + protected void onAfterSelectedRowChanged(int oldRowIndex, CaracteristicMapEditorRowModel oldRow, int newRowIndex, CaracteristicMapEditorRowModel newRow) { + super.onAfterSelectedRowChanged(oldRowIndex, oldRow, newRowIndex, newRow); + getModel().setRemoveCaracteristicEnabled(newRowIndex >= 0); + } + + @Override protected void saveSelectedRowIfRequired(TuttiBeanMonitor<CaracteristicMapEditorRowModel> rowMonitor, CaracteristicMapEditorRowModel row) { if (row.isValid()) { Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-04-16 13:39:58 UTC (rev 801) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-04-16 13:43:20 UTC (rev 802) @@ -574,6 +574,9 @@ tutti.editIndividualObservationCaracteristics.action.cancel= tutti.editIndividualObservationCaracteristics.action.cancel.mnemonic= tutti.editIndividualObservationCaracteristics.action.cancel.tip= +tutti.editIndividualObservationCaracteristics.action.removeCaracteristic= +tutti.editIndividualObservationCaracteristics.action.removeCaracteristic.mnemonic= +tutti.editIndividualObservationCaracteristics.action.removeCaracteristic.tip= tutti.editIndividualObservationCaracteristics.action.save= tutti.editIndividualObservationCaracteristics.action.save.mnemonic= tutti.editIndividualObservationCaracteristics.action.save.tip= Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-04-16 13:39:58 UTC (rev 801) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-04-16 13:43:20 UTC (rev 802) @@ -576,6 +576,9 @@ tutti.editIndividualObservationCaracteristics.action.cancel=Annuler tutti.editIndividualObservationCaracteristics.action.cancel.mnemonic=A tutti.editIndividualObservationCaracteristics.action.cancel.tip=Annuler l'édition des caractéristiques de l'observation +tutti.editIndividualObservationCaracteristics.action.removeCaracteristic=Supprimer la caractéristique sélectionnée +tutti.editIndividualObservationCaracteristics.action.removeCaracteristic.mnemonic=S +tutti.editIndividualObservationCaracteristics.action.removeCaracteristic.tip=Supprimer la caractéristique sélectionnée tutti.editIndividualObservationCaracteristics.action.save=Enregistrer tutti.editIndividualObservationCaracteristics.action.save.mnemonic=E tutti.editIndividualObservationCaracteristics.action.save.tip=Enregistrer les caractéristiques de l'observation @@ -816,7 +819,7 @@ tutti.error.errorpane.htmlmessage=<html><body><b>Une erreur s'est produite</b>\:<br/>%s</body></html> tutti.error.ui.business.error=Erreur tutti.error.ui.other.error=Erreur -tutti.fishingOperations.action.newFishingOperation.mnemonic=C +tutti.fishingOperations.action.newFishingOperation.mnemonic=N tutti.fishingOperations.action.newFishingOperation.tip=Créer une nouvelle opération de pêche tutti.fishingOperations.info.no.fishingOperation.selected=< Aucun trait sélectionné > tutti.fishingOperations.title.edit.operations=Saisie des opérations de pêches (%s)

1 0

r801 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol
by kmorin＠users.forge.codelutin.com 16 Apr '13

16 Apr '13

Author: kmorin Date: 2013-04-16 15:39:58 +0200 (Tue, 16 Apr 2013) New Revision: 801 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/801 Log: fixes #2301 [PROTOCOLE] effacer les onglets plancton et accidental Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx 2013-04-16 13:11:58 UTC (rev 800) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx 2013-04-16 13:39:58 UTC (rev 801) @@ -207,12 +207,12 @@ </Table> </JPanel> </tab> - <tab title='tutti.editProtocol.tab.plankton' enabled='false'> - <JLabel text='tutti.to.be.done' horizontalAlignment="{JLabel.CENTER}"/> - </tab> - <tab title='tutti.editProtocol.tab.accidental' enabled='false'> - <JLabel text='tutti.to.be.done' horizontalAlignment="{JLabel.CENTER}"/> - </tab> +  +  +  +  +  +  </JTabbedPane> <JPanel id='saveWarningContainer' layout='{new BorderLayout(10, 10)}'

1 0

r800 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental
by kmorin＠users.forge.codelutin.com 16 Apr '13

16 Apr '13

Author: kmorin Date: 2013-04-16 15:11:58 +0200 (Tue, 16 Apr 2013) New Revision: 800 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/800 Log: fixes #2303 [CAPTURE ACCIDENTELLE] cr?\195?\169ation lot, ne remonte pas la valeur du sexe et de "mort/vivant" dans le tableau Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java 2013-04-16 13:10:11 UTC (rev 799) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java 2013-04-16 13:11:58 UTC (rev 800) @@ -399,9 +399,11 @@ AccidentalBatchRowModel newRow = tableModel.createNewRow(); newRow.setSpecies(model.getSpecies()); + newRow.setGender(model.getGender()); newRow.setWeight(model.getWeight()); newRow.setSize(model.getSize()); newRow.setLengthStepCaracteristic(model.getLengthStepCaracteristic()); + newRow.setDeadOrAlive(model.getDeadOrAlive()); recomputeRowValidState(newRow);

1 0

r799 - in trunk: tutti-persistence/src/main/xmi 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/individualobservation
by kmorin＠users.forge.codelutin.com 16 Apr '13

16 Apr '13

Author: kmorin Date: 2013-04-16 15:10:11 +0200 (Tue, 16 Apr 2013) New Revision: 799 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/799 Log: fixes #2316 [CAPTURES] - Observations individuelles - Erreur lors de la saisie du code de pr?\195?\169l?\195?\168vement pi?\195?\168ce calcifi?\195?\169e Modified: trunk/tutti-persistence/src/main/xmi/tutti-persistence.zargo trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/AbstractTuttiBatchUIModel.java 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/catches/ComputeWeightsAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java Modified: trunk/tutti-persistence/src/main/xmi/tutti-persistence.zargo =================================================================== (Binary files differ) Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/AbstractTuttiBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/AbstractTuttiBatchUIModel.java 2013-04-16 10:20:24 UTC (rev 798) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/AbstractTuttiBatchUIModel.java 2013-04-16 13:10:11 UTC (rev 799) @@ -45,14 +45,14 @@ private static final long serialVersionUID = 1L; /** - * Fishing Operation to prapagate to catches model. + * Fishing Operation to prapagate to operations model. * * @since 0.3 */ protected final Set<String> propagateProperties; /** - * Editing fishing catches model. + * Editing fishing operations model. * * @since 0.3 */ 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-04-16 10:20:24 UTC (rev 798) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java 2013-04-16 13:10:11 UTC (rev 799) @@ -98,7 +98,7 @@ protected SaveFishingOperationAction saveFishingOperationAction; /** - * Delegate action to compute the weight of the catches. + * Delegate action to compute the weight of the operations. * * @since 1.1 */ Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeWeightsAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeWeightsAction.java 2013-04-16 10:20:24 UTC (rev 798) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeWeightsAction.java 2013-04-16 13:10:11 UTC (rev 799) @@ -33,6 +33,7 @@ import fr.ifremer.tutti.persistence.entities.data.MarineLitterBatch; import fr.ifremer.tutti.persistence.entities.data.SortedUnsortedEnum; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; +import fr.ifremer.tutti.service.catches.TuttiWeightComputingException; import fr.ifremer.tutti.service.catches.TuttiWeightComputingService; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchRowModel; @@ -65,10 +66,23 @@ tuttiWeightComputingService.getComputedSpeciesBatches(model.getFishingOperation()); Float totalSpeciesSortedWeight = computeSpeciesBatches(computedSpeciesBatches); - BatchContainer<BenthosBatch> computedBenthosBatches = - tuttiWeightComputingService.getComputedBenthosBatches(model.getFishingOperation()); - Float totalBenthosSortedWeight = computeBenthosBatches(computedBenthosBatches); + BatchContainer<BenthosBatch> computedBenthosBatches; + Float totalBenthosSortedWeight; + int rowIndex = 0; + try { + computedBenthosBatches = + tuttiWeightComputingService.getComputedBenthosBatches(model.getFishingOperation()); + totalBenthosSortedWeight = computeBenthosBatches(computedBenthosBatches); + } catch (TuttiWeightComputingException e) { + rowIndex = e.getIndex(); + throw e; + + } finally { + getUI().getTabPane().setSelectedIndex(2); + AbstractSelectTableAction.doSelectCell(getUI().getBenthosTabContent().getTable(), rowIndex, 1); + } + BatchContainer<MarineLitterBatch> computedMarineLitterBatches = tuttiWeightComputingService.getComputedMarineLitterBatches(model.getFishingOperation()); Float totalMarineLitterWeight = computeMarineLitterBatches(computedMarineLitterBatches); @@ -189,11 +203,6 @@ Float weight = row.getSortedUnsortedCategoryWeight(); if (weight == null) { weight = row.getSortedUnsortedCategoryComputedWeight(); - } - if (weight == null) { - getUI().getTabPane().setSelectedIndex(2); - AbstractSelectTableAction.doSelectCell(getUI().getBenthosTabContent().getTable(), rowIndex, 1); - throw new TuttiBusinessException(_("tutti.editCatchBatch.action.computeWeights.error.noWeight")); } else if (SortedUnsortedEnum.SORTED.matchValue( row.getSortedUnsortedCategoryValue())) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java 2013-04-16 10:20:24 UTC (rev 798) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java 2013-04-16 13:10:11 UTC (rev 799) @@ -174,12 +174,12 @@ } @Override - public Integer getCalcifiedPieceSamplingCode() { + public String getCalcifiedPieceSamplingCode() { return editObject.getCalcifiedPieceSamplingCode(); } @Override - public void setCalcifiedPieceSamplingCode(Integer calcifiedPieceSamplingCode) { + public void setCalcifiedPieceSamplingCode(String calcifiedPieceSamplingCode) { Object oldValue = getCalcifiedPieceSamplingCode(); editObject.setCalcifiedPieceSamplingCode(calcifiedPieceSamplingCode); firePropertyChange(PROPERTY_CALCIFIED_PIECE_SAMPLING_CODE, oldValue, calcifiedPieceSamplingCode);

1 0

r798 - in trunk: . tutti-persistence tutti-service tutti-ui-swing
by tchemit＠users.forge.codelutin.com 16 Apr '13

16 Apr '13

Author: tchemit Date: 2013-04-16 12:20:24 +0200 (Tue, 16 Apr 2013) New Revision: 798 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/798 Log: back to version 2.0-SNAPSHOT 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-04-16 10:03:43 UTC (rev 797) +++ trunk/pom.xml 2013-04-16 10:20:24 UTC (rev 798) @@ -33,7 +33,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.4.2-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> <modules> <module>tutti-persistence</module> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-04-16 10:03:43 UTC (rev 797) +++ trunk/tutti-persistence/pom.xml 2013-04-16 10:20:24 UTC (rev 798) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.4.2-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-04-16 10:03:43 UTC (rev 797) +++ trunk/tutti-service/pom.xml 2013-04-16 10:20:24 UTC (rev 798) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.4.2-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-04-16 10:03:43 UTC (rev 797) +++ trunk/tutti-ui-swing/pom.xml 2013-04-16 10:20:24 UTC (rev 798) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.4.2-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r797 - in trunk: . tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com 16 Apr '13

16 Apr '13

Author: maven-release Date: 2013-04-16 12:03:43 +0200 (Tue, 16 Apr 2013) New Revision: 797 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/797 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-04-16 10:03:35 UTC (rev 796) +++ trunk/pom.xml 2013-04-16 10:03:43 UTC (rev 797) @@ -33,7 +33,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.4.1</version> + <version>1.4.2-SNAPSHOT</version> <modules> <module>tutti-persistence</module> @@ -89,12 +89,12 @@ </developers> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/tags/tutti-1.4.1</url> + <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-1.4.1 + scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-1.4.1 + scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk </developerConnection> </scm> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-04-16 10:03:35 UTC (rev 796) +++ trunk/tutti-persistence/pom.xml 2013-04-16 10:03:43 UTC (rev 797) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.4.1</version> + <version>1.4.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-04-16 10:03:35 UTC (rev 796) +++ trunk/tutti-service/pom.xml 2013-04-16 10:03:43 UTC (rev 797) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.4.1</version> + <version>1.4.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-04-16 10:03:35 UTC (rev 796) +++ trunk/tutti-ui-swing/pom.xml 2013-04-16 10:03:43 UTC (rev 797) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.4.1</version> + <version>1.4.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r796 - tags
by maven-release＠users.forge.codelutin.com 16 Apr '13

16 Apr '13

Author: maven-release Date: 2013-04-16 12:03:35 +0200 (Tue, 16 Apr 2013) New Revision: 796 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/796 Log: [maven-release-plugin] copy for tag tutti-1.4.1 Added: tags/tutti-1.4.1/

1 0

r795 - in trunk: . tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com 16 Apr '13

16 Apr '13

Author: maven-release Date: 2013-04-16 12:03:26 +0200 (Tue, 16 Apr 2013) New Revision: 795 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/795 Log: [maven-release-plugin] prepare release tutti-1.4.1 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-04-16 10:01:51 UTC (rev 794) +++ trunk/pom.xml 2013-04-16 10:03:26 UTC (rev 795) @@ -33,7 +33,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.4.1-SNAPSHOT</version> + <version>1.4.1</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-1.4.1</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-1.4.1 </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-1.4.1 </developerConnection> </scm> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-04-16 10:01:51 UTC (rev 794) +++ trunk/tutti-persistence/pom.xml 2013-04-16 10:03:26 UTC (rev 795) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.4.1-SNAPSHOT</version> + <version>1.4.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-04-16 10:01:51 UTC (rev 794) +++ trunk/tutti-service/pom.xml 2013-04-16 10:03:26 UTC (rev 795) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.4.1-SNAPSHOT</version> + <version>1.4.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-04-16 10:01:51 UTC (rev 794) +++ trunk/tutti-ui-swing/pom.xml 2013-04-16 10:03:26 UTC (rev 795) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.4.1-SNAPSHOT</version> + <version>1.4.1</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r794 - in trunk: . tutti-persistence tutti-service tutti-ui-swing
by tchemit＠users.forge.codelutin.com 16 Apr '13

16 Apr '13

Author: tchemit Date: 2013-04-16 12:01:51 +0200 (Tue, 16 Apr 2013) New Revision: 794 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/794 Log: prepare release 1.4.1 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-04-16 10:01:18 UTC (rev 793) +++ trunk/pom.xml 2013-04-16 10:01:51 UTC (rev 794) @@ -33,7 +33,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <modules> <module>tutti-persistence</module> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-04-16 10:01:18 UTC (rev 793) +++ trunk/tutti-persistence/pom.xml 2013-04-16 10:01:51 UTC (rev 794) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-04-16 10:01:18 UTC (rev 793) +++ trunk/tutti-service/pom.xml 2013-04-16 10:01:51 UTC (rev 794) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-04-16 10:01:18 UTC (rev 793) +++ trunk/tutti-ui-swing/pom.xml 2013-04-16 10:01:51 UTC (rev 794) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0