This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 6c50ed33479cf2b0898a99961a0d7404f7bb3d7e Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Dec 31 19:51:25 2014 +0100 ajout de l'unite de la classe de taille sur l'ecran des benthos + fix null unit --- .../frequency/BenthosFrequencyUIHandler.java | 28 +++++++++++++++++++++- .../benthos/frequency/BenthosFrequencyUIModel.java | 15 ++++++++++-- .../frequency/SpeciesFrequencyUIHandler.java | 5 ++++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 2 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 ++ 5 files changed, 49 insertions(+), 3 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java index 7ccff5e..8b36c1b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java @@ -25,6 +25,7 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; +import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyTableModel; import fr.ifremer.tutti.ui.swing.util.TuttiNumberTickUnitSource; import fr.ifremer.tutti.util.Numbers; import org.jdesktop.swingx.decorator.HighlightPredicate; @@ -312,7 +313,7 @@ public class BenthosFrequencyUIHandler extends AbstractTuttiTableUIHandler<Benth }); // when lengthStepCaracteristic changed, let's updates all row with the new value - model.addPropertyChangeListener(BenthosFrequencyUIModel.PROPERTY_LENGHT_STEP_CARACTERISTIC, new PropertyChangeListener() { + model.addPropertyChangeListener(BenthosFrequencyUIModel.PROPERTY_LENGTH_STEP_CARACTERISTIC, new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { Caracteristic newValue = (Caracteristic) evt.getNewValue(); @@ -331,6 +332,27 @@ public class BenthosFrequencyUIHandler extends AbstractTuttiTableUIHandler<Benth } }); + // when lengthStepCaracteristicUnit changed, let's updates the label of some fields + model.addPropertyChangeListener(BenthosFrequencyUIModel.PROPERTY_LENGTH_STEP_CARACTERISTIC_UNIT, new PropertyChangeListener() { + + @Override + public void propertyChange(PropertyChangeEvent evt) { + + String unit = (String) evt.getNewValue(); + + if (unit == null) { + + unit = t("tutti.editBenthosFrequencies.unkownStepUnit"); + } + + getUI().getMinStepLabel().setText(getLabelWithUnit(t("tutti.editBenthosFrequencies.field.minStep"), unit)); + getUI().getMaxStepLabel().setText(getLabelWithUnit(t("tutti.editBenthosFrequencies.field.maxStep"), unit)); + getUI().getRafaleStepLabel().setText(getLabelWithUnit(t("tutti.editBenthosFrequencies.field.rafaleStep"), unit)); + getUI().getTable().getColumn(BenthosFrequencyTableModel.LENGTH_STEP).setHeaderValue( + getLabelWithUnit(t("tutti.editSpeciesFrequencies.table.header.lengthStep"), unit)); + } + }); + // when configuration mode change, let's focus the best component (see http://forge.codelutin.com/issues/4035) model.addPropertyChangeListener(BenthosFrequencyUIModel.PROPERTY_CONFIGURATION_MODE, new PropertyChangeListener() { @Override @@ -1017,4 +1039,8 @@ public class BenthosFrequencyUIHandler extends AbstractTuttiTableUIHandler<Benth getConfig().getColorAlternateRow()); logTable.addHighlighter(evenHighlighter); } + + protected String getLabelWithUnit(String label, String unit) { + return label + " (" + unit + ")"; + } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java index 9f0f219..674d3a1 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java @@ -67,7 +67,9 @@ public class BenthosFrequencyUIModel extends AbstractTuttiTableUIModel<BenthosBa public static final String PROPERTY_SIMPLE_COUNT = "simpleCount"; - public static final String PROPERTY_LENGHT_STEP_CARACTERISTIC = "lengthStepCaracteristic"; + public static final String PROPERTY_LENGTH_STEP_CARACTERISTIC = "lengthStepCaracteristic"; + + public static final String PROPERTY_LENGTH_STEP_CARACTERISTIC_UNIT = "lengthStepCaracteristicUnit"; public static final String PROPERTY_TOTAL_NUMBER = "totalNumber"; @@ -231,8 +233,17 @@ public class BenthosFrequencyUIModel extends AbstractTuttiTableUIModel<BenthosBa public void setLengthStepCaracteristic(Caracteristic lengthStepCaracteristic) { Object oldValue = getLengthStepCaracteristic(); this.lengthStepCaracteristic = lengthStepCaracteristic; - firePropertyChange(PROPERTY_LENGHT_STEP_CARACTERISTIC, oldValue, lengthStepCaracteristic); + firePropertyChange(PROPERTY_LENGTH_STEP_CARACTERISTIC, oldValue, lengthStepCaracteristic); firePropertyChange(PROPERTY_CAN_GENERATE, null, isCanGenerate()); + firePropertyChange(PROPERTY_LENGTH_STEP_CARACTERISTIC_UNIT, null, getLengthStepCaracteristicUnit()); + } + + public String getLengthStepCaracteristicUnit() { + return lengthStepCaracteristic == null ? null : lengthStepCaracteristic.getUnit(); + } + + public Float getLengthStepCaracteristicPrecision() { + return lengthStepCaracteristic == null ? null : lengthStepCaracteristic.getPrecision(); } public Float getMinStep() { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java index 052f4cb..fbfef33 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java @@ -393,6 +393,11 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci String unit = (String) evt.getNewValue(); + if (unit == null) { + + unit = t("tutti.editSpeciesFrequencies.unkownStepUnit"); + } + getUI().getMinStepLabel().setText(getLabelWithUnit(t("tutti.editSpeciesFrequencies.field.minStep"), unit)); getUI().getMaxStepLabel().setText(getLabelWithUnit(t("tutti.editSpeciesFrequencies.field.maxStep"), unit)); getUI().getRafaleStepLabel().setText(getLabelWithUnit(t("tutti.editSpeciesFrequencies.field.rafaleStep"), unit)); diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties index 8e25091..7fa3b46 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties @@ -543,6 +543,7 @@ tutti.editBenthosFrequencies.table.header.lengthStep= tutti.editBenthosFrequencies.table.header.number= tutti.editBenthosFrequencies.title= tutti.editBenthosFrequencies.title.addLengthStepCaracteristic= +tutti.editBenthosFrequencies.unkownStepUnit= tutti.editCaracteristics.title= tutti.editCatchBatch.action.attachments.tip= tutti.editCatchBatch.action.cancelEditCatchBatch= @@ -1245,6 +1246,7 @@ tutti.editSpeciesFrequencies.table.header.number= tutti.editSpeciesFrequencies.table.header.weight= tutti.editSpeciesFrequencies.title= tutti.editSpeciesFrequencies.title.addLengthStepCaracteristic= +tutti.editSpeciesFrequencies.unkownStepUnit= tutti.error.application.already.started= tutti.error.delete.startActionFile=Could not delete start action file %s tutti.error.read.startActionFile=Could not read start action file content %s diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties index 332b2d7..3b7eb1b 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties @@ -529,6 +529,7 @@ tutti.editBenthosFrequencies.logTable.header.label=Logs tutti.editBenthosFrequencies.simpleCountingAndFrequencies=Des mensurations ont été saisies dans le tableau. Saisir un simple dénombrement les effacera. tutti.editBenthosFrequencies.title=Mensuration tutti.editBenthosFrequencies.title.addLengthStepCaracteristic=Choisir une autre caractéristique +tutti.editBenthosFrequencies.unkownStepUnit=NA tutti.editCaracteristics.title=%s - Autres caractéristiques tutti.editCatchBatch.action.attachments.tip=Pièce(s) jointe(s) de la capture tutti.editCatchBatch.action.cancelEditCatchBatch=Réinitialiser @@ -1211,6 +1212,7 @@ tutti.editSpeciesFrequencies.table.header.number=Nombre tutti.editSpeciesFrequencies.table.header.weight=Poids observé tutti.editSpeciesFrequencies.title=Mensuration tutti.editSpeciesFrequencies.title.addLengthStepCaracteristic=Choisir une autre caractéristique +tutti.editSpeciesFrequencies.unkownStepUnit=NA tutti.error.application.already.started=<html><body>L'application est déjà démarrée.<br/>Si ce n'était pas le cas, veuillez supprimer le fichier <strong>tutti.lock</strong> présent dans le répertoire de l'outil avant de lancer l'applicatif.</body></html> tutti.error.delete.startActionFile=Impossible de supprimer le fichier %s tutti.error.read.startActionFile=Impossible de lire le contenu du fichier %s -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.