Author: tchemit Date: 2013-02-08 23:18:45 +0100 (Fri, 08 Feb 2013) New Revision: 373 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/373 Log: use new protocol api Modified: 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/species/frequency/SpeciesFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-02-08 22:18:18 UTC (rev 372) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-02-08 22:18:45 UTC (rev 373) @@ -74,7 +74,7 @@ private TuttiProtocol protocol; - private Map<String, SpeciesProtocol> speciesProtocol; + private Map<Integer, SpeciesProtocol> speciesProtocol; private Map<String, Caracteristic> lengthStepCaracteristics; @@ -171,7 +171,7 @@ // FIXME 20130128 kmorin: the species have no technical id speciesProtocol = Maps.newHashMap(); for (SpeciesProtocol sp : protocol.getSpecies()) { - speciesProtocol.put(sp.getSpeciesId(), sp); + speciesProtocol.put(sp.getSpeciesReferenceTaxonId(), sp); } // speciesProtocol = TuttiEntities.splitById(protocol.getSpecies()); @@ -460,8 +460,8 @@ SpeciesFrequencyUIModel.ConfigurationMode mode = SpeciesFrequencyUIModel.ConfigurationMode.SIMPLE; if (protocol != null) { - String speciesId = speciesBatch.getSpecies().getId(); - SpeciesProtocol speciesProtocol = this.speciesProtocol.get(speciesId); + Integer taxonId = speciesBatch.getSpecies().getReferenceTaxonId(); + SpeciesProtocol speciesProtocol = this.speciesProtocol.get(taxonId); if (speciesProtocol.getLengthStepPmfmId() == null) { mode = SpeciesFrequencyUIModel.ConfigurationMode.SIMPLE_COUNTING; }