August 2017 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop] Supprimer 2 champs dans objectmaterial (See #829)
by Tony CHEMIT 04 Aug '17

04 Aug '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 680797f8 by Tony CHEMIT at 2017-08-04T20:23:39+02:00 Supprimer 2 champs dans objectmaterial (See #829) - - - - - 1 changed file: - persistence/src/main/resources/db/migration/6.901/02_add_object_material-common.sql Changes: ===================================== persistence/src/main/resources/db/migration/6.901/02_add_object_material-common.sql ===================================== --- a/persistence/src/main/resources/db/migration/6.901/02_add_object_material-common.sql +++ b/persistence/src/main/resources/db/migration/6.901/02_add_object_material-common.sql @@ -30,7 +30,7 @@ INSERT INTO observe_seine.objectMaterialType(topiaid, topiaversion, topiacreated INSERT INTO observe_seine.objectMaterialType(topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, code, label1, label2) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#3', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '4', 'Text', 'Texte'); UPDATE observe_seine.objectMaterialType set label3 = label2 || ' TODO'; -CREATE TABLE observe_seine.objectMaterial( topiaid VARCHAR(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, lastupdatedate TIMESTAMP NOT NULL, code VARCHAR(255) NOT NULL, legacyCode VARCHAR(1024), standardCode VARCHAR(255), parent VARCHAR(255), status INTEGER DEFAULT 1, needComment BOOLEAN DEFAULT false, uri VARCHAR(255), objectMaterialType VARCHAR(255), biodegradable BOOLEAN DEFAULT false, nonEntangling BOOLEAN DEFAULT false, label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255),label4 VARCHAR(255),label5 VARCHAR(255),label6 VARCHAR(255),label7 VARCHAR(255),label8 VARCHAR(255), selectable boolean ,childrenMultiSelectable boolean,childSelectionMandatory boolean,usedInSimpleForm boolean,usedInDetailledForm boolean, validation VARCHAR(255)); +CREATE TABLE observe_seine.objectMaterial( topiaid VARCHAR(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, lastupdatedate TIMESTAMP NOT NULL, code VARCHAR(255) NOT NULL, legacyCode VARCHAR(1024), standardCode VARCHAR(255), parent VARCHAR(255), status INTEGER DEFAULT 1, needComment BOOLEAN DEFAULT false, uri VARCHAR(255), objectMaterialType VARCHAR(255), biodegradable BOOLEAN DEFAULT false, nonEntangling BOOLEAN DEFAULT false, label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255),label4 VARCHAR(255),label5 VARCHAR(255),label6 VARCHAR(255),label7 VARCHAR(255),label8 VARCHAR(255), selectable boolean ,childrenMultiSelectable boolean,childSelectionMandatory boolean, validation VARCHAR(255)); ALTER TABLE observe_seine.objectMaterial ADD CONSTRAINT PK_OBJECT_MATERIAL PRIMARY KEY(topiaid); ALTER TABLE observe_seine.objectMaterial ADD CONSTRAINT FK_OBJECT_MATERIAL_PARENT FOREIGN KEY (parent) REFERENCES observe_seine.objectMaterial(topiaid); ALTER TABLE observe_seine.objectMaterial ADD CONSTRAINT FK_OBJECT_MATERIAL_OBJECT_MATERIAL_TYPE FOREIGN KEY (objectMaterialType) REFERENCES observe_seine.objectMaterialType(topiaid); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/680797f88e47b7d4ce87721c570… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/680797f88e47b7d4ce87721c570… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: L'accès aux écrans PS targetSample conservés et targetSample rejetés (See #827)
by Tony CHEMIT 04 Aug '17

04 Aug '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ab383dfb by Tony CHEMIT at 2017-08-04T13:41:17+02:00 L'accès aux écrans PS targetSample conservés et targetSample rejetés (See #827) - - - - - 36e81ad3 by Tony CHEMIT at 2017-08-04T13:41:44+02:00 Amélioration API ContentHandler - - - - - 8 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/open/impl/seine/ActivitySeineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/ref/ContentReferenceUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/CatchLonglineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/TargetSampleUIHandler.java - services/src/main/java/fr/ird/observe/services/dto/referential/SizeMeasureTypeHelper.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java @@ -49,7 +49,6 @@ import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.form.FormRequestDefinition; import fr.ird.observe.services.dto.form.FormRequestKeyDefinition; import fr.ird.observe.services.dto.reference.DataReference; -import fr.ird.observe.services.dto.reference.ReferenceSetDefinition; import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; import fr.ird.observe.services.dto.reference.ReferentialReferences; @@ -1189,19 +1188,15 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U return ObserveSwingDataSource.MAIN; } - protected <D extends ReferentialDto> ReferenceSetDefinition<D> getReferentialReferenceSet(Class<D> type) { - return ObserveSwingApplicationContext.get().getReferenceSetDefinitionProvider().getReferentialDefinition(type); - } - protected <D extends ReferentialDto> FormRequestDefinition<D> getReferentialFormRequest(Class<D> type) { return ObserveSwingApplicationContext.get().getFormRequestDefinitionProvider().getDefinition(type); } - protected <D extends ReferentialDto> FormRequestDefinition<D> getFormRequest(String type) { - return ObserveSwingApplicationContext.get().getFormRequestDefinitionProvider().getDefinition(type); + protected <D extends ReferentialDto> List<ReferentialReference<D>> getReferentialReferences(Class<D> type) { + return new LinkedList<>(getDataSource().getReferentialReferences(type)); } - protected <D extends ReferentialDto> Set<ReferentialReference<D>> getReferentialReferences(Class<D> type) { - return getDataSource().getReferentialReferences(type); + private <D extends ReferentialDto> FormRequestDefinition<D> getFormRequest(String type) { + return ObserveSwingApplicationContext.get().getFormRequestDefinitionProvider().getDefinition(type); } } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/open/impl/seine/ActivitySeineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/open/impl/seine/ActivitySeineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/open/impl/seine/ActivitySeineUIHandler.java @@ -40,6 +40,7 @@ import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.service.data.seine.ActivitySeineService; import java.util.HashSet; +import java.util.List; import java.util.Optional; import java.util.Set; import javax.swing.SwingUtilities; @@ -338,7 +339,7 @@ class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySeineDto, private String getActivity6Label() { - Set<ReferentialReference<VesselActivitySeineDto>> activities = getReferentialReferences(VesselActivitySeineDto.class); + List<ReferentialReference<VesselActivitySeineDto>> activities = getReferentialReferences(VesselActivitySeineDto.class); for (ReferentialReference<VesselActivitySeineDto> vesselActivity : activities) { if (VesselActivitySeineHelper.isActivityPeche(vesselActivity)) { ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ref/ContentReferenceUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/ref/ContentReferenceUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/ref/ContentReferenceUIHandler.java @@ -57,7 +57,6 @@ import java.util.Collection; import java.util.Collections; import java.util.LinkedList; import java.util.List; -import java.util.Set; import java.util.stream.Collectors; import javax.swing.JButton; import javax.swing.JComponent; @@ -277,7 +276,7 @@ public class ContentReferenceUIHandler<E extends ReferentialDto, U extends Conte void showUniqueKeys(JButton button) { Class<E> beanType = getBeanType(); - Set<ReferentialReference<E>> entities = getReferentialReferences(beanType); + List<ReferentialReference<E>> entities = getReferentialReferences(beanType); List<Object[]> datas = new ArrayList<>(entities.size()); String[] naturalIds = getModel().getNaturalIds(); @@ -674,7 +673,7 @@ public class ContentReferenceUIHandler<E extends ReferentialDto, U extends Conte // some usages were found // get replacements - Set<ReferentialReference<E>> referentialReferences = getReferentialReferences(getBeanType()); + List<ReferentialReference<E>> referentialReferences = getReferentialReferences(getBeanType()); List<ReferentialReference<E>> referenceList = referentialReferences .stream() .filter(ReferentialReference::isEnabled) @@ -746,7 +745,7 @@ public class ContentReferenceUIHandler<E extends ReferentialDto, U extends Conte // some usages were found // get replacements - Set<ReferentialReference<E>> referentialReferences = getReferentialReferences(getBeanType()); + List<ReferentialReference<E>> referentialReferences = getReferentialReferences(getBeanType()); List<ReferentialReference<E>> referenceList = referentialReferences .stream() .filter(ReferentialReference::isEnabled) ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/CatchLonglineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/CatchLonglineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/CatchLonglineUIHandler.java @@ -553,8 +553,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat ReferentialReferenceDecorator<SizeMeasureTypeDto> decorator = getReferentialReferenceDecorator(SizeMeasureTypeDto.class); - List<ReferentialReference<SizeMeasureTypeDto>> sizeMeasureTypes = - Lists.newArrayList(getReferentialReferences(SizeMeasureTypeDto.class)); + List<ReferentialReference<SizeMeasureTypeDto>> sizeMeasureTypes = getReferentialReferences(SizeMeasureTypeDto.class); UIHelper.setTableColumnEditor(table, 0, ContentUIInitializer.newDataColumnEditor(sizeMeasureTypes, decorator)); UIHelper.setTableColumnEditor(table, 1, ContentUIInitializer.newFloatColumnEditor()); @@ -584,8 +583,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat ReferentialReferenceDecorator<WeightMeasureTypeDto> decorator = getReferentialReferenceDecorator(WeightMeasureTypeDto.class); - List<ReferentialReference<WeightMeasureTypeDto>> weightMeasureTypes = - Lists.newArrayList(getReferentialReferences(WeightMeasureTypeDto.class)); + List<ReferentialReference<WeightMeasureTypeDto>> weightMeasureTypes = getReferentialReferences(WeightMeasureTypeDto.class); UIHelper.setTableColumnEditor(table, 0, ContentUIInitializer.newDataColumnEditor(weightMeasureTypes, decorator)); UIHelper.setTableColumnEditor(table, 1, ContentUIInitializer.newFloatColumnEditor()); ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java @@ -329,7 +329,7 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip ReferentialReferenceDecorator<GearCaracteristicDto> decorator = getReferentialReferenceDecorator(GearCaracteristicDto.class); - List<ReferentialReference<GearCaracteristicDto>> caracteristics = Lists.newArrayList(getReferentialReferences(GearCaracteristicDto.class)); + List<ReferentialReference<GearCaracteristicDto>> caracteristics = getReferentialReferences(GearCaracteristicDto.class); UIHelper.setTableColumnEditor(table, 0, ContentUIInitializer.newDataColumnEditor(caracteristics, decorator)); UIHelper.setTableColumnEditor(table, 1, new GearUseFeatureMeasurementCellEditor(0)); ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java @@ -328,7 +328,7 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei ReferentialReferenceDecorator<GearCaracteristicDto> decorator = getReferentialReferenceDecorator(GearCaracteristicDto.class); - List<ReferentialReference<GearCaracteristicDto>> caracteristics = Lists.newArrayList(getReferentialReferences(GearCaracteristicDto.class)); + List<ReferentialReference<GearCaracteristicDto>> caracteristics = getReferentialReferences(GearCaracteristicDto.class); UIHelper.setTableColumnEditor(table, 0, ContentUIInitializer.newDataColumnEditor(caracteristics, decorator)); UIHelper.setTableColumnEditor(table, 1, new GearUseFeatureMeasurementCellEditor(0)); ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/TargetSampleUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/TargetSampleUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/TargetSampleUIHandler.java @@ -39,7 +39,6 @@ import fr.ird.observe.services.dto.seine.TargetLengthDto; import fr.ird.observe.services.dto.seine.TargetSampleDto; import fr.ird.observe.services.dto.seine.TargetSampleHelper; import fr.ird.observe.services.service.data.seine.TargetSampleService; -import java.util.ArrayList; import java.util.Collection; import java.util.LinkedList; import java.util.List; @@ -200,16 +199,19 @@ public class TargetSampleUIHandler> sizeMeasureTypes = new ArrayList<>(getReferentialReferences(SizeMeasureTypeDto.class)); + List<ReferentialReference<SizeMeasureTypeDto>> sizeMeasureTypes = getReferentialReferences(SizeMeasureTypeDto.class); List<ReferentialReference<SizeMeasureTypeDto>> data = SizeMeasureTypeHelper.filterForSeine(sizeMeasureTypes); if (log.isInfoEnabled()) { log.info("Using " + data.size() + " size measure type(s)."); } - if (data.size() != 2) { - throw new IllegalStateException("WHY???"); - } + checkSizeMeasureTypes(data); ((TargetSampleUI) getUi()).getSizeMeasureType().setData(data); + } + private void checkSizeMeasureTypes(List<ReferentialReference<SizeMeasureTypeDto>> data) { + if (data.size() != 2) { + throw new IllegalStateException("Can't find *Predorsal Length* or *Fork Length* size measure type(s) in database."); + } } @Override @@ -377,9 +379,7 @@ public class TargetSampleUIHandler<U extends ContentTableUI<TargetSampleDto, Tar if (log.isInfoEnabled()) { log.info("Using " + result.size() + " size measure type(s)."); } - if (result.size() != 2) { - throw new IllegalStateException("WHY???"); - } + checkSizeMeasureTypes((List) result); } } ===================================== services/src/main/java/fr/ird/observe/services/dto/referential/SizeMeasureTypeHelper.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/dto/referential/SizeMeasureTypeHelper.java +++ b/services/src/main/java/fr/ird/observe/services/dto/referential/SizeMeasureTypeHelper.java @@ -30,8 +30,8 @@ import java.util.stream.Collectors; public class SizeMeasureTypeHelper extends GeneratedSizeMeasureTypeHelper { - public static final ImmutableSet<String> SEINE_LD1_SIZE_MEASURE_TYPE_ID = ImmutableSet.of("PDL", "LD1"); - public static final ImmutableSet<String> SEINE_LF_SIZE_MEASURE_TYPE_ID = ImmutableSet.of("FL", "LF"); + public static final ImmutableSet<String> SEINE_LD1_SIZE_MEASURE_TYPE_ID = ImmutableSet.of("fr.ird.observe.entities.referentiel.SizeMeasureType#1433499466774#0.529249255312607", "LD1"); + public static final ImmutableSet<String> SEINE_LF_SIZE_MEASURE_TYPE_ID = ImmutableSet.of("fr.ird.observe.entities.referentiel.SizeMeasureType#1433499465700#0.0902433863375336", "LF"); public static List<ReferentialReference<SizeMeasureTypeDto>> filterForSeine(Collection<ReferentialReference<SizeMeasureTypeDto>> incoming) { return incoming.stream() @@ -40,11 +40,11 @@ public class SizeMeasureTypeHelper extends GeneratedSizeMeasureTypeHelper { } public static boolean isLd1(ReferentialReference<SizeMeasureTypeDto> incoming) { - return SEINE_LD1_SIZE_MEASURE_TYPE_ID.contains(incoming.getCode()); + return SEINE_LD1_SIZE_MEASURE_TYPE_ID.contains(incoming.getId()); } public static boolean isLf(ReferentialReference<SizeMeasureTypeDto> incoming) { - return SEINE_LF_SIZE_MEASURE_TYPE_ID.contains(incoming.getCode()); + return SEINE_LF_SIZE_MEASURE_TYPE_ID.contains(incoming.getId()); } public static ReferentialReference<SizeMeasureTypeDto> getLd1(Collection<ReferentialReference<SizeMeasureTypeDto>> incoming) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/81b4f46df7e2c8eb95b1f09f97… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/81b4f46df7e2c8eb95b1f09f97… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] La barre de progression en % ne fonctionne pas (See #821)
by Tony CHEMIT 04 Aug '17

04 Aug '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 81b4f46d by Tony CHEMIT at 2017-08-04T13:17:05+02:00 La barre de progression en % ne fonctionne pas (See #821) - - - - - 9 changed files: - client/src/main/java/fr/ird/observe/client/FloatingObjectReferencesManager.java - client/src/main/java/fr/ird/observe/client/ObserveOpenDataManager.java - client/src/main/java/fr/ird/observe/client/db/ObserveDataSourcesManager.java - client/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java - client/src/main/java/fr/ird/observe/client/ui/ObserveMainUIInitializer.java - client/src/main/java/fr/ird/observe/client/ui/storage/StorageBackupUILauncher.java - client/src/main/java/fr/ird/observe/client/ui/storage/StorageUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/storage/StorageUILauncher.java - client/src/main/java/fr/ird/observe/client/ui/util/ProgressModel.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/FloatingObjectReferencesManager.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/FloatingObjectReferencesManager.java +++ b/client/src/main/java/fr/ird/observe/client/FloatingObjectReferencesManager.java @@ -25,8 +25,10 @@ package fr.ird.observe.client; import com.google.common.collect.ImmutableSet; import fr.ird.observe.client.configuration.ClientConfig; import fr.ird.observe.client.db.ObserveSwingDataSource; +import fr.ird.observe.client.ui.util.ProgressModel; import fr.ird.observe.services.dto.FloatingObjectReference; import java.util.Arrays; +import java.util.Iterator; import java.util.Optional; import java.util.Set; import java.util.TreeSet; @@ -76,13 +78,20 @@ public class FloatingObjectReferencesManager { return ImmutableSet.copyOf(references.stream().map(FloatingObjectReference::getFloatingObjectId).collect(Collectors.toSet())); } - public void sanitize(ObserveSwingDataSource dataSource) { + public void sanitize(ProgressModel progressModel, ObserveSwingDataSource dataSource) { ImmutableSet<String> existingIds = getIds(); ImmutableSet<String> ids = dataSource.getFloatingObjectService().retainExistingIds(existingIds); int beforeSize = references.size(); - references.removeIf(reference -> !ids.contains(reference.getFloatingObjectId())); + Iterator<FloatingObjectReference> iterator = references.iterator(); + while (iterator.hasNext()) { + FloatingObjectReference reference = iterator.next(); + if (!ids.contains(reference.getFloatingObjectId())) { + iterator.remove(); + } + progressModel.incrementsCurrentStep(); + } save(beforeSize); ===================================== client/src/main/java/fr/ird/observe/client/ObserveOpenDataManager.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ObserveOpenDataManager.java +++ b/client/src/main/java/fr/ird/observe/client/ObserveOpenDataManager.java @@ -25,6 +25,7 @@ package fr.ird.observe.client; import com.google.common.base.Preconditions; import fr.ird.observe.client.db.ClientDataContext; import fr.ird.observe.client.db.ObserveSwingDataSource; +import fr.ird.observe.client.ui.util.ProgressModel; import fr.ird.observe.services.ObserveServicesProvider; import fr.ird.observe.services.dto.IdHelper; import fr.ird.observe.services.dto.referential.ProgramDto; @@ -46,7 +47,6 @@ public class ObserveOpenDataManager implements Closeable { this.dataContext = dataContext; } - // Program public boolean canOpenProgram() { return !dataContext.isOpenProgram(); } @@ -290,7 +290,7 @@ public class ObserveOpenDataManager implements Closeable { dataContext.resetOpen(); } - public void sanitizeOpenIds(String[] ids) { + public void sanitizeOpenIds(ProgressModel progressModel, String[] ids) { if (ids != null) { boolean exists = true; @@ -342,6 +342,7 @@ public class ObserveOpenDataManager implements Closeable { if (!exists) { ids[i] = null; } + progressModel.incrementsCurrentStep(); } } } ===================================== client/src/main/java/fr/ird/observe/client/db/ObserveDataSourcesManager.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/db/ObserveDataSourcesManager.java +++ b/client/src/main/java/fr/ird/observe/client/db/ObserveDataSourcesManager.java @@ -36,6 +36,7 @@ import fr.ird.observe.client.ui.ObserveMainUI; import fr.ird.observe.client.ui.ObserveUIMode; import fr.ird.observe.client.ui.actions.menu.storage.ChangeStorageAction; import fr.ird.observe.client.ui.storage.StorageUIModel; +import fr.ird.observe.client.ui.util.ProgressModel; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceInformation; import fr.ird.observe.services.configuration.rest.ObserveDataSourceConfigurationRest; @@ -493,7 +494,7 @@ public class ObserveDataSourcesManager implements Closeable { applicationContext.getConfig().saveTreeOpenNodeIds(dataContext.getOpenIds()); dataContext.populateOpens(); - mainUI.getInitializer().cleanNavigationUI(); + mainUI.getInitializer().cleanNavigationUI(new ProgressModel()); // on met a jour l'état dans la config applicationContext.getConfig().setMainStorageOpened(false); @@ -551,25 +552,29 @@ public class ObserveDataSourcesManager implements Closeable { log.debug("loading ui for storage " + source.getLabel() + ": " + mainUI.getName()); } + ProgressModel progressModel = source.getProgressModel(); + ClientDataContext dataContext = mainUI.getDataContext(); dataContext.setEnabled(true); - mainUI.getInitializer().cleanNavigationUI(); + mainUI.getInitializer().cleanNavigationUI(progressModel); String[] openIds = config.getTreeOpenNodeIds(); - //FIXME On utilise les open ids uniquement en écriture ? le test semble faux - if (source.canReadData()) { - applicationContext.getOpenDataManager().sanitizeOpenIds(openIds); + if (source.canWriteData()) { + applicationContext.getOpenDataManager().sanitizeOpenIds(progressModel, openIds); } + if (source.canWriteData()) { - applicationContext.getFloatingObjectReferencesManager().sanitize(source); + applicationContext.getFloatingObjectReferencesManager().sanitize(progressModel,source); } dataContext.populateOpens(openIds); - mainUI.getInitializer().loadNavigationUI(); + + mainUI.getInitializer().loadNavigationUI(progressModel); mainUI.getModel().setMode(ObserveUIMode.DB); + progressModel.incrementsCurrentStep(); mainUI.getStatus().setStatus(t("observe.message.db.loaded", source.getLabel())); ===================================== client/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java +++ b/client/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java @@ -32,6 +32,7 @@ import fr.ird.observe.client.ObserveSwingApplicationContext; import fr.ird.observe.client.configuration.ClientConfig; import fr.ird.observe.client.db.event.ObserveSwingDataSourceEvent; import fr.ird.observe.client.db.event.ObserveSwingDataSourceListener; +import fr.ird.observe.client.ui.util.ProgressModel; import fr.ird.observe.services.ObserveServiceInitializer; import fr.ird.observe.services.ObserveServicesProvider; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; @@ -135,6 +136,8 @@ public class ObserveSwingDataSource extends AbstractSerializableBean implements private ObserveDataSourceConnection connection; + private ProgressModel progressModel; + // indique que la connexion a expiré mais que la source n'est pas complétement fermer private boolean expired; @@ -243,7 +246,7 @@ public class ObserveSwingDataSource extends AbstractSerializableBean implements fireOpened(); } - // @Override + @Override public void close() { checkIsOpen(); @@ -769,4 +772,12 @@ public class ObserveSwingDataSource extends AbstractSerializableBean implements public <S extends ObserveService> S getService(Class<S> serviceType) { return servicesProvider.getService(serviceType); } + + public ProgressModel getProgressModel() { + return progressModel; + } + + public void setProgressModel(ProgressModel progressModel) { + this.progressModel = progressModel; + } } ===================================== client/src/main/java/fr/ird/observe/client/ui/ObserveMainUIInitializer.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/ObserveMainUIInitializer.java +++ b/client/src/main/java/fr/ird/observe/client/ui/ObserveMainUIInitializer.java @@ -39,6 +39,7 @@ import fr.ird.observe.client.ui.tree.navigation.nodes.ReferenceNavigationTreeNod import fr.ird.observe.client.ui.tree.navigation.nodes.StringNavigationTreeNodeSupport; import fr.ird.observe.client.ui.util.ObserveSwingValidatorMessageTableModel; import fr.ird.observe.client.ui.util.ObserveValidatorMessageTableRenderer; +import fr.ird.observe.client.ui.util.ProgressModel; import fr.ird.observe.services.decoration.DecoratorService; import fr.ird.observe.services.decoration.ObserveI18nDecoratorHelper; import fr.ird.observe.services.dto.constants.ReferentialLocale; @@ -552,11 +553,14 @@ public class ObserveMainUIInitializer { * Nettoye des ui tout ce qui concerne un modèle de navigation. * * Note: cette méthode doit être appelée avant tout rechargement de modèle de naivgation. + * + * @param progressModel progress model to interact with ui */ - public void cleanNavigationUI() { + public void cleanNavigationUI(ProgressModel progressModel) { // reset content uis ui.getContentLayout().reset(ui.getContent()); + progressModel.incrementsCurrentStep(); // clean messages ui.getContextValue(SwingValidatorMessageTableModel.class).clear(); @@ -565,6 +569,7 @@ public class ObserveMainUIInitializer { NavigationTree tree = ui.getNavigation(); tree.clearModel(); + progressModel.incrementsCurrentStep(); // no tree navigation view tree.setVisible(false); @@ -575,16 +580,20 @@ public class ObserveMainUIInitializer { * Charge dans l'ui un nouveau modèle de navigation. * * Note: cette méthode doit être appelée après tout rechargement de modèle de naivgation. - **/ - public void loadNavigationUI() { + * + * @param progressModel the progress model to interact with ui + */ + public void loadNavigationUI(ProgressModel progressModel) { NavigationTree tree = ui.getNavigation(); NavigationTreeModel treeModel = tree.getTreeModel(); treeModel.populate(); + progressModel.incrementsCurrentStep(); // select initial node tree.selectInitialNode(); + progressModel.incrementsCurrentStep(); tree.setVisible(true); ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/StorageBackupUILauncher.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/storage/StorageBackupUILauncher.java +++ b/client/src/main/java/fr/ird/observe/client/ui/storage/StorageBackupUILauncher.java @@ -155,14 +155,13 @@ public class StorageBackupUILauncher extends StorageUILauncher { for (DataReference trip : entry.getValue()) { - progressModel.incrementsCurrentStep(); ExportTripRequest exportRequest = new ExportTripRequest(false, entry.getKey().getId(), trip.getId()); ExportTripResult exportTripResult = managementService.exportTrip(exportRequest); - progressModel.incrementsCurrentStep(); ImportTripRequest importTripRequest = new ImportTripRequest(exportTripResult); tmpManagementService.importTrip(importTripRequest); + progressModel.incrementsCurrentStep(); } @@ -170,13 +169,12 @@ public class StorageBackupUILauncher extends StorageUILauncher { } - progressModel.incrementsCurrentStep(); - if (log.isInfoEnabled()) { log.info("Exporting to " + backupFile); } sourceToBackup.getDataSourceService().backup(backupFile); + progressModel.incrementsCurrentStep(); } catch (DatabaseNotFoundException | DatabaseConnexionNotAuthorizedException | BabModelVersionException | IncompatibleDataSourceCreateConfigurationException | DataSourceCreateWithNoReferentialImportException e) { throw new ObserveSwingTechnicalException(e); ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/StorageUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/storage/StorageUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/storage/StorageUIHandler.java @@ -42,6 +42,7 @@ import fr.ird.observe.client.ui.storage.tabs.SecurityModel; import fr.ird.observe.client.ui.storage.tabs.SelectDataUI; import fr.ird.observe.client.ui.storage.tabs.StorageTabUI; import fr.ird.observe.client.ui.tree.selection.SelectionTreeModel; +import fr.ird.observe.client.ui.util.ProgressModel; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceInformation; import fr.ird.observe.services.configuration.rest.ObserveDataSourceConfigurationRest; @@ -357,15 +358,12 @@ public class StorageUIHandler implements UIHandler<StorageUI> { ClientConfig config = observeContext.getConfig(); // faut-il detruire la base locale ? - boolean destroyLocalBase = - config.isLocalStorageExist() && - model.getDbMode() == DbMode.CREATE_LOCAL; + boolean destroyLocalBase = config.isLocalStorageExist() && model.getDbMode() == DbMode.CREATE_LOCAL; if (log.isDebugEnabled()) { log.debug(">>> should destroy local db ? " + destroyLocalBase); } - ObserveDataSourcesManager dataSourcesManager = observeContext.getDataSourcesManager(); ObserveSwingDataSource currentDataSource = dataSourcesManager.getMainDataSource(); @@ -375,9 +373,36 @@ public class StorageUIHandler implements UIHandler<StorageUI> { localDataSource = currentDataSource; } + ProgressModel progressModel = model.getProgressModel(); + + int stepsCount = 8; + + if (destroyLocalBase || model.isDoBackup()) { + stepsCount++; + } + if (destroyLocalBase) { + stepsCount++; + } + if (model.isDoBackup()) { + stepsCount++; + } + if (currentDataSource != null && currentDataSource.isOpen()) { + stepsCount++; + } + if (DbMode.USE_LOCAL.equals((model.getDbMode()))) { + stepsCount += 2; + } + String[] openIds = config.getTreeOpenNodeIds(); + stepsCount += openIds.length; + stepsCount += observeContext.getFloatingObjectReferencesManager().getNames().size(); + + progressModel.installUI(ui.getCONFIRM().getProgressBar()); + progressModel.setStepsCount(stepsCount); + boolean localDbIsSane = true; if (destroyLocalBase || model.isDoBackup()) { if (localDataSource == null) { + ObserveDataSourceConfigurationTopiaH2 localConfiguration = dataSourcesManager.newH2DataSourceConfiguration(config, t("observe.storage.label.local")); // la base ne doit pas etre mise a jour dans ce cas @@ -413,6 +438,8 @@ public class StorageUIHandler implements UIHandler<StorageUI> { localDataSource = null; } } + + progressModel.incrementsCurrentStep(); } if (model.isDoBackup()) { @@ -439,6 +466,8 @@ public class StorageUIHandler implements UIHandler<StorageUI> { UIHelper.handlingError(e); return; } + + progressModel.incrementsCurrentStep(); } if (destroyLocalBase) { @@ -465,6 +494,8 @@ public class StorageUIHandler implements UIHandler<StorageUI> { return; } } + + progressModel.incrementsCurrentStep(); } // suppression du storage precedent @@ -473,8 +504,13 @@ public class StorageUIHandler implements UIHandler<StorageUI> { log.debug(">>> close main storage " + currentDataSource); } // on doit fermer le storage en cours d'utilisation - currentDataSource.close(); + try { + currentDataSource.close(); + } catch (Exception e) { + UIHelper.handlingError(e); + } } + progressModel.incrementsCurrentStep(); // suppression du storage local if (localDataSource != null @@ -486,7 +522,11 @@ public class StorageUIHandler implements UIHandler<StorageUI> { log.debug(">>> close local storage " + localDataSource); } // on doit fermer le storage local ouvert - localDataSource.close(); + try { + localDataSource.close(); + } catch (Exception e) { + UIHelper.handlingError(e); + } } if (log.isDebugEnabled()) { @@ -498,14 +538,19 @@ public class StorageUIHandler implements UIHandler<StorageUI> { try { currentDataSource = ObserveSwingApplicationContext.get().getDataSourcesManager().newDataSourceFromModel(model); + currentDataSource.setProgressModel(progressModel); // si on utilise la base local on lance une migration de la base si necessaire if (DbMode.USE_LOCAL.equals((model.getDbMode()))) { ObserveDataSourceInformation dataSourceInformation = currentDataSource.checkCanConnect(); + progressModel.incrementsCurrentStep(); + currentDataSource.migrateData(dataSourceInformation, config.getModelVersion()); + progressModel.incrementsCurrentStep(); + } dataSourcesManager.setMainDataSource(currentDataSource); @@ -543,6 +588,8 @@ public class StorageUIHandler implements UIHandler<StorageUI> { currentDataSource.open(); } + progressModel.incrementsCurrentStep(); + if (DbMode.CREATE_LOCAL.equals(model.getDbMode()) && (CreationMode.IMPORT_REMOTE_STORAGE.equals(model.getCreationMode()) || CreationMode.IMPORT_SERVER_STORAGE.equals(model.getCreationMode())) && config.isLocalStorageExist()) { @@ -572,6 +619,8 @@ public class StorageUIHandler implements UIHandler<StorageUI> { log.info(">>> main storage opened " + currentDataSource.getLabel()); } + progressModel.incrementsCurrentStep(); + } catch (Exception ex) { UIHelper.handlingError(ex); throw new RuntimeException(ex); ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/StorageUILauncher.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/storage/StorageUILauncher.java +++ b/client/src/main/java/fr/ird/observe/client/ui/storage/StorageUILauncher.java @@ -100,7 +100,6 @@ public class StorageUILauncher extends WizardUILancher<StorageStep, StorageUIMod @Override protected void doAction(StorageUI ui) { ui.getModel().setBusy(true); - super.doAction(ui); } @Override ===================================== client/src/main/java/fr/ird/observe/client/ui/util/ProgressModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/util/ProgressModel.java +++ b/client/src/main/java/fr/ird/observe/client/ui/util/ProgressModel.java @@ -23,6 +23,7 @@ package fr.ird.observe.client.ui.util; */ import javax.swing.JProgressBar; +import javax.swing.SwingUtilities; import org.jdesktop.beans.AbstractBean; /** @@ -70,6 +71,6 @@ public class ProgressModel extends AbstractBean { } public void incrementsCurrentStep() { - setCurrentStep(getCurrentStep() + 1); + SwingUtilities.invokeLater(() -> setCurrentStep(getCurrentStep() + 1)); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/81b4f46df7e2c8eb95b1f09f972… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/81b4f46df7e2c8eb95b1f09f972… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Libellés manquants (See #817)
by Tony CHEMIT 04 Aug '17

04 Aug '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 126d70a9 by Tony CHEMIT at 2017-08-04T12:25:10+02:00 Libellés manquants (See #817) - - - - - 28 changed files: - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/ClassNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/ActivitiesLonglineNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/CatchLonglineNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/EncounterLonglineNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/GearUseFeaturesLonglineNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/SensorUsedLonglineNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/SetDetailCompositionLonglineNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/SetGlobalCompositionLonglineNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/TdrLonglineNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/ActivitiesSeineNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/DiscardedTargetCatchesSeineNavigationTreeNode.java → client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/DiscardedTargetCatchSeineNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/DiscardedTargetSamplesSeineNavigationTreeNode.java → client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/DiscardedTargetSampleSeineNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/FloatingObjectTransmittingBuoyNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/GearUseFeaturesSeineNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/KeptTargetCatchesSeineNavigationTreeNode.java → client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/KeptTargetCatchSeineNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/KeptTargetSamplesSeineNavigationTreeNode.java → client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/KeptTargetSampleSeineNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/NonTargetCatchesReleasedSeineNavigationTreeNode.java → client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/NonTargetCatchReleasedSeineNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/NonTargetCatchesSeineNavigationTreeNode.java → client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/NonTargetCatchSeineNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/NoneTargetSamplesSeineNavigationTreeNode.java → client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/NonTargetSampleSeineNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/ObjectObservedSpeciesNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/ObjectSchoolEstimateNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/RoutesSeineNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/SchoolEstimatesSeineNavigationTreeNode.java → client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/SchoolEstimateSeineNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/SetSeineNavigationTreeNode.java - client/src/main/resources/i18n/client_en_GB.properties - client/src/main/resources/i18n/client_es_ES.properties - client/src/main/resources/i18n/client_fr_FR.properties Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/ClassNavigationTreeNode.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/ClassNavigationTreeNode.java +++ b/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/ClassNavigationTreeNode.java @@ -22,12 +22,8 @@ package fr.ird.observe.client.ui.tree.navigation.nodes; * #L% */ -import fr.ird.observe.services.decoration.ObserveI18nDecoratorHelper; import fr.ird.observe.services.dto.IdDto; - -import static org.nuiton.i18n.I18n.t; - /** * Created on 14/11/16. * @@ -36,12 +32,15 @@ import static org.nuiton.i18n.I18n.t; */ public abstract class ClassNavigationTreeNode<D extends IdDto> extends NavigationTreeNodeSupport<Class<D>> { - protected ClassNavigationTreeNode(Class<D> data) { - this(data, false); + private final String text; + + protected ClassNavigationTreeNode(Class<D> data, String text) { + this(data, false, text); } - protected ClassNavigationTreeNode(Class<D> data, boolean allowChildren) { + protected ClassNavigationTreeNode(Class<D> data, boolean allowChildren, String text) { super(data, allowChildren); + this.text = text; } @Override @@ -59,8 +58,9 @@ public abstract class ClassNavigationTreeNode<D extends IdDto> extends Navigatio } @Override - public String getText() { - return t(ObserveI18nDecoratorHelper.getTypeI18nKey(getDataType())); + public final String getText() { +// return t(ObserveI18nDecoratorHelper.getTypeI18nKey(getDataType())); + return text; } @Override ===================================== client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/ActivitiesLonglineNavigationTreeNode.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/ActivitiesLonglineNavigationTreeNode.java +++ b/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/ActivitiesLonglineNavigationTreeNode.java @@ -25,7 +25,6 @@ package fr.ird.observe.client.ui.tree.navigation.nodes.longline; import fr.ird.observe.client.ui.content.list.impl.longline.ActivityLonglinesUI; import fr.ird.observe.client.ui.tree.navigation.nodes.ClassNavigationTreeNode; import fr.ird.observe.client.ui.tree.navigation.nodes.WithChildsToReload; -import fr.ird.observe.services.decoration.ObserveI18nDecoratorHelper; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.reference.DataReferenceSet; @@ -41,8 +40,8 @@ import static org.nuiton.i18n.I18n.t; */ public class ActivitiesLonglineNavigationTreeNode extends ClassNavigationTreeNode<ActivityLonglineDto> implements WithChildsToReload { - public ActivitiesLonglineNavigationTreeNode() { - super(ActivityLonglineDto.class, true); + ActivitiesLonglineNavigationTreeNode() { + super(ActivityLonglineDto.class, true, t("observe.ui.tree.activities")); } @Override @@ -61,11 +60,6 @@ public class ActivitiesLonglineNavigationTreeNode extends ClassNavigationTreeNod } @Override - public String getText() { - return t(ObserveI18nDecoratorHelper.getTypePluralI18nKey(getData())); - } - - @Override public void reloadChilds() { DataReferenceSet<ActivityLonglineDto> referenceSet = getServicesProvider().getActivityLonglineService().getActivityLonglineByTripLongline(getId()); for (DataReference<ActivityLonglineDto> reference : referenceSet.getReferences()) { ===================================== client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/CatchLonglineNavigationTreeNode.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/CatchLonglineNavigationTreeNode.java +++ b/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/CatchLonglineNavigationTreeNode.java @@ -26,6 +26,9 @@ import fr.ird.observe.client.ui.content.table.impl.longline.CatchLonglineUI; import fr.ird.observe.client.ui.tree.navigation.nodes.ClassNavigationTreeNode; import fr.ird.observe.services.dto.longline.CatchLonglineDto; + +import static org.nuiton.i18n.I18n.t; + /** * Created on 14/11/16. * @@ -34,8 +37,8 @@ import fr.ird.observe.services.dto.longline.CatchLonglineDto; */ public class CatchLonglineNavigationTreeNode extends ClassNavigationTreeNode<CatchLonglineDto> { - public CatchLonglineNavigationTreeNode() { - super(CatchLonglineDto.class); + CatchLonglineNavigationTreeNode() { + super(CatchLonglineDto.class,t("observe.ui.tree.longline.catch")); } @Override ===================================== client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/EncounterLonglineNavigationTreeNode.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/EncounterLonglineNavigationTreeNode.java +++ b/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/EncounterLonglineNavigationTreeNode.java @@ -26,6 +26,9 @@ import fr.ird.observe.client.ui.content.table.impl.longline.EncounterUI; import fr.ird.observe.client.ui.tree.navigation.nodes.ClassNavigationTreeNode; import fr.ird.observe.services.dto.longline.EncounterDto; + +import static org.nuiton.i18n.I18n.t; + /** * Created on 14/11/16. * @@ -34,8 +37,8 @@ import fr.ird.observe.services.dto.longline.EncounterDto; */ public class EncounterLonglineNavigationTreeNode extends ClassNavigationTreeNode<EncounterDto> { - public EncounterLonglineNavigationTreeNode() { - super(EncounterDto.class); + EncounterLonglineNavigationTreeNode() { + super(EncounterDto.class, t("observe.ui.tree.longline.encounter")); } @Override ===================================== client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/GearUseFeaturesLonglineNavigationTreeNode.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/GearUseFeaturesLonglineNavigationTreeNode.java +++ b/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/GearUseFeaturesLonglineNavigationTreeNode.java @@ -27,6 +27,9 @@ import fr.ird.observe.client.ui.tree.navigation.nodes.ClassNavigationTreeNode; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.GearUseFeaturesLonglineDto; + +import static org.nuiton.i18n.I18n.t; + /** * Created on 14/11/16. * @@ -35,8 +38,8 @@ import fr.ird.observe.services.dto.longline.GearUseFeaturesLonglineDto; */ public class GearUseFeaturesLonglineNavigationTreeNode extends ClassNavigationTreeNode<GearUseFeaturesLonglineDto> { - public GearUseFeaturesLonglineNavigationTreeNode() { - super(GearUseFeaturesLonglineDto.class); + GearUseFeaturesLonglineNavigationTreeNode() { + super(GearUseFeaturesLonglineDto.class, t("observe.ui.tree.gearUseFeatures")); } @Override ===================================== client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/SensorUsedLonglineNavigationTreeNode.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/SensorUsedLonglineNavigationTreeNode.java +++ b/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/SensorUsedLonglineNavigationTreeNode.java @@ -26,6 +26,9 @@ import fr.ird.observe.client.ui.content.table.impl.longline.SensorUsedUI; import fr.ird.observe.client.ui.tree.navigation.nodes.ClassNavigationTreeNode; import fr.ird.observe.services.dto.longline.SensorUsedDto; + +import static org.nuiton.i18n.I18n.t; + /** * Created on 14/11/16. * @@ -34,8 +37,8 @@ import fr.ird.observe.services.dto.longline.SensorUsedDto; */ public class SensorUsedLonglineNavigationTreeNode extends ClassNavigationTreeNode<SensorUsedDto> { - public SensorUsedLonglineNavigationTreeNode() { - super(SensorUsedDto.class); + SensorUsedLonglineNavigationTreeNode() { + super(SensorUsedDto.class, t("observe.ui.tree.longline.sensorUsed")); } @Override ===================================== client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/SetDetailCompositionLonglineNavigationTreeNode.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/SetDetailCompositionLonglineNavigationTreeNode.java +++ b/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/SetDetailCompositionLonglineNavigationTreeNode.java @@ -26,6 +26,9 @@ import fr.ird.observe.client.ui.content.impl.longline.LonglineDetailCompositionU import fr.ird.observe.client.ui.tree.navigation.nodes.ClassNavigationTreeNode; import fr.ird.observe.services.dto.longline.SetLonglineDetailCompositionDto; + +import static org.nuiton.i18n.I18n.t; + /** * Created on 14/11/16. * @@ -34,8 +37,8 @@ import fr.ird.observe.services.dto.longline.SetLonglineDetailCompositionDto; */ public class SetDetailCompositionLonglineNavigationTreeNode extends ClassNavigationTreeNode<SetLonglineDetailCompositionDto> { - public SetDetailCompositionLonglineNavigationTreeNode() { - super(SetLonglineDetailCompositionDto.class); + SetDetailCompositionLonglineNavigationTreeNode() { + super(SetLonglineDetailCompositionDto.class, t("observe.ui.tree.longline.setDetailComposition")); } @Override ===================================== client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/SetGlobalCompositionLonglineNavigationTreeNode.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/SetGlobalCompositionLonglineNavigationTreeNode.java +++ b/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/SetGlobalCompositionLonglineNavigationTreeNode.java @@ -26,6 +26,9 @@ import fr.ird.observe.client.ui.content.impl.longline.LonglineGlobalCompositionU import fr.ird.observe.client.ui.tree.navigation.nodes.ClassNavigationTreeNode; import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto; + +import static org.nuiton.i18n.I18n.t; + /** * Created on 14/11/16. * @@ -34,8 +37,8 @@ import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto; */ public class SetGlobalCompositionLonglineNavigationTreeNode extends ClassNavigationTreeNode<SetLonglineGlobalCompositionDto> { - public SetGlobalCompositionLonglineNavigationTreeNode() { - super(SetLonglineGlobalCompositionDto.class); + SetGlobalCompositionLonglineNavigationTreeNode() { + super(SetLonglineGlobalCompositionDto.class,t("observe.ui.tree.longline.setGlobalComposition")); } @Override ===================================== client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/TdrLonglineNavigationTreeNode.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/TdrLonglineNavigationTreeNode.java +++ b/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/TdrLonglineNavigationTreeNode.java @@ -26,6 +26,9 @@ import fr.ird.observe.client.ui.content.table.impl.longline.TdrUI; import fr.ird.observe.client.ui.tree.navigation.nodes.ClassNavigationTreeNode; import fr.ird.observe.services.dto.longline.TdrDto; + +import static org.nuiton.i18n.I18n.t; + /** * Created on 14/11/16. * @@ -34,8 +37,8 @@ import fr.ird.observe.services.dto.longline.TdrDto; */ public class TdrLonglineNavigationTreeNode extends ClassNavigationTreeNode<TdrDto> { - public TdrLonglineNavigationTreeNode() { - super(TdrDto.class); + TdrLonglineNavigationTreeNode() { + super(TdrDto.class, t("observe.ui.tree.longline.tdr")); } @Override ===================================== client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialNavigationTreeNode.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialNavigationTreeNode.java +++ b/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialNavigationTreeNode.java @@ -40,8 +40,8 @@ import static org.nuiton.i18n.I18n.t; */ public class ReferentialNavigationTreeNode<D extends ReferentialDto> extends ClassNavigationTreeNode<D> { - public ReferentialNavigationTreeNode(Class<D> data) { - super(data, true); + ReferentialNavigationTreeNode(Class<D> data) { + super(data, true, t(ObserveI18nDecoratorHelper.getTypePluralI18nKey(data))); } @Override @@ -66,11 +66,6 @@ public class ReferentialNavigationTreeNode<D extends ReferentialDto> extends Cla } @Override - public String getText() { - return t(ObserveI18nDecoratorHelper.getTypePluralI18nKey(getDataType())); - } - - @Override public String getIconPath() { return "navigation.sub.referentiel"; } ===================================== client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/ActivitiesSeineNavigationTreeNode.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/ActivitiesSeineNavigationTreeNode.java +++ b/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/ActivitiesSeineNavigationTreeNode.java @@ -25,7 +25,6 @@ package fr.ird.observe.client.ui.tree.navigation.nodes.seine; import fr.ird.observe.client.ui.content.list.impl.seine.ActivitySeinesUI; import fr.ird.observe.client.ui.tree.navigation.nodes.ClassNavigationTreeNode; import fr.ird.observe.client.ui.tree.navigation.nodes.WithChildsToReload; -import fr.ird.observe.services.decoration.ObserveI18nDecoratorHelper; import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.reference.DataReferenceSet; import fr.ird.observe.services.dto.seine.ActivitySeineDto; @@ -41,8 +40,8 @@ import static org.nuiton.i18n.I18n.t; */ public class ActivitiesSeineNavigationTreeNode extends ClassNavigationTreeNode<ActivitySeineDto> implements WithChildsToReload { - public ActivitiesSeineNavigationTreeNode() { - super(ActivitySeineDto.class, true); + ActivitiesSeineNavigationTreeNode() { + super(ActivitySeineDto.class, true,t("observe.ui.tree.activities")); } @Override @@ -61,11 +60,6 @@ public class ActivitiesSeineNavigationTreeNode extends ClassNavigationTreeNode<A } @Override - public String getText() { - return t(ObserveI18nDecoratorHelper.getTypePluralI18nKey(getData())); - } - - @Override public void reloadChilds() { DataReferenceSet<ActivitySeineDto> referenceSet = getServicesProvider().getActivitySeineService().getActivitySeineByRoute(getId()); for (DataReference<ActivitySeineDto> reference : referenceSet.getReferences()) { ===================================== client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/DiscardedTargetCatchesSeineNavigationTreeNode.java → client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/DiscardedTargetCatchSeineNavigationTreeNode.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/DiscardedTargetCatchesSeineNavigationTreeNode.java +++ b/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/DiscardedTargetCatchSeineNavigationTreeNode.java @@ -26,16 +26,19 @@ import fr.ird.observe.client.ui.content.table.impl.seine.TargetDiscardCatchUI; import fr.ird.observe.client.ui.tree.navigation.nodes.ClassNavigationTreeNode; import fr.ird.observe.services.dto.seine.DiscardedTargetCatchDto; + +import static org.nuiton.i18n.I18n.t; + /** * Created on 14/11/16. * * @author Tony Chemit - dev(a)tchemit.fr * @since 6.0 */ -public class DiscardedTargetCatchesSeineNavigationTreeNode extends ClassNavigationTreeNode<DiscardedTargetCatchDto> { +public class DiscardedTargetCatchSeineNavigationTreeNode extends ClassNavigationTreeNode<DiscardedTargetCatchDto> { - public DiscardedTargetCatchesSeineNavigationTreeNode() { - super(DiscardedTargetCatchDto.class); + DiscardedTargetCatchSeineNavigationTreeNode() { + super(DiscardedTargetCatchDto.class,t("observe.ui.tree.seine.discardedTargetCatch")); } @Override ===================================== client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/DiscardedTargetSamplesSeineNavigationTreeNode.java → client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/DiscardedTargetSampleSeineNavigationTreeNode.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/DiscardedTargetSamplesSeineNavigationTreeNode.java +++ b/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/DiscardedTargetSampleSeineNavigationTreeNode.java @@ -26,16 +26,19 @@ import fr.ird.observe.client.ui.content.table.impl.seine.TargetSampleRejeteUI; import fr.ird.observe.client.ui.tree.navigation.nodes.ClassNavigationTreeNode; import fr.ird.observe.services.dto.seine.DiscardedTargetSampleDto; + +import static org.nuiton.i18n.I18n.t; + /** * Created on 14/11/16. * * @author Tony Chemit - dev(a)tchemit.fr * @since 6.0 */ -public class DiscardedTargetSamplesSeineNavigationTreeNode extends ClassNavigationTreeNode<DiscardedTargetSampleDto> { +public class DiscardedTargetSampleSeineNavigationTreeNode extends ClassNavigationTreeNode<DiscardedTargetSampleDto> { - public DiscardedTargetSamplesSeineNavigationTreeNode() { - super(DiscardedTargetSampleDto.class); + DiscardedTargetSampleSeineNavigationTreeNode() { + super(DiscardedTargetSampleDto.class, t("observe.ui.tree.seine.discardedTargetSample")); } @Override ===================================== client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/FloatingObjectTransmittingBuoyNavigationTreeNode.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/FloatingObjectTransmittingBuoyNavigationTreeNode.java +++ b/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/FloatingObjectTransmittingBuoyNavigationTreeNode.java @@ -26,6 +26,9 @@ import fr.ird.observe.client.ui.content.impl.seine.FloatingObjectTransmittingBuo import fr.ird.observe.client.ui.tree.navigation.nodes.ClassNavigationTreeNode; import fr.ird.observe.services.dto.referential.seine.ObjectOperationDto; + +import static org.nuiton.i18n.I18n.t; + /** * Created on 04/12/16. * @@ -34,8 +37,8 @@ import fr.ird.observe.services.dto.referential.seine.ObjectOperationDto; */ public class FloatingObjectTransmittingBuoyNavigationTreeNode extends ClassNavigationTreeNode<ObjectOperationDto> { - public FloatingObjectTransmittingBuoyNavigationTreeNode() { - super(ObjectOperationDto.class); + FloatingObjectTransmittingBuoyNavigationTreeNode() { + super(ObjectOperationDto.class, t("observe.ui.tree.seine.objectOperation")); } @Override ===================================== client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/GearUseFeaturesSeineNavigationTreeNode.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/GearUseFeaturesSeineNavigationTreeNode.java +++ b/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/GearUseFeaturesSeineNavigationTreeNode.java @@ -27,6 +27,9 @@ import fr.ird.observe.client.ui.tree.navigation.nodes.ClassNavigationTreeNode; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto; + +import static org.nuiton.i18n.I18n.t; + /** * Created on 14/11/16. * @@ -35,8 +38,8 @@ import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto; */ public class GearUseFeaturesSeineNavigationTreeNode extends ClassNavigationTreeNode<GearUseFeaturesSeineDto> { - public GearUseFeaturesSeineNavigationTreeNode() { - super(GearUseFeaturesSeineDto.class); + GearUseFeaturesSeineNavigationTreeNode() { + super(GearUseFeaturesSeineDto.class,t("observe.ui.tree.gearUseFeatures")); } @Override ===================================== client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/KeptTargetCatchesSeineNavigationTreeNode.java → client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/KeptTargetCatchSeineNavigationTreeNode.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/KeptTargetCatchesSeineNavigationTreeNode.java +++ b/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/KeptTargetCatchSeineNavigationTreeNode.java @@ -26,16 +26,19 @@ import fr.ird.observe.client.ui.content.table.impl.seine.TargetCatchUI; import fr.ird.observe.client.ui.tree.navigation.nodes.ClassNavigationTreeNode; import fr.ird.observe.services.dto.seine.KeptTargetCatchDto; + +import static org.nuiton.i18n.I18n.t; + /** * Created on 14/11/16. * * @author Tony Chemit - dev(a)tchemit.fr * @since 6.0 */ -public class KeptTargetCatchesSeineNavigationTreeNode extends ClassNavigationTreeNode<KeptTargetCatchDto> { +public class KeptTargetCatchSeineNavigationTreeNode extends ClassNavigationTreeNode<KeptTargetCatchDto> { - public KeptTargetCatchesSeineNavigationTreeNode() { - super(KeptTargetCatchDto.class); + KeptTargetCatchSeineNavigationTreeNode() { + super(KeptTargetCatchDto.class, t("observe.ui.tree.seine.keptTargetCatch")); } @Override ===================================== client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/KeptTargetSamplesSeineNavigationTreeNode.java → client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/KeptTargetSampleSeineNavigationTreeNode.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/KeptTargetSamplesSeineNavigationTreeNode.java +++ b/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/KeptTargetSampleSeineNavigationTreeNode.java @@ -26,16 +26,19 @@ import fr.ird.observe.client.ui.content.table.impl.seine.TargetSampleCaptureUI; import fr.ird.observe.client.ui.tree.navigation.nodes.ClassNavigationTreeNode; import fr.ird.observe.services.dto.seine.KeptTargetSampleDto; + +import static org.nuiton.i18n.I18n.t; + /** * Created on 14/11/16. * * @author Tony Chemit - dev(a)tchemit.fr * @since 6.0 */ -public class KeptTargetSamplesSeineNavigationTreeNode extends ClassNavigationTreeNode<KeptTargetSampleDto> { +public class KeptTargetSampleSeineNavigationTreeNode extends ClassNavigationTreeNode<KeptTargetSampleDto> { - public KeptTargetSamplesSeineNavigationTreeNode() { - super(KeptTargetSampleDto.class); + KeptTargetSampleSeineNavigationTreeNode() { + super(KeptTargetSampleDto.class, t("observe.ui.tree.seine.keptTargetSample")); } @Override ===================================== client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/NonTargetCatchesReleasedSeineNavigationTreeNode.java → client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/NonTargetCatchReleasedSeineNavigationTreeNode.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/NonTargetCatchesReleasedSeineNavigationTreeNode.java +++ b/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/NonTargetCatchReleasedSeineNavigationTreeNode.java @@ -26,16 +26,19 @@ import fr.ird.observe.client.ui.content.table.impl.seine.NonTargetCatchReleaseUI import fr.ird.observe.client.ui.tree.navigation.nodes.ClassNavigationTreeNode; import fr.ird.observe.services.dto.seine.NonTargetCatchReleaseDto; + +import static org.nuiton.i18n.I18n.t; + /** * Created on 14/11/16. * * @author Tony Chemit - dev(a)tchemit.fr * @since 7.0 */ -public class NonTargetCatchesReleasedSeineNavigationTreeNode extends ClassNavigationTreeNode<NonTargetCatchReleaseDto> { +public class NonTargetCatchReleasedSeineNavigationTreeNode extends ClassNavigationTreeNode<NonTargetCatchReleaseDto> { - public NonTargetCatchesReleasedSeineNavigationTreeNode() { - super(NonTargetCatchReleaseDto.class); + NonTargetCatchReleasedSeineNavigationTreeNode() { + super(NonTargetCatchReleaseDto.class, t("observe.ui.tree.seine.nonTargetCatchRelease")); } @Override ===================================== client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/NonTargetCatchesSeineNavigationTreeNode.java → client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/NonTargetCatchSeineNavigationTreeNode.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/NonTargetCatchesSeineNavigationTreeNode.java +++ b/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/NonTargetCatchSeineNavigationTreeNode.java @@ -26,16 +26,19 @@ import fr.ird.observe.client.ui.content.table.impl.seine.NonTargetCatchUI; import fr.ird.observe.client.ui.tree.navigation.nodes.ClassNavigationTreeNode; import fr.ird.observe.services.dto.seine.NonTargetCatchDto; + +import static org.nuiton.i18n.I18n.t; + /** * Created on 14/11/16. * * @author Tony Chemit - dev(a)tchemit.fr * @since 6.0 */ -public class NonTargetCatchesSeineNavigationTreeNode extends ClassNavigationTreeNode<NonTargetCatchDto> { +public class NonTargetCatchSeineNavigationTreeNode extends ClassNavigationTreeNode<NonTargetCatchDto> { - public NonTargetCatchesSeineNavigationTreeNode() { - super(NonTargetCatchDto.class); + NonTargetCatchSeineNavigationTreeNode() { + super(NonTargetCatchDto.class, t("observe.ui.tree.seine.nonTargetCatch")); } @Override ===================================== client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/NoneTargetSamplesSeineNavigationTreeNode.java → client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/NonTargetSampleSeineNavigationTreeNode.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/NoneTargetSamplesSeineNavigationTreeNode.java +++ b/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/NonTargetSampleSeineNavigationTreeNode.java @@ -26,16 +26,19 @@ import fr.ird.observe.client.ui.content.table.impl.seine.NonTargetSampleUI; import fr.ird.observe.client.ui.tree.navigation.nodes.ClassNavigationTreeNode; import fr.ird.observe.services.dto.seine.NonTargetSampleDto; + +import static org.nuiton.i18n.I18n.t; + /** * Created on 14/11/16. * * @author Tony Chemit - dev(a)tchemit.fr * @since 6.0 */ -public class NoneTargetSamplesSeineNavigationTreeNode extends ClassNavigationTreeNode<NonTargetSampleDto> { +public class NonTargetSampleSeineNavigationTreeNode extends ClassNavigationTreeNode<NonTargetSampleDto> { - public NoneTargetSamplesSeineNavigationTreeNode() { - super(NonTargetSampleDto.class); + NonTargetSampleSeineNavigationTreeNode() { + super(NonTargetSampleDto.class, t("observe.ui.tree.seine.nonTargetSample")); } @Override ===================================== client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/ObjectObservedSpeciesNavigationTreeNode.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/ObjectObservedSpeciesNavigationTreeNode.java +++ b/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/ObjectObservedSpeciesNavigationTreeNode.java @@ -26,6 +26,9 @@ import fr.ird.observe.client.ui.content.table.impl.seine.ObjectObservedSpeciesUI import fr.ird.observe.client.ui.tree.navigation.nodes.ClassNavigationTreeNode; import fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto; + +import static org.nuiton.i18n.I18n.t; + /** * Created on 04/12/16. * @@ -34,8 +37,8 @@ import fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto; */ public class ObjectObservedSpeciesNavigationTreeNode extends ClassNavigationTreeNode<ObjectObservedSpeciesDto> { - public ObjectObservedSpeciesNavigationTreeNode() { - super(ObjectObservedSpeciesDto.class); + ObjectObservedSpeciesNavigationTreeNode() { + super(ObjectObservedSpeciesDto.class, t("observe.ui.tree.seine.objectObservedSpecies")); } @Override ===================================== client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/ObjectSchoolEstimateNavigationTreeNode.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/ObjectSchoolEstimateNavigationTreeNode.java +++ b/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/ObjectSchoolEstimateNavigationTreeNode.java @@ -26,6 +26,9 @@ import fr.ird.observe.client.ui.content.table.impl.seine.ObjectSchoolEstimateUI; import fr.ird.observe.client.ui.tree.navigation.nodes.ClassNavigationTreeNode; import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto; + +import static org.nuiton.i18n.I18n.t; + /** * Created on 04/12/16. * @@ -34,8 +37,8 @@ import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto; */ public class ObjectSchoolEstimateNavigationTreeNode extends ClassNavigationTreeNode<ObjectSchoolEstimateDto> { - public ObjectSchoolEstimateNavigationTreeNode() { - super(ObjectSchoolEstimateDto.class); + ObjectSchoolEstimateNavigationTreeNode() { + super(ObjectSchoolEstimateDto.class, t("observe.ui.tree.seine.objectSchoolEstimate")); } @Override ===================================== client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/RoutesSeineNavigationTreeNode.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/RoutesSeineNavigationTreeNode.java +++ b/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/RoutesSeineNavigationTreeNode.java @@ -25,7 +25,6 @@ package fr.ird.observe.client.ui.tree.navigation.nodes.seine; import fr.ird.observe.client.ui.content.list.impl.seine.RoutesUI; import fr.ird.observe.client.ui.tree.navigation.nodes.ClassNavigationTreeNode; import fr.ird.observe.client.ui.tree.navigation.nodes.WithChildsToReload; -import fr.ird.observe.services.decoration.ObserveI18nDecoratorHelper; import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.reference.DataReferenceSet; import fr.ird.observe.services.dto.seine.RouteDto; @@ -41,8 +40,8 @@ import static org.nuiton.i18n.I18n.t; */ public class RoutesSeineNavigationTreeNode extends ClassNavigationTreeNode<RouteDto> implements WithChildsToReload { - public RoutesSeineNavigationTreeNode() { - super(RouteDto.class, true); + RoutesSeineNavigationTreeNode() { + super(RouteDto.class, true, t("observe.ui.tree.seine.routes")); } @Override @@ -61,11 +60,6 @@ public class RoutesSeineNavigationTreeNode extends ClassNavigationTreeNode<Route } @Override - public String getText() { - return t(ObserveI18nDecoratorHelper.getTypePluralI18nKey(getData())); - } - - @Override public void reloadChilds() { DataReferenceSet<RouteDto> referenceSet = getServicesProvider().getRouteService().getRouteByTripSeine(getId()); for (DataReference<RouteDto> reference : referenceSet.getReferences()) { ===================================== client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/SchoolEstimatesSeineNavigationTreeNode.java → client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/SchoolEstimateSeineNavigationTreeNode.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/SchoolEstimatesSeineNavigationTreeNode.java +++ b/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/SchoolEstimateSeineNavigationTreeNode.java @@ -26,16 +26,19 @@ import fr.ird.observe.client.ui.content.table.impl.seine.SchoolEstimateUI; import fr.ird.observe.client.ui.tree.navigation.nodes.ClassNavigationTreeNode; import fr.ird.observe.services.dto.seine.SchoolEstimateDto; + +import static org.nuiton.i18n.I18n.t; + /** * Created on 14/11/16. * * @author Tony Chemit - dev(a)tchemit.fr * @since 6.0 */ -public class SchoolEstimatesSeineNavigationTreeNode extends ClassNavigationTreeNode<SchoolEstimateDto> { +public class SchoolEstimateSeineNavigationTreeNode extends ClassNavigationTreeNode<SchoolEstimateDto> { - public SchoolEstimatesSeineNavigationTreeNode() { - super(SchoolEstimateDto.class); + SchoolEstimateSeineNavigationTreeNode() { + super(SchoolEstimateDto.class, t("observe.ui.tree.seine.schoolEstimate")); } @Override ===================================== client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/SetSeineNavigationTreeNode.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/SetSeineNavigationTreeNode.java +++ b/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/SetSeineNavigationTreeNode.java @@ -41,14 +41,14 @@ public class SetSeineNavigationTreeNode extends ReferenceNavigationTreeNodeSuppo public SetSeineNavigationTreeNode(DataReference<SetSeineDto> data) { super(data, true); if (isPersisted()) { - add(new SchoolEstimatesSeineNavigationTreeNode()); - add(new KeptTargetCatchesSeineNavigationTreeNode()); - add(new DiscardedTargetCatchesSeineNavigationTreeNode()); - add(new KeptTargetSamplesSeineNavigationTreeNode()); - add(new DiscardedTargetSamplesSeineNavigationTreeNode()); - add(new NonTargetCatchesSeineNavigationTreeNode()); - add(new NonTargetCatchesReleasedSeineNavigationTreeNode()); - add(new NoneTargetSamplesSeineNavigationTreeNode()); + add(new SchoolEstimateSeineNavigationTreeNode()); + add(new KeptTargetCatchSeineNavigationTreeNode()); + add(new DiscardedTargetCatchSeineNavigationTreeNode()); + add(new KeptTargetSampleSeineNavigationTreeNode()); + add(new DiscardedTargetSampleSeineNavigationTreeNode()); + add(new NonTargetCatchSeineNavigationTreeNode()); + add(new NonTargetCatchReleasedSeineNavigationTreeNode()); + add(new NonTargetSampleSeineNavigationTreeNode()); } } ===================================== client/src/main/resources/i18n/client_en_GB.properties ===================================== --- a/client/src/main/resources/i18n/client_en_GB.properties +++ b/client/src/main/resources/i18n/client_en_GB.properties @@ -1664,6 +1664,26 @@ observe.type.setSeine.unsaved=New set observe.type.tripLongline.unsaved=New trip observe.type.tripSeine.unsaved=New trip observe.ui.objectMaterial.legacyCodeStandardCode=Legacy code / Standard code +observe.ui.tree.activities=Activities +observe.ui.tree.gearUseFeatures=Gear uses features +observe.ui.tree.longline.catch=Catches +observe.ui.tree.longline.encounter=Encouters +observe.ui.tree.longline.sensorUsed=Sensors used +observe.ui.tree.longline.setDetailComposition=Detailed compositions +observe.ui.tree.longline.setGlobalComposition=Global compositions +observe.ui.tree.longline.tdr=Tdrs +observe.ui.tree.seine.discardedTargetCatch=Target discarded +observe.ui.tree.seine.discardedTargetSample=Target sample +observe.ui.tree.seine.keptTargetCatch=Target catch +observe.ui.tree.seine.keptTargetSample=Target sample catch +observe.ui.tree.seine.nonTargetCatch=Non target catch +observe.ui.tree.seine.nonTargetCatchRelease=Non target released catches +observe.ui.tree.seine.nonTargetSample=Non target samples +observe.ui.tree.seine.objectObservedSpecies=Object observed species +observe.ui.tree.seine.objectOperation=Object operations +observe.ui.tree.seine.objectSchoolEstimate=Object school estimates +observe.ui.tree.seine.routes=Routes +observe.ui.tree.seine.schoolEstimate=School estimates observe.usage.action.shouldReplace=Remplace desactivated referential ? observe.usage.replaceTitle=Replacement object observe.usage.usageTitle=Founded references ===================================== client/src/main/resources/i18n/client_es_ES.properties ===================================== --- a/client/src/main/resources/i18n/client_es_ES.properties +++ b/client/src/main/resources/i18n/client_es_ES.properties @@ -1664,6 +1664,26 @@ observe.type.setSeine.unsaved=Nuevo lance observe.type.tripLongline.unsaved=Nueva marea observe.type.tripSeine.unsaved=Nueva marea observe.ui.objectMaterial.legacyCodeStandardCode=Ancien code / Code standard \#TODO +observe.ui.tree.activities=Actividades +observe.ui.tree.gearUseFeatures=Equipamientos +observe.ui.tree.longline.catch=Capturas +observe.ui.tree.longline.encounter=Encuentros +observe.ui.tree.longline.sensorUsed=Sensores utilizados +observe.ui.tree.longline.setDetailComposition=Composiciones detalladas +observe.ui.tree.longline.setGlobalComposition=Composiciones globales +observe.ui.tree.longline.tdr=Registradores de profundidad +observe.ui.tree.seine.discardedTargetCatch=Descarte de atún +observe.ui.tree.seine.discardedTargetSample=Muestreo atún descartado +observe.ui.tree.seine.keptTargetCatch=Captura de atún +observe.ui.tree.seine.keptTargetSample=Muestreo atún capturado +observe.ui.tree.seine.nonTargetCatch=Fauna accesoria conservada o descartada +observe.ui.tree.seine.nonTargetCatchRelease=Faunes accessoires libérées \#TODO +observe.ui.tree.seine.nonTargetSample=Muestreos de fauna accesoria +observe.ui.tree.seine.objectObservedSpecies=Fauna observada +observe.ui.tree.seine.objectOperation=Operaciones sobre el objeto +observe.ui.tree.seine.objectSchoolEstimate=Estimaciones banco de objetos +observe.ui.tree.seine.routes=Rutas +observe.ui.tree.seine.schoolEstimate=Estimaciones banco observe.usage.action.shouldReplace=Reemplaza referencial desactivado? observe.usage.replaceTitle=Objeto de sustitución observe.usage.usageTitle=Referencias encontradas ===================================== client/src/main/resources/i18n/client_fr_FR.properties ===================================== --- a/client/src/main/resources/i18n/client_fr_FR.properties +++ b/client/src/main/resources/i18n/client_fr_FR.properties @@ -1664,6 +1664,26 @@ observe.type.setSeine.unsaved=Nouvelle calée observe.type.tripLongline.unsaved=Nouvelle marée observe.type.tripSeine.unsaved=Nouvelle marée observe.ui.objectMaterial.legacyCodeStandardCode=Ancien code / Code standard +observe.ui.tree.activities=Activités +observe.ui.tree.gearUseFeatures=Équipements +observe.ui.tree.longline.catch=Captures +observe.ui.tree.longline.encounter=Rencontres +observe.ui.tree.longline.sensorUsed=Capteurs utilisés +observe.ui.tree.longline.setDetailComposition=Compositions détaillées +observe.ui.tree.longline.setGlobalComposition=Compositions globales +observe.ui.tree.longline.tdr=Enregistreurs de profondeur +observe.ui.tree.seine.discardedTargetCatch=Rejet de thon +observe.ui.tree.seine.discardedTargetSample=Echantillon thon rejeté +observe.ui.tree.seine.keptTargetCatch=Capture cible +observe.ui.tree.seine.keptTargetSample=Echantillon thon capturé +observe.ui.tree.seine.nonTargetCatch=Faunes accessoire conservée ou rejetée +observe.ui.tree.seine.nonTargetCatchRelease=Faunes accessoires libérées +observe.ui.tree.seine.nonTargetSample=Echantillons faune accessoire +observe.ui.tree.seine.objectObservedSpecies=Faune observée +observe.ui.tree.seine.objectOperation=Opérations sur l'objet +observe.ui.tree.seine.objectSchoolEstimate=Estimations banc objet +observe.ui.tree.seine.routes=Routes +observe.ui.tree.seine.schoolEstimate=Estimations banc observe.usage.action.shouldReplace=Remplacer le référentiel désactivé ? observe.usage.replaceTitle=Objet de remplacement observe.usage.usageTitle=Références trouvées View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/126d70a9c878c1c545c037ad124… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/126d70a9c878c1c545c037ad124… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Use a ClassMapping
by Tony CHEMIT 04 Aug '17

04 Aug '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 6314a2c5 by Tony CHEMIT at 2017-08-04T10:58:20+02:00 Use a ClassMapping - - - - - 24b994c0 by Tony CHEMIT at 2017-08-04T10:58:23+02:00 clean entities - - - - - a65fcbb3 by Tony CHEMIT at 2017-08-04T10:58:23+02:00 Le mode d'acquisition sur les espèces sensibles est Par individu par défaut (See #825) Ecran faune sensible rejetée, gestion de la date du rejet (See #818) Amélioration de l'ap des ContentHandler - - - - - 21 changed files: - client-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetCatchReleaseDto-update-error-validation.xml - client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/ContentUIModel.java - persistence/src/main/java/fr/ird/observe/entities/seine/NonTargetCatchReleaseImpl.java → client/src/main/java/fr/ird/observe/client/ui/content/UiToModelClassMapping.java - client/src/main/java/fr/ird/observe/client/ui/content/table/ContentTableModel.java - client/src/main/java/fr/ird/observe/client/ui/content/table/ContentTableUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchReleaseTableModel.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchReleaseUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchReleaseUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchReleaseUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchReleaseUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetSampleUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/SchoolEstimateUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/TargetCatchUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ChooseDbModeUIHandler.java - persistence/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java - persistence/src/main/java/fr/ird/observe/entities/seine/FloatingObjectImpl.java - services/src/main/java/fr/ird/observe/services/dto/referential/seine/WeightCategoryHelper.java - − services/src/main/java/fr/ird/observe/services/dto/seine/NonTargetCatchReleaseDto.java Changes: ===================================== client-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetCatchReleaseDto-update-error-validation.xml ===================================== --- a/client-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetCatchReleaseDto-update-error-validation.xml +++ b/client-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetCatchReleaseDto-update-error-validation.xml @@ -119,7 +119,7 @@ <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ currentSetSeine.endPursingTime.time < detectionTime.time ]]> + <![CDATA[ currentSetSeine.endPursingTimeStamp.time < detectionTime.time ]]> </param> <message>observe.validation.nonTargetCatchRelease.detectionTime.after.endPursingTimeStamp</message> </field-validator> ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java @@ -59,7 +59,6 @@ import java.awt.Dimension; import java.awt.FocusTraversalPolicy; import java.awt.event.FocusEvent; import java.awt.event.FocusListener; -import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.LinkedList; @@ -901,8 +900,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U data = Collections.emptyList(); } else { - Set<DataReference<R>> referenceSetDto = getModel().getDataReferences(list.getModel().getProperty()); - data = new ArrayList<>(referenceSetDto); + data = getModel().getDataReferences(list.getModel().getProperty()); } @@ -928,8 +926,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U data = Collections.emptyList(); } else { - Set<ReferentialReference<R>> referenceSetDto = getModel().getReferentialReferences(list.getModel().getProperty()); - data = new ArrayList<>(referenceSetDto); + data = getModel().getReferentialReferences(list.getModel().getProperty()); } @@ -960,8 +957,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U } else { - Set<ReferentialReference<R>> referenceSetDto = getModel().getReferentialReferences(propertyName); - data = new ArrayList<>(referenceSetDto); + data = getModel().getReferentialReferences(propertyName); } @@ -990,8 +986,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U } else { - Set<DataReference<R>> referenceSetDto = getModel().getDataReferences(propertyName); - data = new ArrayList<>(referenceSetDto); + data = getModel().getDataReferences(propertyName); } @@ -1189,6 +1184,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U protected void openedUI() { } + protected ObserveServicesProvider getServicesProvider() { return ObserveSwingDataSource.MAIN; } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ContentUIModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/ContentUIModel.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/ContentUIModel.java @@ -31,6 +31,8 @@ import fr.ird.observe.services.dto.reference.DataReferenceSet; import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; import fr.ird.observe.services.dto.referential.ReferentialDto; +import java.util.LinkedList; +import java.util.List; import java.util.Objects; import java.util.Optional; import java.util.Set; @@ -46,36 +48,26 @@ import org.jdesktop.beans.AbstractSerializableBean; */ public abstract class ContentUIModel<E extends IdDto> extends AbstractSerializableBean { - public static final String PROPERTY_EDIT_BEAN = "editBean"; - public static final String PROPERTY_MODE = "mode"; - - public static final String PROPERTY_READING_MODE = "readingMode"; - - public static final String PROPERTY_CREATING_MODE = "creatingMode"; - - public static final String PROPERTY_UPDATING_MODE = "updatingMode"; - - public static final String PROPERTY_ENABLED = "enabled"; - public static final String PROPERTY_MODIFIED = "modified"; - public static final String PROPERTY_EDITING = "editing"; - public static final String PROPERTY_EDITABLE = "editable"; - - public static final String PROPERTY_VALID = "valid"; - - public static final String PROPERTY_CAN_WRITE = "canWrite"; - public static final String PROPERTY_FORM = "form"; + private static final String PROPERTY_EDIT_BEAN = "editBean"; + private static final String PROPERTY_READING_MODE = "readingMode"; + private static final String PROPERTY_CREATING_MODE = "creatingMode"; + private static final String PROPERTY_UPDATING_MODE = "updatingMode"; + private static final String PROPERTY_ENABLED = "enabled"; + private static final String PROPERTY_VALID = "valid"; + private static final String PROPERTY_CAN_WRITE = "canWrite"; + /** Logger */ - static private final Log log = LogFactory.getLog(ContentUIModel.class); + private static final Log log = LogFactory.getLog(ContentUIModel.class); private static final long serialVersionUID = 1L; - protected final Class<E> beanType; + private final Class<E> beanType; protected Form<E> form; @@ -93,7 +85,7 @@ public abstract class ContentUIModel<E extends IdDto> extends AbstractSerializab protected boolean editable; - protected boolean canWrite; + private boolean canWrite; /** * Les référentiels qu'on peut utiliser, ils sont chargés depuis le cache des référentiels et peuvent être filtrés. @@ -105,14 +97,11 @@ public abstract class ContentUIModel<E extends IdDto> extends AbstractSerializab */ protected ImmutableMap<String, DataReferenceSet<?>> dataReferenceSetsByPropertyName = ImmutableMap.of(); - public static <E extends IdDto, U extends ContentUI<E, U>> ContentUIModel<E> newModel(U ui) { - - String uiName = ui.getClass().getName(); - String modelName = uiName + "Model"; + static <E extends IdDto, U extends ContentUI<E, U>> ContentUIModel<E> newModel(U ui) { try { - Class<ContentUIModel<E>> modelClass = (Class) Class.forName(modelName); + Class<ContentUIModel<E>> modelClass = (Class) UiToModelClassMapping.get().getClass(ui.getClass()); return modelClass.newInstance(); } catch (Exception e) { @@ -246,7 +235,7 @@ public abstract class ContentUIModel<E extends IdDto> extends AbstractSerializab firePropertyChange(PROPERTY_MODIFIED, oldValue, modified); } - public boolean isCanWrite() { + boolean isCanWrite() { return canWrite; } @@ -256,17 +245,17 @@ public abstract class ContentUIModel<E extends IdDto> extends AbstractSerializab firePropertyChange(PROPERTY_CAN_WRITE, oldValue, canWrite); } - public <D extends ReferentialDto> Set<ReferentialReference<D>> getReferentialReferences(String name) { + public <D extends ReferentialDto> List<ReferentialReference<D>> getReferentialReferences(String name) { ReferentialReferenceSet<D> referentialReferenceSet = getReferentialReferenceSet(name); - return referentialReferenceSet.getReferences(); + return new LinkedList<>(referentialReferenceSet.getReferences()); } - public <D extends DataDto> Set<DataReference<D>> getDataReferences(String name) { + <D extends DataDto> List<DataReference<D>> getDataReferences(String name) { DataReferenceSet<D> referentialReferenceSet = getDataReferenceSet(name); - return referentialReferenceSet.getReferences(); + return new LinkedList<>(referentialReferenceSet.getReferences()); } @@ -281,19 +270,11 @@ public abstract class ContentUIModel<E extends IdDto> extends AbstractSerializab this.referentialReferenceSetsByPropertyName = referentialReferenceSetsByPropertyName; } - public void setDataReferenceSetsByPropertyName(ImmutableMap<String, DataReferenceSet<?>> dataReferenceSetsByPropertyName) { - this.dataReferenceSetsByPropertyName = dataReferenceSetsByPropertyName; - } - public ImmutableMap<String, ReferentialReferenceSet<?>> getReferentialReferenceSets() { return referentialReferenceSetsByPropertyName; } - public ImmutableMap<String, DataReferenceSet<?>> getDataReferenceSets() { - return dataReferenceSetsByPropertyName; - } - - protected <R extends DataDto> Optional<Set<DataReference<R>>> tryToGetDataReferenceSet(String propertyName) { + <R extends DataDto> Optional<Set<DataReference<R>>> tryToGetDataReferenceSet(String propertyName) { DataReferenceSet<R> referenceSet = getDataReferenceSet(propertyName); Set<DataReference<R>> references = null; if (referenceSet != null) { @@ -316,12 +297,12 @@ public abstract class ContentUIModel<E extends IdDto> extends AbstractSerializab } private <R extends ReferentialDto> ReferentialReferenceSet<R> getReferentialReferenceSet(String propertyName) { - ReferentialReferenceSet<?> referenceSet = this.referentialReferenceSetsByPropertyName.get(propertyName); - Objects.requireNonNull(referenceSet, "Could not find referantialRefenceSet named " + propertyName); + ReferentialReferenceSet<?> referenceSet = referentialReferenceSetsByPropertyName.get(propertyName); + Objects.requireNonNull(referenceSet, "Could not find referentialRefenceSet named " + propertyName); return (ReferentialReferenceSet<R>) referenceSet; } - public <R extends DataDto> DataReferenceSet<R> getDataReferenceSet(String propertyName) { + private <R extends DataDto> DataReferenceSet<R> getDataReferenceSet(String propertyName) { DataReferenceSet<?> referenceSet = dataReferenceSetsByPropertyName.get(propertyName); Objects.requireNonNull(referenceSet, "Could not find dataReferenceSet named " + propertyName); return (DataReferenceSet<R>) referenceSet; ===================================== persistence/src/main/java/fr/ird/observe/entities/seine/NonTargetCatchReleaseImpl.java → client/src/main/java/fr/ird/observe/client/ui/content/UiToModelClassMapping.java ===================================== --- a/persistence/src/main/java/fr/ird/observe/entities/seine/NonTargetCatchReleaseImpl.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/UiToModelClassMapping.java @@ -1,8 +1,8 @@ -package fr.ird.observe.entities.seine; +package fr.ird.observe.client.ui.content; /*- * #%L - * ObServe :: Persistence + * ObServe :: Client * %% * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io * %% @@ -22,21 +22,24 @@ package fr.ird.observe.entities.seine; * #L% */ -import java.util.Date; -import org.nuiton.util.DateUtil; - -public class NonTargetCatchReleaseImpl extends NonTargetCatchReleaseAbstract { +import io.ultreia.java4all.http.ClassMapping; +/** + * Created by tchemit on 04/08/17. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 7.0 + */ +public class UiToModelClassMapping extends ClassMapping<ContentUI, ContentUIModel> { - private static final long serialVersionUID = 1L; + private static UiToModelClassMapping INSTANCE = new UiToModelClassMapping(); - @Override - public void setDetectionTime(Date detectionTime) { - super.setDetectionTime(detectionTime == null ? null : DateUtil.getTime(detectionTime, false, false)); + public static UiToModelClassMapping get() { + return INSTANCE; } - @Override - public void setReleaseTime(Date releaseTime) { - super.setReleaseTime(releaseTime == null ? null : DateUtil.getTime(releaseTime, false, false)); + private UiToModelClassMapping() { + super(ContentUI.class.getPackage(), ContentUIModel.class.getPackage(), "Model"); } + } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/ContentTableModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/ContentTableModel.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/ContentTableModel.java @@ -71,13 +71,13 @@ import org.nuiton.jaxx.validator.swing.SwingValidator; public abstract class ContentTableModel extends AbstractTableModel { /** Le nom de la propriété de la ligne en cours d'édition */ - public static final String SELECTED_ROW_PROPERTY = "selectedRow"; + static final String SELECTED_ROW_PROPERTY = "selectedRow"; /** Le nom de la propriété modifié du modèle */ - public static final String MODIFIED_PROPERTY = "modified"; + private static final String MODIFIED_PROPERTY = "modified"; /** Le nom de la propriété pour editer le modele */ - public static final String EDITABLE_PROPERTY = "editable"; + private static final String EDITABLE_PROPERTY = "editable"; /** * Le nom de la propriété pour indiquer que l'entrée en cours d'édition est @@ -86,7 +86,7 @@ public abstract class ContentTableModel extend public static final String CREATE_PROPERTY = "create"; /** Le nom de la propriété pour savoir si le modèle est vide */ - public static final String EMPTY_PROPERTY = "empty"; + private static final String EMPTY_PROPERTY = "empty"; private static final long serialVersionUID = 1L; @@ -97,7 +97,7 @@ public abstract class ContentTableModel extend protected final List<ContentTableMeta> metas; /** pour la propagation des modifications d'états */ - protected final PropertyChangeSupport pcs = new PropertyChangeSupport(this); + private final PropertyChangeSupport pcs = new PropertyChangeSupport(this); /** la liste des données du modèle */ protected List data = new ArrayList<>(); @@ -115,7 +115,7 @@ public abstract class ContentTableModel extend * un drapeau pour modifier la selection de la ligne en cours sans aucune * verification. */ - protected boolean valueAdjusting; + private boolean valueAdjusting; /** l'entrée sélectionnée (-1 quand pas de sélection) */ protected int selectedRow = -1; @@ -143,8 +143,7 @@ public abstract class ContentTableModel extend String property, boolean unmodiableWhenExisting) { - return new ContentTableMeta<>(childType, - property, unmodiableWhenExisting); + return new ContentTableMeta<>(childType, property, unmodiableWhenExisting); } /** @@ -152,7 +151,7 @@ public abstract class ContentTableModel extend * * Cela va initialiser la liste à utiliser. */ - public void attachModel() { + void attachModel() { // pas de ligne selectionne setSelectedRow(-1); @@ -172,7 +171,7 @@ public abstract class ContentTableModel extend fireTableDataChanged(); } - public void dettachModel() { + void dettachModel() { setModified(false); int size = getRowCount(); // on indique que le modele n'est plus lie au bean @@ -255,7 +254,7 @@ public abstract class ContentTableModel extend } } - public boolean isCanQuitEditingRow() { + boolean isCanQuitEditingRow() { if (selectedRow == -1) { // aucune ligne selectionne // on peut changer la ligne sans verification @@ -359,7 +358,7 @@ public abstract class ContentTableModel extend * * @param row l'index de la nouvelle ligne a editer */ - public void changeSelectedRow(int row) { + void changeSelectedRow(int row) { if (log.isDebugEnabled()) { log.debug("row : " + row); @@ -517,7 +516,7 @@ public abstract class ContentTableModel extend firePropertyChange(EDITABLE_PROPERTY, oldModified, editable); } - public boolean isValueAdjusting() { + boolean isValueAdjusting() { return valueAdjusting; } @@ -581,7 +580,7 @@ public abstract class ContentTableModel extend return metas.get(columnIndex).getType(); } - public ContentTableMeta getColumnMeta(int columnIndex) { + private ContentTableMeta getColumnMeta(int columnIndex) { ensureColumnIndex(columnIndex); return metas.get(columnIndex); } @@ -606,7 +605,7 @@ public abstract class ContentTableModel extend return list == null ? null : list.get(row); } - public void updateEmpty() { + private void updateEmpty() { firePropertyChange(EMPTY_PROPERTY, null, isEmpty()); } @@ -656,7 +655,7 @@ public abstract class ContentTableModel extend } @SuppressWarnings("unchecked") - protected SwingValidator getParentValidator() { + private SwingValidator getParentValidator() { return context == null ? null : context.getValidator(); } @@ -690,20 +689,20 @@ public abstract class ContentTableModel extend return meta.setValue(this, bean, aValue, row); } - protected void ensureColumnIndex(int columnIndex) throws ArrayIndexOutOfBoundsException { + private void ensureColumnIndex(int columnIndex) throws ArrayIndexOutOfBoundsException { if (columnIndex < 0 || columnIndex >= metas.size()) { throw new ArrayIndexOutOfBoundsException("column index should be in [0," + metas.size() + "], but was " + columnIndex); } } - protected void ensureRowIndex(int rowIndex) throws ArrayIndexOutOfBoundsException { + private void ensureRowIndex(int rowIndex) throws ArrayIndexOutOfBoundsException { int size = getRowCount(); if (rowIndex < 0 || rowIndex >= size) { throw new ArrayIndexOutOfBoundsException("row index should be in [0," + (getRowCount() - 1) + "], but was " + rowIndex); } } - protected void ensureEditable() throws IllegalStateException { + private void ensureEditable() throws IllegalStateException { if (!editable) { throw new IllegalStateException("can not edit this model since it is marked as none editable " + this); } @@ -715,11 +714,11 @@ public abstract class ContentTableModel extend clearCache(); } - protected void clearCache() { + private void clearCache() { data = null; } - protected void updateBeanList(boolean shouldChanged) { + private void updateBeanList(boolean shouldChanged) { SwingValidator parentValidator = getParentValidator(); boolean wasChanged = parentValidator.isChanged(); @@ -735,11 +734,11 @@ public abstract class ContentTableModel extend protected abstract void setChilds(P parent, List childs); - protected boolean isModelModified() { + private boolean isModelModified() { return getValidator().isChanged(); } - protected boolean isModelValid() { + private boolean isModelValid() { return getValidator().isValid(); } } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/ContentTableUIModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/ContentTableUIModel.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/ContentTableUIModel.java @@ -153,7 +153,7 @@ public abstract class ContentTableUIModel<E extends IdDto, D extends IdDto> exte return tableEditBean; } - public final D newTableEditBean() { + public D newTableEditBean() { try { return getChildType().getConstructor().newInstance(); ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchReleaseTableModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchReleaseTableModel.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchReleaseTableModel.java @@ -30,25 +30,20 @@ import fr.ird.observe.services.dto.seine.NonTargetCatchReleaseHelper; import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchReleaseDto; import java.util.Collection; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; /** * Created on 12/4/14. * * @author Tony Chemit - dev(a)tchemit.fr - * @since 3.8 + * @since 7.0 */ public class NonTargetCatchReleaseTableModel extends ContentTableModel<SetSeineNonTargetCatchReleaseDto, NonTargetCatchReleaseDto> { - /** Logger. */ - private static final Log log = LogFactory.getLog(NonTargetCatchReleaseTableModel.class); - private static final long serialVersionUID = 1L; private boolean adjusting; - public NonTargetCatchReleaseTableModel(ObserveContentTableUI<SetSeineNonTargetCatchReleaseDto, NonTargetCatchReleaseDto, ?> context, - List<ContentTableMeta<NonTargetCatchReleaseDto>> contentTableMetas) { + NonTargetCatchReleaseTableModel(ObserveContentTableUI<SetSeineNonTargetCatchReleaseDto, NonTargetCatchReleaseDto, ?> context, + List<ContentTableMeta<NonTargetCatchReleaseDto>> contentTableMetas) { super(context, contentTableMetas); } @@ -77,7 +72,7 @@ public class NonTargetCatchReleaseTableModel extends ContentTableModel<SetSeineN return bean.getNonTargetCatchRelease(); } - public void moveUp(int selectedRow) { + void moveUp(int selectedRow) { NonTargetCatchReleaseDto remove = data.remove(selectedRow); data.add(selectedRow - 1, remove); fireTableRowsUpdated(selectedRow - 1, selectedRow); @@ -87,7 +82,7 @@ public class NonTargetCatchReleaseTableModel extends ContentTableModel<SetSeineN getModel().setModified(true); } - public void moveDown(int selectedRow) { + void moveDown(int selectedRow) { NonTargetCatchReleaseDto remove = data.remove(selectedRow); data.add(selectedRow + 1, remove); fireTableRowsUpdated(selectedRow, selectedRow + 1); @@ -97,7 +92,7 @@ public class NonTargetCatchReleaseTableModel extends ContentTableModel<SetSeineN getModel().setModified(true); } - public boolean isAdjusting() { + boolean isAdjusting() { return adjusting; } } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchReleaseUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchReleaseUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchReleaseUI.jaxx @@ -41,7 +41,7 @@ fr.ird.observe.client.validation.ObserveSwingValidator fr.ird.observe.client.ui.content.table.impl.seine.ModeSaisieEchantillonEnum - org.nuiton.jaxx.widgets.datetime.TimeEditor + org.nuiton.jaxx.widgets.datetime.DateTimeEditor org.nuiton.jaxx.widgets.number.NumberEditor org.nuiton.jaxx.widgets.select.BeanComboBox @@ -150,13 +150,16 @@ </cell> </row> -  +  <row> <cell columns="2" weightx="1"> - <JPanel layout='{new GridLayout(1,0)}'> - <TimeEditor id='detectionTime' constructorParams='this'/> - <TimeEditor id='releaseTime' constructorParams='this'/> - </JPanel> + <DateTimeEditor id='detectionTime' constructorParams='this'/> + </cell> + </row> +  + <row> + <cell columns="2" weightx="1"> + <DateTimeEditor id='releaseTime' constructorParams='this'/> </cell> </row> ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchReleaseUI.jcss ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchReleaseUI.jcss +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchReleaseUI.jcss @@ -124,19 +124,19 @@ } #detectionTime { - propertyTime:{NonTargetCatchReleaseDto.PROPERTY_DETECTION_TIME}; + propertyDate:{NonTargetCatchReleaseDto.PROPERTY_DETECTION_TIME}; bean:{tableEditBean}; label:{t("observe.common.detectionTime")}; - time:{tableEditBean.getDetectionTime()}; + date:{tableEditBean.getDetectionTime()}; + dateEditable:false; _validatorLabel:{t("observe.common.detectionTime")}; showTimeEditorSlider: false; } #releaseTime { - propertyTime:{NonTargetCatchReleaseDto.PROPERTY_RELEASE_TIME}; + propertyDate:{NonTargetCatchReleaseDto.PROPERTY_RELEASE_TIME}; bean:{tableEditBean}; label:{t("observe.common.releaseTime")}; - time:{tableEditBean.getReleaseTime()}; - _validatorLabel:{t("observe.common.releaseTime")}; + date:{tableEditBean.getReleaseTime()}; showTimeEditorSlider: false; } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchReleaseUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchReleaseUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchReleaseUIHandler.java @@ -21,7 +21,6 @@ */ package fr.ird.observe.client.ui.content.table.impl.seine; -import com.google.common.collect.Lists; import fr.ird.observe.client.db.constants.DataContextType; import fr.ird.observe.client.ui.UIHelper; import fr.ird.observe.client.ui.content.table.ContentTableUIHandler; @@ -49,7 +48,6 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.Set; import java.util.TreeMap; import javax.swing.JComponent; import javax.swing.JPopupMenu; @@ -130,8 +128,6 @@ public class NonTargetCatchReleaseUIHandler extends ContentTableUIHandler<SetSei NonTargetCatchReleaseTableModel model = getTableModel(); if (!model.isEditable()) { - - // rien a faire return; } @@ -139,47 +135,36 @@ public class NonTargetCatchReleaseUIHandler extends ContentTableUIHandler<SetSei JComponent requestFocus; if (create) { - Set<ReferentialReference<SpeciesDto>> speciesSet = getModel().getReferentialReferences(NonTargetCatchReleaseDto.PROPERTY_SPECIES); - availableEspeces = Lists.newArrayList(speciesSet); + + availableEspeces = getModel().getReferentialReferences(NonTargetCatchReleaseDto.PROPERTY_SPECIES); requestFocus = ui.getSpecies(); if (model.isCreate()) { - // on passe le mode de saisie en count - ui.getAcquisitionModeGroup().setSelectedValue(null); - ui.getAcquisitionModeGroup().setSelectedValue(ModeSaisieEchantillonEnum.byEffectif); - ui.getStatus().init(null); } } else { + ReferentialReference<SpeciesDto> species = bean.getSpecies(); availableEspeces = new ArrayList<>(); availableEspeces.add(species); requestFocus = ui.getSex(); - int acquisitionMode = bean.getAcquisitionMode(); - ModeSaisieEchantillonEnum enumValue = ModeSaisieEchantillonEnum.valueOf(acquisitionMode); - ui.getAcquisitionModeGroup().setSelectedValue(null); - ui.getAcquisitionModeGroup().setSelectedValue(enumValue); } + int acquisitionMode = bean.getAcquisitionMode(); + ModeSaisieEchantillonEnum enumValue = ModeSaisieEchantillonEnum.valueOf(acquisitionMode); + ui.getAcquisitionModeGroup().setSelectedValue(null); + ui.getAcquisitionModeGroup().setSelectedValue(enumValue); + ui.getSpecies().setData(availableEspeces); - Date releaseTime; - Date detectionTime; - NonTargetCatchReleaseStatus status; - if (create) { + Date releaseTime = bean.getReleaseTime(); + Date detectionTime = bean.getDetectionTime(); + NonTargetCatchReleaseStatus status = bean.getStatus(); - releaseTime = getModel().getForm().getObject().getEndPursingTimeStamp(); - detectionTime = getModel().getForm().getObject().getEndPursingTimeStamp(); - status = null; - } else { - releaseTime = bean.getReleaseTime(); - detectionTime = bean.getDetectionTime(); - status = bean.getStatus(); - } updateSpecies(bean.getSpecies()); getModel().setDetectionTime(detectionTime); ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchReleaseUIModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchReleaseUIModel.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchReleaseUIModel.java @@ -71,6 +71,17 @@ public class NonTargetCatchReleaseUIModel extends ContentTableUIModel<SetSeineNo initModel(ui, metas); } + + @Override + public NonTargetCatchReleaseDto newTableEditBean() { + NonTargetCatchReleaseDto result = super.newTableEditBean(); + Date endPursingTimeStamp = getBean().getEndPursingTimeStamp(); + result.setDetectionTime(endPursingTimeStamp); + result.setReleaseTime(endPursingTimeStamp); + result.setAcquisitionMode(ModeSaisieEchantillonEnum.byIndividu.ordinal()); + return result; + } + @Override protected NonTargetCatchReleaseTableModel createTableModel( ObserveContentTableUI<SetSeineNonTargetCatchReleaseDto, NonTargetCatchReleaseDto, ?> ui, ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchUIHandler.java @@ -22,7 +22,6 @@ package fr.ird.observe.client.ui.content.table.impl.seine; import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; import com.google.common.collect.Sets; import fr.ird.observe.client.ObserveSwingApplicationContext; import fr.ird.observe.client.db.constants.DataContextType; @@ -214,8 +213,7 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeineNonTa JComponent requestFocus; if (create) { - Set<ReferentialReference<SpeciesDto>> speciesSet = getModel().getReferentialReferences(NonTargetCatchDto.PROPERTY_SPECIES); - availableEspeces = Lists.newArrayList(speciesSet); + availableEspeces = getModel().getReferentialReferences(NonTargetCatchDto.PROPERTY_SPECIES); requestFocus = ui.getSpecies(); } else { ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetSampleUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetSampleUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetSampleUIHandler.java @@ -43,7 +43,6 @@ import java.util.Collection; import java.util.LinkedList; import java.util.List; import java.util.Optional; -import java.util.Set; import javax.swing.JComponent; import javax.swing.JTable; import javax.swing.table.DefaultTableCellRenderer; @@ -137,8 +136,7 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS ui.getAcquisitionModeGroup().setSelectedValue(ModeSaisieEchantillonEnum.byEffectif); } - Set<ReferentialReference<SpeciesDto>> speciesReferences = getModel().getReferentialReferences(NonTargetLengthDto.PROPERTY_SPECIES); - availableEspeces = Lists.newArrayList(speciesReferences); + availableEspeces = getModel().getReferentialReferences(NonTargetLengthDto.PROPERTY_SPECIES); // on utilise le code par defaut de l'espèce sizeMeasureType = getSpeciesDefaultSizeMeasureType(species); ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/SchoolEstimateUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/SchoolEstimateUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/SchoolEstimateUIHandler.java @@ -88,7 +88,7 @@ public class SchoolEstimateUIHandler extends ContentTableUIHandler<SetSeineSchoo JComponent requestFocus; if (create) { - Set<ReferentialReference<SpeciesDto>> references = getModel().getReferentialReferences(SchoolEstimateDto.PROPERTY_SPECIES); + List<ReferentialReference<SpeciesDto>> references = getModel().getReferentialReferences(SchoolEstimateDto.PROPERTY_SPECIES); List<ReferentialReference<SpeciesDto>> listSpeciesUsed = model.getColumnValues(0); ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/TargetCatchUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/TargetCatchUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/TargetCatchUIHandler.java @@ -258,7 +258,7 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeineTargetCa // un espèce est selectionnee, on calcule les categories pour cette espèce // on ne conserve que les categories de l'espèce - Set<ReferentialReference<WeightCategoryDto>> allCategories = getModel().getReferentialReferences(TargetCatchDto.PROPERTY_WEIGHT_CATEGORY); + List<ReferentialReference<WeightCategoryDto>> allCategories = getModel().getReferentialReferences(TargetCatchDto.PROPERTY_WEIGHT_CATEGORY); availableCategories = WeightCategoryHelper.filterSpeciesWeightCategories(allCategories, species.getId()); } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java @@ -386,24 +386,18 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineT private List<ReferentialReference<WeightCategoryDto>> buildWeightCategoryList(ReferentialReference<SpeciesDto> species) { - Set<ReferentialReference<WeightCategoryDto>> allCategories = getModel().getReferentialReferences(TargetCatchDto.PROPERTY_WEIGHT_CATEGORY); + List<ReferentialReference<WeightCategoryDto>> allCategories = getModel().getReferentialReferences(TargetCatchDto.PROPERTY_WEIGHT_CATEGORY); return WeightCategoryHelper.filterSpeciesWeightCategories(allCategories, species.getId()); } @SuppressWarnings("unchecked") private List<ReferentialReference<ReasonForDiscardDto>> buildReasonFordiscardList() { - - Set<ReferentialReference<ReasonForDiscardDto>> reasonForDiscardSet = getModel().getReferentialReferences(TargetCatchDto.PROPERTY_REASON_FOR_DISCARD); - return new ArrayList<>(reasonForDiscardSet); - + return getModel().getReferentialReferences(TargetCatchDto.PROPERTY_REASON_FOR_DISCARD); } private List<ReferentialReference<WeightCategoryDto>> getAllWeightCategories() { - - Set<ReferentialReference<WeightCategoryDto>> weightCategorySet = getModel().getReferentialReferences(TargetCatchDto.PROPERTY_WEIGHT_CATEGORY); - return new ArrayList<>(weightCategorySet); - + return getModel().getReferentialReferences(TargetCatchDto.PROPERTY_WEIGHT_CATEGORY); } @Override ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ChooseDbModeUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ChooseDbModeUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ChooseDbModeUIHandler.java @@ -44,6 +44,7 @@ import javax.swing.JComponent; import javax.swing.JPanel; import javax.swing.JRadioButton; import javax.swing.KeyStroke; +import javax.swing.SwingUtilities; import org.nuiton.jaxx.runtime.spi.UIHandler; import org.nuiton.jaxx.runtime.swing.JAXXButtonGroup; @@ -95,12 +96,14 @@ public class ChooseDbModeUIHandler extends StorageTabUIHandler<ChooseDbModeUI> i Boolean changeStep = (Boolean) abstractButton.getClientProperty("changeStep"); if (changeStep != null && changeStep) { StorageUI parentContainer = ui.getParentContainer(StorageUI.class); - parentContainer.getNextAction().doClick(); + SwingUtilities.invokeLater(parentContainer.getNextAction()::doClick); + return; } Boolean apply = (Boolean) abstractButton.getClientProperty("apply"); if (apply != null && apply) { StorageUI parentContainer = ui.getParentContainer(StorageUI.class); - parentContainer.getApplyAction().doClick(); + SwingUtilities.invokeLater(parentContainer.getNextAction()::doClick); + SwingUtilities.invokeLater(parentContainer.getApplyAction()::doClick); } } }); ===================================== persistence/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java ===================================== --- a/persistence/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java +++ b/persistence/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java @@ -30,25 +30,20 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Objects; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.nuiton.util.NumberUtil; /** @author Tony Chemit - dev(a)tchemit.fr */ public class ActivitySeineImpl extends ActivitySeineAbstract { - /** Logger. */ - private static final Log log = LogFactory.getLog(ActivitySeineImpl.class); - private static final long serialVersionUID = 2L; public static final String ACTIVITY_FIN_DE_VEILLE = "16"; - public static final String ACTIVITY_DEBUT_DE_PECHE = "7"; + private static final String ACTIVITY_DEBUT_DE_PECHE = "7"; - public static final String ACTIVITY_FIN_DE_PECHE = "6"; + private static final String ACTIVITY_FIN_DE_PECHE = "6"; - public static final String ACTIVITY_CHANGED_ZONE = "21"; + private static final String ACTIVITY_CHANGED_ZONE = "21"; private static final List<String> CALEE_OPERATIONS = Collections.singletonList(ACTIVITY_FIN_DE_PECHE); @@ -56,41 +51,23 @@ public class ActivitySeineImpl extends ActivitySeineAbstract { private static final List<String> SYSTEM_OPERATIONS = Arrays.asList("0", "11", "11", ACTIVITY_FIN_DE_VEILLE); - public static final String PROPERTY_CHANGED_ZONE_OPERATION = "changedZoneOperation"; - - public static final String PROPERTY_SET_OPERATION = "setOperation"; - -// @Override -// public OpenableEntity getOpenChild() { -// // sur une activity, pas d'enfant OpenableEntity -// return null; -// } -// -// @Override -// public List<?> getOpenableChilds() { -// // sur une activity, pas d'enfant OpenableEntity -// return null; -// } + private static final String PROPERTY_CHANGED_ZONE_OPERATION = "changedZoneOperation"; - /** @return {@code true} si l'activite concerne un DCP */ @Override public boolean isDCPOperation() { return vesselActivitySeine != null && DCP_OPERATIONS.contains(vesselActivitySeine.getCode()); } - /** @return {@code true} si l'activite concerne une calée */ @Override public boolean isSetOperation() { return vesselActivitySeine != null && CALEE_OPERATIONS.contains(vesselActivitySeine.getCode()); } - /** @return {@code true} si l'activite concerne un système observé */ @Override public boolean isObservedSystemOperation() { return vesselActivitySeine != null && SYSTEM_OPERATIONS.contains(vesselActivitySeine.getCode()); } - /** @return {@code true} si l'activite concerne un changement de zone */ @Override public boolean isChangedZoneOperation() { return vesselActivitySeine != null && ACTIVITY_CHANGED_ZONE.equals(vesselActivitySeine.getCode()); @@ -101,17 +78,6 @@ public class ActivitySeineImpl extends ActivitySeineAbstract { return CoordinateHelper.getQuadrant(longitude, latitude); } -// @Override -// public void setQuadrant(Integer quadrant) { -// if (!Objects.equals(this.quadrant, quadrant)) { -// Entities.printDebugInformations(PROPERTY_QUADRANT, this, quadrant); -// } -// Integer old = this.quadrant; -//// fireOnPreWrite(PROPERTY_QUADRANT, old, quadrant); -// this.quadrant = quadrant; -// fireOnPostWrite(PROPERTY_QUADRANT, old, quadrant); -// } - @Override public SchoolType getSchoolType() { return ActivitySeines.getSchoolType(this); @@ -136,9 +102,7 @@ public class ActivitySeineImpl extends ActivitySeineAbstract { public void setObservedSystemDistance(Float observedSystemDistance) { if (observedSystemDistance != null) { - // on arrondit à 2 décimales - observedSystemDistance = - NumberUtil.roundTwoDigits(observedSystemDistance); + observedSystemDistance = NumberUtil.roundTwoDigits(observedSystemDistance); } super.setObservedSystemDistance(observedSystemDistance); } ===================================== persistence/src/main/java/fr/ird/observe/entities/seine/FloatingObjectImpl.java ===================================== --- a/persistence/src/main/java/fr/ird/observe/entities/seine/FloatingObjectImpl.java +++ b/persistence/src/main/java/fr/ird/observe/entities/seine/FloatingObjectImpl.java @@ -25,7 +25,6 @@ import com.google.common.collect.Iterables; import fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation; import fr.ird.observe.entities.referentiel.seine.TransmittingBuoyOperation; -/** Implantation des objectOperations pour l'entité FloatingObject. */ public class FloatingObjectImpl extends FloatingObjectAbstract { private static final long serialVersionUID = 1L; ===================================== services/src/main/java/fr/ird/observe/services/dto/referential/seine/WeightCategoryHelper.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/dto/referential/seine/WeightCategoryHelper.java +++ b/services/src/main/java/fr/ird/observe/services/dto/referential/seine/WeightCategoryHelper.java @@ -23,6 +23,7 @@ package fr.ird.observe.services.dto.referential.seine; */ import fr.ird.observe.services.dto.reference.ReferentialReference; +import java.util.Collection; import java.util.List; import java.util.Set; import java.util.function.Predicate; @@ -39,7 +40,7 @@ public class WeightCategoryHelper extends GeneratedWeightCategoryHelper { * @param speciesId l'identifiant de l'espèce * @return la liste de toutes les catégories de poids de l'espèce */ - public static List<ReferentialReference<WeightCategoryDto>> filterSpeciesWeightCategories(Set<ReferentialReference<WeightCategoryDto>> weightCategoryReferences, String speciesId) { + public static List<ReferentialReference<WeightCategoryDto>> filterSpeciesWeightCategories(Collection<ReferentialReference<WeightCategoryDto>> weightCategoryReferences, String speciesId) { List<ReferentialReference<WeightCategoryDto>> references = weightCategoryReferences.stream().filter(new WeightCategorySpeciesPredicate(speciesId)).collect(Collectors.toList()); ===================================== services/src/main/java/fr/ird/observe/services/dto/seine/NonTargetCatchReleaseDto.java deleted ===================================== --- a/services/src/main/java/fr/ird/observe/services/dto/seine/NonTargetCatchReleaseDto.java +++ /dev/null @@ -1,41 +0,0 @@ -package fr.ird.observe.services.dto.seine; - -/*- - * #%L - * ObServe :: Services - * %% - * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io - * %% - * 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 java.util.Date; -import org.nuiton.util.DateUtil; - -public class NonTargetCatchReleaseDto extends GeneratedNonTargetCatchReleaseDto { - - private static final long serialVersionUID = 1L; - - @Override - public void setDetectionTime(Date detectionTime) { - super.setDetectionTime(detectionTime == null ? null : DateUtil.getTime(detectionTime, false, false)); - } - - @Override - public void setReleaseTime(Date releaseTime) { - super.setReleaseTime(releaseTime == null ? null : DateUtil.getTime(releaseTime, false, false)); - } -} View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/60a3ac0a536410b8eeea6d2ce8… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/60a3ac0a536410b8eeea6d2ce8… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Lorsque l'on crée un nouvel objet FOB, le formulaire devrait toujours se…
by Tony CHEMIT 04 Aug '17

04 Aug '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 60a3ac0a by Tony CHEMIT at 2017-08-04T09:16:05+02:00 Lorsque l'on crée un nouvel objet FOB, le formulaire devrait toujours se positionner sur le premier onglet (See #819) - - - - - 4 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/ContentUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/ContentUIManager.java - client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUIHandler.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ContentUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/ContentUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ui/content/ContentUI.jaxx @@ -92,6 +92,10 @@ public void open() { getHandler().openUI(); } +public void opened() { + getHandler().openedUI(); +} + public boolean close() { return getHandler().closeUI(); } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java @@ -1186,6 +1186,9 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U popup.show(button, x, y); } + protected void openedUI() { + + } protected ObserveServicesProvider getServicesProvider() { return ObserveSwingDataSource.MAIN; } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ContentUIManager.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/ContentUIManager.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/ContentUIManager.java @@ -111,8 +111,8 @@ public class ContentUIManager { log.debug("Will open ui [" + constraints + "] : " + content.getClass()); } - // on ouvre l'ui try { + content.open(); ObserveSwingSessionHelper swingSessionHelper = ObserveSwingApplicationContext.get().getSwingSessionHelper(); @@ -124,8 +124,9 @@ public class ContentUIManager { } finally { getLayout().show(getLayoutContent(), constraints); - getMainUI().getHandler().updateContentSize(25); + + content.opened(); } } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUIHandler.java @@ -168,7 +168,6 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto, } floatingObjectReference = Optional.empty(); - getUi().getMainTabbedPane().setSelectedIndex(0); } else { // update mode @@ -195,6 +194,14 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto, getUi().startEdit(null); } + } + + @Override + protected void openedUI() { + if (getModel().isCreatingMode()) { + getUi().getMainTabbedPane().setSelectedIndex(0); + } + SwingUtilities.invokeLater(this::forceGrabFocusOnForm); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/60a3ac0a536410b8eeea6d2ce8a… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/60a3ac0a536410b8eeea6d2ce8a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Caractéristiques calculées des objets FOB (See #820)
by Tony CHEMIT 03 Aug '17

03 Aug '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 7ac51b1a by Tony CHEMIT at 2017-08-04T00:01:05+02:00 Caractéristiques calculées des objets FOB (See #820) - - - - - 14 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUIModel.java - persistence/src/main/models/Observe.model - persistence/src/main/resources/db/migration/6.901/08_add_floating_object_fields-common.sql - services-topia/src/main/java/fr/ird/observe/services/binder/data/seine/FloatingObjectBinder.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateActivitySeineDataResultBuilder.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java - services/src/main/models/Observe.model - test/src/main/resources/db/6.902/dataForTestLongline.sql.gz - test/src/main/resources/db/6.902/dataForTestSeine.sql.gz - test/src/main/resources/db/6.902/empty_h2.sql.gz - test/src/main/resources/db/6.902/empty_pg.sql.gz - test/src/main/resources/db/6.902/referentiel.sql.gz Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUI.jaxx @@ -112,26 +112,46 @@ <Table id="computedPanel" fill="both" weightx="1"> <row> <cell anchor="west"> + <JLabel/> + </cell> + <cell weightx="0.5" fill="both"> + <JLabel text="observe.common.whenArriving"/> + </cell> + <cell weightx="0.5" fill="both"> + <JLabel text="observe.common.whenLeaving"/> + </cell> + </row> + <row> + <cell anchor="west"> <JLabel id='computedBiodegradableLabel'/> </cell> - <cell anchor='east' weightx="1" fill="both"> - <JLabel id='computedBiodegradable'/> + <cell weightx="0.5" fill="both"> + <JLabel id='computedWhenArrivingBiodegradable'/> + </cell> + <cell weightx="0.5" fill="both"> + <JLabel id='computedWhenLeavingBiodegradable'/> </cell> </row> <row> <cell anchor="west"> <JLabel id='computedNonEntanglingLabel'/> </cell> - <cell anchor='east' weightx="1" fill="both"> - <JLabel id='computedNonEntangling'/> + <cell weightx="0.5" fill="both"> + <JLabel id='computedWhenArrivingNonEntangling'/> + </cell> + <cell weightx="0.5" fill="both"> + <JLabel id='computedWhenLeavingNonEntangling'/> </cell> </row> <row> <cell anchor="west"> <JLabel id='computedSimplifiedObjectTypeLabel'/> </cell> - <cell anchor='east' weightx="1" fill="both"> - <JLabel id='computedSimplifiedObjectType'/> + <cell weightx="0.5" fill="both"> + <JLabel id='computedWhenArrivingSimplifiedObjectType'/> + </cell> + <cell weightx="0.5" fill="both"> + <JLabel id='computedWhenLeavingSimplifiedObjectType'/> </cell> </row> </Table> ===================================== client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUI.jcss ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUI.jcss +++ b/client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUI.jcss @@ -75,31 +75,43 @@ BeanComboBox { } #computedBiodegradableLabel { text:"observe.common.computedBiodegradable"; - labelFor:{computedBiodegradable}; } -#computedBiodegradable { - text:{model.getComputedBiodegradableValue()}; +#computedNonEntanglingLabel { + text:"observe.common.computedNonEntangling"; +} + +#computedSimplifiedObjectTypeLabel { + text:"observe.common.computedSimplifiedObjectType"; +} + +#computedWhenArrivingBiodegradable { + text:{model.getComputedWhenArrivingBiodegradableValue()}; font-weight:bold; } -#computedNonEntanglingLabel { - text:"observe.common.computedNonEntangling"; - labelFor:{computedNonEntangling}; +#computedWhenArrivingNonEntangling { + text:{model.getComputedWhenArrivingNonEntanglingValue()}; + font-weight:bold; } -#computedNonEntangling { - text:{model.getComputedNonEntanglingValue()}; +#computedWhenArrivingSimplifiedObjectType { + text:{model.getComputedWhenArrivingSimplifiedObjectTypeValue()}; font-weight:bold; } -#computedSimplifiedObjectTypeLabel { - text:"observe.common.computedSimplifiedObjectType"; - labelFor:{computedSimplifiedObjectType}; +#computedWhenLeavingBiodegradable { + text:{model.getComputedWhenLeavingBiodegradableValue()}; + font-weight:bold; +} + +#computedWhenLeavingNonEntangling { + text:{model.getComputedWhenLeavingNonEntanglingValue()}; + font-weight:bold; } -#computedSimplifiedObjectType { - text:{model.getComputedSimplifiedObjectTypeValue()}; +#computedWhenLeavingSimplifiedObjectType { + text:{model.getComputedWhenLeavingSimplifiedObjectTypeValue()}; font-weight:bold; } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUIModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUIModel.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUIModel.java @@ -116,7 +116,6 @@ public class FloatingObjectUIModel extends ContentUIModel<FloatingObjectDto> { firePropertyChange(PROPERTY_GENERAL_TAB_VALID, oldValue, generalTabValid); } - ImmutableSet<FloatingObjectPartDto> toParts() { ImmutableSet.Builder<FloatingObjectPartDto> result = ImmutableSet.builder(); for (ObjectMaterialDto o : getAll()) { @@ -136,9 +135,12 @@ public class FloatingObjectUIModel extends ContentUIModel<FloatingObjectDto> { public void reset() { whenArriving.clear(); whenLeaving.clear(); - firePropertyChange("computedBiodegradableValue", getComputedBiodegradableValue()); - firePropertyChange("computedNonEntanglingValue", getComputedNonEntanglingValue()); - firePropertyChange("computedSimplifiedObjectTypeValue", getComputedSimplifiedObjectTypeValue()); + firePropertyChange("computedWhenArrivingBiodegradableValue", getComputedWhenArrivingBiodegradableValue()); + firePropertyChange("computedWhenArrivingNonEntanglingValue", getComputedWhenArrivingNonEntanglingValue()); + firePropertyChange("computedWhenArrivingSimplifiedObjectTypeValue", getComputedWhenArrivingSimplifiedObjectTypeValue()); + firePropertyChange("computedWhenLeavingBiodegradableValue", getComputedWhenLeavingBiodegradableValue()); + firePropertyChange("computedWhenLeavingNonEntanglingValue", getComputedWhenLeavingNonEntanglingValue()); + firePropertyChange("computedWhenLeavingSimplifiedObjectTypeValue", getComputedWhenLeavingSimplifiedObjectTypeValue()); } public Map<ObjectMaterialDto, String> getWhenArriving() { @@ -192,23 +194,40 @@ public class FloatingObjectUIModel extends ContentUIModel<FloatingObjectDto> { firePropertyChange(PROPERTY_REFERENCE, null, reference); } - public String getComputedBiodegradableValue() { - return booleanValue(bean.getComputedBiodegradable()); + public String getComputedWhenArrivingBiodegradableValue() { + return booleanValue(bean.getComputedWhenArrivingBiodegradable()); + } + + public String getComputedWhenArrivingNonEntanglingValue() { + return booleanValue(bean.getComputedWhenArrivingNonEntangling()); + } + + public String getComputedWhenArrivingSimplifiedObjectTypeValue() { + String computedSimplifiedObjectType = bean.getComputedWhenArrivingSimplifiedObjectType(); + return stringValue(computedSimplifiedObjectType); } - public String getComputedNonEntanglingValue() { - return booleanValue(bean.getComputedNonEntangling()); + public String getComputedWhenLeavingBiodegradableValue() { + return booleanValue(bean.getComputedWhenLeavingBiodegradable()); } - public String getComputedSimplifiedObjectTypeValue() { - String computedSimplifiedObjectType = bean.getComputedSimplifiedObjectType(); - return computedSimplifiedObjectType == null ? t("observe.common.notComputed") : computedSimplifiedObjectType; + public String getComputedWhenLeavingNonEntanglingValue() { + return booleanValue(bean.getComputedWhenLeavingNonEntangling()); + } + + public String getComputedWhenLeavingSimplifiedObjectTypeValue() { + String computedSimplifiedObjectType = bean.getComputedWhenLeavingSimplifiedObjectType(); + return stringValue(computedSimplifiedObjectType); } private String booleanValue(DcpComputedValue value) { return value == null ? t("observe.common.notComputed") : I18nEnumHelper.getLabel(value); } + private String stringValue(String value) { + return value == null ? t("observe.common.notComputed") : value; + } + public boolean isArriving() { return arriving; } ===================================== persistence/src/main/models/Observe.model ===================================== --- a/persistence/src/main/models/Observe.model +++ b/persistence/src/main/models/Observe.model @@ -732,9 +732,12 @@ objectOperation {*:1} referentiel.seine.ObjectOperation supportVesselName + {*:1} String transmittingBuoy + {*} seine.TransmittingBuoy | unique floatingObjectPart + {*} seine.FloatingObjectPart | unique -computedBiodegradable + {*:1} !fr.ird.observe.common.constants.seine.DcpComputedValue | useEnumerationName -computedNonEntangling + {*:1} !fr.ird.observe.common.constants.seine.DcpComputedValue | useEnumerationName -computedSimplifiedObjectType + {*:1} String +computedWhenArrivingBiodegradable + {*:1} !fr.ird.observe.common.constants.seine.DcpComputedValue | useEnumerationName +computedWhenArrivingNonEntangling + {*:1} !fr.ird.observe.common.constants.seine.DcpComputedValue | useEnumerationName +computedWhenArrivingSimplifiedObjectType + {*:1} String +computedWhenLeavingBiodegradable + {*:1} !fr.ird.observe.common.constants.seine.DcpComputedValue | useEnumerationName +computedWhenLeavingNonEntangling + {*:1} !fr.ird.observe.common.constants.seine.DcpComputedValue | useEnumerationName +computedWhenLeavingSimplifiedObjectType + {*:1} String getTypeTransmittingBuoyOperation() !fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation seine.FloatingObjectPart > ObserveDataEntity | entity ===================================== persistence/src/main/resources/db/migration/6.901/08_add_floating_object_fields-common.sql ===================================== --- a/persistence/src/main/resources/db/migration/6.901/08_add_floating_object_fields-common.sql +++ b/persistence/src/main/resources/db/migration/6.901/08_add_floating_object_fields-common.sql @@ -19,6 +19,9 @@ -- <http://www.gnu.org/licenses/gpl-3.0.html>. -- #L% --- -ALTER TABLE observe_seine.FloatingObject ADD COLUMN computedBiodegradable VARCHAR(255); -ALTER TABLE observe_seine.FloatingObject ADD COLUMN computedNonEntangling VARCHAR(255); -ALTER TABLE observe_seine.FloatingObject ADD COLUMN computedSimplifiedObjectType VARCHAR(255); +ALTER TABLE observe_seine.FloatingObject ADD COLUMN computedWhenArrivingBiodegradable VARCHAR(255); +ALTER TABLE observe_seine.FloatingObject ADD COLUMN computedWhenArrivingNonEntangling VARCHAR(255); +ALTER TABLE observe_seine.FloatingObject ADD COLUMN computedWhenArrivingSimplifiedObjectType VARCHAR(255); +ALTER TABLE observe_seine.FloatingObject ADD COLUMN computedWhenLeavingBiodegradable VARCHAR(255); +ALTER TABLE observe_seine.FloatingObject ADD COLUMN computedWhenLeavingNonEntangling VARCHAR(255); +ALTER TABLE observe_seine.FloatingObject ADD COLUMN computedWhenLeavingSimplifiedObjectType VARCHAR(255); ===================================== services-topia/src/main/java/fr/ird/observe/services/binder/data/seine/FloatingObjectBinder.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/seine/FloatingObjectBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/binder/data/seine/FloatingObjectBinder.java @@ -48,9 +48,12 @@ public class FloatingObjectBinder extends DataBinderSupport<FloatingObject, Floa entity.setObjectOperation(toEntity(dto.getObjectOperation(), ObjectOperation.class)); entity.setSupportVesselName(dto.getSupportVesselName()); - entity.setComputedBiodegradable(dto.getComputedBiodegradable()); - entity.setComputedNonEntangling(dto.getComputedNonEntangling()); - entity.setComputedSimplifiedObjectType(dto.getComputedSimplifiedObjectType()); + entity.setComputedWhenArrivingBiodegradable(dto.getComputedWhenArrivingBiodegradable()); + entity.setComputedWhenArrivingNonEntangling(dto.getComputedWhenArrivingNonEntangling()); + entity.setComputedWhenArrivingSimplifiedObjectType(dto.getComputedWhenArrivingSimplifiedObjectType()); + entity.setComputedWhenLeavingBiodegradable(dto.getComputedWhenLeavingBiodegradable()); + entity.setComputedWhenLeavingNonEntangling(dto.getComputedWhenLeavingNonEntangling()); + entity.setComputedWhenLeavingSimplifiedObjectType(dto.getComputedWhenLeavingSimplifiedObjectType()); } @@ -61,9 +64,12 @@ public class FloatingObjectBinder extends DataBinderSupport<FloatingObject, Floa dto.setObjectOperation(toReferentialReference(referentialLocale, entity.getObjectOperation(), ObjectOperationDto.class)); dto.setSupportVesselName(entity.getSupportVesselName()); - dto.setComputedBiodegradable(entity.getComputedBiodegradable()); - dto.setComputedNonEntangling(entity.getComputedNonEntangling()); - dto.setComputedSimplifiedObjectType(entity.getComputedSimplifiedObjectType()); + dto.setComputedWhenArrivingBiodegradable(entity.getComputedWhenArrivingBiodegradable()); + dto.setComputedWhenArrivingNonEntangling(entity.getComputedWhenArrivingNonEntangling()); + dto.setComputedWhenArrivingSimplifiedObjectType(entity.getComputedWhenArrivingSimplifiedObjectType()); + dto.setComputedWhenLeavingBiodegradable(entity.getComputedWhenLeavingBiodegradable()); + dto.setComputedWhenLeavingNonEntangling(entity.getComputedWhenLeavingNonEntangling()); + dto.setComputedWhenLeavingSimplifiedObjectType(entity.getComputedWhenLeavingSimplifiedObjectType()); } ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateActivitySeineDataResultBuilder.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateActivitySeineDataResultBuilder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateActivitySeineDataResultBuilder.java @@ -87,35 +87,67 @@ public class ConsolidateActivitySeineDataResultBuilder { String dcpLabel = activitySeine.getVesselActivitySeine().getLabel2() + "[" + activitySeine.getTime() + "]" + " - " + (dcp.getObjectOperation() == null ? "" : dcp.getObjectOperation().getLabel2()); for (String modifiedProperty : propertyNamesModified) { switch (modifiedProperty) { - case FloatingObject.PROPERTY_COMPUTED_BIODEGRADABLE: { + case FloatingObject.PROPERTY_COMPUTED_WHEN_ARRIVING_BIODEGRADABLE: { DcpModification element = new DcpModification(); element.setDcpId(dcp.getTopiaId()); element.setDcpLabel(dcpLabel); - element.setPropertyName(FloatingObject.PROPERTY_COMPUTED_BIODEGRADABLE); - element.setNewValue(dcp.getComputedBiodegradable()); + element.setPropertyName(FloatingObject.PROPERTY_COMPUTED_WHEN_ARRIVING_BIODEGRADABLE); + element.setNewValue(dcp.getComputedWhenArrivingBiodegradable()); dcpModificationBuilder.add(element); break; } - case FloatingObject.PROPERTY_COMPUTED_NON_ENTANGLING: { + case FloatingObject.PROPERTY_COMPUTED_WHEN_ARRIVING_NON_ENTANGLING: { DcpModification element = new DcpModification(); element.setDcpId(dcp.getTopiaId()); element.setDcpLabel(dcpLabel); - element.setPropertyName(FloatingObject.PROPERTY_COMPUTED_NON_ENTANGLING); - element.setNewValue(dcp.getComputedNonEntangling()); + element.setPropertyName(FloatingObject.PROPERTY_COMPUTED_WHEN_ARRIVING_NON_ENTANGLING); + element.setNewValue(dcp.getComputedWhenArrivingNonEntangling()); dcpModificationBuilder.add(element); break; } - case FloatingObject.PROPERTY_COMPUTED_SIMPLIFIED_OBJECT_TYPE: { + case FloatingObject.PROPERTY_COMPUTED_WHEN_ARRIVING_SIMPLIFIED_OBJECT_TYPE: { DcpModification element = new DcpModification(); element.setDcpId(dcp.getTopiaId()); element.setDcpLabel(dcpLabel); - element.setPropertyName(FloatingObject.PROPERTY_COMPUTED_SIMPLIFIED_OBJECT_TYPE); - element.setNewValue(dcp.getComputedSimplifiedObjectType()); + element.setPropertyName(FloatingObject.PROPERTY_COMPUTED_WHEN_ARRIVING_SIMPLIFIED_OBJECT_TYPE); + element.setNewValue(dcp.getComputedWhenArrivingSimplifiedObjectType()); + dcpModificationBuilder.add(element); + break; + } + case FloatingObject.PROPERTY_COMPUTED_WHEN_LEAVING_BIODEGRADABLE: { + + DcpModification element = new DcpModification(); + element.setDcpId(dcp.getTopiaId()); + element.setDcpLabel(dcpLabel); + element.setPropertyName(FloatingObject.PROPERTY_COMPUTED_WHEN_LEAVING_BIODEGRADABLE); + element.setNewValue(dcp.getComputedWhenLeavingBiodegradable()); + dcpModificationBuilder.add(element); + + break; + } + case FloatingObject.PROPERTY_COMPUTED_WHEN_LEAVING_NON_ENTANGLING: { + + DcpModification element = new DcpModification(); + element.setDcpId(dcp.getTopiaId()); + element.setDcpLabel(dcpLabel); + element.setPropertyName(FloatingObject.PROPERTY_COMPUTED_WHEN_LEAVING_NON_ENTANGLING); + element.setNewValue(dcp.getComputedWhenLeavingNonEntangling()); + dcpModificationBuilder.add(element); + + break; + } + case FloatingObject.PROPERTY_COMPUTED_WHEN_LEAVING_SIMPLIFIED_OBJECT_TYPE: { + + DcpModification element = new DcpModification(); + element.setDcpId(dcp.getTopiaId()); + element.setDcpLabel(dcpLabel); + element.setPropertyName(FloatingObject.PROPERTY_COMPUTED_WHEN_LEAVING_SIMPLIFIED_OBJECT_TYPE); + element.setNewValue(dcp.getComputedWhenLeavingSimplifiedObjectType()); dcpModificationBuilder.add(element); break; } ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java @@ -113,9 +113,12 @@ public class ConsolidateDataServiceTopia extends ObserveServiceTopia implements ); BeanMonitor dcpMonitor = new BeanMonitor( - FloatingObject.PROPERTY_COMPUTED_BIODEGRADABLE, - FloatingObject.PROPERTY_COMPUTED_NON_ENTANGLING, - FloatingObject.PROPERTY_COMPUTED_SIMPLIFIED_OBJECT_TYPE + FloatingObject.PROPERTY_COMPUTED_WHEN_ARRIVING_BIODEGRADABLE, + FloatingObject.PROPERTY_COMPUTED_WHEN_ARRIVING_NON_ENTANGLING, + FloatingObject.PROPERTY_COMPUTED_WHEN_ARRIVING_SIMPLIFIED_OBJECT_TYPE, + FloatingObject.PROPERTY_COMPUTED_WHEN_LEAVING_BIODEGRADABLE, + FloatingObject.PROPERTY_COMPUTED_WHEN_LEAVING_NON_ENTANGLING, + FloatingObject.PROPERTY_COMPUTED_WHEN_LEAVING_SIMPLIFIED_OBJECT_TYPE ); Locale applicationLocale = serviceContext.getApplicationLocale(); @@ -284,46 +287,71 @@ public class ConsolidateDataServiceTopia extends ObserveServiceTopia implements private void updateDcp(FloatingObject dcp, ConsolidationActivitySeineDataContext activityContext) { activityContext.watchDcp(dcp); - computeDcpBiodegradable(dcp); - computeDcpNonEntangling(dcp); - computeDcpSimplifiedObjectType(dcp, activityContext.simplifiedObjectTypeManager); + Set<FloatingObjectPart> whenArriving = dcp.getFloatingObjectPart().stream().filter(p -> p.getWhenArriving() != null).collect(Collectors.toSet()); + Set<FloatingObjectPart> whenLeaving = dcp.getFloatingObjectPart().stream().filter(p -> p.getWhenLeaving() != null).collect(Collectors.toSet()); + computeDcpBiodegradable(dcp, whenArriving, whenLeaving); + computeDcpNonEntangling(dcp, whenArriving, whenLeaving); + computeDcpSimplifiedObjectType(dcp, whenArriving, whenLeaving, activityContext.simplifiedObjectTypeManager); activityContext.flushDcp(); } - private void computeDcpSimplifiedObjectType(FloatingObject dcp, SimplifiedObjectTypeManager simplifiedObjectTypeManager) { - Set<String> objectMaterialIds = dcp.getFloatingObjectPart().stream().map(p -> p.getObjectMaterial().getTopiaId()).collect(Collectors.toSet()); - String value = simplifiedObjectTypeManager.getStandardCode(objectMaterialIds); - dcp.setComputedSimplifiedObjectType(value); + private void computeDcpSimplifiedObjectType(FloatingObject dcp, Set<FloatingObjectPart> whenArriving, Set<FloatingObjectPart> whenLeaving, SimplifiedObjectTypeManager simplifiedObjectTypeManager) { + String whenArrivingValue = computeDcpSimplifiedObjectType0(whenArriving, simplifiedObjectTypeManager); + dcp.setComputedWhenArrivingSimplifiedObjectType(whenArrivingValue); + + String whenLeavingValue = computeDcpSimplifiedObjectType0(whenLeaving, simplifiedObjectTypeManager); + dcp.setComputedWhenLeavingSimplifiedObjectType(whenLeavingValue); } - private void computeDcpNonEntangling(FloatingObject dcp) { - DcpComputedValue value = DcpComputedValue.UNKNOWN; - if (dcp.isFloatingObjectPartNotEmpty()) { - value = DcpComputedValue.TRUE; - for (FloatingObjectPart floatingObjectPart : dcp.getFloatingObjectPart()) { - if (!floatingObjectPart.getObjectMaterial().isNonEntangling()) { - value = DcpComputedValue.FALSE; + private void computeDcpNonEntangling(FloatingObject dcp, Set<FloatingObjectPart> whenArriving, Set<FloatingObjectPart> whenLeaving) { + DcpComputedValue whenArrivingValue = computeDcpNonEntangling0(whenArriving); + dcp.setComputedWhenArrivingNonEntangling(whenArrivingValue); + + DcpComputedValue whenLeavingValue = computeDcpNonEntangling0(whenLeaving); + dcp.setComputedWhenLeavingNonEntangling(whenLeavingValue); + } + + private void computeDcpBiodegradable(FloatingObject dcp, Set<FloatingObjectPart> whenArriving, Set<FloatingObjectPart> whenLeaving) { + DcpComputedValue whenArrivingValue = computeDcpBiodegradable0(whenArriving); + dcp.setComputedWhenArrivingBiodegradable(whenArrivingValue); + + DcpComputedValue whenLeavingValue = computeDcpBiodegradable0(whenLeaving); + dcp.setComputedWhenLeavingBiodegradable(whenLeavingValue); + } + + private DcpComputedValue computeDcpBiodegradable0(Set<FloatingObjectPart> floatingObjectParts) { + DcpComputedValue result = DcpComputedValue.UNKNOWN; + if (!floatingObjectParts.isEmpty()) { + result = DcpComputedValue.TRUE; + for (FloatingObjectPart floatingObjectPart : floatingObjectParts) { + if (!floatingObjectPart.getObjectMaterial().isBiodegradable()) { + result = DcpComputedValue.FALSE; break; } } } - dcp.setComputedNonEntangling(value); + return result; } - private void computeDcpBiodegradable(FloatingObject dcp) { - DcpComputedValue value = DcpComputedValue.UNKNOWN; - if (dcp.isFloatingObjectPartNotEmpty()) { - value = DcpComputedValue.TRUE; - for (FloatingObjectPart floatingObjectPart : dcp.getFloatingObjectPart()) { - if (!floatingObjectPart.getObjectMaterial().isBiodegradable()) { - value = DcpComputedValue.FALSE; + private String computeDcpSimplifiedObjectType0(Set<FloatingObjectPart> floatingObjectParts, SimplifiedObjectTypeManager simplifiedObjectTypeManager) { + Set<String> objectMaterialIds = floatingObjectParts.stream().map(p -> p.getObjectMaterial().getTopiaId()).collect(Collectors.toSet()); + return simplifiedObjectTypeManager.getStandardCode(objectMaterialIds); + } + + private DcpComputedValue computeDcpNonEntangling0(Set<FloatingObjectPart> floatingObjectParts) { + DcpComputedValue result = DcpComputedValue.UNKNOWN; + if (!floatingObjectParts.isEmpty()) { + result = DcpComputedValue.TRUE; + for (FloatingObjectPart floatingObjectPart : floatingObjectParts) { + if (!floatingObjectPart.getObjectMaterial().isNonEntangling()) { + result = DcpComputedValue.FALSE; break; } } } - dcp.setComputedBiodegradable(value); + return result; } private void updateNonTargetCatch(ConsolidationActivitySeineDataContext activityContext, NonTargetCatch nonTargetCatch) { ===================================== services/src/main/models/Observe.model ===================================== --- a/services/src/main/models/Observe.model +++ b/services/src/main/models/Observe.model @@ -622,12 +622,12 @@ activityFinDeVeille + {*:1} boolean seine.FloatingObject > Commentable objectOperation {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.seine.ObjectOperationDto supportVesselName + {*:1} String -computedBiodegradable + {*:1} !fr.ird.observe.common.constants.seine.DcpComputedValue -computedNonEntangling + {*:1} !fr.ird.observe.common.constants.seine.DcpComputedValue -computedSimplifiedObjectType + {*:1} String -getComputedBiodegradableValue() String -getComputedNonEntanglingValue() String -getComputedSimplifiedObjectTypeValue() String +computedWhenArrivingBiodegradable + {*:1} !fr.ird.observe.common.constants.seine.DcpComputedValue +computedWhenArrivingNonEntangling + {*:1} !fr.ird.observe.common.constants.seine.DcpComputedValue +computedWhenArrivingSimplifiedObjectType + {*:1} String +computedWhenLeavingBiodegradable + {*:1} !fr.ird.observe.common.constants.seine.DcpComputedValue +computedWhenLeavingNonEntangling + {*:1} !fr.ird.observe.common.constants.seine.DcpComputedValue +computedWhenLeavingSimplifiedObjectType + {*:1} String seine.FloatingObjectObservedSpecies > Commentable objectObservedSpecies {*} seine.ObjectObservedSpecies ===================================== test/src/main/resources/db/6.902/dataForTestLongline.sql.gz ===================================== Binary files a/test/src/main/resources/db/6.902/dataForTestLongline.sql.gz and b/test/src/main/resources/db/6.902/dataForTestLongline.sql.gz differ ===================================== test/src/main/resources/db/6.902/dataForTestSeine.sql.gz ===================================== Binary files a/test/src/main/resources/db/6.902/dataForTestSeine.sql.gz and b/test/src/main/resources/db/6.902/dataForTestSeine.sql.gz differ ===================================== test/src/main/resources/db/6.902/empty_h2.sql.gz ===================================== Binary files a/test/src/main/resources/db/6.902/empty_h2.sql.gz and b/test/src/main/resources/db/6.902/empty_h2.sql.gz differ ===================================== test/src/main/resources/db/6.902/empty_pg.sql.gz ===================================== Binary files a/test/src/main/resources/db/6.902/empty_pg.sql.gz and b/test/src/main/resources/db/6.902/empty_pg.sql.gz differ ===================================== test/src/main/resources/db/6.902/referentiel.sql.gz ===================================== Binary files a/test/src/main/resources/db/6.902/referentiel.sql.gz and b/test/src/main/resources/db/6.902/referentiel.sql.gz differ View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7ac51b1a937016364086ea8de0d… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7ac51b1a937016364086ea8de0d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] optimize services usage in client (Close #824)
by Tony CHEMIT 03 Aug '17

03 Aug '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 061a3751 by Tony CHEMIT at 2017-08-03T22:55:29+02:00 optimize services usage in client (Close #824) - - - - - 30 changed files: - client-validation/pom.xml - client-validation/src/main/java/fr/ird/observe/client/validators/AbstractSpeciesFieldDtoValidator.java - client-validation/src/main/java/fr/ird/observe/client/validators/ActivityFinDeVeilleExistsDtoValidator.java - client-validation/src/main/java/fr/ird/observe/client/validators/ActivitySimpleSpeedDtoValidator.java - client-validation/src/main/java/fr/ird/observe/client/validators/ActivitySpeedDtoValidator.java - client-validation/src/main/java/fr/ird/observe/client/validators/CollectionUniqueKeyDtoValidator.java - client-validation/src/main/java/fr/ird/observe/client/validators/CoordinateLatitudeDtoFieldValidator.java - client-validation/src/main/java/fr/ird/observe/client/validators/CoordinateLongitudeDtoFieldValidator.java - client-validation/src/main/java/fr/ird/observe/client/validators/ObserveCollectionUniqueKeyDtoValidator.java - client-validation/src/main/java/fr/ird/observe/client/validators/OpenableDtoFieldValidator.java - client-validation/src/main/java/fr/ird/observe/client/validators/QuadrantFieldDtoValidator.java - client-validation/src/main/java/fr/ird/observe/client/validators/ReferentialCodeValidator.java - client-validation/src/main/java/fr/ird/observe/client/validators/SetLonglineUniqueHomeIdDtoValidator.java - client-validation/src/main/java/fr/ird/observe/client/validators/SetLonglineUniqueNumberDtoValidator.java - client-validation/src/main/java/fr/ird/observe/client/validators/SpeciesLengthFieldDtoValidator.java - client-validation/src/main/java/fr/ird/observe/client/validators/SpeciesWeightFieldDtoValidator.java - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-create-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-create-warning-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-update-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-update-warning-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineEncounterDto-update-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineSensorUsedDto-update-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/BaitsCompositionDto-update-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/BasketDto-update-table-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-update-catchLongline-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-update-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-update-table-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-update-warning-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlinesCompositionDto-update-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/CatchLonglineDto-update-error-validation.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/061a3751050653cf17b1c90925e… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/061a3751050653cf17b1c90925e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: Amélioration cinématique d'ouverture d'une source de données (Si pas d'étape…
by Tony CHEMIT 03 Aug '17

03 Aug '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 644de271 by Tony CHEMIT at 2017-08-03T19:04:32+02:00 Amélioration cinématique d'ouverture d'une source de données (Si pas d'étape supplémentaire, lancer l'ouverture) (See #822) - - - - - 601bc519 by Tony CHEMIT at 2017-08-03T19:12:44+02:00 Use same context name for both validation systems (first step before merge) (See #806) - - - - - 7239bf5a by Tony CHEMIT at 2017-08-03T19:12:49+02:00 Impossible d'enregistrer une DCP (See #823) - - - - - b43bc3cb by Tony CHEMIT at 2017-08-03T19:17:07+02:00 optimize services usage in client (See #824) - - - - - 32d7618b by Tony CHEMIT at 2017-08-03T19:18:00+02:00 Introduce a ValidationContext and DataContext API (See #806) - - - - - 30 changed files: - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-create-error-validation.xml → client-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-create-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-create-warning-validation.xml → client-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-create-warning-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-update-error-validation.xml → client-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-update-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-update-warning-validation.xml → client-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-update-warning-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineEncounterDto-ui-update-error-validation.xml → client-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineEncounterDto-update-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineSensorUsedDto-ui-update-error-validation.xml → client-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineSensorUsedDto-update-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/BaitsCompositionDto-ui-update-error-validation.xml → client-validation/src/main/resources/fr/ird/observe/services/dto/longline/BaitsCompositionDto-update-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/BasketDto-ui-update-table-error-validation.xml → client-validation/src/main/resources/fr/ird/observe/services/dto/longline/BasketDto-update-table-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-ui-update-catchLongline-error-validation.xml → client-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-update-catchLongline-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-ui-update-error-validation.xml → client-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-update-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-ui-update-table-error-validation.xml → client-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-update-table-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-ui-update-warning-validation.xml → client-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-update-warning-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlinesCompositionDto-ui-update-error-validation.xml → client-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlinesCompositionDto-update-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/CatchLonglineDto-ui-update-error-validation.xml → client-validation/src/main/resources/fr/ird/observe/services/dto/longline/CatchLonglineDto-update-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/CatchLonglineDto-ui-update-warning-validation.xml → client-validation/src/main/resources/fr/ird/observe/services/dto/longline/CatchLonglineDto-update-warning-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/EncounterDto-ui-update-error-validation.xml → client-validation/src/main/resources/fr/ird/observe/services/dto/longline/EncounterDto-update-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/EncounterDto-ui-update-warning-validation.xml → client-validation/src/main/resources/fr/ird/observe/services/dto/longline/EncounterDto-update-warning-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/FloatlinesCompositionDto-ui-update-error-validation.xml → client-validation/src/main/resources/fr/ird/observe/services/dto/longline/FloatlinesCompositionDto-update-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/GearUseFeaturesLonglineDto-ui-update-error-validation.xml → client-validation/src/main/resources/fr/ird/observe/services/dto/longline/GearUseFeaturesLonglineDto-update-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/HooksCompositionDto-ui-update-error-validation.xml → client-validation/src/main/resources/fr/ird/observe/services/dto/longline/HooksCompositionDto-update-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/SectionDto-ui-update-table-error-validation.xml → client-validation/src/main/resources/fr/ird/observe/services/dto/longline/SectionDto-update-table-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/SensorUsedDto-ui-update-error-validation.xml → client-validation/src/main/resources/fr/ird/observe/services/dto/longline/SensorUsedDto-update-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/SensorUsedDto-ui-update-warning-validation.xml → client-validation/src/main/resources/fr/ird/observe/services/dto/longline/SensorUsedDto-update-warning-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-ui-create-error-validation.xml → client-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-create-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-ui-create-warning-validation.xml → client-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-create-warning-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-ui-update-error-validation.xml → client-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-update-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-ui-update-warning-validation.xml → client-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-update-warning-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-ui-update-baitsComposition-error-validation.xml → client-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-update-baitsComposition-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-ui-update-branchlinesComposition-error-validation.xml → client-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-update-branchlinesComposition-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-ui-update-floatlinesComposition-error-validation.xml → client-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-update-floatlinesComposition-error-validation.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/223eaa08df25d50254fe373486… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/223eaa08df25d50254fe373486… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Update CHANGELOG.md [skip ci]
by Tony CHEMIT 03 Aug '17

03 Aug '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 223eaa08 by Tony CHEMIT at 2017-08-03T02:47:47+00:00 Update CHANGELOG.md [skip ci] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,10 +21,6 @@ **Closed at 2017-08-02.** -### Download -* [Application (observe-7.0-RC-4.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe…) -* [Serveur (observe-7.0-RC-4.war)](http://repo1.maven.org/maven2/fr/ird/observe/observe…) - ### Issues * [[Anomalie 807]](https://gitlab.com/ultreiaio/ird-observe/issues/807) **Problème de chargement de l'écran de référentiel FloatingObjectMaterial** (Thanks to Tony CHEMIT) (Reported by ) * [[Evolution 809]](https://gitlab.com/ultreiaio/ird-observe/issues/809) **Correction du nom d'un champs sur FloatingObject + ne pas pouvoir éditer l'opération de l'objet est mode modification** (Thanks to Tony CHEMIT) (Reported by ) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/223eaa08df25d50254fe3734864… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/223eaa08df25d50254fe3734864… You're receiving this email because of your account on gitlab.com.

1 0