Author: tchemit Date: 2013-10-04 09:09:12 +0200 (Fri, 04 Oct 2013) New Revision: 1273 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1273 Log: remove old code Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java 2013-10-03 20:30:54 UTC (rev 1272) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java 2013-10-04 07:09:12 UTC (rev 1273) @@ -547,37 +547,6 @@ } referentSpeciesWithSurveyCode = service.getReferentSpeciesWithSurveyCode(getReferentSpecies()); - -// if (isProtocolFilled()) { -// -// // get loaded protocol -// -// TuttiProtocol protocol = getProtocol(); -// Preconditions.checkNotNull(protocol, -// "Could not find protocol in ui context"); -// -// // fill available species from protocol -// referentSpeciesWithSurveyCode = Lists.newArrayList(); -// if (!protocol.isSpeciesEmpty()) { -// -// // split by taxonId -// Map<String, Species> map = TuttiEntities.splitByTaxonId(getReferentSpecies()); -// -// for (SpeciesProtocol protocolSpecy : protocol.getSpecies()) { -// String taxonId = String.valueOf(protocolSpecy.getSpeciesReferenceTaxonId()); -// Species species = map.get(taxonId); -// species.setSurveyCode(protocolSpecy.getSpeciesSurveyCode()); -// referentSpeciesWithSurveyCode.add(species); -// } -// } -// -// } else { -// -// // no protocol, use default values -// referentSpeciesWithSurveyCode = Lists.newArrayList(getReferentSpecies()); -// } -// -// referentSpeciesWithSurveyCode = Collections.unmodifiableList(referentSpeciesWithSurveyCode); } return referentSpeciesWithSurveyCode; } @@ -591,38 +560,6 @@ } referentBenthosWithSurveyCode = service.getReferentBenthosWithSurveyCode(getReferentSpecies()); - -// if (isProtocolFilled()) { -// -// // get loaded protocol -// -// TuttiProtocol protocol = getProtocol(); -// Preconditions.checkNotNull(protocol, -// "Could not find protocol in ui context"); -// -// // fill available species from protocol -// -// referentBenthosWithSurveyCode = Lists.newArrayList(); -// if (!protocol.isBenthosEmpty()) { -// -// // split by taxonId -// Map<String, Species> map = TuttiEntities.splitByTaxonId(getReferentSpecies()); -// -// for (SpeciesProtocol protocolSpecy : protocol.getBenthos()) { -// String taxonId = String.valueOf(protocolSpecy.getSpeciesReferenceTaxonId()); -// Species species = map.get(taxonId); -// species.setSurveyCode(protocolSpecy.getSpeciesSurveyCode()); -// referentBenthosWithSurveyCode.add(species); -// } -// } -// -// } else { -// -// // no protocol, use default values -// referentBenthosWithSurveyCode = Lists.newArrayList(getReferentSpecies()); -// } -// -// referentBenthosWithSurveyCode = Collections.unmodifiableList(referentBenthosWithSurveyCode); } return referentBenthosWithSurveyCode; } @@ -632,7 +569,6 @@ if (log.isInfoEnabled()) { log.info("Loading allSpecies"); } -// species = service.getAllSpecies(protocol); species = service.getAllSpecies(); } return species; @@ -710,30 +646,6 @@ log.info("Loading defaultIndividualObservationCaracteristics"); } defaultIndividualObservationCaracteristics = service.getDefaultIndividualObservationCaracteristics(); - -// List<Caracteristic> list; -// if (isProtocolFilled()) { -// List<String> individualObservationPmfmId = getProtocol().getIndividualObservationPmfmId(); -// if (CollectionUtils.isEmpty(individualObservationPmfmId)) { -// -// // no conf -// list = Lists.newArrayList(); -// -// } else { -// list = Lists.newArrayListWithCapacity(individualObservationPmfmId.size()); -// for (String id : individualObservationPmfmId) { -// Caracteristic caracteristic = service.getCaracteristic(Integer.valueOf(id)); -// list.add(caracteristic); -// } -// } -// -// } else { -// // no default caracteristics to use -// list = Lists.newArrayList(); -// } -// -// defaultIndividualObservationCaracteristics = -// Collections.unmodifiableList(list); } return defaultIndividualObservationCaracteristics; } @@ -746,7 +658,6 @@ if (service != null) { service.setProtocol(null); } -// protocol = null; lengthStepCaracteristics = null; defaultIndividualObservationCaracteristics = null; }