Author: tchemit Date: 2014-03-27 15:49:15 +0100 (Thu, 27 Mar 2014) New Revision: 1647 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1647 Log: fixes #4823: [MENSURATION] Pas de la classe de taille non initialis?\195?\169 Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2014-03-25 13:11:20 UTC (rev 1646) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2014-03-27 14:49:15 UTC (rev 1647) @@ -238,15 +238,9 @@ lengthStepCaracterics, modelCaracteristic); - // get precision from the pmfm - Float precision = null; - if (modelCaracteristic != null) { - precision = model.getLengthStepCaracteristic().getPrecision(); - } - if (precision == null) { - precision = 1f; - } - model.setStep(precision); + // get step from the pmfm + float step = getStep(modelCaracteristic); + model.setStep(step); model.setMinStep(null); model.setMaxStep(null); @@ -273,18 +267,12 @@ @Override public void propertyChange(PropertyChangeEvent evt) { Caracteristic newValue = (Caracteristic) evt.getNewValue(); + // get step from the pmfm + float step = getStep(newValue); + getModel().setStep(step); if (getModel().getRows()!=null) { for (BenthosFrequencyRowModel rowModel : getModel().getRows()) { rowModel.setLengthStepCaracteristic(newValue); - // get precision from the pmfm - Float precision = null; - if (newValue != null) { - precision = newValue.getPrecision(); - } - if (precision == null) { - precision = .5f; - } - getModel().setStep(precision); recomputeRowValidState(rowModel); } } @@ -821,4 +809,15 @@ return doSave; } + + protected float getStep(Caracteristic caracteristic) { + Float precision = null; + if (caracteristic != null) { + precision = caracteristic.getPrecision(); + } + if (precision == null) { + precision = 1f; + } + return precision; + } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2014-03-25 13:11:20 UTC (rev 1646) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2014-03-27 14:49:15 UTC (rev 1647) @@ -281,20 +281,14 @@ speciesProtocol = Maps.newHashMap(); } - Caracteristic modelCaracteristic = model.getLengthStepCaracteristic(); + final Caracteristic modelCaracteristic = model.getLengthStepCaracteristic(); initBeanFilterableComboBox(this.ui.getLengthStepCaracteristicComboBox(), lengthStepCaracterics, modelCaracteristic); - // get precision from the pmfm - Float precision = null; - if (modelCaracteristic != null) { - precision = model.getLengthStepCaracteristic().getPrecision(); - } - if (precision == null) { - precision = 1f; - } - model.setStep(precision); + // get step from the pmfm + float step = getStep(modelCaracteristic); + model.setStep(step); model.setMinStep(null); model.setMaxStep(null); @@ -321,18 +315,12 @@ @Override public void propertyChange(PropertyChangeEvent evt) { Caracteristic newValue = (Caracteristic) evt.getNewValue(); + // get step from the pmfm + float step = getStep(newValue); + getModel().setStep(step); if (getModel().getRows() != null) { for (SpeciesFrequencyRowModel rowModel : getModel().getRows()) { rowModel.setLengthStepCaracteristic(newValue); - // get precision from the pmfm - Float precision = null; - if (newValue != null) { - precision = newValue.getPrecision(); - } - if (precision == null) { - precision = .5f; - } - getModel().setStep(precision); recomputeRowValidState(rowModel); } } @@ -927,4 +915,15 @@ return doSave; } + + protected float getStep(Caracteristic caracteristic) { + Float precision = null; + if (caracteristic != null) { + precision = caracteristic.getPrecision(); + } + if (precision == null) { + precision = 1f; + } + return precision; + } }