This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 2db3d09d159bf8f477aafd093425c307c0bf1387 Author: Kevin Morin <morin@codelutin.com> Date: Thu Nov 20 11:12:18 2014 +0100 refs #6129 [IMPORT SUMATRA] Import des valeurs des PSFMs et des champs du trait --- .../entities}/protocol/CaracteristicType.java | 2 +- .../entities/protocol/TuttiProtocols.java | 43 ++++++++ .../service/ProtocolPersistenceServiceImpl.java | 3 +- .../src/main/xmi/tutti-persistence.properties | 3 +- .../src/main/xmi/tutti-persistence.zargo | Bin 56767 -> 57378 bytes ...-persistence.zargo => tutti-persistence.zargo~} | Bin 56767 -> 57382 bytes .../entities/protocol/TuttiProtocolsTest.java | 18 +++- .../ProtocolPersistenceServiceReadTest.java | 11 +- .../tutti/service/protocol/CaracteristicRow.java | 1 + .../service/protocol/CaracteristicRowModel.java | 2 +- .../protocol/ProtocolImportExportService.java | 36 ++++--- .../protocol/ProtocolImportExportServiceTest.java | 35 +++++-- .../fishing/GearUseFeatureTabUIHandler.java | 10 +- .../fishing/VesselUseFeatureTabUIHandler.java | 10 +- .../ui/swing/content/protocol/EditProtocolUI.css | 10 -- .../ui/swing/content/protocol/EditProtocolUI.jaxx | 8 -- .../content/protocol/EditProtocolUIHandler.java | 26 +---- .../content/protocol/EditProtocolUIModel.java | 116 +++++---------------- 18 files changed, 166 insertions(+), 168 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicType.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/CaracteristicType.java similarity index 94% rename from tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicType.java rename to tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/CaracteristicType.java index 4f92c68..358a184 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicType.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/CaracteristicType.java @@ -1,4 +1,4 @@ -package fr.ifremer.tutti.service.protocol; +package fr.ifremer.tutti.persistence.entities.protocol; /* * #%L diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java index 2503372..32d4279 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java @@ -26,7 +26,11 @@ import com.esotericsoftware.yamlbeans.YamlConfig; import com.esotericsoftware.yamlbeans.YamlReader; import com.esotericsoftware.yamlbeans.YamlWriter; import com.google.common.base.Charsets; +import com.google.common.base.Function; import com.google.common.base.Joiner; +import com.google.common.base.Preconditions; +import com.google.common.base.Predicate; +import com.google.common.collect.Collections2; import com.google.common.collect.Lists; import com.google.common.io.Files; import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId; @@ -50,6 +54,8 @@ import org.nuiton.util.beans.BinderFactory; import java.io.BufferedWriter; import java.io.File; import java.io.Reader; +import java.util.ArrayList; +import java.util.Collection; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -378,4 +384,41 @@ public class TuttiProtocols extends AbstractTuttiProtocols { } return null; } + + public static CaracteristicMappingRow caracteristicMappingRow(String pmfmId, CaracteristicType tab) { + CaracteristicMappingRow caracteristicMappingRow = new CaracteristicMappingRowBean(); + caracteristicMappingRow.setPmfmId(pmfmId); + caracteristicMappingRow.setTab(tab.name()); + return caracteristicMappingRow; + } + + public static List<String> gearUseFeaturePmfmIds(TuttiProtocol protocol) { + return pmfmIdsForCaracteristicType(protocol, CaracteristicType.GEAR_USE_FEATURE); + } + + public static List<String> vesselUseFeaturePmfmIds(TuttiProtocol protocol) { + return pmfmIdsForCaracteristicType(protocol, CaracteristicType.VESSEL_USE_FEATURE); + } + + public static List<String> pmfmIdsForCaracteristicType(TuttiProtocol protocol, final CaracteristicType type) { + Preconditions.checkNotNull(protocol); + Preconditions.checkNotNull(type); + + List<CaracteristicMappingRow> caracteristicMapping = protocol.getCaracteristicMapping(); + Collection<CaracteristicMappingRow> gearUseFeatureCaracteristics = + Collections2.filter(caracteristicMapping, new Predicate<CaracteristicMappingRow>() { + @Override + public boolean apply(CaracteristicMappingRow caracteristicMappingRow) { + return type.equals(caracteristicMappingRow.getTab()); + } + }); + + Collection<String> pmfmIds = Collections2.transform(gearUseFeatureCaracteristics, new Function<CaracteristicMappingRow, String>() { + @Override + public String apply(CaracteristicMappingRow caracteristicMappingRow) { + return caracteristicMappingRow.getPmfmId(); + } + }); + return new ArrayList<>(pmfmIds); + } } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceImpl.java index b3b6279..b5952ae 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceImpl.java @@ -152,8 +152,7 @@ public class ProtocolPersistenceServiceImpl extends AbstractPersistenceService i // result.setVesselUseFeaturePmfmId(TuttiEntities.getList(bean.getVesselUseFeaturePmfmId())); // result.setGearUseFeaturePmfmId(TuttiEntities.getList(bean.getGearUseFeaturePmfmId())); result.setLengthClassesPmfmId(bean.getLengthClassesPmfmId()); - result.setVesselUseFeaturePmfmId(bean.getVesselUseFeaturePmfmId()); - result.setGearUseFeaturePmfmId(bean.getGearUseFeaturePmfmId()); + result.setCaracteristicMapping(bean.getCaracteristicMapping()); Binder<SpeciesProtocol, SpeciesProtocol> speciesProtocolBinder = BinderFactory.newBinder(SpeciesProtocol.class); List<SpeciesProtocol> species = Lists.newArrayList(); diff --git a/tutti-persistence/src/main/xmi/tutti-persistence.properties b/tutti-persistence/src/main/xmi/tutti-persistence.properties index a69a326..0431cee 100644 --- a/tutti-persistence/src/main/xmi/tutti-persistence.properties +++ b/tutti-persistence/src/main/xmi/tutti-persistence.properties @@ -39,8 +39,7 @@ fr.ifremer.tutti.persistence.entities.data.FishingOperation.attribute.secondaryV fr.ifremer.tutti.persistence.entities.data.SpeciesBatch.attribute.childBatchs.stereotype=ordered fr.ifremer.tutti.persistence.entities.data.BenthosBatch.attribute.childBatchs.stereotype=ordered -fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol.attribute.gearUseFeaturePmfmId.stereotype=ordered -fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol.attribute.vesselUseFeaturePmfmId.stereotype=ordered +fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol.attribute.caracteristicMapping.stereotype=ordered fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol.attribute.individualObservationPmfmId.stereotype=ordered fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol.attribute.lengthClassesPmfmId.stereotype=ordered fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol.attribute.species.stereotype=ordered diff --git a/tutti-persistence/src/main/xmi/tutti-persistence.zargo b/tutti-persistence/src/main/xmi/tutti-persistence.zargo index 6a566b8..982bb6a 100644 Binary files a/tutti-persistence/src/main/xmi/tutti-persistence.zargo and b/tutti-persistence/src/main/xmi/tutti-persistence.zargo differ diff --git a/tutti-persistence/src/main/xmi/tutti-persistence.zargo b/tutti-persistence/src/main/xmi/tutti-persistence.zargo~ similarity index 51% copy from tutti-persistence/src/main/xmi/tutti-persistence.zargo copy to tutti-persistence/src/main/xmi/tutti-persistence.zargo~ index 6a566b8..2d2cc86 100644 Binary files a/tutti-persistence/src/main/xmi/tutti-persistence.zargo and b/tutti-persistence/src/main/xmi/tutti-persistence.zargo~ differ diff --git a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java index 9993a55..622ee61 100644 --- a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java +++ b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java @@ -180,8 +180,13 @@ public class TuttiProtocolsTest { Assert.assertEquals("protocolName", protocol.getName()); Assert.assertEquals("Commentaire", protocol.getComment()); Assert.assertEquals(Lists.newArrayList("14", "18"), protocol.getLengthClassesPmfmId()); - Assert.assertEquals(Lists.newArrayList("114", "228", "821"), protocol.getVesselUseFeaturePmfmId()); - Assert.assertEquals(Lists.newArrayList("21", "22"), protocol.getGearUseFeaturePmfmId()); + Assert.assertEquals(Lists.newArrayList( + TuttiProtocols.caracteristicMappingRow("114", CaracteristicType.VESSEL_USE_FEATURE), + TuttiProtocols.caracteristicMappingRow("228", CaracteristicType.VESSEL_USE_FEATURE), + TuttiProtocols.caracteristicMappingRow("821", CaracteristicType.VESSEL_USE_FEATURE), + TuttiProtocols.caracteristicMappingRow("21", CaracteristicType.GEAR_USE_FEATURE), + TuttiProtocols.caracteristicMappingRow("22", CaracteristicType.GEAR_USE_FEATURE)), + protocol.getCaracteristicMapping()); Assert.assertNotNull(protocol.getSpecies()); Assert.assertEquals(2, protocol.getSpecies().size()); @@ -251,8 +256,13 @@ public class TuttiProtocolsTest { protocol.setName("protocolName"); protocol.setComment("Commentaire"); protocol.setLengthClassesPmfmId(Lists.newArrayList("14", "18")); - protocol.setVesselUseFeaturePmfmId(Lists.newArrayList("114", "228", "821")); - protocol.setGearUseFeaturePmfmId(Lists.newArrayList("21", "22")); + + protocol.setCaracteristicMapping(Lists.newArrayList( + TuttiProtocols.caracteristicMappingRow("114", CaracteristicType.VESSEL_USE_FEATURE), + TuttiProtocols.caracteristicMappingRow("228", CaracteristicType.VESSEL_USE_FEATURE), + TuttiProtocols.caracteristicMappingRow("821", CaracteristicType.VESSEL_USE_FEATURE), + TuttiProtocols.caracteristicMappingRow("21", CaracteristicType.GEAR_USE_FEATURE), + TuttiProtocols.caracteristicMappingRow("22", CaracteristicType.GEAR_USE_FEATURE))); protocol.setSpecies(Lists.<SpeciesProtocol>newArrayList()); SpeciesProtocol sp1 = SpeciesProtocols.newSpeciesProtocol(); diff --git a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceReadTest.java b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceReadTest.java index b303c78..1cb0ed8 100644 --- a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceReadTest.java +++ b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceReadTest.java @@ -28,6 +28,7 @@ import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocols; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocols; import fr.ifremer.tutti.persistence.test.DatabaseResource; +import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicType; import org.junit.Assert; import org.junit.Before; import org.junit.ClassRule; @@ -93,8 +94,13 @@ public class ProtocolPersistenceServiceReadTest { protocol.setName("protocolName"); protocol.setComment("Commentaire"); protocol.setLengthClassesPmfmId(Lists.newArrayList("14", "18")); - protocol.setVesselUseFeaturePmfmId(Lists.newArrayList("114", "228", "821")); - protocol.setGearUseFeaturePmfmId(Lists.newArrayList("21", "22")); + + protocol.setCaracteristicMapping(Lists.newArrayList( + TuttiProtocols.caracteristicMappingRow("114", CaracteristicType.VESSEL_USE_FEATURE), + TuttiProtocols.caracteristicMappingRow("228", CaracteristicType.VESSEL_USE_FEATURE), + TuttiProtocols.caracteristicMappingRow("821", CaracteristicType.VESSEL_USE_FEATURE), + TuttiProtocols.caracteristicMappingRow("21", CaracteristicType.GEAR_USE_FEATURE), + TuttiProtocols.caracteristicMappingRow("22", CaracteristicType.GEAR_USE_FEATURE))); protocol.setSpecies(Lists.<SpeciesProtocol>newArrayList()); SpeciesProtocol sp1 = SpeciesProtocols.newSpeciesProtocol(); @@ -154,4 +160,5 @@ public class ProtocolPersistenceServiceReadTest { return protocol; } + } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicRow.java index 242a07f..a4ac8de 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicRow.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicRow.java @@ -22,6 +22,7 @@ package fr.ifremer.tutti.service.protocol; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; +import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicType; import java.io.Serializable; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicRowModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicRowModel.java index b622d39..5a6b244 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicRowModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicRowModel.java @@ -24,7 +24,7 @@ package fr.ifremer.tutti.service.protocol; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.service.TuttiCsvUtil; -import org.nuiton.csv.Common; +import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicType; import java.util.Map; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java index 5f7a4c9..442f8e9 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java @@ -30,6 +30,7 @@ import com.google.common.collect.Maps; import com.google.common.collect.Multimap; import com.google.common.collect.TreeMultimap; import com.google.common.io.Files; +import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicMappingRow; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocols; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; @@ -37,8 +38,7 @@ import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocols; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.AbstractTuttiService; -import fr.ifremer.tutti.service.PersistenceService; -import fr.ifremer.tutti.service.TuttiServiceContext; +import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicType; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; @@ -129,15 +129,16 @@ public class ProtocolImportExportService extends AbstractTuttiService { ids.get(CaracteristicType.LENGTH_STEP)) ); - protocol.setVesselUseFeaturePmfmId( - mergeIds(protocol.getVesselUseFeaturePmfmId(), - ids.get(CaracteristicType.VESSEL_USE_FEATURE)) - ); - - protocol.setGearUseFeaturePmfmId( - mergeIds(protocol.getGearUseFeaturePmfmId(), - ids.get(CaracteristicType.GEAR_USE_FEATURE)) - ); + //FIXME +// protocol.setVesselUseFeaturePmfmId( +// mergeIds(protocol.getVesselUseFeaturePmfmId(), +// ids.get(CaracteristicType.VESSEL_USE_FEATURE)) +// ); +// +// protocol.setGearUseFeaturePmfmId( +// mergeIds(protocol.getGearUseFeaturePmfmId(), +// ids.get(CaracteristicType.GEAR_USE_FEATURE)) +// ); protocol.setIndividualObservationPmfmId( mergeIds(protocol.getIndividualObservationPmfmId(), @@ -194,15 +195,16 @@ public class ProtocolImportExportService extends AbstractTuttiService { rows.addAll(Lists.transform(protocol.getLengthClassesPmfmId(), function)); } - if (!protocol.isVesselUseFeaturePmfmIdEmpty()) { + + //FIXME + if (!protocol.isCaracteristicMappingEmpty()) { function.setType(CaracteristicType.VESSEL_USE_FEATURE); - rows.addAll(Lists.transform(protocol.getVesselUseFeaturePmfmId(), function)); + for (CaracteristicMappingRow mappingRow : protocol.getCaracteristicMapping()) { + function.setType(CaracteristicType.valueOf(mappingRow.getTab())); + rows.add(function.apply(mappingRow.getPmfmId())); + } } - if (!protocol.isGearUseFeaturePmfmIdEmpty()) { - function.setType(CaracteristicType.GEAR_USE_FEATURE); - rows.addAll(Lists.transform(protocol.getGearUseFeaturePmfmId(), function)); - } if (!protocol.isIndividualObservationPmfmIdEmpty()) { function.setType(CaracteristicType.INDIVIDUAL_OBSERVATION); diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportServiceTest.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportServiceTest.java index 270807c..b137692 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportServiceTest.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportServiceTest.java @@ -26,6 +26,7 @@ import com.google.common.base.Charsets; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.io.Files; +import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicType; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocols; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; @@ -189,8 +190,13 @@ public class ProtocolImportExportServiceTest { protocol.setName("protocolName"); protocol.setComment("Commentaire"); protocol.setLengthClassesPmfmId(Lists.newArrayList("14", "18")); - protocol.setVesselUseFeaturePmfmId(Lists.newArrayList("114", "228", "821")); - protocol.setGearUseFeaturePmfmId(Lists.newArrayList("21", "22")); + protocol.setCaracteristicMapping(Lists.newArrayList( + TuttiProtocols.caracteristicMappingRow("114", CaracteristicType.VESSEL_USE_FEATURE), + TuttiProtocols.caracteristicMappingRow("228", CaracteristicType.VESSEL_USE_FEATURE), + TuttiProtocols.caracteristicMappingRow("821", CaracteristicType.VESSEL_USE_FEATURE), + TuttiProtocols.caracteristicMappingRow("21", CaracteristicType.GEAR_USE_FEATURE), + TuttiProtocols.caracteristicMappingRow("262", CaracteristicType.GEAR_USE_FEATURE) + )); protocol.setIndividualObservationPmfmId(Lists.newArrayList("25", "26")); protocol.setSpecies(Lists.<SpeciesProtocol>newArrayList()); @@ -271,8 +277,14 @@ public class ProtocolImportExportServiceTest { Assert.assertEquals("protocolName", protocol.getName()); Assert.assertEquals("Commentaire", protocol.getComment()); Assert.assertEquals(Lists.newArrayList("14", "18"), protocol.getLengthClassesPmfmId()); - Assert.assertEquals(Lists.newArrayList("114", "228", "821"), protocol.getVesselUseFeaturePmfmId()); - Assert.assertEquals(Lists.newArrayList("21", "22"), protocol.getGearUseFeaturePmfmId()); + Assert.assertEquals(Lists.newArrayList( + TuttiProtocols.caracteristicMappingRow("114", CaracteristicType.VESSEL_USE_FEATURE), + TuttiProtocols.caracteristicMappingRow("228", CaracteristicType.VESSEL_USE_FEATURE), + TuttiProtocols.caracteristicMappingRow("821", CaracteristicType.VESSEL_USE_FEATURE), + TuttiProtocols.caracteristicMappingRow("21", CaracteristicType.GEAR_USE_FEATURE), + TuttiProtocols.caracteristicMappingRow("262", CaracteristicType.GEAR_USE_FEATURE) + ), + protocol.getCaracteristicMapping()); Assert.assertEquals(Lists.newArrayList("25", "26"), protocol.getIndividualObservationPmfmId()); Assert.assertNotNull(protocol.getSpecies()); @@ -352,10 +364,11 @@ public class ProtocolImportExportServiceTest { Assert.assertEquals(Lists.newArrayList("1"), protocol.getLengthClassesPmfmId()); - Assert.assertEquals(Lists.newArrayList("2"), - protocol.getVesselUseFeaturePmfmId()); - Assert.assertEquals(Lists.newArrayList("3"), - protocol.getGearUseFeaturePmfmId()); + Assert.assertEquals(Lists.newArrayList( + TuttiProtocols.caracteristicMappingRow("2", CaracteristicType.VESSEL_USE_FEATURE), + TuttiProtocols.caracteristicMappingRow("3", CaracteristicType.GEAR_USE_FEATURE) + ), + protocol.getCaracteristicMapping()); Assert.assertEquals(Lists.newArrayList("4"), protocol.getIndividualObservationPmfmId()); } @@ -387,8 +400,10 @@ public class ProtocolImportExportServiceTest { TuttiProtocol protocol = TuttiProtocols.newTuttiProtocol(); protocol.setLengthClassesPmfmId(Lists.newArrayList("1")); - protocol.setVesselUseFeaturePmfmId(Lists.newArrayList("2")); - protocol.setGearUseFeaturePmfmId(Lists.newArrayList("3")); + protocol.setCaracteristicMapping(Lists.newArrayList( + TuttiProtocols.caracteristicMappingRow("2", CaracteristicType.VESSEL_USE_FEATURE), + TuttiProtocols.caracteristicMappingRow("3", CaracteristicType.GEAR_USE_FEATURE) + )); protocol.setIndividualObservationPmfmId(Lists.newArrayList("4")); Assert.assertFalse(file.exists()); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUIHandler.java index 4b7fabb..bf859b2 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUIHandler.java @@ -22,8 +22,14 @@ package fr.ifremer.tutti.ui.swing.content.operation.fishing; * #L% */ +import com.google.common.base.Function; +import com.google.common.base.Predicate; +import com.google.common.collect.Collections2; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; +import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicMappingRow; +import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicType; +import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocols; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.ui.swing.util.caracteristics.CaracteristicValueEditor; @@ -32,6 +38,8 @@ import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; +import java.util.ArrayList; +import java.util.Collection; import java.util.List; /** @@ -65,7 +73,7 @@ public class GearUseFeatureTabUIHandler extends AbstractCaracteristicTabUIHandle @Override protected List<String> getProtocolPmfmIds() { - return getDataContext().getProtocol().getGearUseFeaturePmfmId(); + return TuttiProtocols.gearUseFeaturePmfmIds(getDataContext().getProtocol()); } //------------------------------------------------------------------------// diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUIHandler.java index b21f980..6f77d9c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUIHandler.java @@ -22,8 +22,14 @@ package fr.ifremer.tutti.ui.swing.content.operation.fishing; * #L% */ +import com.google.common.base.Function; +import com.google.common.base.Predicate; +import com.google.common.collect.Collections2; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; +import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicMappingRow; +import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicType; +import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocols; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.ui.swing.util.caracteristics.CaracteristicValueEditor; @@ -32,6 +38,8 @@ import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; +import java.util.ArrayList; +import java.util.Collection; import java.util.List; /** @@ -65,7 +73,7 @@ public class VesselUseFeatureTabUIHandler extends AbstractCaracteristicTabUIHand @Override protected List<String> getProtocolPmfmIds() { - return getDataContext().getProtocol().getVesselUseFeaturePmfmId(); + return TuttiProtocols.vesselUseFeaturePmfmIds(getDataContext().getProtocol()); } //------------------------------------------------------------------------// diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css index 9011a91..9b882b7 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css @@ -113,16 +113,6 @@ JTextField { _help: {"tutti.editProtocol.pane.caracteristic.help"}; } -#gearUseFeatureList { - property: gearUseFeaturePmfm; - _help: {"tutti.editProtocol.field.gearUseFeature.help"}; -} - -#vesselUseFeatureList { - property: vesselUseFeaturePmfm; - _help: {"tutti.editProtocol.field.vesselUseFeature.help"}; -} - #individualObservationList { property: individualObservationPmfm; _help: {"tutti.editProtocol.field.individualObservation.help"}; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx index 22e70ec..0ca8922 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx @@ -113,18 +113,10 @@ <tab title='tutti.editProtocol.tab.caracteristic.lengthClasses'> <BeanDoubleList id='lengthClassesList' genericType='Caracteristic'/> </tab> - <tab title='tutti.editProtocol.tab.caracteristic.gearUseFeature'> - <BeanDoubleList id='gearUseFeatureList' - genericType='Caracteristic'/> - </tab> <tab title='tutti.editProtocol.tab.caracteristic.individualObservation'> <BeanDoubleList id='individualObservationList' genericType='Caracteristic'/> </tab> - <tab title='tutti.editProtocol.tab.caracteristic.vesselUseFeature'> - <BeanDoubleList id='vesselUseFeatureList' - genericType='Caracteristic'/> - </tab> </JTabbedPane> </JPanel> </tab> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java index d14a898..0913491 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java @@ -409,9 +409,7 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI allDoubleLists = Lists.newArrayList( this.ui.getLengthClassesList(), - this.ui.getGearUseFeatureList(), - this.ui.getIndividualObservationList(), - this.ui.getVesselUseFeatureList() + this.ui.getIndividualObservationList() ); initDoubleList(EditProtocolUIModel.PROPERTY_LENGTH_CLASSES_PMFM_ID, @@ -419,16 +417,6 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI Lists.newArrayList(model.getCaracteristics()), model.getLengthClassesPmfmId()); - initDoubleList(EditProtocolUIModel.PROPERTY_GEAR_USE_FEATURE_PMFM_ID, - this.ui.getGearUseFeatureList(), - Lists.newArrayList(model.getCaracteristics()), - model.getGearUseFeaturePmfmId()); - - initDoubleList(EditProtocolUIModel.PROPERTY_VESSEL_USE_FEATURE_PMFM_ID, - this.ui.getVesselUseFeatureList(), - Lists.newArrayList(model.getCaracteristics()), - model.getVesselUseFeaturePmfmId()); - initDoubleList(EditProtocolUIModel.PROPERTY_INDIVIDUAL_OBSERVATION_PMFM_ID, this.ui.getIndividualObservationList(), Lists.newArrayList(model.getCaracteristics()), @@ -450,17 +438,13 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI break; case 1: - selectedDoubleList = EditProtocolUIHandler.this.ui.getGearUseFeatureList(); - break; - - case 2: +// selectedDoubleList = EditProtocolUIHandler.this.ui.getGearUseFeatureList(); +// break; +// +// case 2: selectedDoubleList = EditProtocolUIHandler.this.ui.getIndividualObservationList(); break; - case 3: - selectedDoubleList = EditProtocolUIHandler.this.ui.getVesselUseFeatureList(); - break; - default: selectedDoubleList = null; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java index 268317f..eed2950 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java @@ -25,6 +25,7 @@ package fr.ifremer.tutti.ui.swing.content.protocol; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; import fr.ifremer.tutti.persistence.entities.TuttiEntities; +import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicMappingRow; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocols; @@ -139,15 +140,10 @@ public class EditProtocolUIModel extends AbstractTuttiBeanUIModel<TuttiProtocol, setLengthClassesPmfmId(ids); } - public void setGearUseFeaturePmfm(List<Caracteristic> gearUseFeaturePmfm) { - List<String> ids = TuttiEntities.collecIds(gearUseFeaturePmfm); - setGearUseFeaturePmfmId(ids); - } - - public void setVesselUseFeaturePmfm(List<Caracteristic> vesselUseFeaturePmfm) { - List<String> ids = TuttiEntities.collecIds(vesselUseFeaturePmfm); - setVesselUseFeaturePmfmId(ids); - } +// public void setGearUseFeaturePmfm(List<Caracteristic> gearUseFeaturePmfm) { +// List<String> ids = TuttiEntities.collecIds(gearUseFeaturePmfm); +// setGearUseFeaturePmfmId(ids); +// } public void setIndividualObservationPmfm(List<Caracteristic> individualObservationPmfm) { List<String> ids = TuttiEntities.collecIds(individualObservationPmfm); @@ -322,28 +318,6 @@ public class EditProtocolUIModel extends AbstractTuttiBeanUIModel<TuttiProtocol, } @Override - public List<String> getGearUseFeaturePmfmId() { - return editObject.getGearUseFeaturePmfmId(); - } - - @Override - public void setGearUseFeaturePmfmId(List<String> gearUseFeaturePmfmId) { - editObject.setGearUseFeaturePmfmId(gearUseFeaturePmfmId); - firePropertyChange(PROPERTY_GEAR_USE_FEATURE_PMFM_ID, null, gearUseFeaturePmfmId); - } - - @Override - public List<String> getVesselUseFeaturePmfmId() { - return editObject.getVesselUseFeaturePmfmId(); - } - - @Override - public void setVesselUseFeaturePmfmId(List<String> vesselUseFeaturePmfmId) { - editObject.setVesselUseFeaturePmfmId(vesselUseFeaturePmfmId); - firePropertyChange(PROPERTY_VESSEL_USE_FEATURE_PMFM_ID, null, vesselUseFeaturePmfmId); - } - - @Override public List<String> getIndividualObservationPmfmId() { return editObject.getIndividualObservationPmfmId(); } @@ -355,93 +329,59 @@ public class EditProtocolUIModel extends AbstractTuttiBeanUIModel<TuttiProtocol, } @Override - public String getGearUseFeaturePmfmId(int index) { - return editObject.getGearUseFeaturePmfmId(index); - } - - @Override - public boolean isGearUseFeaturePmfmIdEmpty() { - return editObject.isGearUseFeaturePmfmIdEmpty(); - } - - @Override - public int sizeGearUseFeaturePmfmId() { - 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 editObject.removeGearUseFeaturePmfmId(gearUseFeaturePmfmId); - } - - @Override - public boolean removeAllGearUseFeaturePmfmId(Collection<String> gearUseFeaturePmfmId) { - return editObject.removeAllGearUseFeaturePmfmId(gearUseFeaturePmfmId); - } - - @Override - public boolean containsGearUseFeaturePmfmId(String gearUseFeaturePmfmId) { - return editObject.containsGearUseFeaturePmfmId(gearUseFeaturePmfmId); + public List<CaracteristicMappingRow> getCaracteristicMapping() { + return editObject.getCaracteristicMapping(); } @Override - public boolean containsAllGearUseFeaturePmfmId(Collection<String> gearUseFeaturePmfmId) { - return editObject.containsAllGearUseFeaturePmfmId(gearUseFeaturePmfmId); + public void setCaracteristicMapping(List<CaracteristicMappingRow> caracteristicMapping) { + editObject.setCaracteristicMapping(caracteristicMapping); + firePropertyChange(PROPERTY_CARACTERISTIC_MAPPING, null, caracteristicMapping); } @Override - public String getVesselUseFeaturePmfmId(int index) { - return editObject.getVesselUseFeaturePmfmId(index); + public CaracteristicMappingRow getCaracteristicMapping(int index) { + return editObject.getCaracteristicMapping(index); } @Override - public boolean isVesselUseFeaturePmfmIdEmpty() { - return editObject.isVesselUseFeaturePmfmIdEmpty(); + public boolean isCaracteristicMappingEmpty() { + return editObject.isCaracteristicMappingEmpty(); } @Override - public int sizeVesselUseFeaturePmfmId() { - return editObject.sizeVesselUseFeaturePmfmId(); + public int sizeCaracteristicMapping() { + return editObject.sizeCaracteristicMapping(); } @Override - public void addVesselUseFeaturePmfmId(String vesselUseFeaturePmfmId) { - editObject.addVesselUseFeaturePmfmId(vesselUseFeaturePmfmId); + public void addCaracteristicMapping(CaracteristicMappingRow caracteristicMapping) { + editObject.addCaracteristicMapping(caracteristicMapping); } @Override - public void addAllVesselUseFeaturePmfmId(Collection<String> vesselUseFeaturePmfmId) { - editObject.addAllVesselUseFeaturePmfmId(vesselUseFeaturePmfmId); + public void addAllCaracteristicMapping(Collection<CaracteristicMappingRow> caracteristicMapping) { + editObject.addAllCaracteristicMapping(caracteristicMapping); } @Override - public boolean removeVesselUseFeaturePmfmId(String vesselUseFeaturePmfmId) { - return editObject.removeVesselUseFeaturePmfmId(vesselUseFeaturePmfmId); + public boolean removeCaracteristicMapping(CaracteristicMappingRow caracteristicMapping) { + return editObject.removeCaracteristicMapping(caracteristicMapping); } @Override - public boolean removeAllVesselUseFeaturePmfmId(Collection<String> vesselUseFeaturePmfmId) { - return editObject.removeAllVesselUseFeaturePmfmId(vesselUseFeaturePmfmId); + public boolean removeAllCaracteristicMapping(Collection<CaracteristicMappingRow> caracteristicMapping) { + return editObject.removeAllCaracteristicMapping(caracteristicMapping); } @Override - public boolean containsVesselUseFeaturePmfmId(String vesselUseFeaturePmfmId) { - return editObject.containsVesselUseFeaturePmfmId(vesselUseFeaturePmfmId); + public boolean containsCaracteristicMapping(CaracteristicMappingRow caracteristicMapping) { + return editObject.containsCaracteristicMapping(caracteristicMapping); } @Override - public boolean containsAllVesselUseFeaturePmfmId(Collection<String> vesselUseFeaturePmfmId) { - return editObject.containsAllVesselUseFeaturePmfmId(vesselUseFeaturePmfmId); + public boolean containsAllCaracteristicMapping(Collection<CaracteristicMappingRow> caracteristicMapping) { + return editObject.containsAllCaracteristicMapping(caracteristicMapping); } @Override -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit b1b82c0687e79fb76051b09a9a849041c0515ca4 Author: Kevin Morin <morin@codelutin.com> Date: Mon Nov 24 14:31:13 2014 +0100 refs #5954 add v2 version --- .../entities/protocol/v2/TuttiProtocol2.java | 176 ++++++++ .../entities/protocol/v2/TuttiProtocolBean2.java | 444 +++++++++++++++++++++ 2 files changed, 620 insertions(+) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v2/TuttiProtocol2.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v2/TuttiProtocol2.java new file mode 100644 index 0000000..a67f592 --- /dev/null +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v2/TuttiProtocol2.java @@ -0,0 +1,176 @@ +package fr.ifremer.tutti.persistence.entities.protocol.v2; + +import fr.ifremer.tutti.persistence.entities.CommentAware; +import fr.ifremer.tutti.persistence.entities.TuttiEntity; +import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; + +import javax.annotation.Generated; +import java.util.Collection; +import java.util.List; + +@Generated(value = "org.nuiton.eugene.java.SimpleJavaBeanTransformer", date = "Mon Nov 24 12:54:48 CET 2014") +public interface TuttiProtocol2 extends CommentAware, TuttiEntity { + + String PROPERTY_NAME = "name"; + + String PROPERTY_COMMENT = "comment"; + + String PROPERTY_GEAR_USE_FEATURE_PMFM_ID = "gearUseFeaturePmfmId"; + + String PROPERTY_VESSEL_USE_FEATURE_PMFM_ID = "vesselUseFeaturePmfmId"; + + String PROPERTY_LENGTH_CLASSES_PMFM_ID = "lengthClassesPmfmId"; + + String PROPERTY_INDIVIDUAL_OBSERVATION_PMFM_ID = "individualObservationPmfmId"; + + String PROPERTY_VERSION = "version"; + + String PROPERTY_SPECIES = "species"; + + String PROPERTY_BENTHOS = "benthos"; + + String getName(); + + void setName(String name); + + String getComment(); + + void setComment(String comment); + + String getGearUseFeaturePmfmId(int index); + + boolean isGearUseFeaturePmfmIdEmpty(); + + int sizeGearUseFeaturePmfmId(); + + void addGearUseFeaturePmfmId(String gearUseFeaturePmfmId); + + void addAllGearUseFeaturePmfmId(Collection<String> gearUseFeaturePmfmId); + + boolean removeGearUseFeaturePmfmId(String gearUseFeaturePmfmId); + + boolean removeAllGearUseFeaturePmfmId(Collection<String> gearUseFeaturePmfmId); + + boolean containsGearUseFeaturePmfmId(String gearUseFeaturePmfmId); + + boolean containsAllGearUseFeaturePmfmId(Collection<String> gearUseFeaturePmfmId); + + List<String> getGearUseFeaturePmfmId(); + + void setGearUseFeaturePmfmId(List<String> gearUseFeaturePmfmId); + + String getVesselUseFeaturePmfmId(int index); + + boolean isVesselUseFeaturePmfmIdEmpty(); + + int sizeVesselUseFeaturePmfmId(); + + void addVesselUseFeaturePmfmId(String vesselUseFeaturePmfmId); + + void addAllVesselUseFeaturePmfmId(Collection<String> vesselUseFeaturePmfmId); + + boolean removeVesselUseFeaturePmfmId(String vesselUseFeaturePmfmId); + + boolean removeAllVesselUseFeaturePmfmId(Collection<String> vesselUseFeaturePmfmId); + + boolean containsVesselUseFeaturePmfmId(String vesselUseFeaturePmfmId); + + boolean containsAllVesselUseFeaturePmfmId(Collection<String> vesselUseFeaturePmfmId); + + List<String> getVesselUseFeaturePmfmId(); + + void setVesselUseFeaturePmfmId(List<String> vesselUseFeaturePmfmId); + + String getLengthClassesPmfmId(int index); + + boolean isLengthClassesPmfmIdEmpty(); + + int sizeLengthClassesPmfmId(); + + void addLengthClassesPmfmId(String lengthClassesPmfmId); + + void addAllLengthClassesPmfmId(Collection<String> lengthClassesPmfmId); + + boolean removeLengthClassesPmfmId(String lengthClassesPmfmId); + + boolean removeAllLengthClassesPmfmId(Collection<String> lengthClassesPmfmId); + + boolean containsLengthClassesPmfmId(String lengthClassesPmfmId); + + boolean containsAllLengthClassesPmfmId(Collection<String> lengthClassesPmfmId); + + List<String> getLengthClassesPmfmId(); + + void setLengthClassesPmfmId(List<String> lengthClassesPmfmId); + + String getIndividualObservationPmfmId(int index); + + boolean isIndividualObservationPmfmIdEmpty(); + + int sizeIndividualObservationPmfmId(); + + void addIndividualObservationPmfmId(String individualObservationPmfmId); + + void addAllIndividualObservationPmfmId(Collection<String> individualObservationPmfmId); + + boolean removeIndividualObservationPmfmId(String individualObservationPmfmId); + + boolean removeAllIndividualObservationPmfmId(Collection<String> individualObservationPmfmId); + + boolean containsIndividualObservationPmfmId(String individualObservationPmfmId); + + boolean containsAllIndividualObservationPmfmId(Collection<String> individualObservationPmfmId); + + List<String> getIndividualObservationPmfmId(); + + void setIndividualObservationPmfmId(List<String> individualObservationPmfmId); + + Integer getVersion(); + + void setVersion(Integer version); + + SpeciesProtocol getSpecies(int index); + + boolean isSpeciesEmpty(); + + int sizeSpecies(); + + void addSpecies(SpeciesProtocol species); + + void addAllSpecies(Collection<SpeciesProtocol> species); + + boolean removeSpecies(SpeciesProtocol species); + + boolean removeAllSpecies(Collection<SpeciesProtocol> species); + + boolean containsSpecies(SpeciesProtocol species); + + boolean containsAllSpecies(Collection<SpeciesProtocol> species); + + List<SpeciesProtocol> getSpecies(); + + void setSpecies(List<SpeciesProtocol> species); + + SpeciesProtocol getBenthos(int index); + + boolean isBenthosEmpty(); + + int sizeBenthos(); + + void addBenthos(SpeciesProtocol benthos); + + void addAllBenthos(Collection<SpeciesProtocol> benthos); + + boolean removeBenthos(SpeciesProtocol benthos); + + boolean removeAllBenthos(Collection<SpeciesProtocol> benthos); + + boolean containsBenthos(SpeciesProtocol benthos); + + boolean containsAllBenthos(Collection<SpeciesProtocol> benthos); + + List<SpeciesProtocol> getBenthos(); + + void setBenthos(List<SpeciesProtocol> benthos); + +} //TuttiProtocol diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v2/TuttiProtocolBean2.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v2/TuttiProtocolBean2.java new file mode 100644 index 0000000..9ae21f3 --- /dev/null +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v2/TuttiProtocolBean2.java @@ -0,0 +1,444 @@ +package fr.ifremer.tutti.persistence.entities.protocol.v2; + +import fr.ifremer.tutti.persistence.entities.TuttiEntityBean; +import fr.ifremer.tutti.persistence.entities.protocol.AbstractTuttiProtocolBean; +import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; +import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; + +import javax.annotation.Generated; +import java.util.Collection; +import java.util.LinkedList; +import java.util.List; + +@Generated(value = "org.nuiton.eugene.java.SimpleJavaBeanTransformer", date = "Mon Nov 24 12:54:48 CET 2014") +public class TuttiProtocolBean2 extends TuttiEntityBean implements TuttiProtocol { + + private static final long serialVersionUID = 3847260679792845110L; + + protected String name; + + protected String comment; + + protected List<String> gearUseFeaturePmfmId; + + protected List<String> vesselUseFeaturePmfmId; + + protected List<String> lengthClassesPmfmId; + + protected List<String> individualObservationPmfmId; + + protected Integer version; + + protected List<SpeciesProtocol> species; + + protected List<SpeciesProtocol> benthos; + + @Override + public String getName() { + return name; + } + + @Override + public void setName(String name) { + this.name = name; + } + + @Override + public String getComment() { + return comment; + } + + @Override + public void setComment(String comment) { + this.comment = comment; + } + + @Override + public String getGearUseFeaturePmfmId(int index) { + String o = getChild(gearUseFeaturePmfmId, index); + return o; + } + + @Override + public boolean isGearUseFeaturePmfmIdEmpty() { + return gearUseFeaturePmfmId == null || gearUseFeaturePmfmId.isEmpty(); + } + + @Override + public int sizeGearUseFeaturePmfmId() { + return gearUseFeaturePmfmId == null ? 0 : gearUseFeaturePmfmId.size(); + } + + @Override + public void addGearUseFeaturePmfmId(String gearUseFeaturePmfmId) { + getGearUseFeaturePmfmId().add(gearUseFeaturePmfmId); + } + + @Override + public void addAllGearUseFeaturePmfmId(Collection<String> gearUseFeaturePmfmId) { + getGearUseFeaturePmfmId().addAll(gearUseFeaturePmfmId); + } + + @Override + public boolean removeGearUseFeaturePmfmId(String gearUseFeaturePmfmId) { + boolean removed = getGearUseFeaturePmfmId().remove(gearUseFeaturePmfmId); + return removed; + } + + @Override + public boolean removeAllGearUseFeaturePmfmId(Collection<String> gearUseFeaturePmfmId) { + boolean removed = getGearUseFeaturePmfmId().removeAll(gearUseFeaturePmfmId); + return removed; + } + + @Override + public boolean containsGearUseFeaturePmfmId(String gearUseFeaturePmfmId) { + boolean contains = getGearUseFeaturePmfmId().contains(gearUseFeaturePmfmId); + return contains; + } + + @Override + public boolean containsAllGearUseFeaturePmfmId(Collection<String> gearUseFeaturePmfmId) { + boolean contains = getGearUseFeaturePmfmId().containsAll(gearUseFeaturePmfmId); + return contains; + } + + @Override + public List<String> getGearUseFeaturePmfmId() { + if (gearUseFeaturePmfmId == null) { + gearUseFeaturePmfmId = new LinkedList<String>(); + } + return gearUseFeaturePmfmId; + } + + @Override + public void setGearUseFeaturePmfmId(List<String> gearUseFeaturePmfmId) { + this.gearUseFeaturePmfmId = gearUseFeaturePmfmId; + } + + @Override + public String getVesselUseFeaturePmfmId(int index) { + String o = getChild(vesselUseFeaturePmfmId, index); + return o; + } + + @Override + public boolean isVesselUseFeaturePmfmIdEmpty() { + return vesselUseFeaturePmfmId == null || vesselUseFeaturePmfmId.isEmpty(); + } + + @Override + public int sizeVesselUseFeaturePmfmId() { + return vesselUseFeaturePmfmId == null ? 0 : vesselUseFeaturePmfmId.size(); + } + + @Override + public void addVesselUseFeaturePmfmId(String vesselUseFeaturePmfmId) { + getVesselUseFeaturePmfmId().add(vesselUseFeaturePmfmId); + } + + @Override + public void addAllVesselUseFeaturePmfmId(Collection<String> vesselUseFeaturePmfmId) { + getVesselUseFeaturePmfmId().addAll(vesselUseFeaturePmfmId); + } + + @Override + public boolean removeVesselUseFeaturePmfmId(String vesselUseFeaturePmfmId) { + boolean removed = getVesselUseFeaturePmfmId().remove(vesselUseFeaturePmfmId); + return removed; + } + + @Override + public boolean removeAllVesselUseFeaturePmfmId(Collection<String> vesselUseFeaturePmfmId) { + boolean removed = getVesselUseFeaturePmfmId().removeAll(vesselUseFeaturePmfmId); + return removed; + } + + @Override + public boolean containsVesselUseFeaturePmfmId(String vesselUseFeaturePmfmId) { + boolean contains = getVesselUseFeaturePmfmId().contains(vesselUseFeaturePmfmId); + return contains; + } + + @Override + public boolean containsAllVesselUseFeaturePmfmId(Collection<String> vesselUseFeaturePmfmId) { + boolean contains = getVesselUseFeaturePmfmId().containsAll(vesselUseFeaturePmfmId); + return contains; + } + + @Override + public List<String> getVesselUseFeaturePmfmId() { + if (vesselUseFeaturePmfmId == null) { + vesselUseFeaturePmfmId = new LinkedList<String>(); + } + return vesselUseFeaturePmfmId; + } + + @Override + public void setVesselUseFeaturePmfmId(List<String> vesselUseFeaturePmfmId) { + this.vesselUseFeaturePmfmId = vesselUseFeaturePmfmId; + } + + @Override + public String getLengthClassesPmfmId(int index) { + String o = getChild(lengthClassesPmfmId, index); + return o; + } + + @Override + public boolean isLengthClassesPmfmIdEmpty() { + return lengthClassesPmfmId == null || lengthClassesPmfmId.isEmpty(); + } + + @Override + public int sizeLengthClassesPmfmId() { + return lengthClassesPmfmId == null ? 0 : lengthClassesPmfmId.size(); + } + + @Override + public void addLengthClassesPmfmId(String lengthClassesPmfmId) { + getLengthClassesPmfmId().add(lengthClassesPmfmId); + } + + @Override + public void addAllLengthClassesPmfmId(Collection<String> lengthClassesPmfmId) { + getLengthClassesPmfmId().addAll(lengthClassesPmfmId); + } + + @Override + public boolean removeLengthClassesPmfmId(String lengthClassesPmfmId) { + boolean removed = getLengthClassesPmfmId().remove(lengthClassesPmfmId); + return removed; + } + + @Override + public boolean removeAllLengthClassesPmfmId(Collection<String> lengthClassesPmfmId) { + boolean removed = getLengthClassesPmfmId().removeAll(lengthClassesPmfmId); + return removed; + } + + @Override + public boolean containsLengthClassesPmfmId(String lengthClassesPmfmId) { + boolean contains = getLengthClassesPmfmId().contains(lengthClassesPmfmId); + return contains; + } + + @Override + public boolean containsAllLengthClassesPmfmId(Collection<String> lengthClassesPmfmId) { + boolean contains = getLengthClassesPmfmId().containsAll(lengthClassesPmfmId); + return contains; + } + + @Override + public List<String> getLengthClassesPmfmId() { + if (lengthClassesPmfmId == null) { + lengthClassesPmfmId = new LinkedList<String>(); + } + return lengthClassesPmfmId; + } + + @Override + public void setLengthClassesPmfmId(List<String> lengthClassesPmfmId) { + this.lengthClassesPmfmId = lengthClassesPmfmId; + } + + @Override + public String getIndividualObservationPmfmId(int index) { + String o = getChild(individualObservationPmfmId, index); + return o; + } + + @Override + public boolean isIndividualObservationPmfmIdEmpty() { + return individualObservationPmfmId == null || individualObservationPmfmId.isEmpty(); + } + + @Override + public int sizeIndividualObservationPmfmId() { + return individualObservationPmfmId == null ? 0 : individualObservationPmfmId.size(); + } + + @Override + public void addIndividualObservationPmfmId(String individualObservationPmfmId) { + getIndividualObservationPmfmId().add(individualObservationPmfmId); + } + + @Override + public void addAllIndividualObservationPmfmId(Collection<String> individualObservationPmfmId) { + getIndividualObservationPmfmId().addAll(individualObservationPmfmId); + } + + @Override + public boolean removeIndividualObservationPmfmId(String individualObservationPmfmId) { + boolean removed = getIndividualObservationPmfmId().remove(individualObservationPmfmId); + return removed; + } + + @Override + public boolean removeAllIndividualObservationPmfmId(Collection<String> individualObservationPmfmId) { + boolean removed = getIndividualObservationPmfmId().removeAll(individualObservationPmfmId); + return removed; + } + + @Override + public boolean containsIndividualObservationPmfmId(String individualObservationPmfmId) { + boolean contains = getIndividualObservationPmfmId().contains(individualObservationPmfmId); + return contains; + } + + @Override + public boolean containsAllIndividualObservationPmfmId(Collection<String> individualObservationPmfmId) { + boolean contains = getIndividualObservationPmfmId().containsAll(individualObservationPmfmId); + return contains; + } + + @Override + public List<String> getIndividualObservationPmfmId() { + if (individualObservationPmfmId == null) { + individualObservationPmfmId = new LinkedList<String>(); + } + return individualObservationPmfmId; + } + + @Override + public void setIndividualObservationPmfmId(List<String> individualObservationPmfmId) { + this.individualObservationPmfmId = individualObservationPmfmId; + } + + @Override + public Integer getVersion() { + return version; + } + + @Override + public void setVersion(Integer version) { + this.version = version; + } + + @Override + public SpeciesProtocol getSpecies(int index) { + SpeciesProtocol o = getChild(species, index); + return o; + } + + @Override + public boolean isSpeciesEmpty() { + return species == null || species.isEmpty(); + } + + @Override + public int sizeSpecies() { + return species == null ? 0 : species.size(); + } + + @Override + public void addSpecies(SpeciesProtocol species) { + getSpecies().add(species); + } + + @Override + public void addAllSpecies(Collection<SpeciesProtocol> species) { + getSpecies().addAll(species); + } + + @Override + public boolean removeSpecies(SpeciesProtocol species) { + boolean removed = getSpecies().remove(species); + return removed; + } + + @Override + public boolean removeAllSpecies(Collection<SpeciesProtocol> species) { + boolean removed = getSpecies().removeAll(species); + return removed; + } + + @Override + public boolean containsSpecies(SpeciesProtocol species) { + boolean contains = getSpecies().contains(species); + return contains; + } + + @Override + public boolean containsAllSpecies(Collection<SpeciesProtocol> species) { + boolean contains = getSpecies().containsAll(species); + return contains; + } + + @Override + public List<SpeciesProtocol> getSpecies() { + if (species == null) { + species = new LinkedList<SpeciesProtocol>(); + } + return species; + } + + @Override + public void setSpecies(List<SpeciesProtocol> species) { + this.species = species; + } + + @Override + public SpeciesProtocol getBenthos(int index) { + SpeciesProtocol o = getChild(benthos, index); + return o; + } + + @Override + public boolean isBenthosEmpty() { + return benthos == null || benthos.isEmpty(); + } + + @Override + public int sizeBenthos() { + return benthos == null ? 0 : benthos.size(); + } + + @Override + public void addBenthos(SpeciesProtocol benthos) { + getBenthos().add(benthos); + } + + @Override + public void addAllBenthos(Collection<SpeciesProtocol> benthos) { + getBenthos().addAll(benthos); + } + + @Override + public boolean removeBenthos(SpeciesProtocol benthos) { + boolean removed = getBenthos().remove(benthos); + return removed; + } + + @Override + public boolean removeAllBenthos(Collection<SpeciesProtocol> benthos) { + boolean removed = getBenthos().removeAll(benthos); + return removed; + } + + @Override + public boolean containsBenthos(SpeciesProtocol benthos) { + boolean contains = getBenthos().contains(benthos); + return contains; + } + + @Override + public boolean containsAllBenthos(Collection<SpeciesProtocol> benthos) { + boolean contains = getBenthos().containsAll(benthos); + return contains; + } + + @Override + public List<SpeciesProtocol> getBenthos() { + if (benthos == null) { + benthos = new LinkedList<SpeciesProtocol>(); + } + return benthos; + } + + @Override + public void setBenthos(List<SpeciesProtocol> benthos) { + this.benthos = benthos; + } + +} -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit b0cdc86ec757be55502b2422fefcbfc8c34ecfc6 Author: Kevin Morin <morin@codelutin.com> Date: Mon Dec 1 14:47:06 2014 +0100 refs #6129 import du fichier avec les colonnes --- .../entities/protocol/TuttiProtocols.java | 69 +++++++++++++++++++-- .../src/main/xmi/tutti-persistence.zargo | Bin 57378 -> 57440 bytes .../src/main/xmi/tutti-persistence.zargo~ | Bin 57382 -> 57378 bytes .../resources/i18n/tutti-service_fr_FR.properties | 1 + .../filtered-resources/tutti-help-fr.properties | 3 +- .../action/LoadProtocolImportColumnsAction.java | 65 +++++++++++++++++++ .../protocol/CaracteristicMappingUIHandler.java | 38 ++++++++++++ .../protocol/CaracteristicMappingUIModel.java | 16 +++++ .../ui/swing/content/protocol/EditProtocolUI.css | 9 +++ .../ui/swing/content/protocol/EditProtocolUI.jaxx | 3 + .../content/protocol/EditProtocolUIModel.java | 62 ++++++++++++++++++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 6 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 6 ++ 13 files changed, 273 insertions(+), 5 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java index ab5eb2a..acfb9b9 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java @@ -40,6 +40,8 @@ import fr.ifremer.tutti.persistence.entities.protocol.v1.SpeciesProtocol1; import fr.ifremer.tutti.persistence.entities.protocol.v1.SpeciesProtocolBean1; import fr.ifremer.tutti.persistence.entities.protocol.v1.TuttiProtocol1; import fr.ifremer.tutti.persistence.entities.protocol.v1.TuttiProtocolBean1; +import fr.ifremer.tutti.persistence.entities.protocol.v2.TuttiProtocol2; +import fr.ifremer.tutti.persistence.entities.protocol.v2.TuttiProtocolBean2; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.Species; import org.apache.commons.collections4.CollectionUtils; @@ -130,12 +132,23 @@ public class TuttiProtocols extends AbstractTuttiProtocols { } } return result; + } catch (Exception e) { - // try to load a v1 - TuttiProtocol1 tuttiProtocol1 = fromFileV1(file); + //try to load a v2 + try { + // try to load a v1 + TuttiProtocol2 tuttiProtocol2 = fromFileV2(file); - TuttiProtocol result = fromTuttiProtocol1(tuttiProtocol1); - return result; + TuttiProtocol result = fromTuttiProtocol2(tuttiProtocol2); + return result; + + } catch (Exception ee) { + // try to load a v1 + TuttiProtocol1 tuttiProtocol1 = fromFileV1(file); + + TuttiProtocol result = fromTuttiProtocol1(tuttiProtocol1); + return result; + } } finally { IOUtils.closeQuietly(fileReader); @@ -158,6 +171,22 @@ public class TuttiProtocols extends AbstractTuttiProtocols { } } + public static TuttiProtocol2 fromFileV2(File file) { + + Reader fileReader = null; + try { + fileReader = Files.newReader(file, Charsets.UTF_8); + YamlReader reader = new YamlReader(fileReader, createConfigV2()); + TuttiProtocol2 result = reader.read(TuttiProtocolBean2.class); + fileReader.close(); + return result; + } catch (Exception e) { + throw new ApplicationTechnicalException(t("tutti.persistence.protocol.fromFile.error", file), e); + } finally { + IOUtils.closeQuietly(fileReader); + } + } + public static void checkSampleCategories(SampleCategoryModel sampleCategoryModel, TuttiProtocol protocol, Set<Integer> badCategories) { @@ -304,6 +333,29 @@ public class TuttiProtocols extends AbstractTuttiProtocols { return result; } + protected static TuttiProtocol fromTuttiProtocol2(TuttiProtocol2 tuttiProtocol2) { + TuttiProtocol result = newTuttiProtocol(); + Binder<TuttiProtocol2, TuttiProtocol> binder = BinderFactory.newBinder(TuttiProtocol2.class, TuttiProtocol.class); + binder.copy(tuttiProtocol2, result); + + List<CaracteristicMappingRow> caracteristicMappingRows = new ArrayList<>(); + for (String id : tuttiProtocol2.getGearUseFeaturePmfmId()) { + CaracteristicMappingRow row = new CaracteristicMappingRowBean(); + row.setPmfmId(id); + row.setTab(CaracteristicType.GEAR_USE_FEATURE.name()); + caracteristicMappingRows.add(row); + } + for (String id : tuttiProtocol2.getVesselUseFeaturePmfmId()) { + CaracteristicMappingRow row = new CaracteristicMappingRowBean(); + row.setPmfmId(id); + row.setTab(CaracteristicType.VESSEL_USE_FEATURE.name()); + caracteristicMappingRows.add(row); + } + result.setCaracteristicMapping(caracteristicMappingRows); + + return result; + } + protected static YamlConfig createConfig() { YamlConfig result = new YamlConfig(); result.setClassTag(SpeciesProtocol.class.getSimpleName(), @@ -324,6 +376,15 @@ public class TuttiProtocols extends AbstractTuttiProtocols { return result; } + protected static YamlConfig createConfigV2() { + YamlConfig result = new YamlConfig(); + result.setClassTag(SpeciesProtocol.class.getSimpleName(), + SpeciesProtocols.typeOfSpeciesProtocol()); + result.writeConfig.setAlwaysWriteClassname(false); + result.writeConfig.setWriteRootTags(false); + return result; + } + public static SpeciesProtocol getSpeciesOrBenthosProtocol(TuttiProtocol protocol, Integer speciesReferenceTaxonId) { SpeciesProtocol speciesProtocol = getSpeciesProtocol(protocol, speciesReferenceTaxonId); if (speciesProtocol == null) { diff --git a/tutti-persistence/src/main/xmi/tutti-persistence.zargo b/tutti-persistence/src/main/xmi/tutti-persistence.zargo index 982bb6a..b3c7107 100644 Binary files a/tutti-persistence/src/main/xmi/tutti-persistence.zargo and b/tutti-persistence/src/main/xmi/tutti-persistence.zargo differ diff --git a/tutti-persistence/src/main/xmi/tutti-persistence.zargo~ b/tutti-persistence/src/main/xmi/tutti-persistence.zargo~ index 2d2cc86..982bb6a 100644 Binary files a/tutti-persistence/src/main/xmi/tutti-persistence.zargo~ and b/tutti-persistence/src/main/xmi/tutti-persistence.zargo~ differ diff --git a/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties b/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties index 0e4f677..202911d 100644 --- a/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties +++ b/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties @@ -2,6 +2,7 @@ tutti.caracteristicType.GEAR_USE_FEATURE=Caractéristiques de l'engin tutti.caracteristicType.INDIVIDUAL_OBSERVATION=Observations individuelles tutti.caracteristicType.LENGTH_STEP=Classes de tailles tutti.caracteristicType.VESSEL_USE_FEATURE=Autres caractéristiques +tutti.caracteristicType.lengthStep= tutti.io.mkDir.error=Erreur à la création du dossier %s tutti.pdf.export.missing.species.code=Une espèce (referenceId %s, nom scientifique %s) n'a ni code campagne, ni code refTax. tutti.property.attachment=Pièce jointe diff --git a/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties b/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties index f14baa3..001e779 100644 --- a/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties +++ b/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties @@ -22,7 +22,7 @@ # #L% ### #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Sat Nov 15 23:48:54 CET 2014 +#Mon Dec 01 10:21:58 CET 2014 tutti.config.help=config.html tutti.createAccidentalBatch.action.cancel.help=editFishingOperation.html\#captureCapturesAccidentellesActions tutti.createAccidentalBatch.action.saveAndClose.help=editFishingOperation.html\#captureCapturesAccidentellesActions @@ -256,6 +256,7 @@ tutti.editProtocol.action.exportProtocolSpecies.help=editProtocol.html\#actionsS tutti.editProtocol.action.exportPupitri.help=editProtocol.html\#actionsSpecies tutti.editProtocol.action.importProtocolBenthos.help=editProtocol.html\#actionsBenthos tutti.editProtocol.action.importProtocolCaracteristic.help=editProtocol.html\#actionsCaracteristics +tutti.editProtocol.action.importProtocolColumns.help= tutti.editProtocol.action.importProtocolSpecies.help=editProtocol.html\#actionsSpecies tutti.editProtocol.action.removeBenthosProtocol.help=editProtocol.html\#actionsBenthos tutti.editProtocol.action.removeSpeciesProtocol.help=editProtocol.html\#actionsSpecies diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/LoadProtocolImportColumnsAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/LoadProtocolImportColumnsAction.java new file mode 100644 index 0000000..725e2cd --- /dev/null +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/LoadProtocolImportColumnsAction.java @@ -0,0 +1,65 @@ +package fr.ifremer.tutti.ui.swing.action; + +import com.csvreader.CsvReader; +import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUI; +import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUIHandler; +import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUIModel; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.io.File; +import java.io.FileInputStream; +import java.nio.charset.Charset; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import static org.nuiton.i18n.I18n.t; + +/** + * @author Kevin Morin (Code Lutin) + * @since 3.10 + */ +public class LoadProtocolImportColumnsAction extends AbstractTuttiAction<EditProtocolUIModel, EditProtocolUI, EditProtocolUIHandler> { + + private static final Log log = LogFactory.getLog(LoadProtocolImportColumnsAction.class); + + protected File columnsFile; + + public LoadProtocolImportColumnsAction(EditProtocolUIHandler handler) { + super(handler, false); + } + + @Override + public boolean prepareAction() throws Exception { + boolean result = super.prepareAction(); + + if (result) { + columnsFile = chooseFile(t("tutti.editProtocol.action.title.choose.importColumnsFile"), + t("tutti.editProtocol.action.chooseColumnsFile.import"), + "^.*\\.csv", t("tutti.common.file.csv")); + + result = columnsFile != null; + } + + return result; + } + + @Override + public void doAction() throws Exception { + FileInputStream fileInputStream = new FileInputStream(columnsFile); + CsvReader csvReader = new CsvReader(fileInputStream, ';', Charset.forName("UTF-8")); + if (csvReader.readHeaders()) { + String[] headers = csvReader.getHeaders(); + List<String> importColumns = Arrays.asList(headers); + Collections.sort(importColumns); + getModel().setImportColumns(importColumns); + } + } + + @Override + public void postSuccessAction() { + super.postSuccessAction(); + sendMessage(t("tutti.editProtocol.action.loadImportColumns.success", getModel().sizeImportColumns())); + } +} diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/CaracteristicMappingUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/CaracteristicMappingUIHandler.java index f1b92fc..b3f2903 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/CaracteristicMappingUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/CaracteristicMappingUIHandler.java @@ -6,11 +6,18 @@ import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicType; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; +import jaxx.runtime.JAXXUtil; +import jaxx.runtime.SwingUtil; +import jaxx.runtime.swing.editor.bean.BeanUIUtil; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; +import org.jdesktop.swingx.autocomplete.ComboBoxCellEditor; +import org.jdesktop.swingx.autocomplete.ObjectToStringConverter; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; +import org.jdesktop.swingx.table.TableColumnExt; +import org.nuiton.decorator.Decorator; import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import javax.swing.*; @@ -93,12 +100,43 @@ public class CaracteristicMappingUIHandler CaracteristicMappingUIModel model = new CaracteristicMappingUIModel(); model.setCaracteristics(editProtocolUIModel.getCaracteristics()); + editProtocolUIModel.addPropertyChangeListener(EditProtocolUIModel.PROPERTY_CARACTERISTIC_MAPPING, new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { getModel().setCaracteristicMappingRows((List<CaracteristicMappingRow>) evt.getNewValue()); } }); + + editProtocolUIModel.addPropertyChangeListener(EditProtocolUIModel.PROPERTY_IMPORT_COLUMNS, new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent evt) { + + Collection<String> newValue = (Collection<String>) evt.getNewValue(); + ArrayList<String> dataToList = new ArrayList<String>(); + + if (newValue != null) { + dataToList.addAll(newValue); + + // add a null value at first position + if (!dataToList.isEmpty() && dataToList.get(0) != null) { + dataToList.add(0, null); + } + + } else { + dataToList.add(null); + } + + JComboBox comboBox = new JComboBox(); + SwingUtil.fillComboBox(comboBox, dataToList, null); + + TableColumnExt col = getTable().getColumnExt(2); + ComboBoxCellEditor editor = new ComboBoxCellEditor(comboBox); + col.setCellEditor(editor); + + } + }); + ui.setContextValue(model); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/CaracteristicMappingUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/CaracteristicMappingUIModel.java index d07ab9f..03538c9 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/CaracteristicMappingUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/CaracteristicMappingUIModel.java @@ -22,10 +22,14 @@ import java.util.Map; public class CaracteristicMappingUIModel extends AbstractTuttiTableUIModel<CaracteristicMappingRow, EditProtocolCaracteristicsRowModel, CaracteristicMappingUIModel> { public static final String PROPERTY_CARACTERISTIC_MAPPING_ROWS = "caracteristicMappingRows"; + public static final String PROPERTY_CARACTERISTICS_IN_MAPPING = "caracteristicsInMapping"; protected List<Caracteristic> caracteristics = new ArrayList<Caracteristic>(); + protected Map<String, CaracteristicMappingRow> caracteristicMappingRows = new HashMap<String, CaracteristicMappingRow>(); + protected List<String> importColumns = new ArrayList<String>(); + public CaracteristicMappingUIModel() { super(CaracteristicMappingRow.class, null, null); } @@ -53,6 +57,18 @@ public class CaracteristicMappingUIModel extends AbstractTuttiTableUIModel<Carac })); } firePropertyChanged(PROPERTY_CARACTERISTIC_MAPPING_ROWS, null, caracteristicMappingRows); + firePropertyChanged(PROPERTY_CARACTERISTICS_IN_MAPPING, null, this.caracteristicMappingRows.values()); + } + + public List<String> getImportColumns() { + return importColumns; + } + + public void setImportColumns(List<String> importColumns) { + this.importColumns.clear(); + if (importColumns != null) { + this.importColumns.addAll(importColumns); + } } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css index 9b882b7..aec68ad 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css @@ -268,3 +268,12 @@ JTextField { _help: {"tutti.editProtocol.action.exportProtocolAllCaracteristic.help"}; } +#importColumnsButton { + actionIcon: import; + text: "tutti.editProtocol.action.importProtocolColumns"; + toolTipText: "tutti.editProtocol.action.importProtocolColumns.tip"; + i18nMnemonic: "tutti.editProtocol.action.importProtocolColumns.mnemonic"; + _applicationAction: {fr.ifremer.tutti.ui.swing.action.LoadProtocolImportColumnsAction.class}; + _help: {"tutti.editProtocol.action.importProtocolColumns.help"}; +} + diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx index b8e29f4..1644756 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx @@ -108,7 +108,10 @@ <JButton id='importCaracteristicButton'/> <JButton id='exportCaracteristicButton'/> <JButton id='exportAllCaracteristicButton'/> + <JButton id='importColumnsButton'/> + </JPanel> + <JTabbedPane id='caracteristicPane' constraints='BorderLayout.CENTER'> <tab title='tutti.editProtocol.tab.caracteristic.lengthClasses'> <BeanDoubleList id='lengthClassesList' genericType='Caracteristic'/> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java index eed2950..506a97b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java @@ -603,4 +603,66 @@ public class EditProtocolUIModel extends AbstractTuttiBeanUIModel<TuttiProtocol, public void setVersion(Integer version) { editObject.setVersion(version); } + + @Override + public String getImportColumns(int index) { + return editObject.getImportColumns(index); + } + + @Override + public boolean isImportColumnsEmpty() { + return editObject.isImportColumnsEmpty(); + } + + @Override + public int sizeImportColumns() { + return editObject.sizeImportColumns(); + } + + @Override + public void addImportColumns(String importColumns) { + editObject.addImportColumns(importColumns); + firePropertyChanged(TuttiProtocol.PROPERTY_IMPORT_COLUMNS, null, getImportColumns()); + } + + @Override + public void addAllImportColumns(Collection<String> importColumns) { + editObject.addAllImportColumns(importColumns); + firePropertyChanged(TuttiProtocol.PROPERTY_IMPORT_COLUMNS, null, getImportColumns()); + } + + @Override + public boolean removeImportColumns(String importColumns) { + boolean removeImportColumns = editObject.removeImportColumns(importColumns); + firePropertyChanged(TuttiProtocol.PROPERTY_IMPORT_COLUMNS, null, getImportColumns()); + return removeImportColumns; + } + + @Override + public boolean removeAllImportColumns(Collection<String> importColumns) { + boolean removeAllImportColumns = editObject.removeAllImportColumns(importColumns); + firePropertyChanged(TuttiProtocol.PROPERTY_IMPORT_COLUMNS, null, getImportColumns()); + return removeAllImportColumns; + } + + @Override + public boolean containsImportColumns(String importColumns) { + return editObject.containsImportColumns(importColumns); + } + + @Override + public boolean containsAllImportColumns(Collection<String> importColumns) { + return editObject.containsAllImportColumns(importColumns); + } + + @Override + public Collection<String> getImportColumns() { + return editObject.getImportColumns(); + } + + @Override + public void setImportColumns(Collection<String> importColumns) { + editObject.setImportColumns(importColumns); + firePropertyChanged(TuttiProtocol.PROPERTY_IMPORT_COLUMNS, null, getImportColumns()); + } } diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties index 245b3a6..8fbf9d3 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties @@ -889,6 +889,7 @@ tutti.editProtocol.action.addBenthosProtocol.mnemonic= tutti.editProtocol.action.addBenthosProtocol.tip= tutti.editProtocol.action.addSpeciesProtocol.mnemonic= tutti.editProtocol.action.addSpeciesProtocol.tip= +tutti.editProtocol.action.chooseColumnsFile.import= tutti.editProtocol.action.chooseProtocolBenthosFile= tutti.editProtocol.action.chooseProtocolCaracteristicFile= tutti.editProtocol.action.chooseProtocolSpeciesFile= @@ -920,6 +921,9 @@ tutti.editProtocol.action.importProtocolBenthos.tip= tutti.editProtocol.action.importProtocolCaracteristic= tutti.editProtocol.action.importProtocolCaracteristic.mnemonic= tutti.editProtocol.action.importProtocolCaracteristic.tip= +tutti.editProtocol.action.importProtocolColumns= +tutti.editProtocol.action.importProtocolColumns.mnemonic= +tutti.editProtocol.action.importProtocolColumns.tip= tutti.editProtocol.action.importProtocolSpecies= tutti.editProtocol.action.importProtocolSpecies.mnemonic= tutti.editProtocol.action.importProtocolSpecies.speciesInBenthos= @@ -927,6 +931,7 @@ tutti.editProtocol.action.importProtocolSpecies.speciesInBenthos.title= tutti.editProtocol.action.importProtocolSpecies.tip= tutti.editProtocol.action.importSpecies.speciesInBenthos= tutti.editProtocol.action.importSpecies.speciesInBenthos.title= +tutti.editProtocol.action.loadImportColumns.success= tutti.editProtocol.action.removeBenthosProtocol= tutti.editProtocol.action.removeBenthosProtocol.mnemonic= tutti.editProtocol.action.removeBenthosProtocol.tip= @@ -942,6 +947,7 @@ tutti.editProtocol.action.selectOtherBenthos.tip= tutti.editProtocol.action.selectOtherSpecies= tutti.editProtocol.action.selectOtherSpecies.mnemonic= tutti.editProtocol.action.selectOtherSpecies.tip= +tutti.editProtocol.action.title.choose.importColumnsFile= tutti.editProtocol.askCancelEditBeforeLeaving.cancelSaveProtocol= tutti.editProtocol.askCancelEditBeforeLeaving.cancelSaveSampleCategoryModel= tutti.editProtocol.askSaveBeforeLeaving.saveProtocol= diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties index d5f5451..d18ab1c 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties @@ -871,6 +871,7 @@ tutti.editProtocol.action.addBenthosProtocol.mnemonic=j tutti.editProtocol.action.addBenthosProtocol.tip=Ajouter une espèce du benthos au protocole tutti.editProtocol.action.addSpeciesProtocol.mnemonic=j tutti.editProtocol.action.addSpeciesProtocol.tip=Ajouter une espèce au protocole +tutti.editProtocol.action.chooseColumnsFile.import=Choisir le fichier contenant les colonnes tutti.editProtocol.action.chooseProtocolBenthosFile=Choisir le fichier des benthos tutti.editProtocol.action.chooseProtocolCaracteristicFile=Choisir le fichier des caractéristiques tutti.editProtocol.action.chooseProtocolSpeciesFile=Choisir le fichier des espèces @@ -900,11 +901,15 @@ tutti.editProtocol.action.importProtocolBenthos.tip=Importer les benthos dans le tutti.editProtocol.action.importProtocolCaracteristic=Importer les caractéristiques tutti.editProtocol.action.importProtocolCaracteristic.mnemonic=i tutti.editProtocol.action.importProtocolCaracteristic.tip=Importer les caractéristiques dans le protocole +tutti.editProtocol.action.importProtocolColumns=Importer les colonnes d'import +tutti.editProtocol.action.importProtocolColumns.mnemonic=c +tutti.editProtocol.action.importProtocolColumns.tip=Importer les colonnes d'import tutti.editProtocol.action.importProtocolSpecies=Importer les espèces tutti.editProtocol.action.importProtocolSpecies.mnemonic=é tutti.editProtocol.action.importProtocolSpecies.speciesInBenthos=Les espèces suivantes n'ont pas été importées car elles sont déjà présentes dans le benthos \:<ul>%s</ul> tutti.editProtocol.action.importProtocolSpecies.speciesInBenthos.title=Espèces non importées tutti.editProtocol.action.importProtocolSpecies.tip=Importer les espèces dans le protocole +tutti.editProtocol.action.loadImportColumns.success=%s colonnes importées avec succès tutti.editProtocol.action.removeBenthosProtocol=Supprimer les benthos tutti.editProtocol.action.removeBenthosProtocol.mnemonic=S tutti.editProtocol.action.removeBenthosProtocol.tip=Supprimer les benthos sélectionnés @@ -920,6 +925,7 @@ tutti.editProtocol.action.selectOtherBenthos.tip=Sélectionner une autre espèce tutti.editProtocol.action.selectOtherSpecies=... tutti.editProtocol.action.selectOtherSpecies.mnemonic=. tutti.editProtocol.action.selectOtherSpecies.tip=Sélectionner une autre espèce (dans les synonymes) +tutti.editProtocol.action.title.choose.importColumnsFile=Importer les colonnes d'import tutti.editProtocol.askCancelEditBeforeLeaving.cancelSaveProtocol=Le protocole n'est pas valide et ne peut pas être enregistré tutti.editProtocol.askCancelEditBeforeLeaving.cancelSaveSampleCategoryModel=La catégorisation n'est pas valide et ne peut pas être enregistré tutti.editProtocol.askSaveBeforeLeaving.saveProtocol=Des modifications sur le protocole n'ont pas été enregistrées -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 4085ac33909c11155d147699cab8ff455aad835f Author: Kevin Morin <morin@codelutin.com> Date: Mon Dec 8 17:38:25 2014 +0100 refactoring : table des caractéristiques non éditable, ajouter les caractéristiques depuis la liste déroulante au dessus --- .../entities/protocol/TuttiProtocols.java | 87 ++--- .../filtered-resources/tutti-help-fr.properties | 5 +- .../action/AddCaracteristicMappingAction.java | 96 ++++++ .../swing/action/ImportFromColumnFileAction.java | 87 +++-- .../swing/action/ImportProtocolBenthosAction.java | 2 +- .../swing/action/ImportProtocolSpeciesAction.java | 2 +- .../tutti/ui/swing/action/SaveProtocolAction.java | 24 +- .../content/protocol/CaracteristicMappingUI.css | 20 -- .../content/protocol/CaracteristicMappingUI.jaxx | 46 --- .../protocol/CaracteristicMappingUIHandler.java | 343 -------------------- .../protocol/CaracteristicMappingUIModel.java | 99 ------ .../EditProtocolCaracteristicsRowModel.java | 18 +- .../EditProtocolCaracteristicsTableModel.java | 6 +- .../EditProtocolOperationFieldsRowModel.java | 25 +- .../EditProtocolOperationFieldsTableModel.java | 5 +- .../ui/swing/content/protocol/EditProtocolUI.css | 31 ++ .../ui/swing/content/protocol/EditProtocolUI.jaxx | 30 +- .../content/protocol/EditProtocolUIHandler.java | 355 +++++++++++++++------ .../content/protocol/EditProtocolUIModel.java | 28 ++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 4 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 4 + 21 files changed, 610 insertions(+), 707 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java index afa555c..eaeae66 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java @@ -76,7 +76,7 @@ public class TuttiProtocols extends AbstractTuttiProtocols { /** Logger. */ private static final Log log = LogFactory.getLog(TuttiProtocols.class); - public static final int CURRENT_PROTOCOL_VERSION = 3; + public static final Integer CURRENT_PROTOCOL_VERSION = 3; public static void toFile(TuttiProtocol protocol, File file) { @@ -97,63 +97,70 @@ public class TuttiProtocols extends AbstractTuttiProtocols { } public static TuttiProtocol fromFile(File file) { - + TuttiProtocol result; Reader fileReader = null; try { fileReader = Files.newReader(file, Charsets.UTF_8); YamlReader reader = new YamlReader(fileReader, createConfig()); - TuttiProtocol result = reader.read(typeOfTuttiProtocol()); + result = reader.read(typeOfTuttiProtocol()); fileReader.close(); - // transform String to Integer... + if (!CURRENT_PROTOCOL_VERSION.equals(result.getVersion())) { + result = migrateProtocol(file); + } - Integer sampleCategoryIdToRemove = PmfmId.SORTED_UNSORTED.getValue(); + } catch (Exception e) { + result = migrateProtocol(file); - if (!result.isBenthosEmpty()) { - for (SpeciesProtocol speciesProtocol : result.getBenthos()) { - List mandatorySampleCategoryId = speciesProtocol.getMandatorySampleCategoryId(); - List<Integer> mandatorySampleCategoryIdInteger = Lists.newArrayList(); - for (Object o : mandatorySampleCategoryId) { - mandatorySampleCategoryIdInteger.add(Integer.valueOf(o.toString())); - } - mandatorySampleCategoryIdInteger.remove(sampleCategoryIdToRemove); - speciesProtocol.setMandatorySampleCategoryId(mandatorySampleCategoryIdInteger); + } finally { + IOUtils.closeQuietly(fileReader); + } + Integer sampleCategoryIdToRemove = PmfmId.SORTED_UNSORTED.getValue(); + // transform String to Integer... + if (!result.isBenthosEmpty()) { + for (SpeciesProtocol speciesProtocol : result.getBenthos()) { + List mandatorySampleCategoryId = speciesProtocol.getMandatorySampleCategoryId(); + List<Integer> mandatorySampleCategoryIdInteger = Lists.newArrayList(); + for (Object o : mandatorySampleCategoryId) { + mandatorySampleCategoryIdInteger.add(Integer.valueOf(o.toString())); } - } - if (!result.isSpeciesEmpty()) { - for (SpeciesProtocol speciesProtocol : result.getSpecies()) { - List mandatorySampleCategoryId = speciesProtocol.getMandatorySampleCategoryId(); - List<Integer> mandatorySampleCategoryIdInteger = Lists.newArrayList(); - for (Object o : mandatorySampleCategoryId) { - mandatorySampleCategoryIdInteger.add(Integer.valueOf(o.toString())); - } - mandatorySampleCategoryIdInteger.remove(sampleCategoryIdToRemove); - speciesProtocol.setMandatorySampleCategoryId(mandatorySampleCategoryIdInteger); + mandatorySampleCategoryIdInteger.remove(sampleCategoryIdToRemove); + speciesProtocol.setMandatorySampleCategoryId(mandatorySampleCategoryIdInteger); + } + } + if (!result.isSpeciesEmpty()) { + for (SpeciesProtocol speciesProtocol : result.getSpecies()) { + List mandatorySampleCategoryId = speciesProtocol.getMandatorySampleCategoryId(); + List<Integer> mandatorySampleCategoryIdInteger = Lists.newArrayList(); + for (Object o : mandatorySampleCategoryId) { + mandatorySampleCategoryIdInteger.add(Integer.valueOf(o.toString())); } + mandatorySampleCategoryIdInteger.remove(sampleCategoryIdToRemove); + speciesProtocol.setMandatorySampleCategoryId(mandatorySampleCategoryIdInteger); + } - return result; + } - } catch (Exception e) { - //try to load a v2 - try { - // try to load a v1 - TuttiProtocol2 tuttiProtocol2 = fromFileV2(file); + return result; + } - TuttiProtocol result = fromTuttiProtocol2(tuttiProtocol2); - return result; + protected static TuttiProtocol migrateProtocol(File file) { + //try to load a v2 + try { + // try to load a v1 + TuttiProtocol2 tuttiProtocol2 = fromFileV2(file); - } catch (Exception ee) { - // try to load a v1 - TuttiProtocol1 tuttiProtocol1 = fromFileV1(file); + TuttiProtocol result = fromTuttiProtocol2(tuttiProtocol2); + return result; - TuttiProtocol result = fromTuttiProtocol1(tuttiProtocol1); - return result; - } + } catch (Exception ee) { + // try to load a v1 + TuttiProtocol1 tuttiProtocol1 = fromFileV1(file); - } finally { - IOUtils.closeQuietly(fileReader); + TuttiProtocol result = fromTuttiProtocol1(tuttiProtocol1); + return result; } } diff --git a/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties b/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties index 8529f64..2fe7a39 100644 --- a/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties +++ b/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties @@ -22,7 +22,8 @@ # #L% ### #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Mon Dec 01 16:05:35 CET 2014 +#Mon Dec 08 17:29:36 CET 2014 +\ "tutti.editProtocol.action.addCaracteristicMapping.help"\ = tutti.config.help=config.html tutti.createAccidentalBatch.action.cancel.help=editFishingOperation.html\#captureCapturesAccidentellesActions tutti.createAccidentalBatch.action.saveAndClose.help=editFishingOperation.html\#captureCapturesAccidentellesActions @@ -248,6 +249,7 @@ tutti.editProgram.field.name.help=editProgram.html\#fields tutti.editProgram.field.zone.help=editProgram.html\#fields tutti.editProgram.help=editProgram.html tutti.editProtocol.action.addBenthosProtocol.help=editProtocol.html\#actionsBenthos +tutti.editProtocol.action.addCaracteristicMapping.help= tutti.editProtocol.action.addSpeciesProtocol.help=editProtocol.html\#actionsSpecies tutti.editProtocol.action.closeEditProtocol.help=editProtocol.html\#actions tutti.editProtocol.action.exportProtocolAllCaracteristic.help=editProtocol.html\#actionsCaracteristics @@ -265,6 +267,7 @@ tutti.editProtocol.action.saveProtocol.help=editProtocol.html\#actions tutti.editProtocol.action.selectOtherBenthos.help=editProtocol.html\#actionsBenthos tutti.editProtocol.action.selectOtherSpecies.help=editProtocol.html\#actionsSpecies tutti.editProtocol.field.benthos.help=editProtocol.html\#fieldsBenthos +tutti.editProtocol.field.caracteristicMapping.help= tutti.editProtocol.field.comment.help=editProtocol.html\#fields tutti.editProtocol.field.gearUseFeature.help=editProtocol.html\#fieldsCaracteristics tutti.editProtocol.field.individualObservation.help=editProtocol.html\#fieldsCaracteristics diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AddCaracteristicMappingAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AddCaracteristicMappingAction.java new file mode 100644 index 0000000..6b72393 --- /dev/null +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AddCaracteristicMappingAction.java @@ -0,0 +1,96 @@ +package fr.ifremer.tutti.ui.swing.action; + +/* + * #%L + * Tutti :: UI + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import com.google.common.base.Preconditions; +import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; +import fr.ifremer.tutti.persistence.entities.referential.Species; +import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolCaracteristicsRowModel; +import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolCaracteristicsTableModel; +import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolSpeciesRowModel; +import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolSpeciesTableModel; +import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUI; +import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUIHandler; +import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUIModel; +import jaxx.runtime.SwingUtil; +import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; + +import java.util.Collection; + +import static org.nuiton.i18n.I18n.t; + +/** + * To add a new species protocol. + * + * @author tchemit <chemit@codelutin.com> + * @since 1.0 + */ +public class AddCaracteristicMappingAction extends AbstractTuttiAction<EditProtocolUIModel, EditProtocolUI, EditProtocolUIHandler> { + + public AddCaracteristicMappingAction(EditProtocolUIHandler handler) { + super(handler, false); + } + + protected Caracteristic caracteristic; + + protected EditProtocolCaracteristicsRowModel newRow; + + @Override + public void doAction() throws Exception { + + EditProtocolUI ui = getUI(); + + BeanFilterableComboBox<Caracteristic> caracteristicMappingCombBox = ui.getCaracteristicMappingComboBox(); + + caracteristic = (Caracteristic) caracteristicMappingCombBox.getSelectedItem(); + Preconditions.checkNotNull( + caracteristic, "Can't add a speciesProtocol with a null species"); + + // add new row to model (do it after combo stuff for ui best display) + newRow = handler.createEditProtocolCaracteristicsRowModel(); + newRow.setPsfm(caracteristic); + + getModel().getCaracteristicMappingRows().add(newRow); + } + + @Override + public void postSuccessAction() { + super.postSuccessAction(); + + // update comboboxes + getUI().getCaracteristicMappingComboBox().removeItem(caracteristic); + + // fire row was inserted in table model + EditProtocolCaracteristicsTableModel tableModel = getHandler().getCaracteristicMappingTableModel(); + tableModel.fireTableRowsInserted(newRow); + + // select this new row + int rowIndex = tableModel.getRowIndex(newRow); + SwingUtil.setSelectionInterval(handler.getCaracteristicsMappingTable(), rowIndex); + + // add notification + String caracteristicStr = decorate(caracteristic); + sendMessage(t("tutti.flash.info.caracteristic.add.to.protocol", + caracteristicStr)); + } +} diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportFromColumnFileAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportFromColumnFileAction.java index 259f96f..aaa73f6 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportFromColumnFileAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportFromColumnFileAction.java @@ -1,34 +1,36 @@ package fr.ifremer.tutti.ui.swing.action; -import com.csvreader.CsvReader; import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.collect.Maps; import com.google.common.collect.Sets; +import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.FishingOperations; import fr.ifremer.tutti.persistence.entities.protocol.OperationFieldMappingRow; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; +import fr.ifremer.tutti.persistence.entities.referential.Gear; +import fr.ifremer.tutti.persistence.entities.referential.Person; +import fr.ifremer.tutti.persistence.entities.referential.Vessel; import fr.ifremer.tutti.service.TuttiCsvUtil; import fr.ifremer.tutti.ui.swing.content.operation.EditFishingOperationUI; import fr.ifremer.tutti.ui.swing.content.operation.EditFishingOperationUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.EditFishingOperationUIModel; -import fr.ifremer.tutti.ui.swing.content.operation.FishingOperationsUIModel; -import org.apache.commons.io.Charsets; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.csv.Import; +import org.nuiton.csv.Import2; +import org.nuiton.csv.ImportConf; +import org.nuiton.csv.ImportRow; import org.nuiton.csv.ValueParser; import org.nuiton.csv.ext.CsvReaders; import java.io.File; import java.io.FileInputStream; -import java.nio.charset.Charset; -import java.util.Arrays; +import java.util.ArrayList; import java.util.Collection; -import java.util.Date; import java.util.HashSet; +import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Objects; @@ -46,6 +48,8 @@ public class ImportFromColumnFileAction extends AbstractTuttiAction<EditFishingO protected File columnsFile; + protected String error; + public ImportFromColumnFileAction(EditFishingOperationUIHandler handler) { super(handler, true); } @@ -70,9 +74,12 @@ public class ImportFromColumnFileAction extends AbstractTuttiAction<EditFishingO Set<String> headers = Sets.newHashSet(CsvReaders.getHeader(columnsFile, ';')); - ImportFromColumnFile importModel = new ImportFromColumnFile(';', headers); - Import<FishingOperation> operationUIModelImport = - Import.newImport(importModel, new FileInputStream(columnsFile)); + ImportFromColumnFileModel importModel = new ImportFromColumnFileModel(';', new HashSet<>(headers)); + ImportConf conf = new ImportConf(); + conf.setStrictMode(false); +// conf.setIgnoreUnknownHeader(true); + Import2<FishingOperation> operationUIModelImport = + Import2.newImport(conf, importModel, new FileInputStream(columnsFile)); TuttiProtocol protocol = getDataContext().getProtocol(); final Map<String, OperationFieldMappingRow> mappingRowsByField = @@ -104,28 +111,44 @@ public class ImportFromColumnFileAction extends AbstractTuttiAction<EditFishingO }; boolean found = false; - while (!found && operationUIModelImport.iterator().hasNext()) { - FishingOperation next = operationUIModelImport.iterator().next(); - if (predicate.apply(next)) { - getModel().fromEntity(next); + Iterator<ImportRow<FishingOperation>> iterator = operationUIModelImport.iterator(); + while (!found && iterator.hasNext()) { + ImportRow<FishingOperation> next = iterator.next(); + FishingOperation fishingOperation = next.getBean(); + + if (predicate.apply(fishingOperation)) { + if (next.isValid()) { + getModel().fromEntity(fishingOperation); + + } else { + if (log.isErrorEnabled()) { + log.error(next.getErrors()); + } + error = next.getErrors().toString(); + } found = true; } } if (!found) { - throw new Exception(t("tutti.editFishingOperation.action.importColumns.operationNotFound")); + error = t("tutti.editFishingOperation.action.importColumns.operationNotFound"); } } @Override public void postSuccessAction() { super.postSuccessAction(); - sendMessage(t("tutti.editFishingOperation.action.importColumns.success")); + if (error != null) { + displayErrorMessage("error", error); + } else { + sendMessage(t("tutti.editFishingOperation.action.importColumns.success")); + } + error = null; } - protected class ImportFromColumnFile extends TuttiCsvUtil.AbstractTuttiImportModel<FishingOperation> { + protected class ImportFromColumnFileModel extends TuttiCsvUtil.AbstractTuttiImportModel<FishingOperation> { - public ImportFromColumnFile(char separator, Set<String> headers) { + public ImportFromColumnFileModel(char separator, Set<String> headers) { super(separator); TuttiProtocol protocol = getDataContext().getProtocol(); @@ -156,16 +179,38 @@ public class ImportFromColumnFileAction extends AbstractTuttiAction<EditFishingO break; case EditFishingOperationUIModel.PROPERTY_FISHING_OPERATION_RECTILIGNE: - case EditFishingOperationUIModel.PROPERTY_FISHING_OPERATION_VALID: valueParser = TuttiCsvUtil.PRIMITIVE_BOOLEAN; break; + case EditFishingOperationUIModel.PROPERTY_FISHING_OPERATION_VALID: + valueParser = TuttiCsvUtil.BOOLEAN; + break; + case EditFishingOperationUIModel.PROPERTY_GEAR: + List<Gear> gears = new ArrayList<>(getDataContext().getFishingGears()); + gears.addAll(getDataContext().getScientificGears()); + Map<String, Gear> gearUniverse = TuttiEntities.splitById(gears); + valueParser = newForeignKeyValue(Gear.class, field, gearUniverse); + break; + case EditFishingOperationUIModel.PROPERTY_VESSEL: - case EditFishingOperationUIModel.PROPERTY_STRATA: - case EditFishingOperationUIModel.PROPERTY_SUB_STRATA: case EditFishingOperationUIModel.PROPERTY_SECONDARY_VESSEL: + List<Vessel> vessels = new ArrayList<>(getDataContext().getFishingVessels()); + vessels.addAll(getDataContext().getScientificVessels()); + Map<String, Vessel> vesselUniverse = TuttiEntities.splitById(vessels); + valueParser = newForeignKeyValue(Vessel.class, field, vesselUniverse); + break; + +// case EditFishingOperationUIModel.PROPERTY_STRATA: +// case EditFishingOperationUIModel.PROPERTY_SUB_STRATA: +// Map<String, TuttiLocation> locationUniverse = TuttiEntities.splitById(getDataContext().getL); +// valueParser = newForeignKeyValue(Gear.class, field, gearUniverse); +// break; + case EditFishingOperationUIModel.PROPERTY_RECORDER_PERSON: + Map<String, Person> personUniverse = TuttiEntities.splitById(getDataContext().getPersons()); + valueParser = newForeignKeyValue(Person.class, field, personUniverse); + break; default: valueParser = TuttiCsvUtil.STRING; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolBenthosAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolBenthosAction.java index 377c076..b120e79 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolBenthosAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolBenthosAction.java @@ -108,7 +108,7 @@ public class ImportProtocolBenthosAction extends AbstractTuttiAction<EditProtoco // build rows from imported+merged protocol // (will also remove all synonyms of species referent used) List<EditProtocolSpeciesRowModel> rows = - handler.toRows(protocol.getBenthos()); + handler.toSpeciesRows(protocol.getBenthos()); // update species comboBox getUI().getSpeciesComboBox().getHandler().reset(); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolSpeciesAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolSpeciesAction.java index 718d459..4a4a7f5 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolSpeciesAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolSpeciesAction.java @@ -108,7 +108,7 @@ public class ImportProtocolSpeciesAction extends AbstractTuttiAction<EditProtoco // build rows from imported+merged protocol // (will also remove all synonyms of species referent used) List<EditProtocolSpeciesRowModel> rows = - handler.toRows(protocol.getSpecies()); + handler.toSpeciesRows(protocol.getSpecies()); // update species comboBox getUI().getSpeciesComboBox().getHandler().reset(); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveProtocolAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveProtocolAction.java index 4d96eab..b1702f9 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveProtocolAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveProtocolAction.java @@ -23,6 +23,8 @@ package fr.ifremer.tutti.ui.swing.action; * #L% */ +import com.google.common.base.Function; +import com.google.common.collect.Collections2; import com.google.common.collect.Lists; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicMappingRow; @@ -31,12 +33,16 @@ import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.ui.swing.TuttiUIContext; +import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolCaracteristicsRowModel; +import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolOperationFieldsRowModel; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolSpeciesRowModel; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUI; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUIHandler; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUIModel; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.util.StringUtil; import java.util.ArrayList; import java.util.List; @@ -71,12 +77,22 @@ public class SaveProtocolAction extends AbstractTuttiAction<EditProtocolUIModel, TuttiProtocol bean = model.toBean(); - List<CaracteristicMappingRow> caracteristicMappingRows = - new ArrayList<>(getUI().getCaracteristicsTable().getModel().getCaracteristicMapping().values()); + List<EditProtocolCaracteristicsRowModel> protocolCaracteristicMappingRows = getUI().getModel().getCaracteristicMappingRows(); + List<CaracteristicMappingRow> caracteristicMappingRows = new ArrayList<CaracteristicMappingRow>(); + for (EditProtocolCaracteristicsRowModel row : protocolCaracteristicMappingRows) { + if (row.getPsfm() != null && row.getType() != null) { + caracteristicMappingRows.add(row.toEntity()); + } + } bean.setCaracteristicMapping(caracteristicMappingRows); - List<OperationFieldMappingRow> operationFieldMappingRows = - new ArrayList<>(getUI().getCaracteristicsTable().getModel().getOperationFieldMappingRows().values()); + List<EditProtocolOperationFieldsRowModel> protocolOperationFieldMappingRows = getUI().getModel().getOperationFieldMappingRows(); + List<OperationFieldMappingRow> operationFieldMappingRows = new ArrayList<OperationFieldMappingRow>(); + for (EditProtocolOperationFieldsRowModel row : protocolOperationFieldMappingRows) { + if (StringUtils.isNotBlank(row.getField()) && StringUtils.isNotBlank(row.getImportColumn())) { + operationFieldMappingRows.add(row.toEntity()); + } + } bean.setOperationFieldMapping(operationFieldMappingRows); // get the species protocols from the table diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/CaracteristicMappingUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/CaracteristicMappingUI.css deleted file mode 100644 index d92ab70..0000000 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/CaracteristicMappingUI.css +++ /dev/null @@ -1,20 +0,0 @@ -#splitpane { - orientation: {JSplitPane.VERTICAL_SPLIT}; - resizeWeight: 1.0; -} - -#caracteristicsTable { - selectionMode: {ListSelectionModel.SINGLE_SELECTION}; - selectionBackground: {null}; - selectionForeground: {Color.BLACK}; - sortable: false; - enabled: true; -} - -#operationFieldsTable { - selectionMode: {ListSelectionModel.SINGLE_SELECTION}; - selectionBackground: {null}; - selectionForeground: {Color.BLACK}; - sortable: false; - enabled: true; -} \ No newline at end of file diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/CaracteristicMappingUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/CaracteristicMappingUI.jaxx deleted file mode 100644 index 52c3949..0000000 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/CaracteristicMappingUI.jaxx +++ /dev/null @@ -1,46 +0,0 @@ -<JPanel layout="{new BorderLayout()}" - implements='fr.ifremer.tutti.ui.swing.util.TuttiUI<CaracteristicMappingUIModel, CaracteristicMappingUIHandler>'> - - <import> - fr.ifremer.tutti.persistence.entities.referential.Caracteristic - fr.ifremer.tutti.persistence.entities.referential.Species - - fr.ifremer.tutti.ui.swing.TuttiHelpBroker - fr.ifremer.tutti.ui.swing.util.TuttiUI - fr.ifremer.tutti.ui.swing.util.TuttiUIUtil - - jaxx.runtime.swing.editor.bean.BeanFilterableComboBox - jaxx.runtime.swing.editor.bean.BeanDoubleList - - java.awt.Color - - javax.swing.ListSelectionModel - - org.jdesktop.swingx.JXTable - - static org.nuiton.i18n.I18n.t - static jaxx.runtime.SwingUtil.getStringValue - - </import> - - <script><![CDATA[ - - public CaracteristicMappingUI(TuttiUI parentUI) { - TuttiUIUtil.setParentUI(this, parentUI); - } - ]]> - </script> - - <CaracteristicMappingUIModel id='model' - initializer='getContextValue(CaracteristicMappingUIModel.class)'/> - - <JSplitPane id="splitpane" constraints="BorderLayout.CENTER"> - <JScrollPane> - <JXTable id='caracteristicsTable'/> - </JScrollPane> - <JScrollPane> - <JXTable id='operationFieldsMapping'/> - </JScrollPane> - </JSplitPane> - -</JPanel> \ No newline at end of file diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/CaracteristicMappingUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/CaracteristicMappingUIHandler.java deleted file mode 100644 index 5c4252a..0000000 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/CaracteristicMappingUIHandler.java +++ /dev/null @@ -1,343 +0,0 @@ -package fr.ifremer.tutti.ui.swing.content.protocol; - -import com.google.common.collect.Lists; -import fr.ifremer.tutti.persistence.entities.data.FishingOperation; -import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicMappingRow; -import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicType; -import fr.ifremer.tutti.persistence.entities.protocol.OperationFieldMappingRow; -import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; -import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; -import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; -import jaxx.runtime.SwingUtil; -import jaxx.runtime.validator.swing.SwingValidator; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jdesktop.swingx.JXTable; -import org.jdesktop.swingx.autocomplete.ComboBoxCellEditor; -import org.jdesktop.swingx.table.DefaultTableColumnModelExt; -import org.jdesktop.swingx.table.TableColumnExt; -import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; - -import javax.swing.*; -import javax.swing.table.DefaultTableCellRenderer; -import javax.swing.table.TableCellRenderer; -import java.awt.*; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Objects; - -import static org.nuiton.i18n.I18n.t; - -/** - * @author Kevin Morin (Code Lutin) - * @since x.x - */ -public class CaracteristicMappingUIHandler - extends AbstractTuttiTableUIHandler<EditProtocolCaracteristicsRowModel, CaracteristicMappingUIModel, CaracteristicMappingUI> { - - private static final Log log = LogFactory.getLog(CaracteristicMappingUIHandler.class); - - public CaracteristicMappingUIHandler() { - super(EditProtocolCaracteristicsRowModel.PROPERTY_PSFM, - EditProtocolCaracteristicsRowModel.PROPERTY_TYPE, - EditProtocolCaracteristicsRowModel.PROPERTY_IMPORT_FILE_COLUMN); - } - - @Override - public AbstractApplicationTableModel<EditProtocolCaracteristicsRowModel> getTableModel() { - return (EditProtocolCaracteristicsTableModel) getTable().getModel(); - } - - @Override - public JXTable getTable() { - return getUI().getCaracteristicsTable(); - } - - @Override - protected boolean isRowValid(EditProtocolCaracteristicsRowModel row) { - return row.getPsfm() != null && row.getType() != null; - } - - @Override - protected void saveSelectedRowIfRequired(TuttiBeanMonitor<EditProtocolCaracteristicsRowModel> rowMonitor, - EditProtocolCaracteristicsRowModel row) { - if (row.isValid()) { - // there is a valid bean attached to the monitor - - if (rowMonitor.wasModified()) { - - // monitored bean was modified, save it - if (log.isInfoEnabled()) { - log.info("Row " + row + " was modified, will save it"); - } - - getModel().getCaracteristicMapping().put(row.getPsfm().getId(), row.toBean()); - } - } - - } - - @Override - public void onCloseUI() { - - } - - @Override - public SwingValidator<CaracteristicMappingUIModel> getValidator() { - return null; - } - - @Override - protected JComponent getComponentToFocus() { - return null; - } - - @Override - public void beforeInit(CaracteristicMappingUI ui) { - super.beforeInit(ui); - - EditProtocolUIModel editProtocolUIModel = - ui.getContextValue(EditProtocolUIModel.class); - - CaracteristicMappingUIModel model = new CaracteristicMappingUIModel(); - model.setCaracteristics(editProtocolUIModel.getCaracteristics()); - model.setOperationFieldMappingRows(editProtocolUIModel.getOperationFieldMapping()); - - editProtocolUIModel.addPropertyChangeListener(EditProtocolUIModel.PROPERTY_CARACTERISTIC_MAPPING, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - getModel().setCaracteristicMappingRows((List<CaracteristicMappingRow>) evt.getNewValue()); - } - }); - - editProtocolUIModel.addPropertyChangeListener(EditProtocolUIModel.PROPERTY_OPERATION_FIELD_MAPPING, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - getModel().setOperationFieldMappingRows((List<OperationFieldMappingRow>) evt.getNewValue()); - } - }); - - editProtocolUIModel.addPropertyChangeListener(EditProtocolUIModel.PROPERTY_IMPORT_COLUMNS, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - - Collection<String> newValue = (Collection<String>) evt.getNewValue(); - ArrayList<String> dataToList = new ArrayList<String>(); - - if (newValue != null) { - dataToList.addAll(newValue); - - // add a null value at first position - if (!dataToList.isEmpty() && dataToList.get(0) != null) { - dataToList.add(0, null); - } - - } else { - dataToList.add(null); - } - - populateImportColumnTableEditor(getTable(), 2, dataToList); - populateImportColumnTableEditor(getUI().getOperationFieldsMapping(), 1, dataToList); - - } - }); - - ui.setContextValue(model); - } - - protected void populateImportColumnTableEditor(JXTable table, int columnIndex, ArrayList<String> dataToList) { - JComboBox comboBox = new JComboBox(); - SwingUtil.fillComboBox(comboBox, dataToList, null); - - TableColumnExt col = table.getColumnExt(columnIndex); - ComboBoxCellEditor editor = new ComboBoxCellEditor(comboBox); - col.setCellEditor(editor); - } - - @Override - public void afterInit(CaracteristicMappingUI caracteristicMappingUI) { - - initUI(this.ui); - - // init caracteristics mappingtable - { - JXTable caracteristicsMappingTable = getTable(); - - DefaultTableColumnModelExt columnModel = new DefaultTableColumnModelExt(); - - // getModel().addPropertyChangeListener(EditProtocolUIModel.PROPERTY_LENGTH_CLASSES_PMFM_ID, new PropertyChangeListener() { - // @Override - // public void propertyChange(PropertyChangeEvent evt) { - // List<String> ids = (List<String>) evt.getNewValue(); - // selectLengthClasses(ids, comboBox); - // } - // }); - - List<Caracteristic> caracteristics = new ArrayList<Caracteristic>(getModel().getCaracteristics()); - addComboDataColumnToModel(columnModel, - EditProtocolCaracteristicsTableModel.PSFM_ID, - getDecorator(Caracteristic.class, null), - caracteristics); - - addComboDataColumnToModel(columnModel, - EditProtocolCaracteristicsTableModel.TYPE, - getDecorator(CaracteristicType.class, null), - Lists.newArrayList(CaracteristicType.getTabTypes())); - - addColumnToModel(columnModel, - EditProtocolCaracteristicsTableModel.IMPORT_FILE_COLUMN); - - EditProtocolCaracteristicsTableModel tableModel = new EditProtocolCaracteristicsTableModel(columnModel, caracteristics); - caracteristicsMappingTable.setModel(tableModel); - caracteristicsMappingTable.setColumnModel(columnModel); - - initTable(caracteristicsMappingTable); - - getModel().setRows(new ArrayList<EditProtocolCaracteristicsRowModel>()); - } - - // init operation fields table - { - JXTable operationFieldsTable = getUI().getOperationFieldsMapping(); - - DefaultTableColumnModelExt columnModel = new DefaultTableColumnModelExt(); - - addColumnToModel(columnModel, - null, - new DefaultTableCellRenderer() { - @Override - public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { - setText(t("tutti.editFishingOperation.field." + value.toString())); - return this; - } - }, - EditProtocolOperationFieldsTableModel.FIELD); - - addColumnToModel(columnModel, - EditProtocolOperationFieldsTableModel.IMPORT_FILE_COLUMN); - - EditProtocolOperationFieldsTableModel tableModel = new EditProtocolOperationFieldsTableModel(columnModel); - operationFieldsTable.setModel(tableModel); - operationFieldsTable.setColumnModel(columnModel); - - // by default do not authorize to change column orders - operationFieldsTable.getTableHeader().setReorderingAllowed(false); - - addHighlighters(operationFieldsTable); - - tableModel.setRows(new ArrayList<EditProtocolOperationFieldsRowModel>()); - createOperationFieldRow(tableModel, FishingOperation.PROPERTY_STATION_NUMBER); - createOperationFieldRow(tableModel, FishingOperation.PROPERTY_FISHING_OPERATION_NUMBER); - createOperationFieldRow(tableModel, FishingOperation.PROPERTY_GEAR_SHOOTING_START_DATE); - createOperationFieldRow(tableModel, FishingOperation.PROPERTY_GEAR_SHOOTING_START_LATITUDE); - createOperationFieldRow(tableModel, FishingOperation.PROPERTY_GEAR_SHOOTING_START_LONGITUDE); - createOperationFieldRow(tableModel, FishingOperation.PROPERTY_GEAR_SHOOTING_END_DATE); - createOperationFieldRow(tableModel, FishingOperation.PROPERTY_GEAR_SHOOTING_END_LATITUDE); - createOperationFieldRow(tableModel, FishingOperation.PROPERTY_GEAR_SHOOTING_END_LONGITUDE); - createOperationFieldRow(tableModel, FishingOperation.PROPERTY_FISHING_OPERATION_RECTILIGNE); - createOperationFieldRow(tableModel, FishingOperation.PROPERTY_TRAWL_DISTANCE); - createOperationFieldRow(tableModel, FishingOperation.PROPERTY_FISHING_OPERATION_VALID); - createOperationFieldRow(tableModel, FishingOperation.PROPERTY_MULTIRIG_AGGREGATION); - createOperationFieldRow(tableModel, FishingOperation.PROPERTY_RECORDER_PERSON); - createOperationFieldRow(tableModel, FishingOperation.PROPERTY_GEAR); - createOperationFieldRow(tableModel, FishingOperation.PROPERTY_VESSEL); - createOperationFieldRow(tableModel, FishingOperation.PROPERTY_STRATA); - createOperationFieldRow(tableModel, FishingOperation.PROPERTY_SUB_STRATA); - createOperationFieldRow(tableModel, FishingOperation.PROPERTY_LOCATION); - createOperationFieldRow(tableModel, FishingOperation.PROPERTY_SECONDARY_VESSEL); - //TODO voir avec Vincent comment on gère le cas où aucun des champs clé n'est renseigné - - // when model data change let's propagate it table model -// getModel().addPropertyChangeListener(AbstractTuttiTableUIModel.PROPERTY_ROWS, new PropertyChangeListener() { -// @Override -// public void propertyChange(PropertyChangeEvent evt) { -// log.info("row schanged"); -// onModelRowsChanged((List<R>) evt.getNewValue()); -// } -// }); - - // always scroll to selected row - SwingUtil.scrollToTableSelection(operationFieldsTable); - } - - getModel().addPropertyChangeListener(CaracteristicMappingUIModel.PROPERTY_CARACTERISTIC_MAPPING_ROWS, - new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - populateCaracteristicsTable((Collection<CaracteristicMappingRow>) evt.getNewValue()); - } - }); - - getModel().addPropertyChangeListener(CaracteristicMappingUIModel.PROPERTY_OPERATION_FIELD_MAPPING_ROWS, - new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - populateFieldsTable((Map<String, OperationFieldMappingRow>) evt.getNewValue()); - } - }); - - } - - protected void createOperationFieldRow(EditProtocolOperationFieldsTableModel tableModel, String property) { - EditProtocolOperationFieldsRowModel row = tableModel.createNewRow(); - row.setField(property); - row.setValid(true); - row.addPropertyChangeListener(new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - EditProtocolOperationFieldsRowModel row = (EditProtocolOperationFieldsRowModel) evt.getSource(); - Map<String, OperationFieldMappingRow> operationFieldMappingRows = getModel().getOperationFieldMappingRows(); - - OperationFieldMappingRow operationFieldMappingRow = operationFieldMappingRows.get(row.getField()); - if (operationFieldMappingRow != null) { - operationFieldMappingRow.setImportColumn(row.getImportFileColumn()); - - } else { - operationFieldMappingRows.put(row.getField(), row.toBean()); - } - getModel().setModify(true); - } - }); - tableModel.addNewRow(row); - } - - protected void populateFieldsTable(Map<String, OperationFieldMappingRow> fieldRows) { - EditProtocolOperationFieldsTableModel tableModel = - (EditProtocolOperationFieldsTableModel) getUI().getOperationFieldsMapping().getModel(); - for (EditProtocolOperationFieldsRowModel row : tableModel.getRows()) { - OperationFieldMappingRow mappingRow = fieldRows.get(row.getField()); - if (mappingRow != null) { - row.setImportFileColumn(mappingRow.getImportColumn()); - } - } - } - - protected void populateCaracteristicsTable(Collection<CaracteristicMappingRow> values) { - List<EditProtocolCaracteristicsRowModel> rows = new ArrayList<EditProtocolCaracteristicsRowModel>(); - for (CaracteristicMappingRow row : values) { - EditProtocolCaracteristicsRowModel rowModel = getTableModel().createNewRow(); - rowModel.fromEntity(row); - recomputeRowValidState(rowModel); - rows.add(rowModel); - } - getModel().setRows(rows); - } - - @Override - protected void initTable(JXTable table) { - super.initTable(table); - installTableKeyListener(table.getColumnModel(), table); - } - - @Override - protected void onRowModified(int rowIndex, EditProtocolCaracteristicsRowModel row, - String propertyName, Object oldValue, Object newValue) { - recomputeRowValidState(row); - super.onRowModified(rowIndex, row, propertyName, oldValue, newValue); - saveSelectedRowIfNeeded(); - } -} diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/CaracteristicMappingUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/CaracteristicMappingUIModel.java deleted file mode 100644 index a353eb5..0000000 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/CaracteristicMappingUIModel.java +++ /dev/null @@ -1,99 +0,0 @@ -package fr.ifremer.tutti.ui.swing.content.protocol; - -import com.google.common.base.Function; -import com.google.common.collect.Maps; -import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicMappingRow; -import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicMappingRowBean; -import fr.ifremer.tutti.persistence.entities.protocol.OperationFieldMappingRow; -import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; -import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIModel; -import org.nuiton.util.beans.Binder; -import org.nuiton.util.beans.BinderFactory; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * @author Kevin Morin (Code Lutin) - * @since x.x - */ -public class CaracteristicMappingUIModel extends AbstractTuttiTableUIModel<CaracteristicMappingRow, EditProtocolCaracteristicsRowModel, CaracteristicMappingUIModel> { - - public static final String PROPERTY_CARACTERISTIC_MAPPING_ROWS = "caracteristicMappingRows"; - public static final String PROPERTY_CARACTERISTICS_IN_MAPPING = "caracteristicsInMapping"; - public static final String PROPERTY_OPERATION_FIELD_MAPPING_ROWS = "operationFieldMappingRows"; - - protected List<Caracteristic> caracteristics = new ArrayList<Caracteristic>(); - - protected Map<String, CaracteristicMappingRow> caracteristicMappingRows = new HashMap<String, CaracteristicMappingRow>(); - - protected Map<String, OperationFieldMappingRow> operationFieldMappingRows = new HashMap<String, OperationFieldMappingRow>(); - - protected List<String> importColumns = new ArrayList<String>(); - - public CaracteristicMappingUIModel() { - super(CaracteristicMappingRow.class, null, null); - } - - public List<Caracteristic> getCaracteristics() { - return caracteristics; - } - - public void setCaracteristics(List<Caracteristic> caracteristics) { - this.caracteristics = caracteristics; - } - - public Map<String, CaracteristicMappingRow> getCaracteristicMapping() { - return caracteristicMappingRows; - } - - public void setCaracteristicMappingRows(List<CaracteristicMappingRow> caracteristicMappingRows) { - this.caracteristicMappingRows = new HashMap<String, CaracteristicMappingRow>(); - if (caracteristicMappingRows != null) { - this.caracteristicMappingRows.putAll(Maps.uniqueIndex(caracteristicMappingRows, new Function<CaracteristicMappingRow, String>() { - @Override - public String apply(CaracteristicMappingRow caracteristicMappingRow) { - return caracteristicMappingRow.getPmfmId(); - } - })); - } - firePropertyChanged(PROPERTY_CARACTERISTIC_MAPPING_ROWS, null, caracteristicMappingRows); - firePropertyChanged(PROPERTY_CARACTERISTICS_IN_MAPPING, null, this.caracteristicMappingRows.values()); - } - - public Map<String, OperationFieldMappingRow> getOperationFieldMappingRows() { - return operationFieldMappingRows; - } - - public void setOperationFieldMappingRows(Collection<OperationFieldMappingRow> operationFieldMappingRows) { - this.operationFieldMappingRows = new HashMap<String, OperationFieldMappingRow>(); - if (operationFieldMappingRows != null) { - this.operationFieldMappingRows.putAll(Maps.uniqueIndex(operationFieldMappingRows, new Function<OperationFieldMappingRow, String>() { - @Override - public String apply(OperationFieldMappingRow operationFieldMappingRow) { - return operationFieldMappingRow.getField(); - } - })); - } - firePropertyChanged(PROPERTY_OPERATION_FIELD_MAPPING_ROWS, null, this.operationFieldMappingRows); - } - - public List<String> getImportColumns() { - return importColumns; - } - - public void setImportColumns(List<String> importColumns) { - this.importColumns.clear(); - if (importColumns != null) { - this.importColumns.addAll(importColumns); - } - } - - @Override - protected CaracteristicMappingRow newEntity() { - return new CaracteristicMappingRowBean(); - } -} diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolCaracteristicsRowModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolCaracteristicsRowModel.java index c845b8e..d2ec82a 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolCaracteristicsRowModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolCaracteristicsRowModel.java @@ -1,7 +1,5 @@ package fr.ifremer.tutti.ui.swing.content.protocol; -import com.google.common.base.Function; -import com.google.common.collect.Maps; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicMappingRow; import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicMappingRowBean; @@ -23,12 +21,12 @@ public class EditProtocolCaracteristicsRowModel extends AbstractTuttiBeanUIModel public static final String PROPERTY_PSFM = "psfm"; public static final String PROPERTY_TYPE = "type"; - public static final String PROPERTY_IMPORT_FILE_COLUMN = "importFileColumn"; + public static final String PROPERTY_IMPORT_COLUMN = "importColumn"; protected Map<String, Caracteristic> caracteristicMap; protected Caracteristic psfm; protected CaracteristicType type; - protected String importFileColumn; + protected String importColumn; protected static final Binder<CaracteristicMappingRow, EditProtocolCaracteristicsRowModel> fromBeanBinder = BinderFactory.newBinder(CaracteristicMappingRow.class, @@ -63,14 +61,14 @@ public class EditProtocolCaracteristicsRowModel extends AbstractTuttiBeanUIModel firePropertyChanged(PROPERTY_TYPE, oldValue, type); } - public String getImportFileColumn() { - return importFileColumn; + public String getImportColumn() { + return importColumn; } - public void setImportFileColumn(String importFileColumn) { - Object oldValue = getImportFileColumn(); - this.importFileColumn = importFileColumn; - firePropertyChanged(PROPERTY_IMPORT_FILE_COLUMN, oldValue, importFileColumn); + public void setImportColumn(String importColumn) { + Object oldValue = getImportColumn(); + this.importColumn = importColumn; + firePropertyChanged(PROPERTY_IMPORT_COLUMN, oldValue, importColumn); } public String getPmfmId() { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolCaracteristicsTableModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolCaracteristicsTableModel.java index 6e262ed..93de4ae 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolCaracteristicsTableModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolCaracteristicsTableModel.java @@ -28,13 +28,13 @@ public class EditProtocolCaracteristicsTableModel extends AbstractApplicationTab n("tutti.editProtocol.table.header.caracteristics.type.tip")); public static final ColumnIdentifier<EditProtocolCaracteristicsRowModel> IMPORT_FILE_COLUMN = ColumnIdentifier.newId( - EditProtocolCaracteristicsRowModel.PROPERTY_IMPORT_FILE_COLUMN, + EditProtocolCaracteristicsRowModel.PROPERTY_IMPORT_COLUMN, n("tutti.editProtocol.table.header.caracteristics.importFileColumn"), n("tutti.editProtocol.table.header.caracteristics.importFileColumn.tip")); public EditProtocolCaracteristicsTableModel(TableColumnModelExt columnModel, Collection<Caracteristic> caracteristics) { - super(columnModel, true, true); - setNoneEditableCols(); + super(columnModel, false, false); + setNoneEditableCols(PSFM_ID); this.caracteristics = caracteristics; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolOperationFieldsRowModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolOperationFieldsRowModel.java index ac16751..f0a9b53 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolOperationFieldsRowModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolOperationFieldsRowModel.java @@ -1,20 +1,11 @@ package fr.ifremer.tutti.ui.swing.content.protocol; -import fr.ifremer.tutti.persistence.entities.TuttiEntities; -import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicMappingRow; -import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicMappingRowBean; -import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicType; import fr.ifremer.tutti.persistence.entities.protocol.OperationFieldMappingRow; import fr.ifremer.tutti.persistence.entities.protocol.OperationFieldMappingRowBean; -import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; - /** * @author Kevin Morin (Code Lutin) * @since 3.10 @@ -22,10 +13,10 @@ import java.util.Map; public class EditProtocolOperationFieldsRowModel extends AbstractTuttiBeanUIModel<OperationFieldMappingRow, EditProtocolOperationFieldsRowModel> { public static final String PROPERTY_FIELD = "field"; - public static final String PROPERTY_IMPORT_FILE_COLUMN = "importFileColumn"; + public static final String PROPERTY_IMPORT_COLUMN = "importColumn"; protected String field; - protected String importFileColumn; + protected String importColumn; protected static final Binder<OperationFieldMappingRow, EditProtocolOperationFieldsRowModel> fromBeanBinder = BinderFactory.newBinder(OperationFieldMappingRow.class, @@ -49,14 +40,14 @@ public class EditProtocolOperationFieldsRowModel extends AbstractTuttiBeanUIMode firePropertyChanged(PROPERTY_FIELD, oldValue, field); } - public String getImportFileColumn() { - return importFileColumn; + public String getImportColumn() { + return importColumn; } - public void setImportFileColumn(String importFileColumn) { - Object oldValue = getImportFileColumn(); - this.importFileColumn = importFileColumn; - firePropertyChanged(PROPERTY_IMPORT_FILE_COLUMN, oldValue, importFileColumn); + public void setImportColumn(String importColumn) { + Object oldValue = getImportColumn(); + this.importColumn = importColumn; + firePropertyChanged(PROPERTY_IMPORT_COLUMN, oldValue, importColumn); } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolOperationFieldsTableModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolOperationFieldsTableModel.java index 5d636a9..0be5d51 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolOperationFieldsTableModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolOperationFieldsTableModel.java @@ -1,12 +1,9 @@ package fr.ifremer.tutti.ui.swing.content.protocol; -import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import org.jdesktop.swingx.table.TableColumnModelExt; import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; -import java.util.Collection; - import static org.nuiton.i18n.I18n.n; /** @@ -21,7 +18,7 @@ public class EditProtocolOperationFieldsTableModel extends AbstractApplicationTa n("tutti.editProtocol.table.header.operationFields.field.tip")); public static final ColumnIdentifier<EditProtocolCaracteristicsRowModel> IMPORT_FILE_COLUMN = ColumnIdentifier.newId( - EditProtocolOperationFieldsRowModel.PROPERTY_IMPORT_FILE_COLUMN, + EditProtocolOperationFieldsRowModel.PROPERTY_IMPORT_COLUMN, n("tutti.editProtocol.table.header.operationFields.importFileColumn"), n("tutti.editProtocol.table.header.operationFields.importFileColumn.tip")); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css index aec68ad..d12659f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css @@ -76,6 +76,37 @@ JTextField { border: {new javax.swing.border.EmptyBorder(5, 10, 5, 10)}; } +#caracteristicMappingComboBox { + enabled: {!caracteristicMappingComboBox.isEmpty()}; + toolTipText: "tutti.editProtocol.field.caracteristicMapping.tip"; + _help: {"tutti.editProtocol.field.caracteristicMapping.help"}; +} + +#addCaracteristicMappingButton { + actionIcon: add; + toolTipText: "tutti.editProtocol.action.addCaracteristicMapping.tip"; + i18nMnemonic: "tutti.editProtocol.action.addCaracteristicMapping.mnemonic"; + _applicationAction: {fr.ifremer.tutti.ui.swing.action.AddCaracteristicMappingAction.class}; + enabled: { caracteristicMappingComboBox.getSelectedItem() != null }; + _help: { "tutti.editProtocol.action.addCaracteristicMapping.help" }; +} + +#caracteristicsMappingTable { + selectionMode: {ListSelectionModel.SINGLE_SELECTION}; + selectionBackground: {null}; + selectionForeground: {Color.BLACK}; + sortable: false; + enabled: true; +} + +#operationFieldsMappingTable { + selectionMode: {ListSelectionModel.SINGLE_SELECTION}; + selectionBackground: {null}; + selectionForeground: {Color.BLACK}; + sortable: false; + enabled: true; +} + #speciesComboBox { enabled: {!speciesComboBox.isEmpty()}; toolTipText: "tutti.editProtocol.field.species.tip"; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx index 1644756..a976187 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx @@ -121,7 +121,35 @@ genericType='Caracteristic'/> </tab> <tab title='tutti.editProtocol.tab.caracteristic.mapping'> - <CaracteristicMappingUI id='caracteristicsTable' constructorParams="(TuttiUI)this"/> + <Table fill='both'> + + <row fill='both'> + <cell fill='both' weightx='1'> + <BeanFilterableComboBox id='caracteristicMappingComboBox' + constructorParams='this' + genericType='Caracteristic'/> + </cell> + <cell fill='both'> + <JButton id='addCaracteristicMappingButton'/> + </cell> + </row> + <row fill='both' weighty='1'> + <cell fill='both' columns='2'> + <JScrollPane> + <JXTable id='caracteristicsMappingTable'/> + </JScrollPane> + </cell> + </row> + <row fill='both' weighty='1'> + <cell fill='both' columns='2'> + <JScrollPane> + <JXTable id='operationFieldsMappingTable'/> + </JScrollPane> + </cell> + </row> + </Table> + <!--<CaracteristicMappingUI id='caracteristicsTable' constructorParams="(TuttiUI)this"/>--> + </tab> </JTabbedPane> </JPanel> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java index a3012c3..278a2da 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java @@ -22,16 +22,20 @@ package fr.ifremer.tutti.ui.swing.content.protocol; * #L% */ +import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import com.google.common.collect.Multimap; import com.google.common.collect.Sets; -import fr.ifremer.adagio.core.dao.referential.pmfm.Pmfm; import fr.ifremer.tutti.persistence.entities.TuttiEntities; +import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModelEntry; +import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicMappingRow; import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicType; +import fr.ifremer.tutti.persistence.entities.protocol.OperationFieldMappingRow; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocols; @@ -64,19 +68,17 @@ import org.jdesktop.swingx.table.TableColumnExt; import org.nuiton.decorator.Decorator; import org.nuiton.jaxx.application.swing.util.CloseableUI; -import javax.swing.JComboBox; -import javax.swing.JComponent; -import javax.swing.JTabbedPane; -import javax.swing.ListSelectionModel; +import javax.swing.*; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; +import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.JTableHeader; import javax.swing.table.TableColumnModel; -import java.awt.Dimension; +import java.awt.*; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.ArrayList; @@ -123,6 +125,14 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI return ui.getBenthosTable(); } + public JXTable getCaracteristicsMappingTable() { + return ui.getCaracteristicsMappingTable(); + } + + public JXTable getOperationFieldsMappingTable() { + return ui.getOperationFieldsMappingTable(); + } + public EditProtocolSpeciesTableModel getSpeciesTableModel() { return (EditProtocolSpeciesTableModel) getSpeciesTable().getModel(); } @@ -135,6 +145,14 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI return selectedItem != null && selectedItem instanceof Species; } + public EditProtocolCaracteristicsTableModel getCaracteristicMappingTableModel() { + return (EditProtocolCaracteristicsTableModel) getCaracteristicsMappingTable().getModel(); + } + + public EditProtocolOperationFieldsTableModel getEditProtocolOperationFieldsMappingTableModel() { + return (EditProtocolOperationFieldsTableModel) getOperationFieldsMappingTable().getModel(); + } + //------------------------------------------------------------------------// //-- AbstractTuttiUIHandler methods --// //------------------------------------------------------------------------// @@ -265,20 +283,38 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI Lists.newArrayList(referents), null); initBeanFilterableComboBox(this.ui.getBenthosComboBox(), Lists.newArrayList(referents), null); + initBeanFilterableComboBox(ui.getCaracteristicMappingComboBox(), + new ArrayList<Caracteristic>(model.getCaracteristics()), + null); + List<EditProtocolCaracteristicsRowModel> caracteristicMappingRows; + List<EditProtocolOperationFieldsRowModel> operationFieldMappingRows; List<EditProtocolSpeciesRowModel> speciesRows; List<EditProtocolSpeciesRowModel> benthosRows; + model.addPropertyChangeListener(EditProtocolUIModel.PROPERTY_IMPORT_COLUMNS, new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent evt) { + populateImportColumnTableEditors(); + + } + }); + incrementsMessage("Préparation des interfaces graphiques"); // build species and benthos rows if (protocol == null) { + caracteristicMappingRows = Lists.newArrayList(); + operationFieldMappingRows = Lists.newArrayList(); speciesRows = Lists.newArrayList(); benthosRows = Lists.newArrayList(); } else { - speciesRows = toRows(protocol.getSpecies()); - benthosRows = toRows(protocol.getBenthos()); + caracteristicMappingRows = toProtocolCaracteristicRows(protocol.getCaracteristicMapping()); + operationFieldMappingRows = toProtocolOperationFieldsRows(protocol.getOperationFieldMapping()); + + speciesRows = toSpeciesRows(protocol.getSpecies()); + benthosRows = toSpeciesRows(protocol.getBenthos()); if (log.isDebugEnabled()) { log.debug("Will edit protocol with " + @@ -290,9 +326,12 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI // set to model (will propagate to tableModel) model.setSpeciesRow(speciesRows); model.setBenthosRow(benthosRows); + model.setCaracteristicMappingRows(caracteristicMappingRows); + model.setOperationFieldMappingRows(operationFieldMappingRows); this.ui.getSpeciesComboBox().reset(); this.ui.getBenthosComboBox().reset(); + this.ui.getCaracteristicMappingComboBox().reset(); { // create species table model @@ -427,6 +466,78 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI Lists.newArrayList(model.getCaracteristics()), model.getIndividualObservationPmfmId()); + // init caracteristics mappingtable + { + JXTable caracteristicsMappingTable = getCaracteristicsMappingTable(); + + DefaultTableColumnModelExt columnModel = new DefaultTableColumnModelExt(); + + addColumnToModel(columnModel, + null, + newTableCellRender(Caracteristic.class), + EditProtocolCaracteristicsTableModel.PSFM_ID); + + addComboDataColumnToModel(columnModel, + EditProtocolCaracteristicsTableModel.TYPE, + getDecorator(CaracteristicType.class, null), + Lists.newArrayList(CaracteristicType.getTabTypes())); + + addColumnToModel(columnModel, + EditProtocolCaracteristicsTableModel.IMPORT_FILE_COLUMN); + + List<Caracteristic> caracteristics = new ArrayList<Caracteristic>(getModel().getCaracteristics()); + EditProtocolCaracteristicsTableModel tableModel = new EditProtocolCaracteristicsTableModel(columnModel, caracteristics); + caracteristicsMappingTable.setModel(tableModel); + caracteristicsMappingTable.setColumnModel(columnModel); + + // by default do not authorize to change column orders + caracteristicsMappingTable.getTableHeader().setReorderingAllowed(false); + + addHighlighters(caracteristicsMappingTable); + + // always scroll to selected row + SwingUtil.scrollToTableSelection(caracteristicsMappingTable); + + tableModel.setRows(caracteristicMappingRows); + } + + // init operation fields table + { + JXTable operationFieldsTable = getUI().getOperationFieldsMappingTable(); + + DefaultTableColumnModelExt columnModel = new DefaultTableColumnModelExt(); + + addColumnToModel(columnModel, + null, + new DefaultTableCellRenderer() { + @Override + public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { + setText(t("tutti.editFishingOperation.field." + value.toString())); + return this; + } + }, + EditProtocolOperationFieldsTableModel.FIELD); + + addColumnToModel(columnModel, + EditProtocolOperationFieldsTableModel.IMPORT_FILE_COLUMN); + + EditProtocolOperationFieldsTableModel tableModel = new EditProtocolOperationFieldsTableModel(columnModel); + operationFieldsTable.setModel(tableModel); + operationFieldsTable.setColumnModel(columnModel); + + // by default do not authorize to change column orders + operationFieldsTable.getTableHeader().setReorderingAllowed(false); + + addHighlighters(operationFieldsTable); + + tableModel.setRows(operationFieldMappingRows); + + // always scroll to selected row + SwingUtil.scrollToTableSelection(operationFieldsTable); + } + + populateImportColumnTableEditors(); + // if new protocol can already cancel his creation model.setModify(model.isCreate() || model.isCleaned()); @@ -443,10 +554,6 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI break; case 1: -// selectedDoubleList = EditProtocolUIHandler.this.ui.getGearUseFeatureList(); -// break; -// -// case 2: selectedDoubleList = EditProtocolUIHandler.this.ui.getIndividualObservationList(); break; @@ -463,8 +570,6 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI dialog = new SelectSpeciesUI(false, this.ui); - ui.getCaracteristicsTable().getModel().setModify(false); - listenModelModifiy(ui.getCaracteristicsTable().getModel()); } @Override @@ -472,7 +577,7 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI return getUI().getNameField(); } - public List<EditProtocolSpeciesRowModel> toRows(List<SpeciesProtocol> speciesProtocols) { + public List<EditProtocolSpeciesRowModel> toSpeciesRows(List<SpeciesProtocol> speciesProtocols) { BeanFilterableComboBox<Species> speciesComboBox = ui.getSpeciesComboBox(); Preconditions.checkNotNull(speciesComboBox.getData()); BeanFilterableComboBox<Species> benthosComboBox = ui.getBenthosComboBox(); @@ -547,6 +652,84 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI return result; } + public List<EditProtocolCaracteristicsRowModel> toProtocolCaracteristicRows(List<CaracteristicMappingRow> caracteristicMappingRows) { + BeanFilterableComboBox<Caracteristic> caracteristicMappingComboBox = ui.getCaracteristicMappingComboBox(); + Preconditions.checkNotNull(caracteristicMappingComboBox.getData()); + + EditProtocolUIModel model = getModel(); + + Set<Caracteristic> caracteristicSet = Sets.newHashSet(); + List<EditProtocolCaracteristicsRowModel> result = Lists.newArrayList(); + if (CollectionUtils.isNotEmpty(caracteristicMappingRows)) { + for (CaracteristicMappingRow caracteristicMappingRow : caracteristicMappingRows) { + String pmfmId = caracteristicMappingRow.getPmfmId(); + + if (pmfmId == null) { + + continue; + } + + // make sure it exists + caracteristicSet.add(model.getAllCaracteristic().get(pmfmId)); + + EditProtocolCaracteristicsRowModel row = createEditProtocolCaracteristicsRowModel(); + row.fromBean(caracteristicMappingRow); + row.setValid(row.getType() != null); + + result.add(row); + } + + caracteristicMappingComboBox.removeItems(caracteristicSet); + } + + return result; + } + + public List<EditProtocolOperationFieldsRowModel> toProtocolOperationFieldsRows(Collection<OperationFieldMappingRow> operationFieldMappingRows) { + List<EditProtocolOperationFieldsRowModel> result = Lists.newArrayList(); + + if (operationFieldMappingRows == null) { + operationFieldMappingRows = new ArrayList<OperationFieldMappingRow>(); + } + Map<String, OperationFieldMappingRow> rowsByField = Maps.uniqueIndex(operationFieldMappingRows, + new Function<OperationFieldMappingRow, String>() { + @Override + public String apply(OperationFieldMappingRow operationFieldMappingRow) { + return operationFieldMappingRow.getField(); + } + }); + + List<String> properties = Lists.newArrayList( + FishingOperation.PROPERTY_STATION_NUMBER, + FishingOperation.PROPERTY_FISHING_OPERATION_NUMBER, + FishingOperation.PROPERTY_GEAR_SHOOTING_START_DATE, + FishingOperation.PROPERTY_GEAR_SHOOTING_START_LATITUDE, + FishingOperation.PROPERTY_GEAR_SHOOTING_START_LONGITUDE, + FishingOperation.PROPERTY_GEAR_SHOOTING_END_DATE, + FishingOperation.PROPERTY_GEAR_SHOOTING_END_LATITUDE, + FishingOperation.PROPERTY_GEAR_SHOOTING_END_LONGITUDE, + FishingOperation.PROPERTY_FISHING_OPERATION_RECTILIGNE, + FishingOperation.PROPERTY_TRAWL_DISTANCE, + FishingOperation.PROPERTY_FISHING_OPERATION_VALID, + FishingOperation.PROPERTY_MULTIRIG_AGGREGATION, + FishingOperation.PROPERTY_RECORDER_PERSON, + FishingOperation.PROPERTY_GEAR, + FishingOperation.PROPERTY_VESSEL, + FishingOperation.PROPERTY_STRATA, + FishingOperation.PROPERTY_SUB_STRATA, + FishingOperation.PROPERTY_LOCATION, + FishingOperation.PROPERTY_SECONDARY_VESSEL + ); + //TODO voir avec Vincent comment on gère le cas où aucun des champs clé n'est renseigné + + for (String property : properties) { + OperationFieldMappingRow row = rowsByField.get(property); + EditProtocolOperationFieldsRowModel newRow = createOperationFieldRow(property, row != null ? row.getImportColumn() : null); + result.add(newRow); + } + return result; + } + @Override public void onCloseUI() { if (log.isDebugEnabled()) { @@ -555,7 +738,6 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI clearValidators(); ui.getTabPanel().setSelectedIndex(0); - closeUI(ui.getCaracteristicsTable()); } @Override @@ -605,6 +787,24 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI return model.getSelectedSpecies(); } + public EditProtocolCaracteristicsRowModel createEditProtocolCaracteristicsRowModel() { + EditProtocolCaracteristicsRowModel newRow = new EditProtocolCaracteristicsRowModel(getModel().getCaracteristics()); + + newRow.addPropertyChangeListener(new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent evt) { + EditProtocolCaracteristicsRowModel row = (EditProtocolCaracteristicsRowModel) evt.getSource(); + row.setValid(row.getType() != null); + + if (row.isValid()) { + getModel().setModify(true); + } + } + }); + + return newRow; + } + //------------------------------------------------------------------------// //-- Internal methods --// //------------------------------------------------------------------------// @@ -758,6 +958,49 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI tableModel.setRows(rows); } + protected EditProtocolOperationFieldsRowModel createOperationFieldRow(String property, String column) { + EditProtocolOperationFieldsRowModel newRow = new EditProtocolOperationFieldsRowModel(); + newRow.setField(property); + newRow.setImportColumn(column); + newRow.setValid(true); + newRow.addPropertyChangeListener(new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent evt) { + getModel().setModify(true); + } + }); + return newRow; + } + + protected void populateImportColumnTableEditors() { + Collection<String> importColumns = getModel().getImportColumns(); + ArrayList<String> dataToList = new ArrayList<String>(); + + if (importColumns != null) { + dataToList.addAll(importColumns); + + // add a null value at first position + if (!dataToList.isEmpty() && dataToList.get(0) != null) { + dataToList.add(0, null); + } + + } else { + dataToList.add(null); + } + + populateImportColumnTableEditor(getUI().getCaracteristicsMappingTable(), 2, dataToList); + populateImportColumnTableEditor(getUI().getOperationFieldsMappingTable(), 1, dataToList); + } + + protected void populateImportColumnTableEditor(JXTable table, int columnIndex, ArrayList<String> dataToList) { + JComboBox comboBox = new JComboBox(); + SwingUtil.fillComboBox(comboBox, dataToList, null); + + TableColumnExt col = table.getColumnExt(columnIndex); + ComboBoxCellEditor editor = new ComboBoxCellEditor(comboBox); + col.setCellEditor(editor); + } + protected static class UpdateSelectedList implements PropertyChangeListener { private final BeanDoubleListModel<Caracteristic> model; @@ -828,84 +1071,4 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI } } -// public static class SpeciesDecoratorListener implements ActionListener { -// -// protected final JXTable table; -// -// protected final ButtonGroup buttonGroup; -// -// protected final TuttiDecorator<Species> decorator; -// -// protected final TableColumnExt column; -// -// public SpeciesDecoratorListener(JXTable table, -// ButtonGroup buttonGroup) { -// this.table = table; -// this.buttonGroup = buttonGroup; -// this.column = (TableColumnExt) table.getColumn(0); -// this.decorator = TuttiUIUtil.getSpeciesColumnDecorator(column); -// } -// -// @Override -// public void actionPerformed(ActionEvent e) { -// -// JRadioButtonMenuItem source = (JRadioButtonMenuItem) e.getSource(); -// buttonGroup.setSelected(source.getModel(), true); -// -// Integer index = -// (Integer) source.getClientProperty(SPECIES_DECORATOR_INDEX); -// -// if (log.isInfoEnabled()) { -// log.info("Selected decorator context index: " + index); -// } -// -// decorator.setContextIndex(index); -// -// column.setComparator(decorator.getCurrentComparator()); -// -// -// EditProtocolSpeciesTableModel tableModel = -// (EditProtocolSpeciesTableModel) table.getModel(); -// -// // keep selected rows -// int[] rowIndexes = table.getSelectedRows(); -// List<EditProtocolSpeciesRowModel> rowsToReSelect = Lists.newArrayList(); -// for (int viewRowIndex : rowIndexes) { -// int modelRowIndex = table.convertRowIndexToModel(viewRowIndex); -// EditProtocolSpeciesRowModel row = tableModel.getEntry(modelRowIndex); -// rowsToReSelect.add(row); -// } -// -// // fire model (will reload the comparator) -// tableModel.fireTableDataChanged(); -// -// // reselect rows -// for (EditProtocolSpeciesRowModel row : rowsToReSelect) { -// int modelRowIndex = tableModel.getRowIndex(row); -// int viewRowIndex = table.convertRowIndexToView(modelRowIndex); -// table.addRowSelectionInterval(viewRowIndex, viewRowIndex); -// } -// } -// } -// -// private static class ShowSpeciesDecoratorPopupListener extends MouseAdapter { -// private final JPopupMenu popup; -// -// public ShowSpeciesDecoratorPopupListener(JPopupMenu popup) { -// this.popup = popup; -// } -// -// @Override -// public void mouseClicked(MouseEvent e) { -// JTableHeader source = (JTableHeader) e.getSource(); -// Point point = e.getPoint(); -// int columnIndex = source.columnAtPoint(point); -// -// boolean rightClick = SwingUtilities.isRightMouseButton(e); -// if (columnIndex == 0 && rightClick) { -// e.consume(); -// popup.show(source, e.getX(), e.getY()); -// } -// } -// } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java index 5650ef4..ec9f584 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java @@ -48,6 +48,10 @@ public class EditProtocolUIModel extends AbstractTuttiBeanUIModel<TuttiProtocol, private static final long serialVersionUID = 1L; + public static final String PROPERTY_CARACTERISTIC_MAPPING_ROWS = "caracteristicMappingRows"; + + public static final String PROPERTY_OPERATION_FIELD_MAPPING_ROWS = "operationFieldMappingRows"; + public static final String PROPERTY_SPECIES_ROW = "speciesRow"; public static final String PROPERTY_BENTHOS_ROW = "benthosRow"; @@ -116,6 +120,10 @@ public class EditProtocolUIModel extends AbstractTuttiBeanUIModel<TuttiProtocol, protected Map<String, Caracteristic> allCaracteristic; + protected List<EditProtocolCaracteristicsRowModel> caracteristicMappingRows; + + protected List<EditProtocolOperationFieldsRowModel> operationFieldMappingRows; + protected List<EditProtocolSpeciesRowModel> speciesRow; protected List<EditProtocolSpeciesRowModel> benthosRow; @@ -151,6 +159,26 @@ public class EditProtocolUIModel extends AbstractTuttiBeanUIModel<TuttiProtocol, setIndividualObservationPmfmId(ids); } + public List<EditProtocolCaracteristicsRowModel> getCaracteristicMappingRows() { + return caracteristicMappingRows; + } + + public void setCaracteristicMappingRows(List<EditProtocolCaracteristicsRowModel> caracteristicMappingRows) { + Object oldValue = getCaracteristicMappingRows(); + this.caracteristicMappingRows = caracteristicMappingRows; + firePropertyChange(PROPERTY_CARACTERISTIC_MAPPING_ROWS, oldValue, caracteristicMappingRows); + } + + public List<EditProtocolOperationFieldsRowModel> getOperationFieldMappingRows() { + return operationFieldMappingRows; + } + + public void setOperationFieldMappingRows(List<EditProtocolOperationFieldsRowModel> operationFieldMappingRows) { + Object oldValue = getOperationFieldMappingRows(); + this.operationFieldMappingRows = operationFieldMappingRows; + firePropertyChange(PROPERTY_OPERATION_FIELD_MAPPING_ROWS, oldValue, operationFieldMappingRows); + } + public List<EditProtocolSpeciesRowModel> getSpeciesRow() { return speciesRow; } diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties index d2ec62e..9cb8670 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties @@ -894,6 +894,8 @@ tutti.editProgram.title.create.program= tutti.editProgram.title.edit.program= tutti.editProtocol.action.addBenthosProtocol.mnemonic= tutti.editProtocol.action.addBenthosProtocol.tip= +tutti.editProtocol.action.addCaracteristicMapping.mnemonic= +tutti.editProtocol.action.addCaracteristicMapping.tip= tutti.editProtocol.action.addSpeciesProtocol.mnemonic= tutti.editProtocol.action.addSpeciesProtocol.tip= tutti.editProtocol.action.chooseColumnsFile.import= @@ -960,6 +962,7 @@ tutti.editProtocol.askCancelEditBeforeLeaving.cancelSaveSampleCategoryModel= tutti.editProtocol.askSaveBeforeLeaving.saveProtocol= tutti.editProtocol.askSaveBeforeLeaving.saveSampleCategoryModel= tutti.editProtocol.field.benthos.tip= +tutti.editProtocol.field.caracteristicMapping.tip= tutti.editProtocol.field.comment= tutti.editProtocol.field.comment.tip= tutti.editProtocol.field.protocol.name= @@ -1308,6 +1311,7 @@ tutti.flash.info.benthos.imported.in.protocol.oneReplaced= tutti.flash.info.benthos.imported.in.protocol.severalReplaced= tutti.flash.info.benthos.remove.from.protocol= tutti.flash.info.benthos.replaced= +tutti.flash.info.caracteristic.add.to.protocol= tutti.flash.info.caracteristic.imported.in.protocol= tutti.flash.info.caractristic.exported.from.protocol= tutti.flash.info.cruiseCreated= diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties index 43e187b..b902985 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties @@ -876,6 +876,8 @@ tutti.editProgram.title.create.program=Créer une nouvelle série de campagne tutti.editProgram.title.edit.program=Éditer une série de campagne existante tutti.editProtocol.action.addBenthosProtocol.mnemonic=j tutti.editProtocol.action.addBenthosProtocol.tip=Ajouter une espèce du benthos au protocole +tutti.editProtocol.action.addCaracteristicMapping.mnemonic= +tutti.editProtocol.action.addCaracteristicMapping.tip= tutti.editProtocol.action.addSpeciesProtocol.mnemonic=j tutti.editProtocol.action.addSpeciesProtocol.tip=Ajouter une espèce au protocole tutti.editProtocol.action.chooseColumnsFile.import=Choisir le fichier contenant les colonnes @@ -938,6 +940,7 @@ tutti.editProtocol.askCancelEditBeforeLeaving.cancelSaveSampleCategoryModel=La c tutti.editProtocol.askSaveBeforeLeaving.saveProtocol=Des modifications sur le protocole n'ont pas été enregistrées tutti.editProtocol.askSaveBeforeLeaving.saveSampleCategoryModel=Des modifications sur la catégorisation n'ont pas été enregistrées tutti.editProtocol.field.benthos.tip=Benthos +tutti.editProtocol.field.caracteristicMapping.tip= tutti.editProtocol.field.comment=Commentaire tutti.editProtocol.field.comment.tip=Commentaire tutti.editProtocol.field.protocol.name=Nom @@ -1260,6 +1263,7 @@ tutti.flash.info.benthos.imported.in.protocol.oneReplaced=Benthos importés dans tutti.flash.info.benthos.imported.in.protocol.severalReplaced=Benthos importés dans le protocole depuis le fichier <strong>%s</strong>. %s remplacées par leur référent. tutti.flash.info.benthos.remove.from.protocol=Les benthos ont été retirés du protocole. tutti.flash.info.benthos.replaced=Le benthos <strong>%s</strong> a été remplacé par son référent <strong>%s</strong>. +tutti.flash.info.caracteristic.add.to.protocol= tutti.flash.info.caracteristic.imported.in.protocol=Caractéristiques importées dans le protocole depuis le fichier <strong>%s</strong>. tutti.flash.info.caractristic.exported.from.protocol=Caractéristiques du protocole exportées dans le fichier <strong>%s</strong>. tutti.flash.info.cruiseCreated=La campagne <strong>%s</strong> a été créée. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 4b7efb2105e9a90667277c15ad8e2d5fc904fddc Author: Kevin Morin <morin@codelutin.com> Date: Tue Dec 9 12:21:12 2014 +0100 correction de la suppression --- .../persistence/entities/protocol/TuttiProtocols.java | 3 +-- .../ui/swing/action/RemoveCaracteristicMappingAction.java | 14 +++++++++++++- .../tutti/ui/swing/content/protocol/EditProtocolUI.css | 1 - 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java index eaeae66..bad4ce2 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java @@ -147,9 +147,8 @@ public class TuttiProtocols extends AbstractTuttiProtocols { } protected static TuttiProtocol migrateProtocol(File file) { - //try to load a v2 try { - // try to load a v1 + //try to load a v2 TuttiProtocol2 tuttiProtocol2 = fromFileV2(file); TuttiProtocol result = fromTuttiProtocol2(tuttiProtocol2); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveCaracteristicMappingAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveCaracteristicMappingAction.java index ce0732d..bc7eb03 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveCaracteristicMappingAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveCaracteristicMappingAction.java @@ -9,8 +9,12 @@ import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUI; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUIHandler; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUIModel; import jaxx.runtime.SwingUtil; +import org.apache.commons.collections4.ComparatorUtils; import javax.swing.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; import java.util.Set; import static org.nuiton.i18n.I18n.t; @@ -32,6 +36,8 @@ public class RemoveCaracteristicMappingAction extends AbstractTuttiAction<EditPr */ protected Set<EditProtocolCaracteristicsRowModel> removedRows; + protected List<Integer> removedRowIndexes; + public RemoveCaracteristicMappingAction(EditProtocolUIHandler handler) { super(handler, false); @@ -50,9 +56,12 @@ public class RemoveCaracteristicMappingAction extends AbstractTuttiAction<EditPr removedCarateristics = Sets.newHashSet(); removedRows = Sets.newHashSet(); + removedRowIndexes = new ArrayList<Integer>(); for (Integer rowIndex : SwingUtil.getSelectedModelRows(table)) { + removedRowIndexes.add(rowIndex); + // get row to remove EditProtocolCaracteristicsRowModel selectedRow = tableModel.getEntry(rowIndex); @@ -64,6 +73,8 @@ public class RemoveCaracteristicMappingAction extends AbstractTuttiAction<EditPr // mark row to be removed at the very last moment removedRows.add(selectedRow); } + + Collections.sort(removedRowIndexes, Collections.reverseOrder()); } @Override @@ -80,7 +91,8 @@ public class RemoveCaracteristicMappingAction extends AbstractTuttiAction<EditPr JTable table = handler.getCaracteristicsMappingTable(); EditProtocolCaracteristicsTableModel tableModel = (EditProtocolCaracteristicsTableModel) table.getModel(); - for (Integer rowIndex : SwingUtil.getSelectedModelRows(table)) { + + for (Integer rowIndex : removedRowIndexes) { tableModel.removeRow(rowIndex); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css index 5bd6f32..022ca7c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css @@ -97,7 +97,6 @@ JTextField { } #caracteristicsMappingTable { - selectionMode: {ListSelectionModel.SINGLE_SELECTION}; selectionBackground: {null}; selectionForeground: {Color.BLACK}; sortable: false; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 65484e68b6aaf38f8b8039a26cf878aab06528cd Author: Kevin Morin <morin@codelutin.com> Date: Wed Dec 10 09:22:20 2014 +0100 empecher de saisir plusieurs fois la même colonne dans les caracteristiques --- .../tutti/ui/swing/action/SaveProtocolAction.java | 5 +- .../fishing/AbstractCaracteristicTabUIHandler.java | 1 + .../content/protocol/EditProtocolUIHandler.java | 70 +++++++++++++++++++++- .../content/protocol/EditProtocolUIModel.java | 50 +++++++++++++++- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 16 ++--- 5 files changed, 128 insertions(+), 14 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveProtocolAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveProtocolAction.java index be1ba1a..c0a14f6 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveProtocolAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveProtocolAction.java @@ -81,7 +81,7 @@ public class SaveProtocolAction extends AbstractTuttiAction<EditProtocolUIModel, Collection<EditProtocolCaracteristicsRowModel> protocolCaracteristicMappingRows = getUI().getModel().getCaracteristicMappingRows(); List<CaracteristicMappingRow> caracteristicMappingRows = new ArrayList<CaracteristicMappingRow>(); for (EditProtocolCaracteristicsRowModel row : protocolCaracteristicMappingRows) { - if (row.getPsfm() != null && row.getType() != null) { + if (row.isValid()) { caracteristicMappingRows.add(row.toEntity()); } } @@ -90,7 +90,8 @@ public class SaveProtocolAction extends AbstractTuttiAction<EditProtocolUIModel, List<EditProtocolOperationFieldsRowModel> protocolOperationFieldMappingRows = getUI().getModel().getOperationFieldMappingRows(); List<OperationFieldMappingRow> operationFieldMappingRows = new ArrayList<OperationFieldMappingRow>(); for (EditProtocolOperationFieldsRowModel row : protocolOperationFieldMappingRows) { - if (StringUtils.isNotBlank(row.getField()) && StringUtils.isNotBlank(row.getImportColumn())) { + if (StringUtils.isNotBlank(row.getField()) && StringUtils.isNotBlank(row.getImportColumn()) + && row.isValid()) { operationFieldMappingRows.add(row.toEntity()); } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIHandler.java index c8a8317..a4cab77 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIHandler.java @@ -213,6 +213,7 @@ public abstract class AbstractCaracteristicTabUIHandler for (Caracteristic caracteristic : caracteristicMap.keySet()) { thisCaracteristicMap.put(caracteristic, caracteristicMap.get(caracteristic)); } + getModel().setModify(true); updateRows(); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java index de0aed7..8333438 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java @@ -812,10 +812,26 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI @Override public void propertyChange(PropertyChangeEvent evt) { EditProtocolCaracteristicsRowModel row = (EditProtocolCaracteristicsRowModel) evt.getSource(); - row.setValid(row.getType() != null); + EditProtocolUIModel model = getModel(); + + if (EditProtocolCaracteristicsRowModel.PROPERTY_IMPORT_COLUMN.equals(evt.getPropertyName())) { + String oldValue = (String) evt.getOldValue(); + if (oldValue != null) { + model.decNumberOfRows(oldValue); + } + String newValue = (String) evt.getNewValue(); + if (newValue != null) { + model.incNumberOfRows(newValue); + } + + recomputeRowsValidState(); + + } else { + row.setValid(isCaracteristicsRowValid(row)); + } if (row.isValid()) { - getModel().setModify(true); + model.setModify(true); } } }); @@ -982,6 +998,28 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI protected EditProtocolOperationFieldsRowModel createOperationFieldRow(String property, String column) { EditProtocolOperationFieldsRowModel newRow = new EditProtocolOperationFieldsRowModel(); + newRow.addPropertyChangeListener(new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent evt) { + EditProtocolOperationFieldsRowModel row = (EditProtocolOperationFieldsRowModel) evt.getSource(); + EditProtocolUIModel model = getModel(); + + //update number of rows by column + if (EditProtocolOperationFieldsRowModel.PROPERTY_IMPORT_COLUMN.equals(evt.getPropertyName())) { + String oldValue = (String) evt.getOldValue(); + if (oldValue != null) { + model.decNumberOfRows(oldValue); + } + String newValue = (String) evt.getNewValue(); + if (newValue != null) { + model.incNumberOfRows(newValue); + } + + recomputeRowsValidState(); + } + } + }); + newRow.setValid(true); newRow.setField(property); newRow.setImportColumn(column); newRow.setValid(true); @@ -994,6 +1032,34 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI return newRow; } + protected void recomputeRowsValidState() { + EditProtocolUIModel model = getModel(); + + for (EditProtocolCaracteristicsRowModel row : model.getCaracteristicMappingRows()) { + row.setValid(isCaracteristicsRowValid(row)); + } + + for (EditProtocolOperationFieldsRowModel row : model.getOperationFieldMappingRows()) { + row.setValid(isOperationFieldsRowValid(row)); + } + + getCaracteristicsMappingTable().repaint(); + getOperationFieldsMappingTable().repaint(); + } + + protected boolean isOperationFieldsRowValid(EditProtocolOperationFieldsRowModel row) { + EditProtocolUIModel model = getModel(); + String importColumn = row.getImportColumn(); + return importColumn == null || model.numberOfRows(importColumn) < 2; + } + + protected boolean isCaracteristicsRowValid(EditProtocolCaracteristicsRowModel row) { + EditProtocolUIModel model = getModel(); + String importColumn = row.getImportColumn(); + return row.getType() != null && + (importColumn == null || model.numberOfRows(importColumn) < 2); + } + protected void populateImportColumnTableEditors() { Collection<String> importColumns = getModel().getImportColumns(); ArrayList<String> dataToList = new ArrayList<String>(); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java index ef50154..0ef2903 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java @@ -23,6 +23,7 @@ package fr.ifremer.tutti.ui.swing.content.protocol; */ import com.google.common.base.Function; +import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; @@ -35,9 +36,11 @@ import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocols; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; +import org.apache.commons.lang3.mutable.MutableInt; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; +import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.List; @@ -127,9 +130,18 @@ public class EditProtocolUIModel extends AbstractTuttiBeanUIModel<TuttiProtocol, protected Map<String, Caracteristic> allCaracteristic; - protected Map<Caracteristic, EditProtocolCaracteristicsRowModel> caracteristicMappingRows; + protected Map<Caracteristic, EditProtocolCaracteristicsRowModel> caracteristicMappingRows = + new HashMap<Caracteristic, EditProtocolCaracteristicsRowModel>(); - protected List<EditProtocolOperationFieldsRowModel> operationFieldMappingRows; + protected List<EditProtocolOperationFieldsRowModel> operationFieldMappingRows = + new ArrayList<EditProtocolOperationFieldsRowModel>(); + + /** + * Number of rows for each column + * + * @since 3.10 + */ + protected Map<String, MutableInt> numberOfRowsByColumn = new HashMap<String, MutableInt>(); protected List<EditProtocolSpeciesRowModel> speciesRow; @@ -794,4 +806,38 @@ public class EditProtocolUIModel extends AbstractTuttiBeanUIModel<TuttiProtocol, public OperationFieldMappingRow getOperationFieldMapping(int index) { return editObject.getOperationFieldMapping(index); } + + public int numberOfRows(String column) { + int result = 0; + MutableInt mutableInt = numberOfRowsByColumn.get(column); + if (mutableInt != null) { + result = mutableInt.intValue(); + } + return result; + } + + public void resetNumbersOfRows() { + numberOfRowsByColumn = new HashMap<String, MutableInt>(); + } + + public int incNumberOfRows(String column) { + MutableInt mutableInt = numberOfRowsByColumn.get(column); + if (mutableInt == null) { + mutableInt = new MutableInt(1); + numberOfRowsByColumn.put(column, mutableInt); + } else { + mutableInt.increment(); + } + return mutableInt.intValue(); + + } + + public int decNumberOfRows(String column) { + MutableInt mutableInt = numberOfRowsByColumn.get(column); + Preconditions.checkNotNull(mutableInt); + Preconditions.checkArgument(mutableInt.intValue() > 0); + mutableInt.decrement(); + return mutableInt.intValue(); + } + } diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties index a79fdca..fc0ec56 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties @@ -677,16 +677,16 @@ tutti.editFishingOperation.action.attachments.tip=Pièces-jointes de l'opératio tutti.editFishingOperation.action.cancelEditFishingOperation=Annuler tutti.editFishingOperation.action.cancelEditFishingOperation.mnemonic=A tutti.editFishingOperation.action.cancelEditFishingOperation.tip=Annuler la création du trait -tutti.editFishingOperation.action.chooseColumnsFile.import=Choisir le fichier de colonnes +tutti.editFishingOperation.action.chooseColumnsFile.import=Choisir le fichier de paramètres tutti.editFishingOperation.action.deleteFishingOperation.message=Vous êtes sur le point de supprimer l'opération de pêche <strong>%s</strong> tutti.editFishingOperation.action.deleteFishingOperation.tip=Supprimer l'opération de pêche sélectionnée tutti.editFishingOperation.action.deleteFishingOperation.title=Supprimer l'opération de pêche sélectionnée tutti.editFishingOperation.action.editFishingOperation.tip=Éditer l'opération de pêche tutti.editFishingOperation.action.importColumns.operationNotFound=Le trait n'a pas été trouvé dans le fichier importé tutti.editFishingOperation.action.importColumns.success=Les données du fichier ont été importées dans le trait -tutti.editFishingOperation.action.importFromColumnFile=Import du fichier de colonnes +tutti.editFishingOperation.action.importFromColumnFile=Import du fichier de paramètre tutti.editFishingOperation.action.importFromColumnFile.mnemonic=c -tutti.editFishingOperation.action.importFromColumnFile.tip=Import du fichier de colonnes +tutti.editFishingOperation.action.importFromColumnFile.tip=Import du fichier de paramètres tutti.editFishingOperation.action.resetEditFishingOperation=Réinitialiser tutti.editFishingOperation.action.resetEditFishingOperation.mnemonic=R tutti.editFishingOperation.action.resetEditFishingOperation.tip=Réinitialiser l'édition du trait @@ -696,7 +696,7 @@ tutti.editFishingOperation.action.resetFishingOperationValidState.tip=Réinitial tutti.editFishingOperation.action.saveEditFishingOperation.mnemonic=E tutti.editFishingOperation.action.saveEditFishingOperation.tip=Enregistrer le trait tutti.editFishingOperation.action.saveFishingOperation=Enregistrer -tutti.editFishingOperation.action.title.choose.importColumnsFile=Importer par fichier de colonnes +tutti.editFishingOperation.action.title.choose.importColumnsFile=Importer le fichier de paramètres tutti.editFishingOperation.askCancelEditBeforeLeaving.cancelEditFishingOperation=Le trait modifié n'est pas valide et ne peut pas être enregistré tutti.editFishingOperation.askSaveBeforeLeaving.createFishingOperation=Le trait n'a pas été créé tutti.editFishingOperation.askSaveBeforeLeaving.saveFishingOperation=Des modifications sur le trait n'ont pas été enregistrées @@ -880,7 +880,7 @@ tutti.editProtocol.action.addCaracteristicMapping.mnemonic=j tutti.editProtocol.action.addCaracteristicMapping.tip=Ajouter aux caractéristiques du trait tutti.editProtocol.action.addSpeciesProtocol.mnemonic=j tutti.editProtocol.action.addSpeciesProtocol.tip=Ajouter une espèce au protocole -tutti.editProtocol.action.chooseColumnsFile.import=Choisir le fichier contenant les colonnes +tutti.editProtocol.action.chooseColumnsFile.import=Choisir le fichier de paramètres tutti.editProtocol.action.chooseProtocolBenthosFile=Choisir le fichier des benthos tutti.editProtocol.action.chooseProtocolCaracteristicFile=Choisir le fichier des caractéristiques tutti.editProtocol.action.chooseProtocolSpeciesFile=Choisir le fichier des espèces @@ -910,9 +910,9 @@ tutti.editProtocol.action.importProtocolBenthos.tip=Importer les benthos dans le tutti.editProtocol.action.importProtocolCaracteristic=Importer les caractéristiques tutti.editProtocol.action.importProtocolCaracteristic.mnemonic=i tutti.editProtocol.action.importProtocolCaracteristic.tip=Importer les caractéristiques dans le protocole -tutti.editProtocol.action.importProtocolColumns=Importer les colonnes d'import +tutti.editProtocol.action.importProtocolColumns=Importer le fichier de paramètres tutti.editProtocol.action.importProtocolColumns.mnemonic=c -tutti.editProtocol.action.importProtocolColumns.tip=Importer les colonnes d'import +tutti.editProtocol.action.importProtocolColumns.tip=Importer le fichier de paramètres tutti.editProtocol.action.importProtocolSpecies=Importer les espèces tutti.editProtocol.action.importProtocolSpecies.mnemonic=é tutti.editProtocol.action.importProtocolSpecies.speciesInBenthos=Les espèces suivantes n'ont pas été importées car elles sont déjà présentes dans le benthos \:<ul>%s</ul> @@ -937,7 +937,7 @@ tutti.editProtocol.action.selectOtherBenthos.tip=Sélectionner une autre espèce tutti.editProtocol.action.selectOtherSpecies=... tutti.editProtocol.action.selectOtherSpecies.mnemonic=. tutti.editProtocol.action.selectOtherSpecies.tip=Sélectionner une autre espèce (dans les synonymes) -tutti.editProtocol.action.title.choose.importColumnsFile=Importer les colonnes d'import +tutti.editProtocol.action.title.choose.importColumnsFile=Importer le fichier de paramètres tutti.editProtocol.askCancelEditBeforeLeaving.cancelSaveProtocol=Le protocole n'est pas valide et ne peut pas être enregistré tutti.editProtocol.askCancelEditBeforeLeaving.cancelSaveSampleCategoryModel=La catégorisation n'est pas valide et ne peut pas être enregistré tutti.editProtocol.askSaveBeforeLeaving.saveProtocol=Des modifications sur le protocole n'ont pas été enregistrées -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 34b8502bf937aab63b64aa6951cb757d6fa72607 Author: Kevin Morin <morin@codelutin.com> Date: Thu Dec 11 11:10:25 2014 +0100 - error management - check the operation key to enable or not the import - import locations --- .../swing/action/ImportFromColumnFileAction.java | 75 ++++++++++++++++------ .../content/operation/EditFishingOperationUI.css | 1 + .../operation/EditFishingOperationUIHandler.java | 18 ++++++ .../operation/EditFishingOperationUIModel.java | 10 +++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 3 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 3 + 6 files changed, 89 insertions(+), 21 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportFromColumnFileAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportFromColumnFileAction.java index 87f9359..17c7b18 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportFromColumnFileAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportFromColumnFileAction.java @@ -16,20 +16,26 @@ import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.persistence.entities.referential.Person; +import fr.ifremer.tutti.persistence.entities.referential.TuttiLocation; import fr.ifremer.tutti.persistence.entities.referential.Vessel; +import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.TuttiCsvUtil; +import fr.ifremer.tutti.service.TuttiDataContext; import fr.ifremer.tutti.ui.swing.content.operation.EditFishingOperationUI; import fr.ifremer.tutti.ui.swing.content.operation.EditFishingOperationUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.EditFishingOperationUIModel; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.csv.AbstractImportErrorInfo; import org.nuiton.csv.Import2; import org.nuiton.csv.ImportConf; import org.nuiton.csv.ImportRow; +import org.nuiton.csv.ImportRuntimeException; import org.nuiton.csv.ValueParser; import org.nuiton.csv.ValueSetter; import org.nuiton.csv.ext.CsvReaders; +import org.nuiton.util.DateUtil; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; @@ -38,6 +44,7 @@ import java.io.FileInputStream; import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; +import java.util.Date; import java.util.HashSet; import java.util.Iterator; import java.util.List; @@ -65,7 +72,7 @@ public class ImportFromColumnFileAction extends AbstractTuttiAction<EditFishingO @Override public boolean prepareAction() throws Exception { - boolean result = super.prepareAction(); + boolean result = super.prepareAction() && getModel().isImportFromColumnFileEnabled(); if (result) { columnsFile = chooseFile(t("tutti.editFishingOperation.action.title.choose.importColumnsFile"), @@ -86,7 +93,6 @@ public class ImportFromColumnFileAction extends AbstractTuttiAction<EditFishingO ImportFromColumnFileModel importModel = new ImportFromColumnFileModel(';', new HashSet<>(headers)); ImportConf conf = new ImportConf(); conf.setStrictMode(false); -// conf.setIgnoreUnknownHeader(true); Import2<FishingOperation> operationUIModelImport = Import2.newImport(conf, importModel, new FileInputStream(columnsFile)); @@ -116,7 +122,16 @@ public class ImportFromColumnFileAction extends AbstractTuttiAction<EditFishingO EditFishingOperationUIModel model = getModel(); boolean sameStationNumber = Objects.equals(fishingOperation.getStationNumber(), model.getStationNumber()); boolean sameFishingOperationNumber = Objects.equals(fishingOperation.getFishingOperationNumber(), model.getFishingOperationNumber()); - boolean sameGearShootingStartDate = Objects.equals(fishingOperation.getGearShootingStartDate(), model.getGearShootingStartDate()); + // check if the dates (not time) are equals, but push the time to the model + Date modelGearShootingStartDate = model.getGearShootingStartDate(); + if (modelGearShootingStartDate != null) { + modelGearShootingStartDate = DateUtil.getDay(modelGearShootingStartDate); + } + Date gearShootingStartDate = fishingOperation.getGearShootingStartDate(); + if (gearShootingStartDate != null) { + gearShootingStartDate = DateUtil.getDay(gearShootingStartDate); + } + boolean sameGearShootingStartDate = Objects.equals(modelGearShootingStartDate, gearShootingStartDate); return (StringUtils.isBlank(stationColumn) || sameStationNumber) && (StringUtils.isBlank(operationNumberColumn) || sameFishingOperationNumber) @@ -137,10 +152,13 @@ public class ImportFromColumnFileAction extends AbstractTuttiAction<EditFishingO getUI().getVesselUseFeatureTabContent().getHandler().mergeCaracteristics(fishingOperation); } else { - if (log.isErrorEnabled()) { - log.error(next.getErrors()); + error = ""; + for (AbstractImportErrorInfo<FishingOperation> errorInfo : next.getErrors()) { + if (log.isErrorEnabled()) { + log.error(errorInfo.getCause().getLocalizedMessage()); + } + error += "<li>" + errorInfo.getCause().getLocalizedMessage() + "</li>"; } - error = next.getErrors().toString(); } found = true; } @@ -155,7 +173,8 @@ public class ImportFromColumnFileAction extends AbstractTuttiAction<EditFishingO public void postSuccessAction() { super.postSuccessAction(); if (error != null) { - displayErrorMessage("error", error); + displayErrorMessage(t("tutti.editFishingOperation.action.importColumns.error.title"), + t("tutti.editFishingOperation.action.importColumns.error", error)); } else { sendMessage(t("tutti.editFishingOperation.action.importColumns.success")); } @@ -171,12 +190,18 @@ public class ImportFromColumnFileAction extends AbstractTuttiAction<EditFishingO public ImportFromColumnFileModel(char separator, Set<String> headers) { super(separator); - TuttiProtocol protocol = getDataContext().getProtocol(); + PersistenceService persistenceService = getContext().getPersistenceService(); + TuttiDataContext dataContext = getDataContext(); + + TuttiProtocol protocol = dataContext.getProtocol(); Collection<OperationFieldMappingRow> operationFieldMapping = protocol.getOperationFieldMapping(); + String zoneId = dataContext.getProgram().getZone().getId(); + for (OperationFieldMappingRow mappingRow : operationFieldMapping) { String importColumn = mappingRow.getImportColumn(); - if (StringUtils.isNotBlank(importColumn) && headers.remove(importColumn)) { + boolean importColumnsInHeaders = headers.remove(importColumn); + if (StringUtils.isNotBlank(importColumn) && importColumnsInHeaders) { String field = mappingRow.getField(); ValueParser valueParser; @@ -207,29 +232,34 @@ public class ImportFromColumnFileAction extends AbstractTuttiAction<EditFishingO break; case EditFishingOperationUIModel.PROPERTY_GEAR: - List<Gear> gears = new ArrayList<>(getDataContext().getFishingGears()); - gears.addAll(getDataContext().getScientificGears()); + List<Gear> gears = new ArrayList<>(dataContext.getFishingGears()); + gears.addAll(dataContext.getScientificGears()); Map<String, Gear> gearUniverse = TuttiEntities.splitById(gears); valueParser = newForeignKeyValue(Gear.class, field, gearUniverse); break; case EditFishingOperationUIModel.PROPERTY_VESSEL: case EditFishingOperationUIModel.PROPERTY_SECONDARY_VESSEL: - List<Vessel> vessels = new ArrayList<>(getDataContext().getFishingVessels()); - vessels.addAll(getDataContext().getScientificVessels()); + List<Vessel> vessels = new ArrayList<>(dataContext.getFishingVessels()); + vessels.addAll(dataContext.getScientificVessels()); Map<String, Vessel> vesselUniverse = TuttiEntities.splitById(vessels); valueParser = newForeignKeyValue(Vessel.class, field, vesselUniverse); break; - //TODO comment on recupere les tuttilocation qui vont bien ? -// case EditFishingOperationUIModel.PROPERTY_STRATA: -// case EditFishingOperationUIModel.PROPERTY_SUB_STRATA: -// Map<String, TuttiLocation> locationUniverse = TuttiEntities.splitById(getDataContext().getL); -// valueParser = newForeignKeyValue(TuttiLocation.class, field, locationUniverse); -// break; + case EditFishingOperationUIModel.PROPERTY_STRATA: + Map<String, TuttiLocation> strataUniverse = TuttiEntities.splitById( + persistenceService.getAllFishingOperationStrata(zoneId)); + valueParser = newForeignKeyValue(TuttiLocation.class, field, strataUniverse); + break; + + case EditFishingOperationUIModel.PROPERTY_SUB_STRATA: + Map<String, TuttiLocation> subStrataUniverse = TuttiEntities.splitById( + persistenceService.getAllFishingOperationSubStrata(zoneId, null)); + valueParser = newForeignKeyValue(TuttiLocation.class, field, subStrataUniverse); + break; case EditFishingOperationUIModel.PROPERTY_RECORDER_PERSON: - Map<String, Person> personUniverse = TuttiEntities.splitById(getDataContext().getPersons()); + Map<String, Person> personUniverse = TuttiEntities.splitById(dataContext.getPersons()); valueParser = newForeignKeyValue(Person.class, field, personUniverse); break; @@ -238,6 +268,9 @@ public class ImportFromColumnFileAction extends AbstractTuttiAction<EditFishingO } newMandatoryColumn(importColumn, field, valueParser); + + } else if (!importColumnsInHeaders) { + throw new ImportRuntimeException(t("tutti.editFishingOperation.action.importColumns.missingHeader", importColumn)); } } @@ -247,7 +280,7 @@ public class ImportFromColumnFileAction extends AbstractTuttiAction<EditFishingO if (StringUtils.isNotBlank(importColumn) && headers.remove(importColumn)) { int pmfmId = Integer.parseInt(mappingRow.getPmfmId()); - final Caracteristic caracteristic = getContext().getPersistenceService().getCaracteristic(pmfmId); + final Caracteristic caracteristic = persistenceService.getCaracteristic(pmfmId); ValueSetter<FishingOperation, String> setter = new ValueSetter<FishingOperation, String>() { @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css index fe79d09..d5a42ed 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css @@ -87,6 +87,7 @@ JXDatePicker { i18nMnemonic: "tutti.editFishingOperation.action.importFromColumnFile.mnemonic"; _applicationAction: {fr.ifremer.tutti.ui.swing.action.ImportFromColumnFileAction.class}; _help: {"tutti.editFishingOperation.action.importFromColumnFile.help"}; + enabled: {model.isImportFromColumnFileEnabled()} } #fishingOperationAttachmentsButton { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java index 3105fe4..3a2ec3c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java @@ -28,6 +28,7 @@ import com.google.common.collect.Maps; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.Program; +import fr.ifremer.tutti.persistence.entities.protocol.OperationFieldMappingRow; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.persistence.entities.referential.Person; @@ -49,6 +50,7 @@ import fr.ifremer.tutti.util.Distances; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.BooleanUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -70,6 +72,7 @@ import java.awt.event.ItemListener; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.Calendar; +import java.util.Collection; import java.util.Date; import java.util.List; import java.util.Map; @@ -308,6 +311,21 @@ public class EditFishingOperationUIHandler extends AbstractTuttiTabContainerUIHa } }); + // enable or not the import from column file + if (getDataContext().isProtocolFilled()) { + Collection<OperationFieldMappingRow> operationFieldMapping = getDataContext().getProtocol().getOperationFieldMapping(); + for (OperationFieldMappingRow row : operationFieldMapping) { + if ((EditFishingOperationUIModel.PROPERTY_STATION_NUMBER.equals(row.getField()) + || EditFishingOperationUIModel.PROPERTY_FISHING_OPERATION_NUMBER.equals(row.getField()) + || EditFishingOperationUIModel.PROPERTY_GEAR_SHOOTING_START_DATE.equals(row.getField())) + && StringUtils.isNotBlank(row.getImportColumn())) { + + model.setImportFromColumnFileEnabled(true); + break; + } + } + } + ui.setContextValue(model); fishingOperationMonitor.setBean(model); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java index 4f8adac..477c76a 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java @@ -256,6 +256,8 @@ public class EditFishingOperationUIModel extends AbstractTuttiBeanUIModel<Fishin protected SecondaryVesselTypeEnum secondaryVesselType; + protected boolean importFromColumnFileEnabled; + protected static Binder<EditFishingOperationUIModel, FishingOperation> toBeanBinder = BinderFactory.newBinder(EditFishingOperationUIModel.class, FishingOperation.class); @@ -1462,4 +1464,12 @@ public class EditFishingOperationUIModel extends AbstractTuttiBeanUIModel<Fishin public boolean containsAllRecorderPerson(Collection<Person> recorderPerson) { return false; } + + public boolean isImportFromColumnFileEnabled() { + return importFromColumnFileEnabled; + } + + public void setImportFromColumnFileEnabled(boolean importFromColumnFileEnabled) { + this.importFromColumnFileEnabled = importFromColumnFileEnabled; + } } diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties index 785ecc6..c807422 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties @@ -700,6 +700,9 @@ tutti.editFishingOperation.action.deleteFishingOperation.message= tutti.editFishingOperation.action.deleteFishingOperation.tip= tutti.editFishingOperation.action.deleteFishingOperation.title= tutti.editFishingOperation.action.editFishingOperation.tip= +tutti.editFishingOperation.action.importColumns.error= +tutti.editFishingOperation.action.importColumns.error.title= +tutti.editFishingOperation.action.importColumns.missingHeader= tutti.editFishingOperation.action.importColumns.operationNotFound= tutti.editFishingOperation.action.importColumns.success= tutti.editFishingOperation.action.importFromColumnFile= diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties index fc0ec56..9e5aafc 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties @@ -682,6 +682,9 @@ tutti.editFishingOperation.action.deleteFishingOperation.message=Vous êtes sur tutti.editFishingOperation.action.deleteFishingOperation.tip=Supprimer l'opération de pêche sélectionnée tutti.editFishingOperation.action.deleteFishingOperation.title=Supprimer l'opération de pêche sélectionnée tutti.editFishingOperation.action.editFishingOperation.tip=Éditer l'opération de pêche +tutti.editFishingOperation.action.importColumns.error=<html><body>L'import des paramètres a échoué pour les raisons suivantes \:<ul>%s</ul></body></html> +tutti.editFishingOperation.action.importColumns.error.title=Erreur lors de l'import des paramètres +tutti.editFishingOperation.action.importColumns.missingHeader=Le fichier de paramètre ne contient pas la colonne '%s'. tutti.editFishingOperation.action.importColumns.operationNotFound=Le trait n'a pas été trouvé dans le fichier importé tutti.editFishingOperation.action.importColumns.success=Les données du fichier ont été importées dans le trait tutti.editFishingOperation.action.importFromColumnFile=Import du fichier de paramètre -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit a899157b71c88fedf2bce5904e4b69beb03c7e71 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Dec 11 13:49:30 2014 +0100 ajout javadoc + nettoyage imports --- .../tutti/persistence/entities/protocol/v2/TuttiProtocol2.java | 4 ++++ .../tutti/persistence/entities/protocol/v2/TuttiProtocolBean2.java | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v2/TuttiProtocol2.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v2/TuttiProtocol2.java index a67f592..df7322c 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v2/TuttiProtocol2.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v2/TuttiProtocol2.java @@ -8,6 +8,10 @@ import javax.annotation.Generated; import java.util.Collection; import java.util.List; +/** + * @author kmorin - morin@codelutin.com + * @since 3.9 + */ @Generated(value = "org.nuiton.eugene.java.SimpleJavaBeanTransformer", date = "Mon Nov 24 12:54:48 CET 2014") public interface TuttiProtocol2 extends CommentAware, TuttiEntity { diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v2/TuttiProtocolBean2.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v2/TuttiProtocolBean2.java index 0405b21..76ac378 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v2/TuttiProtocolBean2.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v2/TuttiProtocolBean2.java @@ -1,9 +1,7 @@ package fr.ifremer.tutti.persistence.entities.protocol.v2; import fr.ifremer.tutti.persistence.entities.TuttiEntityBean; -import fr.ifremer.tutti.persistence.entities.protocol.AbstractTuttiProtocolBean; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; -import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import javax.annotation.Generated; import java.util.Collection; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 51e78a270fc20df29a75fd8a7f2a52c026b9661a Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Dec 11 13:50:44 2014 +0100 renommage de l'action d'import de caracteristiques d'un trait + utilisation du service dédié --- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 5 + ...perationCaracteristicsFromColumnFileAction.java | 138 ++++++++ .../swing/action/ImportFromColumnFileAction.java | 367 --------------------- .../content/operation/EditFishingOperationUI.css | 2 +- 4 files changed, 144 insertions(+), 368 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java index 01b117f..cce58d1 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java @@ -42,6 +42,7 @@ import fr.ifremer.tutti.service.catches.multipost.MultiPostImportService; import fr.ifremer.tutti.service.export.generic.TuttiExportService; import fr.ifremer.tutti.service.export.pdf.CatchesPdfExportService; import fr.ifremer.tutti.service.export.sumatra.CatchesSumatraExportService; +import fr.ifremer.tutti.service.operationimport.FishingOperationImportService; import fr.ifremer.tutti.service.protocol.ProtocolImportExportService; import fr.ifremer.tutti.service.psionimport.PsionImportService; import fr.ifremer.tutti.service.pupitri.PupitriExportService; @@ -736,6 +737,10 @@ public class TuttiUIContext extends AbstractBean implements Closeable, UIMessage return serviceContext.getService(MultiPostExportService.class); } + public FishingOperationImportService getFishingOperationImportService() { + return serviceContext.getService(FishingOperationImportService.class); + } + public ReportService getReportService() { return serviceContext.getService(ReportService.class); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportFishingOperationCaracteristicsFromColumnFileAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportFishingOperationCaracteristicsFromColumnFileAction.java new file mode 100644 index 0000000..c3382d2 --- /dev/null +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportFishingOperationCaracteristicsFromColumnFileAction.java @@ -0,0 +1,138 @@ +package fr.ifremer.tutti.ui.swing.action; + +import fr.ifremer.tutti.persistence.entities.data.FishingOperation; +import fr.ifremer.tutti.service.operationimport.FishingOperationImportService; +import fr.ifremer.tutti.service.operationimport.ImportFromColumnFileFishingOperationNotFoundException; +import fr.ifremer.tutti.service.operationimport.ImportFromColumnFileInvalidRowException; +import fr.ifremer.tutti.ui.swing.content.operation.EditFishingOperationUI; +import fr.ifremer.tutti.ui.swing.content.operation.EditFishingOperationUIHandler; +import fr.ifremer.tutti.ui.swing.content.operation.EditFishingOperationUIModel; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.csv.AbstractImportErrorInfo; +import org.nuiton.jaxx.application.ApplicationBusinessException; + +import java.io.File; + +import static org.nuiton.i18n.I18n.t; + +/** + * @author Kevin Morin (Code Lutin) + * @since 3.10 + */ +public class ImportFishingOperationCaracteristicsFromColumnFileAction extends AbstractTuttiAction<EditFishingOperationUIModel, EditFishingOperationUI, EditFishingOperationUIHandler> { + + private static final Log log = LogFactory.getLog(LoadProtocolImportColumnsAction.class); + + /** + * File to import. + */ + protected File columnsFile; + + /** + * Result fishing operation after import to merge back to ui model. + */ + protected FishingOperation fishingOperationToMerge; + + public ImportFishingOperationCaracteristicsFromColumnFileAction(EditFishingOperationUIHandler handler) { + super(handler, true); + } + + @Override + public boolean prepareAction() throws Exception { + boolean result = super.prepareAction() && getModel().isImportFromColumnFileEnabled(); + + if (result) { + columnsFile = chooseFile(t("tutti.editFishingOperation.action.title.choose.importColumnsFile"), + t("tutti.editFishingOperation.action.chooseColumnsFile.import"), + "^.*\\.csv", t("tutti.common.file.csv")); + + result = columnsFile != null; + } + + return result; + } + + @Override + public void doAction() throws ImportFromColumnFileInvalidRowException, ImportFromColumnFileFishingOperationNotFoundException { + + EditFishingOperationUIModel model = getModel(); + + // Create a copy of the ui model to use in the import + // this bean will be merged back after import into ui model + fishingOperationToMerge = model.toEntity(); + + //FIXME Check we don't need this ? +// fishingOperationToMerge = FishingOperations.newFishingOperation(); +// Binder<EditFishingOperationUIModel, FishingOperation> toBeanBinder = BinderFactory.newBinder(EditFishingOperationUIModel.class, FishingOperation.class); +// toBeanBinder.copy(model, fishingOperationToMerge); + + FishingOperationImportService fishingOperationImportService = getContext().getFishingOperationImportService(); + + fishingOperationImportService.importCaracteristicsFromColumnFile(columnsFile, fishingOperationToMerge); + + } + + @Override + public void postSuccessAction() { + + super.postSuccessAction(); + + // Merge result to ui model + EditFishingOperationUI ui = getUI(); + EditFishingOperationUIModel model = getModel(); + + model.fromEntity(fishingOperationToMerge); + + //FIXME Find out why ? + //these 2 do not refresh correctly + ui.getRecorderPersonList().getHandler().setSelected(fishingOperationToMerge.getRecorderPerson()); + ui.getSecondaryVesselList().getHandler().setSelected(fishingOperationToMerge.getSecondaryVessel()); + + ui.getGearUseFeatureTabContent().getHandler().mergeCaracteristics(fishingOperationToMerge); + ui.getVesselUseFeatureTabContent().getHandler().mergeCaracteristics(fishingOperationToMerge); + + sendMessage(t("tutti.editFishingOperation.action.importColumns.success")); + + } + + @Override + public void postFailedAction(Throwable error) { + + String errorMessage = null; + if (error instanceof ImportFromColumnFileFishingOperationNotFoundException) { + + // no matching fishing operation + errorMessage = "<li>" + t("tutti.editFishingOperation.action.importColumns.operationNotFound") + "</li>"; + + } + + if (error instanceof ImportFromColumnFileInvalidRowException) { + + // matching row is not valid + ImportFromColumnFileInvalidRowException importFromColumnFileInvalidRowException = (ImportFromColumnFileInvalidRowException) error; + + errorMessage = ""; + for (AbstractImportErrorInfo<FishingOperation> errorInfo : importFromColumnFileInvalidRowException.getErrors()) { + if (log.isErrorEnabled()) { + log.error(errorInfo.getCause().getLocalizedMessage()); + } + errorMessage += "<li>" + errorInfo.getCause().getLocalizedMessage().replaceAll("\\s+", " ") + "</li>"; + } + + } + + //TODO Check this is ok, otherwise use below code + throw new ApplicationBusinessException(t("tutti.editFishingOperation.action.importColumns.error", errorMessage)); + +// if (errorMessage != null) { +// +// displayErrorMessage(t("tutti.editFishingOperation.action.importColumns.error.title"), +// "<html><body>" + +// t("tutti.editFishingOperation.action.importColumns.error", errorMessage) +// + "</body></html>"); +// +// } + + } +} diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportFromColumnFileAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportFromColumnFileAction.java deleted file mode 100644 index 4a84e47..0000000 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportFromColumnFileAction.java +++ /dev/null @@ -1,367 +0,0 @@ -package fr.ifremer.tutti.ui.swing.action; - -import com.google.common.base.Function; -import com.google.common.base.Predicate; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; -import fr.ifremer.tutti.persistence.entities.CaracteristicMap; -import fr.ifremer.tutti.persistence.entities.TuttiEntities; -import fr.ifremer.tutti.persistence.entities.data.FishingOperation; -import fr.ifremer.tutti.persistence.entities.data.FishingOperations; -import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicMappingRow; -import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicType; -import fr.ifremer.tutti.persistence.entities.protocol.OperationFieldMappingRow; -import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; -import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; -import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; -import fr.ifremer.tutti.persistence.entities.referential.Gear; -import fr.ifremer.tutti.persistence.entities.referential.Person; -import fr.ifremer.tutti.persistence.entities.referential.TuttiLocation; -import fr.ifremer.tutti.persistence.entities.referential.Vessel; -import fr.ifremer.tutti.service.PersistenceService; -import fr.ifremer.tutti.service.TuttiCsvUtil; -import fr.ifremer.tutti.service.TuttiDataContext; -import fr.ifremer.tutti.ui.swing.content.operation.EditFishingOperationUI; -import fr.ifremer.tutti.ui.swing.content.operation.EditFishingOperationUIHandler; -import fr.ifremer.tutti.ui.swing.content.operation.EditFishingOperationUIModel; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.csv.AbstractImportErrorInfo; -import org.nuiton.csv.Import2; -import org.nuiton.csv.ImportConf; -import org.nuiton.csv.ImportRow; -import org.nuiton.csv.ImportRuntimeException; -import org.nuiton.csv.ValueParser; -import org.nuiton.csv.ValueSetter; -import org.nuiton.csv.ext.CsvReaders; -import org.nuiton.util.DateUtil; -import org.nuiton.util.beans.Binder; -import org.nuiton.util.beans.BinderFactory; - -import java.io.File; -import java.io.FileInputStream; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Date; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; - -import static org.nuiton.i18n.I18n.t; - -/** - * @author Kevin Morin (Code Lutin) - * @since 3.10 - */ -public class ImportFromColumnFileAction extends AbstractTuttiAction<EditFishingOperationUIModel, EditFishingOperationUI, EditFishingOperationUIHandler> { - - private static final Log log = LogFactory.getLog(LoadProtocolImportColumnsAction.class); - - protected File columnsFile; - - protected String error; - - public ImportFromColumnFileAction(EditFishingOperationUIHandler handler) { - super(handler, true); - } - - @Override - public boolean prepareAction() throws Exception { - boolean result = super.prepareAction() && getModel().isImportFromColumnFileEnabled(); - - if (result) { - columnsFile = chooseFile(t("tutti.editFishingOperation.action.title.choose.importColumnsFile"), - t("tutti.editFishingOperation.action.chooseColumnsFile.import"), - "^.*\\.csv", t("tutti.common.file.csv")); - - result = columnsFile != null; - } - - return result; - } - - @Override - public void doAction() throws Exception { - - final EditFishingOperationUIModel model = getModel(); - - Set<String> headers = Sets.newHashSet(CsvReaders.getHeader(columnsFile, ';')); - - ImportFromColumnFileModel importModel = new ImportFromColumnFileModel(';', new HashSet<>(headers)); - ImportConf conf = new ImportConf(); - conf.setStrictMode(false); - - Import2<FishingOperation> operationUIModelImport = - Import2.newImport(conf, importModel, new FileInputStream(columnsFile)); - - TuttiProtocol protocol = getDataContext().getProtocol(); - final Map<String, OperationFieldMappingRow> mappingRowsByField = - Maps.uniqueIndex(protocol.getOperationFieldMapping(), new Function<OperationFieldMappingRow, String>() { - @Override - public String apply(OperationFieldMappingRow operationFieldMappingRow) { - return operationFieldMappingRow.getField(); - } - }); - - // predicate to check if the row matches the model key defined by the protocol< - Predicate<FishingOperation> predicate = new Predicate<FishingOperation>() { - @Override - public boolean apply(FishingOperation fishingOperation) { - - OperationFieldMappingRow operationNumberRow = mappingRowsByField.get(FishingOperation.PROPERTY_FISHING_OPERATION_NUMBER); - OperationFieldMappingRow stationNumberRow = mappingRowsByField.get(FishingOperation.PROPERTY_STATION_NUMBER); - OperationFieldMappingRow startDateRow = mappingRowsByField.get(FishingOperation.PROPERTY_GEAR_SHOOTING_START_DATE); - - String operationNumberColumn = operationNumberRow != null ? operationNumberRow.getImportColumn() : null; - String stationColumn = stationNumberRow != null ? stationNumberRow.getImportColumn() : null; - String startDateColumn = startDateRow != null ? startDateRow.getImportColumn() : null; - - boolean sameStationNumber = Objects.equals(fishingOperation.getStationNumber(), model.getStationNumber()); - boolean sameFishingOperationNumber = Objects.equals(fishingOperation.getFishingOperationNumber(), model.getFishingOperationNumber()); - // check if the dates (not time) are equals, but push the time to the model - Date modelGearShootingStartDate = model.getGearShootingStartDate(); - if (modelGearShootingStartDate != null) { - modelGearShootingStartDate = DateUtil.getDay(modelGearShootingStartDate); - } - Date gearShootingStartDate = fishingOperation.getGearShootingStartDate(); - if (gearShootingStartDate != null) { - gearShootingStartDate = DateUtil.getDay(gearShootingStartDate); - } - boolean sameGearShootingStartDate = Objects.equals(modelGearShootingStartDate, gearShootingStartDate); - - return (StringUtils.isBlank(stationColumn) || sameStationNumber) - && (StringUtils.isBlank(operationNumberColumn) || sameFishingOperationNumber) - && (StringUtils.isBlank(startDateColumn) || sameGearShootingStartDate); - } - }; - - boolean found = false; - Iterator<ImportRow<FishingOperation>> iterator = operationUIModelImport.iterator(); - while (!found && iterator.hasNext()) { - ImportRow<FishingOperation> next = iterator.next(); - FishingOperation fishingOperation = next.getBean(); - - if (predicate.apply(fishingOperation)) { - if (next.isValid()) { - EditFishingOperationUI ui = getUI(); - model.fromEntity(fishingOperation); - //these 2 do not refresh correctly - ui.getRecorderPersonList().getHandler().setSelected(model.getRecorderPerson()); - ui.getSecondaryVesselList().getHandler().setSelected(model.getSecondaryVessel()); - - ui.getGearUseFeatureTabContent().getHandler().mergeCaracteristics(fishingOperation); - ui.getVesselUseFeatureTabContent().getHandler().mergeCaracteristics(fishingOperation); - - } else { - error = ""; - for (AbstractImportErrorInfo<FishingOperation> errorInfo : next.getErrors()) { - if (log.isErrorEnabled()) { - log.error(errorInfo.getCause().getLocalizedMessage()); - } - error += "<li>" + errorInfo.getCause().getLocalizedMessage().replaceAll("\\s+", " ") + "</li>"; - } - } - found = true; - } - } - - if (!found) { - error = "<li>" + t("tutti.editFishingOperation.action.importColumns.operationNotFound") + "</li>"; - } - } - - @Override - public void postSuccessAction() { - super.postSuccessAction(); - if (error != null) { - displayErrorMessage(t("tutti.editFishingOperation.action.importColumns.error.title"), - "<html><body>" + - t("tutti.editFishingOperation.action.importColumns.error", error) - + "</body></html>"); - } else { - sendMessage(t("tutti.editFishingOperation.action.importColumns.success")); - } - error = null; - } - - protected class ImportFromColumnFileModel extends TuttiCsvUtil.AbstractTuttiImportModel<FishingOperation> { - - protected Binder<EditFishingOperationUIModel, FishingOperation> toBeanBinder = - BinderFactory.newBinder(EditFishingOperationUIModel.class, - FishingOperation.class); - - public ImportFromColumnFileModel(char separator, Set<String> headers) { - super(separator); - - PersistenceService persistenceService = getContext().getPersistenceService(); - TuttiDataContext dataContext = getDataContext(); - - TuttiProtocol protocol = dataContext.getProtocol(); - Collection<OperationFieldMappingRow> operationFieldMapping = protocol.getOperationFieldMapping(); - - String zoneId = dataContext.getProgram().getZone().getId(); - - for (OperationFieldMappingRow mappingRow : operationFieldMapping) { - String importColumn = mappingRow.getImportColumn(); - boolean importColumnsInHeaders = headers.remove(importColumn); - if (StringUtils.isNotBlank(importColumn) && importColumnsInHeaders) { - - String field = mappingRow.getField(); - ValueParser valueParser; - switch (field) { - case EditFishingOperationUIModel.PROPERTY_FISHING_OPERATION_NUMBER: - valueParser = TuttiCsvUtil.INTEGER; - break; - - case EditFishingOperationUIModel.PROPERTY_GEAR_SHOOTING_START_LATITUDE: - case EditFishingOperationUIModel.PROPERTY_GEAR_SHOOTING_START_LONGITUDE: - case EditFishingOperationUIModel.PROPERTY_GEAR_SHOOTING_END_LATITUDE: - case EditFishingOperationUIModel.PROPERTY_GEAR_SHOOTING_END_LONGITUDE: - case EditFishingOperationUIModel.PROPERTY_TRAWL_DISTANCE: - valueParser = TuttiCsvUtil.FLOAT; - break; - - case EditFishingOperationUIModel.PROPERTY_GEAR_SHOOTING_START_DATE: - case EditFishingOperationUIModel.PROPERTY_GEAR_SHOOTING_END_DATE: - valueParser = TuttiCsvUtil.DAY_TIME; - break; - - case EditFishingOperationUIModel.PROPERTY_FISHING_OPERATION_RECTILIGNE: - valueParser = TuttiCsvUtil.PRIMITIVE_BOOLEAN; - break; - - case EditFishingOperationUIModel.PROPERTY_FISHING_OPERATION_VALID: - valueParser = TuttiCsvUtil.BOOLEAN; - break; - - case EditFishingOperationUIModel.PROPERTY_GEAR: - List<Gear> gears = new ArrayList<>(dataContext.getFishingGears()); - gears.addAll(dataContext.getScientificGears()); - Map<String, Gear> gearUniverse = TuttiEntities.splitById(gears); - valueParser = newForeignKeyValue(Gear.class, field, gearUniverse); - break; - - case EditFishingOperationUIModel.PROPERTY_VESSEL: - List<Vessel> vessels = new ArrayList<>(dataContext.getFishingVessels()); - vessels.addAll(dataContext.getScientificVessels()); - Map<String, Vessel> vesselUniverse = TuttiEntities.splitById(vessels); - valueParser = newForeignKeyValue(Vessel.class, field, vesselUniverse); - break; - - case EditFishingOperationUIModel.PROPERTY_SECONDARY_VESSEL: - vessels = new ArrayList<>(dataContext.getFishingVessels()); - vessels.addAll(dataContext.getScientificVessels()); - vesselUniverse = TuttiEntities.splitById(vessels); - valueParser = newForeignKeyListValue(Vessel.class, field, vesselUniverse); - break; - - case EditFishingOperationUIModel.PROPERTY_STRATA: - Map<String, TuttiLocation> strataUniverse = TuttiEntities.splitById( - persistenceService.getAllFishingOperationStrata(zoneId)); - valueParser = newForeignKeyValue(TuttiLocation.class, field, strataUniverse); - break; - - case EditFishingOperationUIModel.PROPERTY_SUB_STRATA: - Map<String, TuttiLocation> subStrataUniverse = TuttiEntities.splitById( - persistenceService.getAllFishingOperationSubStrata(zoneId, null)); - valueParser = newForeignKeyValue(TuttiLocation.class, field, subStrataUniverse); - break; - - case EditFishingOperationUIModel.PROPERTY_LOCATION: - Map<String, TuttiLocation> locationUniverse = TuttiEntities.splitById( - persistenceService.getAllFishingOperationLocation(zoneId, null, null)); - valueParser = newForeignKeyValue(TuttiLocation.class, field, locationUniverse); - break; - - case EditFishingOperationUIModel.PROPERTY_RECORDER_PERSON: - Map<String, Person> personUniverse = TuttiEntities.splitById(dataContext.getPersons()); - valueParser = newForeignKeyListValue(Person.class, field, personUniverse); - break; - - default: - valueParser = TuttiCsvUtil.STRING; - - } - newMandatoryColumn(importColumn, field, valueParser); - - } else if (!importColumnsInHeaders) { - throw new ImportRuntimeException(t("tutti.editFishingOperation.action.importColumns.missingHeader", importColumn)); - } - } - - Collection<CaracteristicMappingRow> caracteristicMappingRows = protocol.getCaracteristicMapping(); - for (final CaracteristicMappingRow mappingRow : caracteristicMappingRows) { - String importColumn = mappingRow.getImportColumn(); - if (StringUtils.isNotBlank(importColumn) && headers.remove(importColumn)) { - - int pmfmId = Integer.parseInt(mappingRow.getPmfmId()); - final Caracteristic caracteristic = persistenceService.getCaracteristic(pmfmId); - - ValueSetter<FishingOperation, String> setter = new ValueSetter<FishingOperation, String>() { - @Override - public void set(FishingOperation fishingOperation, String value) throws Exception { - - Serializable realValue = null; - if (StringUtils.isNotBlank(value)) { - switch (caracteristic.getCaracteristicType()) { - case QUALITATIVE: - for (CaracteristicQualitativeValue cqv : caracteristic.getQualitativeValue()) { - if (value.equals(cqv.getId())) { - realValue = cqv; - break; - } - } - break; - - case NUMBER: - realValue = Float.parseFloat(value); - break; - - default: - realValue = value; - } - } - - CaracteristicMap caracteristicMap; - if (CaracteristicType.GEAR_USE_FEATURE.toString().equals(mappingRow.getTab())) { - caracteristicMap = fishingOperation.getGearUseFeatures(); - if (caracteristicMap == null) { - caracteristicMap = new CaracteristicMap(); - fishingOperation.setGearUseFeatures(caracteristicMap); - } - - } else { - caracteristicMap = fishingOperation.getVesselUseFeatures(); - if (caracteristicMap == null) { - caracteristicMap = new CaracteristicMap(); - fishingOperation.setVesselUseFeatures(caracteristicMap); - } - } - caracteristicMap.put(caracteristic, realValue); - - } - }; - newMandatoryColumn(importColumn, setter); - - } - } - - - for (String header : headers) { - newIgnoredColumn(header); - } - } - - @Override - public FishingOperation newEmptyInstance() { - FishingOperation fishingOperation = FishingOperations.newFishingOperation(); - toBeanBinder.copy(getModel(), fishingOperation); - return fishingOperation; - } - } -} diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css index d5a42ed..dede964 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css @@ -85,7 +85,7 @@ JXDatePicker { text: "tutti.editFishingOperation.action.importFromColumnFile"; toolTipText: "tutti.editFishingOperation.action.importFromColumnFile.tip"; i18nMnemonic: "tutti.editFishingOperation.action.importFromColumnFile.mnemonic"; - _applicationAction: {fr.ifremer.tutti.ui.swing.action.ImportFromColumnFileAction.class}; + _applicationAction: {fr.ifremer.tutti.ui.swing.action.ImportFishingOperationCaracteristicsFromColumnFileAction.class}; _help: {"tutti.editFishingOperation.action.importFromColumnFile.help"}; enabled: {model.isImportFromColumnFileEnabled()} } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 97b6318484b7899d9d97ac5525896ccefb915367 Author: Kevin Morin <morin@codelutin.com> Date: Thu Dec 11 16:01:05 2014 +0100 fix imports --- .../protocol/ProtocolImportExportService.java | 58 ++++++++++----- ...perationCaracteristicsFromColumnFileAction.java | 86 +++++++++------------- 2 files changed, 75 insertions(+), 69 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java index 442f8e9..f9a3a79 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java @@ -31,6 +31,7 @@ import com.google.common.collect.Multimap; import com.google.common.collect.TreeMultimap; import com.google.common.io.Files; import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicMappingRow; +import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicMappingRowBean; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocols; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; @@ -129,22 +130,27 @@ public class ProtocolImportExportService extends AbstractTuttiService { ids.get(CaracteristicType.LENGTH_STEP)) ); - //FIXME -// protocol.setVesselUseFeaturePmfmId( -// mergeIds(protocol.getVesselUseFeaturePmfmId(), -// ids.get(CaracteristicType.VESSEL_USE_FEATURE)) -// ); -// -// protocol.setGearUseFeaturePmfmId( -// mergeIds(protocol.getGearUseFeaturePmfmId(), -// ids.get(CaracteristicType.GEAR_USE_FEATURE)) -// ); - protocol.setIndividualObservationPmfmId( mergeIds(protocol.getIndividualObservationPmfmId(), ids.get(CaracteristicType.INDIVIDUAL_OBSERVATION)) ); + List<CaracteristicMappingRow> caracteristicMapping = protocol.getCaracteristicMapping(); + if (caracteristicMapping == null) { + caracteristicMapping = new ArrayList<CaracteristicMappingRow>(); + } + Map<String, CaracteristicMappingRow> rowsByCaracteristicId = + Maps.uniqueIndex(caracteristicMapping, + new Function<CaracteristicMappingRow, String>() { + @Override + public String apply(CaracteristicMappingRow caracteristicMappingRow) { + return caracteristicMappingRow.getPmfmId(); + } + }); + + mergeCaracteristicMappingRows(ids, rowsByCaracteristicId, CaracteristicType.GEAR_USE_FEATURE); + mergeCaracteristicMappingRows(ids, rowsByCaracteristicId, CaracteristicType.VESSEL_USE_FEATURE); + } public void exportAllCaracteristic(File file, @@ -196,14 +202,14 @@ public class ProtocolImportExportService extends AbstractTuttiService { rows.addAll(Lists.transform(protocol.getLengthClassesPmfmId(), function)); } - //FIXME - if (!protocol.isCaracteristicMappingEmpty()) { - function.setType(CaracteristicType.VESSEL_USE_FEATURE); - for (CaracteristicMappingRow mappingRow : protocol.getCaracteristicMapping()) { - function.setType(CaracteristicType.valueOf(mappingRow.getTab())); - rows.add(function.apply(mappingRow.getPmfmId())); - } - } + //FIXME kmorin do export +// if (!protocol.isCaracteristicMappingEmpty()) { +// function.setType(CaracteristicType.VESSEL_USE_FEATURE); +// for (CaracteristicMappingRow mappingRow : protocol.getCaracteristicMapping()) { +// function.setType(CaracteristicType.valueOf(mappingRow.getTab())); +// rows.add(function.apply(mappingRow.getPmfmId())); +// } +// } if (!protocol.isIndividualObservationPmfmIdEmpty()) { @@ -514,6 +520,20 @@ public class ProtocolImportExportService extends AbstractTuttiService { return result; } + + protected void mergeCaracteristicMappingRows(Multimap<CaracteristicType, String> ids, + Map<String, CaracteristicMappingRow> rowsByCaracteristicId, + CaracteristicType type) { + for (String id : ids.get(type)) { + CaracteristicMappingRow row = rowsByCaracteristicId.get(id); + if (row == null) { + row = new CaracteristicMappingRowBean(); + row.setPmfmId(id); + } + row.setTab(type.name()); + } + } + private static class PmfmIdToCaracteristicRowFunction implements Function<String, CaracteristicRow> { private CaracteristicType type; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportFishingOperationCaracteristicsFromColumnFileAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportFishingOperationCaracteristicsFromColumnFileAction.java index b1eadc7..d5dd486 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportFishingOperationCaracteristicsFromColumnFileAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportFishingOperationCaracteristicsFromColumnFileAction.java @@ -1,6 +1,7 @@ package fr.ifremer.tutti.ui.swing.action; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; +import fr.ifremer.tutti.persistence.entities.data.FishingOperations; import fr.ifremer.tutti.service.operationimport.FishingOperationImportService; import fr.ifremer.tutti.service.operationimport.ImportFromColumnFileFishingOperationNotFoundException; import fr.ifremer.tutti.service.operationimport.ImportFromColumnFileInvalidRowException; @@ -12,6 +13,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.csv.AbstractImportErrorInfo; import org.nuiton.jaxx.application.ApplicationBusinessException; +import org.nuiton.util.beans.Binder; +import org.nuiton.util.beans.BinderFactory; import java.io.File; @@ -61,16 +64,42 @@ public class ImportFishingOperationCaracteristicsFromColumnFileAction extends Ab // Create a copy of the ui model to use in the import // this bean will be merged back after import into ui model - fishingOperationToMerge = model.toEntity(); - - //FIXME Check we don't need this ? -// fishingOperationToMerge = FishingOperations.newFishingOperation(); -// Binder<EditFishingOperationUIModel, FishingOperation> toBeanBinder = BinderFactory.newBinder(EditFishingOperationUIModel.class, FishingOperation.class); -// toBeanBinder.copy(model, fishingOperationToMerge); + // use the binder, cause EditFishingOperationUIModel.newEntity() returns always the same instance + fishingOperationToMerge = FishingOperations.newFishingOperation(); + Binder<EditFishingOperationUIModel, FishingOperation> toBeanBinder = + BinderFactory.newBinder(EditFishingOperationUIModel.class, FishingOperation.class); + toBeanBinder.copy(model, fishingOperationToMerge); FishingOperationImportService importService = getContext().getFishingOperationImportService(); - importService.importCaracteristicsFromColumnFile(importFile, fishingOperationToMerge); + String errorMessage = null; + try { + importService.importCaracteristicsFromColumnFile(importFile, fishingOperationToMerge); + + } catch (ImportFromColumnFileInvalidRowException error) { + // matching row is not valid + ImportFromColumnFileInvalidRowException importFromColumnFileInvalidRowException = (ImportFromColumnFileInvalidRowException) error; + + errorMessage = ""; + for (AbstractImportErrorInfo<FishingOperation> errorInfo : importFromColumnFileInvalidRowException.getErrors()) { + if (log.isErrorEnabled()) { + log.error(errorInfo.getCause().getLocalizedMessage()); + } + errorMessage += "<li>" + errorInfo.getCause().getLocalizedMessage().replaceAll("\\s+", " ") + "</li>"; + } + + } catch (ImportFromColumnFileFishingOperationNotFoundException error) { + // no matching fishing operation + errorMessage = "<li>" + t("tutti.editFishingOperation.action.importColumns.operationNotFound") + "</li>"; + + } catch (ImportFromColumnFileMissingHeaderException error) { + ImportFromColumnFileMissingHeaderException importFromColumnFileMissingHeaderException = (ImportFromColumnFileMissingHeaderException) error; + errorMessage = t("tutti.editFishingOperation.action.importColumns.missingHeader", importFromColumnFileMissingHeaderException.getImportColumn()); + } + + if (errorMessage != null) { + throw new ApplicationBusinessException(t("tutti.editFishingOperation.action.importColumns.error", errorMessage)); + } } @Override @@ -96,47 +125,4 @@ public class ImportFishingOperationCaracteristicsFromColumnFileAction extends Ab } - @Override - public void postFailedAction(Throwable error) { - - String errorMessage = null; - - if (error instanceof ImportFromColumnFileMissingHeaderException) { - ImportFromColumnFileMissingHeaderException importFromColumnFileMissingHeaderException = (ImportFromColumnFileMissingHeaderException) error; - - errorMessage = t("tutti.editFishingOperation.action.importColumns.missingHeader", importFromColumnFileMissingHeaderException.getImportColumn()); - - } else if (error instanceof ImportFromColumnFileFishingOperationNotFoundException) { - - // no matching fishing operation - errorMessage = "<li>" + t("tutti.editFishingOperation.action.importColumns.operationNotFound") + "</li>"; - - } else if (error instanceof ImportFromColumnFileInvalidRowException) { - - // matching row is not valid - ImportFromColumnFileInvalidRowException importFromColumnFileInvalidRowException = (ImportFromColumnFileInvalidRowException) error; - - errorMessage = ""; - for (AbstractImportErrorInfo<FishingOperation> errorInfo : importFromColumnFileInvalidRowException.getErrors()) { - if (log.isErrorEnabled()) { - log.error(errorInfo.getCause().getLocalizedMessage()); - } - errorMessage += "<li>" + errorInfo.getCause().getLocalizedMessage().replaceAll("\\s+", " ") + "</li>"; - } - - } - - //TODO Check this is ok, otherwise use below code - throw new ApplicationBusinessException(t("tutti.editFishingOperation.action.importColumns.error", errorMessage)); - -// if (errorMessage != null) { -// -// displayErrorMessage(t("tutti.editFishingOperation.action.importColumns.error.title"), -// "<html><body>" + -// t("tutti.editFishingOperation.action.importColumns.error", errorMessage) -// + "</body></html>"); -// -// } - - } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 7c138f2df004a99203c4c69467f7cfceffdbba08 Author: Kevin Morin <morin@codelutin.com> Date: Thu Dec 11 16:15:49 2014 +0100 remove fixme --- .../fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java | 1 - 1 file changed, 1 deletion(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java index 01d98e3..72832eb 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java @@ -202,7 +202,6 @@ public class ProtocolImportExportService extends AbstractTuttiService { rows.addAll(Lists.transform(protocol.getLengthClassesPmfmId(), function)); } - //FIXME kmorin do export if (!protocol.isCaracteristicMappingEmpty()) { for (CaracteristicMappingRow mappingRow : protocol.getCaracteristicMapping()) { function.setType(CaracteristicType.valueOf(mappingRow.getTab())); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.