Author: tchemit Date: 2013-09-26 21:44:44 +0200 (Thu, 26 Sep 2013) New Revision: 1235 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1235 Log: fixes #3325: [PROTOCOLE] Gestion des caract?\195?\169ristiques "Classe de taille" sur les imports de protocole Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2013-09-26 18:37:15 UTC (rev 1234) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2013-09-26 19:44:44 UTC (rev 1235) @@ -483,6 +483,8 @@ Map<String, Species> allReferentSpeciesByTaxonId = model.getAllReferentSpeciesByTaxonId(); Map<String, Caracteristic> allCaracteristic = model.getAllCaracteristic(); + List<Caracteristic> lengthClassesPmfmId = Lists.newArrayList(); + List<EditProtocolSpeciesRowModel> result = Lists.newArrayList(); if (CollectionUtils.isNotEmpty(speciesProtocols)) { for (SpeciesProtocol speciesProtocol : speciesProtocols) { @@ -502,7 +504,16 @@ EditProtocolSpeciesRowModel row = EditProtocolSpeciesTableModel.newRow(sampleCategoryModel); row.setSpecies(species); - row.setLengthStepPmfm(allCaracteristic.get(speciesProtocol.getLengthStepPmfmId())); + String lengthStepPmfmId = speciesProtocol.getLengthStepPmfmId(); + + Caracteristic lengthStepPmfm = allCaracteristic.get(lengthStepPmfmId); + if (lengthStepPmfmId != null && !model.containsLengthClassesPmfmId(lengthStepPmfmId)) { + if (log.isInfoEnabled()) { + log.info("Found a new lengthStep pmfm: " + lengthStepPmfmId); + } + lengthClassesPmfmId.add(lengthStepPmfm); + } + row.setLengthStepPmfm(lengthStepPmfm); row.fromBean(speciesProtocol); // make sure to get a clean copy of the list @@ -510,6 +521,17 @@ result.add(row); } } + + if (CollectionUtils.isNotEmpty(lengthClassesPmfmId)) { + // detect some new length step pmfp to add in protocol + + // add it to model + model.addAllLengthClassesPmfmId(TuttiEntities.collecIds(lengthClassesPmfmId)); + + // add it to ui (no binding here, must do it manually) + BeanDoubleList<Caracteristic> lengthClassesList = ui.getLengthClassesList(); + lengthClassesList.getModel().addToSelected(lengthClassesPmfmId); + } return result; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java 2013-09-26 18:37:15 UTC (rev 1234) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java 2013-09-26 19:44:44 UTC (rev 1235) @@ -137,7 +137,7 @@ } public void setLengthClassesPmfm(List<Caracteristic> lengthClassesPmfm) { - List<String> ids = TuttiEntities.collecIds(lengthClassesPmfm); + List<String> ids = Lists.newArrayList(TuttiEntities.collecIds(lengthClassesPmfm)); setLengthClassesPmfmId(ids); } @@ -357,174 +357,192 @@ @Override public String getGearUseFeaturePmfmId(int index) { - return null; + return editObject.getGearUseFeaturePmfmId(index); } @Override public boolean isGearUseFeaturePmfmIdEmpty() { - return false; + return editObject.isGearUseFeaturePmfmIdEmpty(); } @Override public int sizeGearUseFeaturePmfmId() { - return 0; + return editObject.sizeGearUseFeaturePmfmId(); } @Override public void addGearUseFeaturePmfmId(String gearUseFeaturePmfmId) { + editObject.addGearUseFeaturePmfmId(gearUseFeaturePmfmId); } @Override public void addAllGearUseFeaturePmfmId(Collection<String> gearUseFeaturePmfmId) { + editObject.addAllGearUseFeaturePmfmId(gearUseFeaturePmfmId); } @Override public boolean removeGearUseFeaturePmfmId(String gearUseFeaturePmfmId) { - return false; + return editObject.removeGearUseFeaturePmfmId(gearUseFeaturePmfmId); } @Override public boolean removeAllGearUseFeaturePmfmId(Collection<String> gearUseFeaturePmfmId) { - return false; + return editObject.removeAllGearUseFeaturePmfmId(gearUseFeaturePmfmId); } @Override public boolean containsGearUseFeaturePmfmId(String gearUseFeaturePmfmId) { - return false; + return editObject.containsGearUseFeaturePmfmId(gearUseFeaturePmfmId); } @Override public boolean containsAllGearUseFeaturePmfmId(Collection<String> gearUseFeaturePmfmId) { - return false; + return editObject.containsAllGearUseFeaturePmfmId(gearUseFeaturePmfmId); } @Override public String getVesselUseFeaturePmfmId(int index) { - return null; + return editObject.getVesselUseFeaturePmfmId(index); } @Override public boolean isVesselUseFeaturePmfmIdEmpty() { - return false; + return editObject.isVesselUseFeaturePmfmIdEmpty(); } @Override public int sizeVesselUseFeaturePmfmId() { - return 0; + return editObject.sizeVesselUseFeaturePmfmId(); } @Override public void addVesselUseFeaturePmfmId(String vesselUseFeaturePmfmId) { + editObject.addVesselUseFeaturePmfmId(vesselUseFeaturePmfmId); } @Override public void addAllVesselUseFeaturePmfmId(Collection<String> vesselUseFeaturePmfmId) { + editObject.addAllVesselUseFeaturePmfmId(vesselUseFeaturePmfmId); } @Override public boolean removeVesselUseFeaturePmfmId(String vesselUseFeaturePmfmId) { - return false; + return editObject.removeVesselUseFeaturePmfmId(vesselUseFeaturePmfmId); } @Override public boolean removeAllVesselUseFeaturePmfmId(Collection<String> vesselUseFeaturePmfmId) { - return false; + return editObject.removeAllVesselUseFeaturePmfmId(vesselUseFeaturePmfmId); } @Override public boolean containsVesselUseFeaturePmfmId(String vesselUseFeaturePmfmId) { - return false; + return editObject.containsVesselUseFeaturePmfmId(vesselUseFeaturePmfmId); } @Override public boolean containsAllVesselUseFeaturePmfmId(Collection<String> vesselUseFeaturePmfmId) { - return false; + return editObject.containsAllVesselUseFeaturePmfmId(vesselUseFeaturePmfmId); } @Override public String getIndividualObservationPmfmId(int index) { - return null; + return editObject.getIndividualObservationPmfmId(index); } @Override public boolean isIndividualObservationPmfmIdEmpty() { - return false; + return editObject.isIndividualObservationPmfmIdEmpty(); } @Override public int sizeIndividualObservationPmfmId() { - return 0; + return editObject.sizeIndividualObservationPmfmId(); } @Override public void addIndividualObservationPmfmId(String individualObservationPmfmId) { + editObject.addIndividualObservationPmfmId(individualObservationPmfmId); } @Override public void addAllIndividualObservationPmfmId(Collection<String> individualObservationPmfmId) { + editObject.addAllIndividualObservationPmfmId(individualObservationPmfmId); } @Override public boolean removeIndividualObservationPmfmId(String individualObservationPmfmId) { - return false; + return editObject.removeIndividualObservationPmfmId(individualObservationPmfmId); } @Override public boolean removeAllIndividualObservationPmfmId(Collection<String> individualObservationPmfmId) { - return false; + return editObject.removeAllIndividualObservationPmfmId(individualObservationPmfmId); } @Override public boolean containsIndividualObservationPmfmId(String individualObservationPmfmId) { - return false; + return editObject.containsIndividualObservationPmfmId(individualObservationPmfmId); } @Override public boolean containsAllIndividualObservationPmfmId(Collection<String> individualObservationPmfmId) { - return false; + return editObject.containsAllIndividualObservationPmfmId(individualObservationPmfmId); } @Override public String getLengthClassesPmfmId(int index) { - return null; + return editObject.getLengthClassesPmfmId(index); } @Override public boolean isLengthClassesPmfmIdEmpty() { - return false; + return editObject.isLengthClassesPmfmIdEmpty(); } @Override public int sizeLengthClassesPmfmId() { - return 0; + return editObject.sizeLengthClassesPmfmId(); } @Override public void addLengthClassesPmfmId(String lengthClassesPmfmId) { + editObject.addLengthClassesPmfmId(lengthClassesPmfmId); + // force to always propagates (need to recompte data of combobox in species table) + firePropertyChange(PROPERTY_LENGTH_CLASSES_PMFM_ID, null, getLengthClassesPmfmId()); } @Override public void addAllLengthClassesPmfmId(Collection<String> lengthClassesPmfmId) { + editObject.addAllLengthClassesPmfmId(lengthClassesPmfmId); + // force to always propagates (need to recompte data of combobox in species table) + firePropertyChange(PROPERTY_LENGTH_CLASSES_PMFM_ID, null, getLengthClassesPmfmId()); } @Override public boolean removeLengthClassesPmfmId(String lengthClassesPmfmId) { - return false; + boolean result = editObject.removeLengthClassesPmfmId(lengthClassesPmfmId); + // force to always propagates (need to recompte data of combobox in species table) + firePropertyChange(PROPERTY_LENGTH_CLASSES_PMFM_ID, null, getLengthClassesPmfmId()); + return result; } @Override public boolean removeAllLengthClassesPmfmId(Collection<String> lengthClassesPmfmId) { - return false; + boolean result = editObject.removeAllLengthClassesPmfmId(lengthClassesPmfmId); + // force to always propagates (need to recompte data of combobox in species table) + firePropertyChange(PROPERTY_LENGTH_CLASSES_PMFM_ID, null, getLengthClassesPmfmId()); + return result; } @Override public boolean containsLengthClassesPmfmId(String lengthClassesPmfmId) { - return false; + return editObject.containsLengthClassesPmfmId(lengthClassesPmfmId); } @Override public boolean containsAllLengthClassesPmfmId(Collection<String> lengthClassesPmfmId) { - return false; + return editObject.containsAllLengthClassesPmfmId(lengthClassesPmfmId); } @Override @@ -534,101 +552,107 @@ @Override public boolean isSpeciesEmpty() { - return false; + return editObject.isSpeciesEmpty(); } @Override public int sizeSpecies() { - return 0; + return editObject.sizeSpecies(); } @Override public void addSpecies(SpeciesProtocol species) { + editObject.addSpecies(species); } @Override public void addAllSpecies(Collection<SpeciesProtocol> species) { + editObject.addAllSpecies(species); } @Override public boolean removeSpecies(SpeciesProtocol species) { - return false; + return editObject.removeSpecies(species); } @Override public boolean removeAllSpecies(Collection<SpeciesProtocol> species) { - return false; + return editObject.removeAllSpecies(species); } @Override public boolean containsSpecies(SpeciesProtocol species) { - return false; + return editObject.containsSpecies(species); } @Override public boolean containsAllSpecies(Collection<SpeciesProtocol> species) { - return false; + return editObject.containsAllSpecies(species); } @Override public List<SpeciesProtocol> getSpecies() { - return null; + return editObject.getSpecies(); } @Override public void setSpecies(List<SpeciesProtocol> species) { + editObject.setSpecies(species); } @Override public SpeciesProtocol getBenthos(int index) { - return null; + return editObject.getBenthos(index); } @Override public boolean isBenthosEmpty() { - return false; + return editObject.isBenthosEmpty(); } @Override public int sizeBenthos() { - return 0; + return editObject.sizeBenthos(); } @Override public void addBenthos(SpeciesProtocol benthos) { + editObject.addBenthos(benthos); } @Override public void addAllBenthos(Collection<SpeciesProtocol> benthos) { + editObject.addAllBenthos(benthos); } @Override public boolean removeBenthos(SpeciesProtocol benthos) { - return false; + return editObject.removeBenthos(benthos); } @Override public boolean removeAllBenthos(Collection<SpeciesProtocol> benthos) { - return false; + return editObject.removeAllBenthos(benthos); } @Override public boolean containsBenthos(SpeciesProtocol benthos) { - return false; + return editObject.containsBenthos(benthos); } @Override public boolean containsAllBenthos(Collection<SpeciesProtocol> benthos) { - return false; + return editObject.containsAllBenthos(benthos); } @Override public List<SpeciesProtocol> getBenthos() { - return null; + return editObject.getBenthos(); } @Override public void setBenthos(List<SpeciesProtocol> benthos) { + editObject.setBenthos(benthos); } @Override