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

r599 - in trunk/tutti-ui-swing/src/main: java/fr/ifremer/tutti/ui/swing/content/operation/catches java/fr/ifremer/tutti/ui/swing/content/protocol java/fr/ifremer/tutti/ui/swing/util/editor resources/i18n
by kmorin＠users.forge.codelutin.com 12 Mar '13

12 Mar '13

Author: kmorin Date: 2013-03-12 19:50:50 +0100 (Tue, 12 Mar 2013) New Revision: 599 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/599 Log: fixes #2041 [PROTOCOLE] - Esp?\195?\168ces - Import des esp?\195?\168ces Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolSpeciesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataEditorHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataTableCell.java 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/EditCatchesUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css 2013-03-12 18:49:46 UTC (rev 598) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css 2013-03-12 18:50:50 UTC (rev 599) @@ -174,7 +174,7 @@ text: {getStringValue(model.getSpeciesTotalSortedWeight() != null ? model.getSpeciesTotalSortedWeight() : model.getSpeciesTotalSortedComputedWeight() != null ? - String.format("%.3f", model.getSpeciesTotalSortedComputedWeight()) : + new java.text.DecimalFormat("#.###").format(model.getSpeciesTotalSortedComputedWeight()) : null)}; _computed: true; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolSpeciesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolSpeciesAction.java 2013-03-12 18:49:46 UTC (rev 598) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolSpeciesAction.java 2013-03-12 18:50:50 UTC (rev 599) @@ -25,6 +25,7 @@ */ import com.google.common.base.Preconditions; +import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService; @@ -113,13 +114,34 @@ // update species comboBox speciesComboBox.getHandler().sortData(); -// handler.selectFirstInCombo(speciesComboBox); speciesComboBox.getHandler().reset(); // update rows in model model.setRows(rows); - sendMessage(_("tutti.flash.information.species.imported.in.protocol", - file)); + int nbSynonym = 0; + for (SpeciesProtocol speciesProtocol : protocol.getSpecies()) { + if (!speciesProtocol.isMadeFromAReferentTaxon()) { + nbSynonym++; + } + } + + String message; + switch (nbSynonym) { + case 0: + message = _("tutti.flash.information.species.imported.in.protocol", + file); + break; + + case 1: + message = _("tutti.flash.information.species.imported.in.protocol.oneReplaced", + file); + break; + + default: + message = _("tutti.flash.information.species.imported.in.protocol.severalReplaced", + file, nbSynonym); + } + sendMessage(message); } } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataEditorHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataEditorHandler.java 2013-03-12 18:49:46 UTC (rev 598) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataEditorHandler.java 2013-03-12 18:50:50 UTC (rev 599) @@ -38,6 +38,8 @@ import java.awt.event.FocusListener; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; +import java.text.DecimalFormat; +import org.apache.commons.lang3.StringUtils; /** * @author kmorin <kmorin(a)codelutin.com> @@ -122,7 +124,8 @@ Number computedData = bean.getComputedData(); if (editor.isUseFloat() && decimalNumber != null && computedData != null) { - modelText = String.format("%." + decimalNumber + "f", computedData); + String format = "#." + StringUtils.repeat("#", decimalNumber); + modelText = new DecimalFormat(format).format(computedData); } else { modelText = JAXXUtil.getStringValue(computedData); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataTableCell.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataTableCell.java 2013-03-12 18:49:46 UTC (rev 598) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataTableCell.java 2013-03-12 18:50:50 UTC (rev 599) @@ -43,6 +43,8 @@ import java.awt.Font; import java.awt.event.FocusEvent; import java.awt.event.FocusListener; +import java.text.DecimalFormat; +import org.apache.commons.lang3.StringUtils; /** * Editor for TuttiComputedOrNotData @@ -218,8 +220,9 @@ foreground = computedDataColor; if (useFloat && decimalNumber != null && dataValue != null) { + String format = "#." + StringUtils.repeat("#", decimalNumber); text = JAXXUtil.getStringValue( - String.format("%." + decimalNumber + "f", dataValue)); + new DecimalFormat(format).format(dataValue)); } else { text = JAXXUtil.getStringValue(dataValue); } 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-03-12 18:49:46 UTC (rev 598) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-03-12 18:50:50 UTC (rev 599) @@ -170,6 +170,8 @@ tutti.flash.information.species.add.to.protocol=L'espèce %s a été ajoutée au protocole. tutti.flash.information.species.exported.from.protocol=Espèces du protocole exportées dans le fichier %s. tutti.flash.information.species.imported.in.protocol=Espèces importées dans le protocole depuis le fichier %s. +tutti.flash.information.species.imported.in.protocol.oneReplaced=Espèces importées dans le protocole depuis le fichier %s. 1 remplacée par son référent. +tutti.flash.information.species.imported.in.protocol.severalReplaced=Espèces importées dans le protocole depuis le fichier %s. %s remplacées par leur référent. tutti.flash.information.species.remove.from.protocol=L'espèce %s a été retirée du protocole. tutti.flash.information.species.replaced=L'espèce %s a été remplacée par son référent %s. tutti.information.db.loaded=Tutti est connecté à une base de données

1 0

r598 - trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol
by kmorin＠users.forge.codelutin.com 12 Mar '13

12 Mar '13

Author: kmorin Date: 2013-03-12 19:49:46 +0100 (Tue, 12 Mar 2013) New Revision: 598 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/598 Log: fixes #2041 [PROTOCOLE] - Esp?\195?\168ces - Import des esp?\195?\168ces Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java 2013-03-12 18:49:20 UTC (rev 597) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java 2013-03-12 18:49:46 UTC (rev 598) @@ -84,6 +84,7 @@ public SpeciesRow() { delegate = new SpeciesProtocol(); + delegate.setMadeFromAReferentTaxon(true); } public Species getSpecies() { @@ -98,10 +99,22 @@ return species == null ? null : species.getName(); } + public void setSpeciesName(String name) { + boolean madeFromAReferentTaxon = isMadeFromAReferentTaxon(); + setMadeFromAReferentTaxon(madeFromAReferentTaxon && + species != null && species.getName().equals(name)); + } + public String getSpeciesRefTaxCode() { return species.getRefTaxCode(); } + public void setSpeciesRefTaxCode(String refTaxCode) { + boolean madeFromAReferentTaxon = isMadeFromAReferentTaxon(); + setMadeFromAReferentTaxon(madeFromAReferentTaxon && + species != null && species.getRefTaxCode().equals(refTaxCode)); + } + public void setSpecies(Species species) { this.species = species; delegate.setSpeciesReferenceTaxonId(species == null ? null : species.getReferenceTaxonId()); @@ -199,4 +212,12 @@ public void setCalcifySampleEnabled(boolean calcifySampleEnabled) { delegate.setCalcifySampleEnabled(calcifySampleEnabled); } + + public boolean isMadeFromAReferentTaxon() { + return delegate.isMadeFromAReferentTaxon(); + } + + public void setMadeFromAReferentTaxon(boolean referent) { + delegate.setMadeFromAReferentTaxon(referent); + } } \ No newline at end of file Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java 2013-03-12 18:49:20 UTC (rev 597) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java 2013-03-12 18:49:46 UTC (rev 598) @@ -77,13 +77,13 @@ Caracteristic.PROPERTY_ID, caracteristicMap); - newIgnoredColumn(SpeciesRow.PROPERTY_SPECIES_REF_TAX_CODE); - newIgnoredColumn(SpeciesRow.PROPERTY_SPECIES_NAME); newIgnoredColumn(SpeciesRow.PROPERTY_LENGTH_STEP_PMFM_PARAMETER_NAME); newIgnoredColumn(SpeciesRow.PROPERTY_LENGTH_STEP_PMFM_MATRIX_NAME); newIgnoredColumn(SpeciesRow.PROPERTY_LENGTH_STEP_PMFM_FRACTION_NAME); newIgnoredColumn(SpeciesRow.PROPERTY_LENGTH_STEP_PMFM_METHOD_NAME); + newMandatoryColumn(SpeciesRow.PROPERTY_SPECIES_REF_TAX_CODE); + newMandatoryColumn(SpeciesRow.PROPERTY_SPECIES_NAME); newMandatoryColumn(SpeciesRow.PROPERTY_SPECIES_SURVEY_CODE, new TuttiCsvUtil.StringParserFormatter(null, true)); newMandatoryColumn(SpeciesRow.PROPERTY_SIZE_ENABLED, Common.PRIMITIVE_BOOLEAN); newMandatoryColumn(SpeciesRow.PROPERTY_SEX_ENABLED, Common.PRIMITIVE_BOOLEAN);

1 0

r597 - trunk/tutti-persistence/src/main/xmi
by kmorin＠users.forge.codelutin.com 12 Mar '13

12 Mar '13

Author: kmorin Date: 2013-03-12 19:49:20 +0100 (Tue, 12 Mar 2013) New Revision: 597 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/597 Log: fixes #2041 [PROTOCOLE] - Esp?\195?\168ces - Import des esp?\195?\168ces Modified: trunk/tutti-persistence/src/main/xmi/tutti-persistence.zargo Modified: trunk/tutti-persistence/src/main/xmi/tutti-persistence.zargo =================================================================== (Binary files differ)

1 0

r596 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches
by kmorin＠users.forge.codelutin.com 12 Mar '13

12 Mar '13

Author: kmorin Date: 2013-03-12 19:25:31 +0100 (Tue, 12 Mar 2013) New Revision: 596 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/596 Log: fixes #2128 [especes] ?\195?\169l?\195?\169vation de spoids impossible alors que tout semble ok Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeWeightsAction.java 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-03-12 18:24:26 UTC (rev 595) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeWeightsAction.java 2013-03-12 18:25:31 UTC (rev 596) @@ -46,8 +46,6 @@ */ public class ComputeWeightsAction extends AbstractTuttiAction<EditCatchesUIModel, EditCatchesUI, EditCatchesUIHandler> { - protected String errorMessage; - public ComputeWeightsAction(EditCatchesUIHandler handler) { super(handler, false); } @@ -63,50 +61,44 @@ computeSpeciesBatches(); - if (errorMessage == null) { - Float speciesTotalSortedWeight = model.getSpeciesTotalSortedWeight(); - if (speciesTotalSortedWeight == null) { - speciesTotalSortedWeight = model.getSpeciesTotalSortedComputedWeight(); - } - Float speciesTotalUnsortedWeight = model.getSpeciesTotalUnsortedComputedWeight(); + Float speciesTotalSortedWeight = model.getSpeciesTotalSortedWeight(); + if (speciesTotalSortedWeight == null) { + speciesTotalSortedWeight = model.getSpeciesTotalSortedComputedWeight(); + } + Float speciesTotalUnsortedWeight = model.getSpeciesTotalUnsortedComputedWeight(); - model.setCatchTotalSortedComputedWeight(speciesTotalSortedWeight); - model.setCatchTotalUnsortedComputedWeight(speciesTotalUnsortedWeight); + model.setCatchTotalSortedComputedWeight(speciesTotalSortedWeight); + model.setCatchTotalUnsortedComputedWeight(speciesTotalUnsortedWeight); - Float totalWeight = model.getCatchTotalWeight(); - Float rejectedWeight = model.getCatchTotalRejectedWeight(); + Float totalWeight = model.getCatchTotalWeight(); + Float rejectedWeight = model.getCatchTotalRejectedWeight(); - if (rejectedWeight == null && totalWeight != null) { - if (!totalWeight.equals(speciesTotalUnsortedWeight - + speciesTotalSortedWeight)) { - errorMessage = _("tutti.action.computeWeights.error.incoherentTotal"); + if (rejectedWeight == null && totalWeight != null) { + if (!totalWeight.equals(speciesTotalUnsortedWeight + + speciesTotalSortedWeight)) { + throw new TuttiBusinessException(_("tutti.action.computeWeights.error.incoherentTotal")); - } else { + } else { - model.setCatchTotalRejectedComputedWeight(totalWeight - - speciesTotalUnsortedWeight - - speciesTotalSortedWeight); - } + model.setCatchTotalRejectedComputedWeight(totalWeight + - speciesTotalUnsortedWeight + - speciesTotalSortedWeight); + } - } else if (totalWeight == null) { - if (rejectedWeight == null) { - rejectedWeight = 0f; - model.setCatchTotalRejectedComputedWeight(0f); - } - model.setCatchTotalComputedWeight(speciesTotalUnsortedWeight - + speciesTotalSortedWeight - + rejectedWeight); - - } else if (rejectedWeight != null - && !totalWeight.equals(speciesTotalUnsortedWeight - + speciesTotalSortedWeight - + rejectedWeight)) { - errorMessage = _("tutti.action.computeWeights.error.incoherentTotal"); + } else if (totalWeight == null) { + if (rejectedWeight == null) { + rejectedWeight = 0f; + model.setCatchTotalRejectedComputedWeight(0f); } - } + model.setCatchTotalComputedWeight(speciesTotalUnsortedWeight + + speciesTotalSortedWeight + + rejectedWeight); - if (errorMessage != null) { - throw new TuttiBusinessException(errorMessage); + } else if (rejectedWeight != null + && !totalWeight.equals(speciesTotalUnsortedWeight + + speciesTotalSortedWeight + + rejectedWeight)) { + throw new TuttiBusinessException(_("tutti.action.computeWeights.error.incoherentTotal")); } } @@ -131,9 +123,8 @@ if (row.isBatchRoot()) { Float weight = computeSpeciesBatch(row); if (weight == null) { - errorMessage = _("tutti.action.computeWeights.error.noWeight"); AbstractSelectTableAction.doSelectCell(speciesUI.getTable(), i, 1); - break; + throw new TuttiBusinessException(_("tutti.action.computeWeights.error.noWeight")); } if (persistenceService.isSortedQualitativeValue(row.getSortedUnsortedCategory().getCategoryValue())) { totalSortedWeight += weight; @@ -143,56 +134,54 @@ } } - if (errorMessage == null) { - Number inertWeight = model.getSpeciesTotalInertWeight(); - if (inertWeight != null) { - totalSortedWeight += inertWeight.floatValue(); - } else { - model.setSpeciesTotalInertComputedWeight(0f); - } + Number inertWeight = model.getSpeciesTotalInertWeight(); + if (inertWeight != null) { + totalSortedWeight += inertWeight.floatValue(); + } else { + model.setSpeciesTotalInertComputedWeight(0f); + } - Number livingNotItemizedWeight = model.getSpeciesTotalLivingNotItemizedWeight(); - if (livingNotItemizedWeight != null) { - totalSortedWeight += livingNotItemizedWeight.floatValue(); - } else { - model.setSpeciesTotalLivingNotItemizedComputedWeight(0f); - } + Number livingNotItemizedWeight = model.getSpeciesTotalLivingNotItemizedWeight(); + if (livingNotItemizedWeight != null) { + totalSortedWeight += livingNotItemizedWeight.floatValue(); + } else { + model.setSpeciesTotalLivingNotItemizedComputedWeight(0f); + } - model.setSpeciesTotalSampleSortedComputedWeight(totalSortedWeight); + model.setSpeciesTotalSampleSortedComputedWeight(totalSortedWeight); - Float speciesTotalSortedWeight = model.getSpeciesTotalSortedWeight(); - Float rate = getConfig().getDifferenceRateBetweenSortedAndTotalWeights(); - if (speciesTotalSortedWeight == null) { - speciesTotalSortedWeight = totalSortedWeight; - model.setSpeciesTotalSortedComputedWeight(totalSortedWeight); + Float speciesTotalSortedWeight = model.getSpeciesTotalSortedWeight(); + Float rate = getConfig().getDifferenceRateBetweenSortedAndTotalWeights(); + if (speciesTotalSortedWeight == null) { + speciesTotalSortedWeight = totalSortedWeight; + model.setSpeciesTotalSortedComputedWeight(totalSortedWeight); - } else if (speciesTotalSortedWeight < totalSortedWeight) { - errorMessage = _("tutti.action.computeWeights.error.incoherentSpeciesTotalSorted"); + } else if (speciesTotalSortedWeight < totalSortedWeight) { + throw new TuttiBusinessException(_("tutti.action.computeWeights.error.incoherentSpeciesTotalSorted")); - } else if (speciesTotalSortedWeight < (1 + rate / 100) * totalSortedWeight) { - // Si le "Poids total VRAC" est saisi est que sa valeur - // est supérieure de moins de x% (x en configuration) - // du "Poids total Vrac trié", demander confirmation que - // le "Poids total VRAC" est bien une valeur observée - // sinon la remplacer par le "Poids total Vrac trié" - int answer = JOptionPane.showConfirmDialog(getContext().getActionUI(), - _("tutti.action.computeWeights.replaceTotalSortedWeight.message", rate), - _("tutti.action.computeWeights.replaceTotalSortedWeight.title"), - JOptionPane.YES_NO_OPTION, - JOptionPane.QUESTION_MESSAGE); + } else if (speciesTotalSortedWeight < (1 + rate / 100) * totalSortedWeight) { + // Si le "Poids total VRAC" est saisi est que sa valeur + // est supérieure de moins de x% (x en configuration) + // du "Poids total Vrac trié", demander confirmation que + // le "Poids total VRAC" est bien une valeur observée + // sinon la remplacer par le "Poids total Vrac trié" + int answer = JOptionPane.showConfirmDialog(getContext().getActionUI(), + _("tutti.action.computeWeights.replaceTotalSortedWeight.message", rate), + _("tutti.action.computeWeights.replaceTotalSortedWeight.title"), + JOptionPane.YES_NO_OPTION, + JOptionPane.QUESTION_MESSAGE); - if (answer == JOptionPane.NO_OPTION) { - model.setSpeciesTotalSortedWeight(null); - speciesTotalSortedWeight = totalSortedWeight; - model.setSpeciesTotalSortedComputedWeight(totalSortedWeight); - } + if (answer == JOptionPane.NO_OPTION) { + model.setSpeciesTotalSortedWeight(null); + speciesTotalSortedWeight = totalSortedWeight; + model.setSpeciesTotalSortedComputedWeight(totalSortedWeight); } + } - model.setSpeciesTotalUnsortedComputedWeight(totalUnsortedWeight); + model.setSpeciesTotalUnsortedComputedWeight(totalUnsortedWeight); - Float totalWeight = totalUnsortedWeight + speciesTotalSortedWeight; - model.setSpeciesTotalComputedWeight(totalWeight); - } + Float totalWeight = totalUnsortedWeight + speciesTotalSortedWeight; + model.setSpeciesTotalComputedWeight(totalWeight); speciesUI.getTable().repaint(); } @@ -226,7 +215,7 @@ } } else if (categoryWeight < sum) { - errorMessage = _("tutti.action.computeWeights.error.incoherentParentCategoryWeight"); + throw new TuttiBusinessException(_("tutti.action.computeWeights.error.incoherentParentCategoryWeight")); } else { boolean subSample = categoryWeight > sum; @@ -261,7 +250,7 @@ } if (categoryWeight == null && rowWeight != null) { - errorMessage = _("tutti.action.computeWeights.error.incoherentRowWeightCategory"); + throw new TuttiBusinessException(_("tutti.action.computeWeights.error.incoherentRowWeightCategory")); } else if (categoryWeight == null && frequencyWeight != null) { // if the category weight is null and the frequencies have a weight, @@ -275,13 +264,13 @@ // if the weight of the frequencies is different from the category // weight, then set the weight of the sample if (frequencyWeight > categoryWeight) { - errorMessage = _("tutti.action.computeWeights.error.incoherentCategoryWeight"); + throw new TuttiBusinessException(_("tutti.action.computeWeights.error.incoherentCategoryWeight")); } else if (rowWeight == null) { row.setComputedWeight(frequencyWeight); } else if (!rowWeight.equals(frequencyWeight)) { - errorMessage = _("tutti.action.computeWeights.error.incoherentRowWeightFrequency"); + throw new TuttiBusinessException(_("tutti.action.computeWeights.error.incoherentRowWeightFrequency")); } result = categoryWeight; @@ -297,14 +286,4 @@ return result; } -// @Override -// protected void releaseAction() { -// if (errorMessage != null) { -// error = new Exception(errorMessage); -// } else { -// super.releaseAction(); -// } -// errorMessage = null; -// } - }

1 0

r595 - trunk
by kmorin＠users.forge.codelutin.com 12 Mar '13

12 Mar '13

Author: kmorin Date: 2013-03-12 19:24:26 +0100 (Tue, 12 Mar 2013) New Revision: 595 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/595 Log: use last jaxx snapshot Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-03-12 15:24:29 UTC (rev 594) +++ trunk/pom.xml 2013-03-12 18:24:26 UTC (rev 595) @@ -129,7 +129,7 @@ <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> <licensePluginVersion>1.4</licensePluginVersion> - <jaxxVersion>2.5.13</jaxxVersion> + <jaxxVersion>2.5.14-SNAPSHOT</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> <xworkVersion>2.3.7</xworkVersion>

1 0

r594 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content
by tchemit＠users.forge.codelutin.com 12 Mar '13

12 Mar '13

Author: tchemit Date: 2013-03-12 16:24:29 +0100 (Tue, 12 Mar 2013) New Revision: 594 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/594 Log: fixes #2126: [AIDE] Le composant d'aide en ligne n'est pas mise ?\195?\160 jour au d?\195?\169marrage de l'application Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateApplicationAction.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateApplicationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateApplicationAction.java 2013-03-12 13:54:49 UTC (rev 593) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateApplicationAction.java 2013-03-12 15:24:29 UTC (rev 594) @@ -84,7 +84,8 @@ callback.setTypes(TuttiApplicationUpdaterCallBack.UpdateType.JRE, TuttiApplicationUpdaterCallBack.UpdateType.I18N, - TuttiApplicationUpdaterCallBack.UpdateType.TUTTI); + TuttiApplicationUpdaterCallBack.UpdateType.TUTTI, + TuttiApplicationUpdaterCallBack.UpdateType.HELP); up.update(url, current, dest,

1 0

r593 - in trunk: . tutti-persistence tutti-service tutti-ui-swing
by tchemit＠users.forge.codelutin.com 12 Mar '13

12 Mar '13

Author: tchemit Date: 2013-03-12 14:54:49 +0100 (Tue, 12 Mar 2013) New Revision: 593 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/593 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-03-12 13:54:41 UTC (rev 592) +++ trunk/pom.xml 2013-03-12 13:54:49 UTC (rev 593) @@ -33,7 +33,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.0.3</version> + <version>1.1-SNAPSHOT</version> <modules> <module>tutti-persistence</module> @@ -89,12 +89,12 @@ </developers> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/tags/tutti-1.0.3</url> + <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-1.0.3 + scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-1.0.3 + scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk </developerConnection> </scm> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-03-12 13:54:41 UTC (rev 592) +++ trunk/tutti-persistence/pom.xml 2013-03-12 13:54:49 UTC (rev 593) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.0.3</version> + <version>1.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-03-12 13:54:41 UTC (rev 592) +++ trunk/tutti-service/pom.xml 2013-03-12 13:54:49 UTC (rev 593) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.0.3</version> + <version>1.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-03-12 13:54:41 UTC (rev 592) +++ trunk/tutti-ui-swing/pom.xml 2013-03-12 13:54:49 UTC (rev 593) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.0.3</version> + <version>1.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r592 - tags
by tchemit＠users.forge.codelutin.com 12 Mar '13

12 Mar '13

Author: tchemit Date: 2013-03-12 14:54:41 +0100 (Tue, 12 Mar 2013) New Revision: 592 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/592 Log: [maven-release-plugin] copy for tag tutti-1.0.3 Added: tags/tutti-1.0.3/

1 0

r591 - in trunk: . tutti-persistence tutti-service tutti-ui-swing
by tchemit＠users.forge.codelutin.com 12 Mar '13

12 Mar '13

Author: tchemit Date: 2013-03-12 14:54:33 +0100 (Tue, 12 Mar 2013) New Revision: 591 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/591 Log: [maven-release-plugin] prepare release tutti-1.0.3 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-03-12 13:37:25 UTC (rev 590) +++ trunk/pom.xml 2013-03-12 13:54:33 UTC (rev 591) @@ -33,7 +33,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.0.3</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.0.3</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-1.0.3 </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-1.0.3 </developerConnection> </scm> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-03-12 13:37:25 UTC (rev 590) +++ trunk/tutti-persistence/pom.xml 2013-03-12 13:54:33 UTC (rev 591) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.0.3</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-03-12 13:37:25 UTC (rev 590) +++ trunk/tutti-service/pom.xml 2013-03-12 13:54:33 UTC (rev 591) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.0.3</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-03-12 13:37:25 UTC (rev 590) +++ trunk/tutti-ui-swing/pom.xml 2013-03-12 13:54:33 UTC (rev 591) @@ -21,16 +21,14 @@ #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.0.3</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r590 - trunk
by tchemit＠users.forge.codelutin.com 12 Mar '13

12 Mar '13

Author: tchemit Date: 2013-03-12 14:37:25 +0100 (Tue, 12 Mar 2013) New Revision: 590 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/590 Log: use last stable fo jaxx Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-03-12 13:29:55 UTC (rev 589) +++ trunk/pom.xml 2013-03-12 13:37:25 UTC (rev 590) @@ -129,7 +129,7 @@ <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> <licensePluginVersion>1.4</licensePluginVersion> - <jaxxVersion>2.5.13-SNAPSHOT</jaxxVersion> + <jaxxVersion>2.5.13</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> <xworkVersion>2.3.7</xworkVersion>

1 0