Author: tchemit Date: 2013-11-18 10:09:03 +0100 (Mon, 18 Nov 2013) New Revision: 1361 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1361 Log: fixes #3807: [CAPTURE] mensurations, non r?\195?\169initialisation des champs taile min et max entre deux ouverture de l'?\195?\169cran... 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 2013-11-17 17:39:59 UTC (rev 1360) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-11-18 09:09:03 UTC (rev 1361) @@ -427,22 +427,22 @@ Float maxStep = model.getLengthStep(model.getMaxStep()); Caracteristic lengthStepCaracteristic = model.getLengthStepCaracteristic(); + Set<Float> existingKeys = Sets.newHashSet(rowsByStep.keySet()); + List<BenthosFrequencyRowModel> rows = Lists.newArrayList(rowsByStep.values()); + for (float i = minStep, step = model.getStep(); i <= maxStep; i = TuttiUIUtil.getRoundedLengthStep(i + step, true)) { - if (!rowsByStep.containsKey(i)) { + if (!existingKeys.contains(i)) { // add it BenthosFrequencyRowModel newRow = tableModel.createNewRow(); newRow.setLengthStep(i); newRow.setLengthStepCaracteristic(lengthStepCaracteristic); - rowsByStep.put(i, newRow); + rows.add(newRow); } } - - List<BenthosFrequencyRowModel> rows = - Lists.newArrayList(rowsByStep.values()); - + Collections.sort(rows); model.setRows(rows); // select first cell in table (see http://forge.codelutin.com/issues/2496) 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 2013-11-17 17:39:59 UTC (rev 1360) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-11-18 09:09:03 UTC (rev 1361) @@ -424,22 +424,22 @@ Float maxStep = model.getLengthStep(model.getMaxStep()); Caracteristic lengthStepCaracteristic = model.getLengthStepCaracteristic(); + Set<Float> existingKeys = Sets.newHashSet(rowsByStep.keySet()); + List<SpeciesFrequencyRowModel> rows = Lists.newArrayList(rowsByStep.values()); + for (float i = minStep, step = model.getStep(); i <= maxStep; i = TuttiUIUtil.getRoundedLengthStep(i + step, true)) { - if (!rowsByStep.containsKey(i)) { + if (!existingKeys.contains(i)) { // add it SpeciesFrequencyRowModel newRow = tableModel.createNewRow(); newRow.setLengthStep(i); newRow.setLengthStepCaracteristic(lengthStepCaracteristic); - rowsByStep.put(i, newRow); + rows.add(newRow); } } - - List<SpeciesFrequencyRowModel> rows = - Lists.newArrayList(rowsByStep.values()); - + Collections.sort(rows); model.setRows(rows); // select first cell in table (see http://forge.codelutin.com/issues/2496)