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

[Git][ultreiaio/ird-observe][develop] big new storm to clean up some stuff, and review NavigationTree to just have to…
by Tony CHEMIT 02 Jan '18

02 Jan '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 31235e42 by Tony CHEMIT at 2018-01-02T17:04:26+01:00 big new storm to clean up some stuff, and review NavigationTree to just have to extends the model + happy new year comment - - - - - 30 changed files: - client-configuration/pom.xml - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-configuration/src/main/java/fr/ird/observe/client/constants/AcquisitionMode.java - client-configuration/src/main/java/fr/ird/observe/client/constants/CatchAcquisitionMode.java - client-configuration/src/main/java/fr/ird/observe/client/constants/ReferentialSynchronizeMode.java - client-configuration/src/main/java/fr/ird/observe/client/constants/ValidationModelMode.java - client-configuration/src/main/resources/log4j.properties - client-configuration/src/main/resources/observe-log4j.properties - client/pom.xml - client/src/main/assembly/bin.xml - client/src/main/assembly/dist/obstuna-admin/extra/create-postgis-1-activity.sql - client/src/main/assembly/dist/obstuna-admin/extra/create-postgis-2-harbour.sql - client/src/main/assembly/dist/obstuna-admin/extra/create-postgis-3-activity-seine.sql - client/src/main/assembly/dist/obstuna-admin/extra/create-postgis-4-activity-longine.sql - client/src/main/assembly/dist/obstuna-admin/extra/function_enhanced_sets_school_types.sql - client/src/main/assembly/i18n.xml - client/src/main/assembly/map.xml - client/src/main/assembly/sql/v1/sql/obstuna.sql - client/src/main/filtered-resources/observe-application.properties - client/src/main/java/fr/ird/observe/client/ObserveClientApplicationContext.java - client/src/main/java/fr/ird/observe/client/ObserveClientImplementationFactory.java - client/src/main/java/fr/ird/observe/client/ObserveCommon.jcss - client/src/main/java/fr/ird/observe/client/ObserveUIResourcesProvider.java - client/src/main/java/fr/ird/observe/client/RunObserveClient.java - client/src/main/java/fr/ird/observe/client/admin/AdminActionModel.java - client/src/main/java/fr/ird/observe/client/admin/AdminActionWorker.java - client/src/main/java/fr/ird/observe/client/admin/AdminStep.java - client/src/main/java/fr/ird/observe/client/admin/AdminTabUI.jaxx - client/src/main/java/fr/ird/observe/client/admin/AdminTabUI.jcss - client/src/main/java/fr/ird/observe/client/admin/AdminTabUIHandler.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/31235e42d3f832b0ff89bee136f… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/31235e42d3f832b0ff89bee136f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] use last pom
by Tony CHEMIT 30 Dec '17

30 Dec '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f99e58b5 by Tony CHEMIT at 2017-12-30T19:56:10+01:00 use last pom - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>2017.11-SNAPSHOT</version> + <version>2017.11</version> </parent> <artifactId>ird-observe</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f99e58b50a84d4f076c6433805f… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f99e58b50a84d4f076c6433805f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] fix services cache
by Tony CHEMIT 30 Dec '17

30 Dec '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 780ede1c by Tony CHEMIT at 2017-12-30T19:47:20+01:00 fix services cache - - - - - 2 changed files: - client/src/main/java/fr/ird/observe/client/ds/ObserveDataSourceServicesProvider.java - services-test/src/main/java/fr/ird/observe/services/test/TestMethodRule.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ds/ObserveDataSourceServicesProvider.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/ObserveDataSourceServicesProvider.java +++ b/client/src/main/java/fr/ird/observe/client/ds/ObserveDataSourceServicesProvider.java @@ -39,7 +39,6 @@ public class ObserveDataSourceServicesProvider extends ObserveServicesProviderSu private final MutableClassMap<ObserveService> cache; private final ClientDataSource dataSource; - private boolean closed; public ObserveDataSourceServicesProvider(ClientDataSource dataSource) { this.dataSource = dataSource; @@ -59,15 +58,11 @@ public class ObserveDataSourceServicesProvider extends ObserveServicesProviderSu @Override public void close() { cache.clear(); - closed = true; } @SuppressWarnings("unchecked") @Override public <S extends ObserveService> S getService(Class<S> serviceType) { - if (closed) { - throw new IllegalStateException("Services provider was closed."); - } S result = (S) cache.get(serviceType); if (result == null) { result = newService(serviceType); ===================================== services-test/src/main/java/fr/ird/observe/services/test/TestMethodRule.java ===================================== --- a/services-test/src/main/java/fr/ird/observe/services/test/TestMethodRule.java +++ b/services-test/src/main/java/fr/ird/observe/services/test/TestMethodRule.java @@ -252,7 +252,8 @@ public abstract class TestMethodRule implements TestRuleContract { protected ReferentialDtoCache getReferentialCache() { if (referentialCache == null) { - referentialCache = new ReferentialDtoCache(() -> { + referentialCache = new ReferentialDtoCache(); + referentialCache.setReferentialService(() -> { try { return newService(ReferentialService.class); } catch (DatabaseConnexionNotAuthorizedException | DatabaseNotFoundException | BabModelVersionException e) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/780ede1c6edd2358541d770bc24… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/780ede1c6edd2358541d770bc24… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: improve some service code
by Tony CHEMIT 30 Dec '17

30 Dec '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 68cd7900 by Tony CHEMIT at 2017-12-28T13:11:33+01:00 improve some service code - - - - - 61fcf9fb by Tony CHEMIT at 2017-12-30T19:29:46+01:00 Use new java-util lib + update other libs, and continue ui storm - - - - - 30 changed files: - CONTRIBUTING.md - client/pom.xml - client/src/main/java/fr/ird/observe/client/RunObserveClient.java - client/src/main/java/fr/ird/observe/client/admin/AdminTabUIHandler.java - client/src/main/java/fr/ird/observe/client/admin/config/SelectDataModel.java - client/src/main/java/fr/ird/observe/client/admin/consolidate/ConsolidateUIHandler.java - client/src/main/java/fr/ird/observe/client/ds/ObserveClientDataSource.java - client/src/main/java/fr/ird/observe/client/ds/ObserveDataSourceServicesProvider.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/MoveDataHelper.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/ObserveFormHelper.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/TripUI.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/main/CommonMainDataFormUI.jcss - client/src/main/java/fr/ird/observe/client/ds/editor/form/main/longline/SetLonglineObsUIModel.java - + client/src/main/java/fr/ird/observe/client/ds/editor/form/main/seine/FloatingObjectComputedValueDecorator.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/main/seine/FloatingObjectUI.jaxx - client/src/main/java/fr/ird/observe/client/ds/editor/form/main/seine/FloatingObjectUI.jcss - client/src/main/java/fr/ird/observe/client/ds/editor/form/main/seine/FloatingObjectUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/main/seine/SetSeineUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/ActivityLonglineObsUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/TripLonglineUI.jaxx - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/RouteUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/TripSeineUI.jaxx - client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/longline/BranchlineUIHandler.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/simplelist/seine/FloatingObjectTransmittingBuoyUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/table/longline/ActivityLonglineObsEncounterUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/table/longline/ActivityLonglineObsSensorUsedUIHandler.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/table/longline/SetLonglineObsCatchLonglineUIHandler.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/table/longline/SetLonglineObsCatchLonglineUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/table/longline/SetLonglineObsTdrUIHandler.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/table/longline/SetLonglineObsTdrUIModel.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/25bf22bccc0b736d6d7fbcd511… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/25bf22bccc0b736d6d7fbcd511… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: improve some service code
by Tony CHEMIT 28 Dec '17

28 Dec '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: c3242a94 by Tony CHEMIT at 2017-12-28T11:08:26+01:00 improve some service code - - - - - 25bf22bc by Tony CHEMIT at 2017-12-28T11:08:47+01:00 introduce main form ui and use it - - - - - 30 changed files: - + client/src/main/java/fr/ird/observe/client/ds/editor/form/main/CommonMainDataFormUI.jcss - client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/longline/SetLonglineObsUI.jaxx → client/src/main/java/fr/ird/observe/client/ds/editor/form/main/longline/SetLonglineObsUI.jaxx - client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/longline/SetLonglineObsUI.jcss → client/src/main/java/fr/ird/observe/client/ds/editor/form/main/longline/SetLonglineObsUI.jcss - client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/longline/SetLonglineObsUIModel.java → client/src/main/java/fr/ird/observe/client/ds/editor/form/main/longline/SetLonglineObsUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/seine/FloatingObjectPartLegendTreeCellRenderer.java → client/src/main/java/fr/ird/observe/client/ds/editor/form/main/seine/FloatingObjectPartLegendTreeCellRenderer.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/seine/FloatingObjectPartsTableCellEditor.java → client/src/main/java/fr/ird/observe/client/ds/editor/form/main/seine/FloatingObjectPartsTableCellEditor.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/seine/FloatingObjectPartsTableCellRenderer.java → client/src/main/java/fr/ird/observe/client/ds/editor/form/main/seine/FloatingObjectPartsTableCellRenderer.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/seine/FloatingObjectPartsTreeNode.java → client/src/main/java/fr/ird/observe/client/ds/editor/form/main/seine/FloatingObjectPartsTreeNode.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/seine/FloatingObjectPartsTreeTableModel.java → client/src/main/java/fr/ird/observe/client/ds/editor/form/main/seine/FloatingObjectPartsTreeTableModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/seine/FloatingObjectUI.jaxx → client/src/main/java/fr/ird/observe/client/ds/editor/form/main/seine/FloatingObjectUI.jaxx - client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/seine/FloatingObjectUI.jcss → client/src/main/java/fr/ird/observe/client/ds/editor/form/main/seine/FloatingObjectUI.jcss - client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/seine/FloatingObjectUIModel.java → client/src/main/java/fr/ird/observe/client/ds/editor/form/main/seine/FloatingObjectUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/seine/SetSeineUI.jaxx → client/src/main/java/fr/ird/observe/client/ds/editor/form/main/seine/SetSeineUI.jaxx - client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/seine/SetSeineUI.jcss → client/src/main/java/fr/ird/observe/client/ds/editor/form/main/seine/SetSeineUI.jcss - client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/seine/SetSeineUIModel.java → client/src/main/java/fr/ird/observe/client/ds/editor/form/main/seine/SetSeineUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/seine/actions/AddFloatingObjectPresetUIAction.java → client/src/main/java/fr/ird/observe/client/ds/editor/form/main/seine/actions/AddFloatingObjectPresetUIAction.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/seine/actions/CopyFloatingObjectPartToLeftAction.java → client/src/main/java/fr/ird/observe/client/ds/editor/form/main/seine/actions/CopyFloatingObjectPartToLeftAction.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/seine/actions/CopyFloatingObjectPartToRightAction.java → client/src/main/java/fr/ird/observe/client/ds/editor/form/main/seine/actions/CopyFloatingObjectPartToRightAction.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/seine/actions/EditFloatingObjectPresetUIAction.java → client/src/main/java/fr/ird/observe/client/ds/editor/form/main/seine/actions/EditFloatingObjectPresetUIAction.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/seine/actions/RemoveFloatingObjectPresetUIAction.java → client/src/main/java/fr/ird/observe/client/ds/editor/form/main/seine/actions/RemoveFloatingObjectPresetUIAction.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/ActivityLonglineObsUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/ActivitySeineUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/CommonSimpleDataFormUI.jcss - − client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/longline/SetLonglineObsUIHandler.java - − client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/seine/FloatingObjectUIHandler.java - − client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/seine/SetSeineUIHandler.java - client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/longline/SetLonglineObsNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/seine/FloatingObjectNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/seine/SetSeineNavigationTreeNode.java - client/src/main/resources/META-INF/ui/FormUIContextProvider.properties The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/58b6dbbf1309a1e2db7ca81f87… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/58b6dbbf1309a1e2db7ca81f87… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: add temperature config option + continue ui storm
by Tony CHEMIT 24 Dec '17

24 Dec '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 26fd5a96 by Tony CHEMIT at 2017-12-23T16:20:58+01:00 add temperature config option + continue ui storm - - - - - 58b6dbbf by Tony CHEMIT at 2017-12-24T10:51:51+01:00 review activity seine ui - - - - - 21 changed files: - client-configuration/pom.xml - client-configuration/src/main/config/Client.ini - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-configuration/src/main/resources/i18n/client-configuration_en_GB.properties - client-configuration/src/main/resources/i18n/client-configuration_es_ES.properties - client-configuration/src/main/resources/i18n/client-configuration_fr_FR.properties - client/src/main/java/fr/ird/observe/client/admin/validate/ValidationMessageTableRenderer.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/CommonOpenDataFormUI.jcss - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/ActivitySeineUI.jaxx - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/ActivitySeineUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/ActivityLonglineObsListUI.jaxx - client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/ActivityLonglineObsListUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/TripLonglineListUI.jaxx - client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/TripLonglineListUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/ActivitySeineListUI.jaxx - client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/ActivitySeineListUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/RouteListUI.jaxx - client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/RouteListUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/TripSeineListUI.jaxx - client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/TripSeineListUIModel.java - dto/src/test/java/fr/ird/observe/spi/dto/DtoModuleHelperTest.java Changes: ===================================== client-configuration/pom.xml ===================================== --- a/client-configuration/pom.xml +++ b/client-configuration/pom.xml @@ -102,6 +102,10 @@ <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-gis</artifactId> </dependency> + <dependency> + <groupId>io.ultreia.java4all.jaxx</groupId> + <artifactId>jaxx-widgets-temperature</artifactId> + </dependency> </dependencies> ===================================== client-configuration/src/main/config/Client.ini ===================================== --- a/client-configuration/src/main/config/Client.ini +++ b/client-configuration/src/main/config/Client.ini @@ -506,6 +506,12 @@ key = ui.coordinate.format type = org.nuiton.jaxx.widgets.gis.CoordinateFormat defaultValue = "dmd" +[option temperatureFormat] +description = observe.config.temperature.format +key = ui.temperature.format +type = org.nuiton.jaxx.widgets.temperature.TemperatureFormat +defaultValue = "C" + [option focusBorderColor] description = observe.config.ui.focusBorderColor key = ui.focusBorder.color ===================================== client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java ===================================== --- a/client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java +++ b/client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java @@ -37,6 +37,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.config.ApplicationConfig; import org.nuiton.config.ArgumentsParserException; import org.nuiton.jaxx.widgets.gis.CoordinateFormat; +import org.nuiton.jaxx.widgets.temperature.TemperatureFormat; import org.nuiton.version.Version; import org.nuiton.version.Versions; @@ -200,6 +201,11 @@ public class ClientConfig extends GeneratedClientConfig implements ClientApplica return CoordinateFormat.valueOf(get().getOption(ClientConfigOption.COORDINATE_FORMAT.getKey())); } + + public TemperatureFormat getTemperatureFormat() { + return get().getOption(TemperatureFormat.class, ClientConfigOption.TEMPERATURE_FORMAT.getKey()); + } + @Override public String getCopyrightText() { if (copyrightText == null) { ===================================== client-configuration/src/main/resources/i18n/client-configuration_en_GB.properties ===================================== --- a/client-configuration/src/main/resources/i18n/client-configuration_en_GB.properties +++ b/client-configuration/src/main/resources/i18n/client-configuration_en_GB.properties @@ -72,6 +72,7 @@ observe.config.speciesList.seine.objectSchoolEstimate=Species for object school observe.config.speciesList.seine.schoolEstimate=Species for school esitmates observe.config.speciesList.seine.targetCatch=Species for target catches observe.config.swingSessionFile.description=Swing session file. +observe.config.temperature.format=Default temperature format observe.config.ui.autoPopupNumberEditor=Flag sets to true when number editor show automaticly popup observe.config.ui.changeSynchroSrc=Flag sets to true if you can change local source in admin tasks observe.config.ui.focusBorderColor=Color of the focus container border ===================================== client-configuration/src/main/resources/i18n/client-configuration_es_ES.properties ===================================== --- a/client-configuration/src/main/resources/i18n/client-configuration_es_ES.properties +++ b/client-configuration/src/main/resources/i18n/client-configuration_es_ES.properties @@ -72,6 +72,7 @@ observe.config.speciesList.seine.objectSchoolEstimate=Especies para las estimaci observe.config.speciesList.seine.schoolEstimate=Especies para las estimaciones observe.config.speciesList.seine.targetCatch=Especies par las capturas objetivo observe.config.swingSessionFile.description=Fichier de sauvegarde des états des UI. \#TODO +observe.config.temperature.format=Default temperature format \#TODO observe.config.ui.autoPopupNumberEditor=Para mostrar automáticamente el editor numérico durante la edición de un número observe.config.ui.changeSynchroSrc=Pour autoriser la sélection de la base source dans les opérations sur base observe.config.ui.focusBorderColor=Couleur de la bordure de la zone qui a le focus \#TODO ===================================== client-configuration/src/main/resources/i18n/client-configuration_fr_FR.properties ===================================== --- a/client-configuration/src/main/resources/i18n/client-configuration_fr_FR.properties +++ b/client-configuration/src/main/resources/i18n/client-configuration_fr_FR.properties @@ -72,6 +72,7 @@ observe.config.speciesList.seine.objectSchoolEstimate=Espèces pour les estimati observe.config.speciesList.seine.schoolEstimate=Espèces pour les estimations observe.config.speciesList.seine.targetCatch=Espèces pour les captures cible observe.config.swingSessionFile.description=Fichier de sauvegarde des états des UI. +observe.config.temperature.format=Unité de température observe.config.ui.autoPopupNumberEditor=Pour afficher automatiquement l'éditeur numérique lors de l'édition d'un nombre observe.config.ui.changeSynchroSrc=Pour autoriser la sélection de la base source dans les opérations sur base observe.config.ui.focusBorderColor=Couleur de la bordure de la zone qui a le focus ===================================== client/src/main/java/fr/ird/observe/client/admin/validate/ValidationMessageTableRenderer.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/admin/validate/ValidationMessageTableRenderer.java +++ b/client/src/main/java/fr/ird/observe/client/admin/validate/ValidationMessageTableRenderer.java @@ -46,7 +46,7 @@ public class ValidationMessageTableRenderer extends DefaultTableCellRenderer { private static final long serialVersionUID = 1L; - private final ObserveI18nLabelsBuilder labelsBuilder = new ObserveI18nLabelsBuilder(null); + private final ObserveI18nLabelsBuilder labelsBuilder = ObserveI18nLabelsBuilder.fromNull(); @Override public Component getTableCellRendererComponent(JTable table, ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/open/CommonOpenDataFormUI.jcss ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/CommonOpenDataFormUI.jcss +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/CommonOpenDataFormUI.jcss @@ -55,6 +55,14 @@ ReferentialComboBoxBeanEditor { bean:{bean}; } +ReferentialDoubleListBeanEditor { + bean:{bean}; +} + +TemperatureBeanEditor { + bean:{bean}; +} + NormalTextBeanEditor { model:{bean}; } ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/ActivitySeineUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/ActivitySeineUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/ActivitySeineUI.jaxx @@ -60,13 +60,8 @@ static org.nuiton.i18n.I18n.n </import> -  <ActivitySeineUIModel id='model' title='observe.common.ActivitySeineDto.title'/> - -  <ActivitySeineDto id='bean'/> - -  <BeanValidator id='validator' autoField='true' beanClass='fr.ird.observe.dto.data.seine.ActivitySeineDto' errorTableModel='{getErrorTableModel()}' context='create'> @@ -77,198 +72,191 @@ </BeanValidator> - <JPanel id="body"> - <Table insets="0" fill="both" constraints='BorderLayout.CENTER'> - <row> - <cell anchor="north" weightx="1"> - <JTabbedPane id='mainTabbedPane'> - <tab id='generalTab' computeI18n=""> - <Table fill="both"> -  - <row> - <cell columns="2" weightx="1"> - <TimeBeanEditor id='time' styleClass="i18n"/> - </cell> - </row> - -  - <row> - <cell anchor='west'> - <JLabel id='coordinatesLabel'/> - </cell> - <cell anchor='east' fill="both"> - <CoordinatesBeanEditor id='coordinates'/> - </cell> - </row> + <JPanel id="body" layout="{new BorderLayout()}"> + <JTabbedPane id='mainTabbedPane' constraints='BorderLayout.CENTER'> + <tab id='generalTab' computeI18n=""> + <Table fill="both"> +  + <row> + <cell columns="2" weightx="1"> + <TimeBeanEditor id='time' styleClass="i18n"/> + </cell> + </row> -  - <row> - <cell anchor='west' columns="2"> - <JLabel id='vesselActivityInformation' styleClass="skipI18n"/> - </cell> - </row> - <row> - <cell anchor='west'> - <JLabel id='vesselActivitySeineLabel'/> - </cell> - <cell anchor='east' weightx="1"> - <ReferentialComboBoxBeanEditor id='vesselActivitySeine' genericType='VesselActivitySeineReference'/> - </cell> - </row> +  + <row> + <cell anchor='west'> + <JLabel id='coordinatesLabel'/> + </cell> + <cell anchor='east' fill="both"> + <CoordinatesBeanEditor id='coordinates'/> + </cell> + </row> -  - <row> - <cell anchor='west'> - <JLabel id='surroundingActivityLabel'/> - </cell> - <cell anchor='east' weightx="1"> - <ReferentialComboBoxBeanEditor id='surroundingActivity' genericType='SurroundingActivityReference'/> - </cell> - </row> +  + <row> + <cell anchor='west' columns="2"> + <JLabel id='vesselActivityInformation' styleClass="skipI18n"/> + </cell> + </row> + <row> + <cell anchor='west'> + <JLabel id='vesselActivitySeineLabel'/> + </cell> + <cell anchor='east' weightx="1"> + <ReferentialComboBoxBeanEditor id='vesselActivitySeine' genericType='VesselActivitySeineReference'/> + </cell> + </row> -  - <row> - <cell anchor='west'> - <JLabel id='previousFpaZoneLabel'/> - </cell> - <cell anchor='east' weightx="1"> - <ReferentialComboBoxBeanEditor id='previousFpaZone' genericType='FpaZoneReference'/> - </cell> - </row> +  + <row> + <cell anchor='west'> + <JLabel id='surroundingActivityLabel'/> + </cell> + <cell anchor='east' weightx="1"> + <ReferentialComboBoxBeanEditor id='surroundingActivity' genericType='SurroundingActivityReference'/> + </cell> + </row> -  - <row> - <cell anchor='west'> - <JLabel id='currentFpaZoneLabel'/> - </cell> - <cell anchor='east' weightx="1"> - <ReferentialComboBoxBeanEditor id='currentFpaZone' genericType='FpaZoneReference'/> - </cell> - </row> +  + <row> + <cell anchor='west'> + <JLabel id='previousFpaZoneLabel'/> + </cell> + <cell anchor='east' weightx="1"> + <ReferentialComboBoxBeanEditor id='previousFpaZone' genericType='FpaZoneReference'/> + </cell> + </row> -  - <row> - <cell anchor='west'> - <JLabel id='nextFpaZoneLabel'/> - </cell> - <cell anchor='east' weightx="1"> - <ReferentialComboBoxBeanEditor id='nextFpaZone' genericType='FpaZoneReference'/> - </cell> - </row> +  + <row> + <cell anchor='west'> + <JLabel id='currentFpaZoneLabel'/> + </cell> + <cell anchor='east' weightx="1"> + <ReferentialComboBoxBeanEditor id='currentFpaZone' genericType='FpaZoneReference'/> + </cell> + </row> -  - <row> +  + <row> + <cell anchor='west'> + <JLabel id='nextFpaZoneLabel'/> + </cell> + <cell anchor='east' weightx="1"> + <ReferentialComboBoxBeanEditor id='nextFpaZone' genericType='FpaZoneReference'/> + </cell> + </row> - <cell anchor='west'> - <JLabel id='ersIdLabel'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <NormalTextBeanEditor id='ersId'/> - </cell> - </row> - </Table> - </tab> +  + <row> - <tab id='measurementsTab' computeI18n=""> - <Table fill="both"> -  - <row> - <cell anchor='west'> - <JLabel id='vesselSpeedLabel'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <FloatBeanEditor id='vesselSpeed' styleClass="float2"/> - </cell> - </row> + <cell anchor='west'> + <JLabel id='ersIdLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <NormalTextBeanEditor id='ersId'/> + </cell> + </row> + <row> + <cell columns="2" weighty="1"> + <JLabel styleClass="skipI18n"/> + </cell> + </row> + </Table> + </tab> -  - <row> - <cell anchor='west'> - <JLabel id='seaSurfaceTemperatureLabel'/> - </cell> - <cell anchor='east' fill="both"> - <TemperatureBeanEditor id='seaSurfaceTemperature'/> - </cell> - </row> + <tab id='measurementsTab' computeI18n=""> + <Table fill="both"> +  + <row> + <cell anchor='west'> + <JLabel id='vesselSpeedLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <FloatBeanEditor id='vesselSpeed' styleClass="float2"/> + </cell> + </row> -  - <row> - <cell anchor='west'> - <JLabel id='windLabel'/> - </cell> - <cell anchor='east'> - <ReferentialComboBoxBeanEditor id='wind' genericType='WindReference'/> - </cell> - </row> +  + <row> + <cell anchor='west'> + <JLabel id='seaSurfaceTemperatureLabel'/> + </cell> + <cell anchor='east' fill="both"> + <TemperatureBeanEditor id='seaSurfaceTemperature'/> + </cell> + </row> -  - <row> - <cell anchor='west'> - <JLabel id='detectionModeLabel'/> - </cell> - <cell anchor='east'> - <ReferentialComboBoxBeanEditor id='detectionMode' genericType='DetectionModeReference'/> - </cell> - </row> +  + <row> + <cell anchor='west'> + <JLabel id='windLabel'/> + </cell> + <cell anchor='east'> + <ReferentialComboBoxBeanEditor id='wind' genericType='WindReference'/> + </cell> + </row> -  - <row> - <cell anchor='west'> - <JLabel id='reasonForNoFishingLabel'/> - </cell> - <cell anchor='east'> - <ReferentialComboBoxBeanEditor id='reasonForNoFishing' genericType='ReasonForNoFishingReference'/> - </cell> - </row> - <row> - <cell columns="2" weighty="1"> - <JLabel styleClass="skipI18n"/> - </cell> - </row> - </Table> - </tab> +  + <row> + <cell anchor='west'> + <JLabel id='detectionModeLabel'/> + </cell> + <cell anchor='east'> + <ReferentialComboBoxBeanEditor id='detectionMode' genericType='DetectionModeReference'/> + </cell> + </row> - <tab id="observedSystemTab" computeI18n=""> - <Table fill="both"> -  - <row> - <cell columns="2" fill="both" weighty="0.7"> - <JScrollPane id='observedSystemPane' onFocusGained='observedSystem.requestFocus()'> - <ReferentialDoubleListBeanEditor id='observedSystem' genericType='ObservedSystemReference'/> - </JScrollPane> - </cell> - </row> -  - <row> - <cell anchor='west'> - <JLabel id='observedSystemDistanceLabel'/> - </cell> - <cell weightx="1" fill="both"> - <FloatBeanEditor id='observedSystemDistance' styleClass="float2"/> - </cell> - </row> - </Table> - </tab> +  + <row> + <cell anchor='west'> + <JLabel id='reasonForNoFishingLabel'/> + </cell> + <cell anchor='east'> + <ReferentialComboBoxBeanEditor id='reasonForNoFishing' genericType='ReasonForNoFishingReference'/> + </cell> + </row> + <row> + <cell columns="2" weighty="1"> + <JLabel styleClass="skipI18n"/> + </cell> + </row> + </Table> + </tab> - </JTabbedPane> - </cell> - </row> - -  - <row> - <cell columns='2' weighty="1"> - <CommentBeanEditor id="comment"/> - </cell> - </row> - </Table> + <tab id="observedSystemTab" computeI18n=""> + <Table fill="both"> +  + <row> + <cell columns="2" fill="both" weighty="1"> + <JScrollPane id='observedSystemPane' onFocusGained='observedSystem.requestFocus()'> + <ReferentialDoubleListBeanEditor id='observedSystem' genericType='ObservedSystemReference'/> + </JScrollPane> + </cell> + </row> +  + <row> + <cell anchor='west'> + <JLabel id='observedSystemDistanceLabel'/> + </cell> + <cell weightx="1" fill="both"> + <FloatBeanEditor id='observedSystemDistance' styleClass="float2"/> + </cell> + </row> + </Table> + </tab> + </JTabbedPane> + <CommentBeanEditor id="comment" constraints='BorderLayout.SOUTH'/> </JPanel> + <Table id='extraActions' fill="both" weightx="1" insets='2'> <row> <cell weightx="0.5" fill="both"> - <JButton id='addSet'/> + <JButton id='addSet' visible="true"/> </cell> <cell weightx="0.5" fill="both"> - <JButton id='addDCP'/> + <JButton id='addDCP' visible="true"/> </cell> </row> </Table> ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/ActivitySeineUIModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/ActivitySeineUIModel.java +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/ActivitySeineUIModel.java @@ -127,14 +127,6 @@ public class ActivitySeineUIModel extends OpenDataFormUIModel<ActivitySeineDto, ObserveFormHelper.getApplicationDataSourceContext(ui).setOpenSetSeineId(setSeineId); } - public boolean isSetOperation() { - return bean.isSetOperation(); - } - - public boolean isDcpOperation() { - return bean.isDcpOperation(); - } - public boolean isChangedZoneOperation() { return VesselActivitySeineHelper.isChangedZoneOperation(bean.getVesselActivitySeine()); } @@ -176,10 +168,6 @@ public class ActivitySeineUIModel extends OpenDataFormUIModel<ActivitySeineDto, public <U extends OpenDataFormUI<ActivitySeineDto, ActivitySeineReference>> void installUI(U ui) { super.installUI(ui); ActivitySeineUI ui1 = (ActivitySeineUI) ui; - ui1.getAddSet().setVisible(bean.isSetOperation() && bean.getSetSeine() == null); - ui1.getAddDCP().setVisible(bean.isDcpOperation()); - ui.getExtraActions().setVisible(isUpdatingMode()); - VesselActivitySeineReference fishingOperationActivity = getFishingOperationActivity(); String activity6Label = ClientApplicationContext.get().getDecoratorService().getReferentialReferenceDecorator(VesselActivitySeineReference.class).toString(fishingOperationActivity); @@ -202,12 +190,39 @@ public class ActivitySeineUIModel extends OpenDataFormUIModel<ActivitySeineDto, @Override protected <U extends OpenDataFormUI<ActivitySeineDto, ActivitySeineReference>> void onModelPropertyChanged(U ui, String propertyName) { super.onModelPropertyChanged(ui, propertyName); + boolean updateAddDcp = false; + boolean updateAddSet = false; + boolean updateExtraActions = false; switch (propertyName) { case PROPERTY_MODIFIED: + updateAddDcp = true; + updateAddSet = true; + break; case PROPERTY_VALID: - boolean enabled = !isModified() && (isValid() || isHistoricalData()); - ((ActivitySeineUI) ui).getAddSet().setEnabled(enabled); - ((ActivitySeineUI) ui).getAddDCP().setEnabled(enabled); + updateAddDcp = true; + updateAddSet = true; + break; + case PROPERTY_EDITING: + updateAddDcp = true; + updateAddSet = true; + break; + case PROPERTY_MODE: + updateAddDcp = true; + updateAddSet = true; + updateExtraActions = true; + } + + ActivitySeineUI ui1 = (ActivitySeineUI) ui; + if (updateAddDcp) { + ui1.getAddDCP().setVisible(bean.isDcpOperation()); + ui1.getAddDCP().setEnabled(ui1.getDelete().isEnabled()); + } + if (updateAddSet) { + ui1.getAddSet().setVisible(bean.isSetOperation() && bean.getSetSeine() == null); + ui1.getAddSet().setEnabled(ui1.getDelete().isEnabled()); + } + if (updateExtraActions) { + ui.getExtraActions().setVisible(isUpdatingMode()); } } ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/ActivityLonglineObsListUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/ActivityLonglineObsListUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/ActivityLonglineObsListUI.jaxx @@ -25,13 +25,9 @@ <import> fr.ird.observe.dto.data.longline.ActivityLonglineObsDto fr.ird.observe.dto.data.longline.ActivityLonglineObsReference - org.nuiton.jaxx.widgets.select.BeanListHeader </import> <ActivityLonglineObsListUIModel id='model'/> - <JLabel id="emptyLabel" text='observe.common.ActivityLonglineObsDto.message.nonForTrip'/> - <BeanListHeader id='listHeader' labelText='observe.common.ActivityDto.list'/> - <JButton id='showSelectedData'/> <JButton id='showOpenData'/> <JButton id='openData'/> ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/ActivityLonglineObsListUIModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/ActivityLonglineObsListUIModel.java +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/ActivityLonglineObsListUIModel.java @@ -56,6 +56,16 @@ public class ActivityLonglineObsListUIModel extends OpenDataListFormUIModel<Acti } @Override + public String getListEmptyLabel() { + return t("observe.common.ActivityLonglineObsDto.message.nonForTrip"); + } + + @Override + public String getListLabel() { + return t("observe.common.ActivityDto.list"); + } + + @Override public void computeReadMessages(FormUIValidationMessageManager validationManager) { if (isAnotherParentOpen()) { validationManager.addInfoMessage(n("observe.common.ActivityLonglineObsDto.message.active.found.for.other.trip")); ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/TripLonglineListUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/TripLonglineListUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/TripLonglineListUI.jaxx @@ -19,19 +19,14 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<fr.ird.observe.client.ds.editor.form.openlist.OpenDataListFormUI - superGenericType='TripLonglineDto, TripLonglineReference'> +<fr.ird.observe.client.ds.editor.form.openlist.OpenDataListFormUI superGenericType='TripLonglineDto, TripLonglineReference'> <import> fr.ird.observe.dto.data.longline.TripLonglineDto fr.ird.observe.dto.data.longline.TripLonglineReference - org.nuiton.jaxx.widgets.select.BeanListHeader </import> <TripLonglineListUIModel id='model'/> - <JLabel id="emptyLabel" text='observe.common.TripDto.message.noneForTrip'/> - <BeanListHeader id='listHeader' labelText='observe.common.TripDto.list'/> - <JButton id='showSelectedData'/> <JButton id='showOpenData'/> <JButton id='openData'/> ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/TripLonglineListUIModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/TripLonglineListUIModel.java +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/TripLonglineListUIModel.java @@ -54,6 +54,16 @@ public class TripLonglineListUIModel extends OpenDataListFormUIModel<TripLonglin } @Override + public String getListEmptyLabel() { + return t("observe.common.TripDto.message.noneForTrip"); + } + + @Override + public String getListLabel() { + return t("observe.common.TripDto.list"); + } + + @Override public void computeReadMessages(FormUIValidationMessageManager validationManager) { validationManager.addInfoMessage(n("observe.common.TripLonglineDto.message.active.found.for.other.program")); } ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/ActivitySeineListUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/ActivitySeineListUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/ActivitySeineListUI.jaxx @@ -25,12 +25,9 @@ <import> fr.ird.observe.dto.data.seine.ActivitySeineDto fr.ird.observe.dto.data.seine.ActivitySeineReference - org.nuiton.jaxx.widgets.select.BeanListHeader </import> <ActivitySeineListUIModel id='model'/> - <JLabel id="emptyLabel" text='observe.common.ActivitySeineDto.message.noneForRoute'/> - <BeanListHeader id='listHeader' labelText='observe.common.ActivityDto.list'/> <JButton id='showSelectedData'/> <JButton id='showOpenData'/> <JButton id='openData'/> ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/ActivitySeineListUIModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/ActivitySeineListUIModel.java +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/ActivitySeineListUIModel.java @@ -56,6 +56,16 @@ public class ActivitySeineListUIModel extends OpenDataListFormUIModel<ActivitySe } @Override + public String getListEmptyLabel() { + return t("observe.common.ActivitySeineDto.message.noneForRoute"); + } + + @Override + public String getListLabel() { + return t("observe.common.ActivityDto.list"); + } + + @Override public void computeReadMessages(FormUIValidationMessageManager validationManager) { if (!ObserveClientApplicationContext.applicationDataContext().isOpenRoute()) { validationManager.addInfoMessage(n("observe.common.RouteDto.message.no.active.found")); ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/RouteListUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/RouteListUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/RouteListUI.jaxx @@ -25,12 +25,9 @@ <import> fr.ird.observe.dto.data.seine.RouteDto fr.ird.observe.dto.data.seine.RouteReference - org.nuiton.jaxx.widgets.select.BeanListHeader </import> <RouteListUIModel id='model'/> - <JLabel id="emptyLabel" text='observe.common.RouteDto.noneForTrip'/> - <BeanListHeader id='listHeader' labelText='observe.common.RouteDto.list'/> <JButton id='showSelectedData'/> <JButton id='showOpenData'/> <JButton id='openData'/> ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/RouteListUIModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/RouteListUIModel.java +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/RouteListUIModel.java @@ -56,6 +56,16 @@ public class RouteListUIModel extends OpenDataListFormUIModel<RouteDto, RouteRef } @Override + public String getListEmptyLabel() { + return t("observe.common.RouteDto.noneForTrip"); + } + + @Override + public String getListLabel() { + return t("observe.common.RouteDto.list"); + } + + @Override public void computeReadMessages(FormUIValidationMessageManager validationManager) { if (isAnotherParentOpen()) { validationManager.addInfoMessage(n("observe.common.RouteDto.message.active.found.for.other.trip")); ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/TripSeineListUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/TripSeineListUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/TripSeineListUI.jaxx @@ -24,12 +24,9 @@ <import> fr.ird.observe.dto.data.seine.TripSeineDto fr.ird.observe.dto.data.seine.TripSeineReference - org.nuiton.jaxx.widgets.select.BeanListHeader </import> <TripSeineListUIModel id='model'/> - <JLabel id="emptyLabel" text='observe.common.TripDto.message.noneForTrip'/> - <BeanListHeader id='listHeader' labelText='observe.common.TripDto.list'/> <JButton id='showSelectedData'/> <JButton id='showOpenData'/> <JButton id='openData'/> ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/TripSeineListUIModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/TripSeineListUIModel.java +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/TripSeineListUIModel.java @@ -54,6 +54,16 @@ public class TripSeineListUIModel extends OpenDataListFormUIModel<TripSeineDto, } @Override + public String getListEmptyLabel() { + return t("observe.common.TripDto.message.noneForTrip"); + } + + @Override + public String getListLabel() { + return t("observe.common.TripDto.list"); + } + + @Override public void computeReadMessages(FormUIValidationMessageManager validationManager) { validationManager.addInfoMessage(n("observe.common.TripSeineDto.message.active.found.for.other.program")); } ===================================== dto/src/test/java/fr/ird/observe/spi/dto/DtoModuleHelperTest.java ===================================== --- a/dto/src/test/java/fr/ird/observe/spi/dto/DtoModuleHelperTest.java +++ b/dto/src/test/java/fr/ird/observe/spi/dto/DtoModuleHelperTest.java @@ -123,6 +123,11 @@ public class DtoModuleHelperTest { Class<R> referenceType = typeContext.toReferenceType(); Assert.assertNotNull(referenceType); + Class<? extends ReferentialDto> aClass = DtoModuleHelper.toReferentialDtoType(referenceType); + Assert.assertNotNull(aClass); + Assert.assertEquals(dtoType, aClass); + + ReferentialDtoReferenceBinder<D, R> referenceBinder = typeContext.toReferenceBinder(); Assert.assertNotNull(referenceBinder); @@ -170,9 +175,12 @@ public class DtoModuleHelperTest { referenceCount.increment(); expectedNull = false; + Class<? extends DataDto> aClass = DtoModuleHelper.toDataDtoType(referenceType); + Assert.assertNotNull(aClass); + Assert.assertEquals(dtoType, aClass); + } else { expectedNull = true; - } Assert.assertEquals(expectedNull, referenceBinder == null); @@ -183,10 +191,8 @@ public class DtoModuleHelperTest { R r = typeContext.newReferenceInstance(ReferentialLocale.FR); Assert.assertNotNull(r); } - } - private <D extends DataDto> void fromDataForm(Class<D> dtoType, MutableInt formCount) { Optional<FormDefinition<D>> typeContext = DtoModuleHelper.fromDataForm(dtoType); @@ -200,7 +206,6 @@ public class DtoModuleHelperTest { // check } - } private void assertCommonModel(CommonDtoModelDefinition model) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/0b434c78ef3ada2878afa93bf5… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/0b434c78ef3ada2878afa93bf5… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] add missing headers
by Tony CHEMIT 22 Dec '17

22 Dec '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 0b434c78 by Tony CHEMIT at 2017-12-22T23:50:42+01:00 add missing headers - - - - - 4 changed files: - client/pom.xml - client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/longline/LonglineReferenceNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/seine/SeineReferenceNavigationTreeNode.java - client/src/test/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/ReferenceNavigationTreeNodeFactoriesTest.java Changes: ===================================== client/pom.xml ===================================== --- a/client/pom.xml +++ b/client/pom.xml @@ -45,7 +45,7 @@ ${project.basedir}/src/main/java/fr/ird/observe/client/ObserveCommon.jcss </jaxx.commonCss> - <license.excludes>**/ftl/*.ftl,**/i18n/*.properties,**/THIRD-PARTY.properties,**/*.sh,**/*.json,**/FormUIContextProvider.properties + <license.excludes>**/ftl/*.ftl,**/i18n/*.properties,**/THIRD-PARTY.properties,**/*.sh,**/*.json,**/FormUIContextProvider.properties,**/ReferenceNavigationTreeNodeFactories.properties </license.excludes>  ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/longline/LonglineReferenceNavigationTreeNode.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/longline/LonglineReferenceNavigationTreeNode.java +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/longline/LonglineReferenceNavigationTreeNode.java @@ -1,5 +1,27 @@ package fr.ird.observe.client.ds.editor.tree.navigation.nodes.longline; +/*- + * #%L + * ObServe :: Client + * %% + * 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 fr.ird.observe.client.ds.editor.form.FormUIModel; import fr.ird.observe.client.ds.editor.tree.navigation.nodes.ReferenceNavigationTreeNode; import fr.ird.observe.dto.IdDto; ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/seine/SeineReferenceNavigationTreeNode.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/seine/SeineReferenceNavigationTreeNode.java +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/seine/SeineReferenceNavigationTreeNode.java @@ -1,5 +1,27 @@ package fr.ird.observe.client.ds.editor.tree.navigation.nodes.seine; +/*- + * #%L + * ObServe :: Client + * %% + * 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 fr.ird.observe.client.ds.editor.form.FormUIModel; import fr.ird.observe.client.ds.editor.tree.navigation.nodes.ReferenceNavigationTreeNode; import fr.ird.observe.dto.IdDto; ===================================== client/src/test/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/ReferenceNavigationTreeNodeFactoriesTest.java ===================================== --- a/client/src/test/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/ReferenceNavigationTreeNodeFactoriesTest.java +++ b/client/src/test/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/ReferenceNavigationTreeNodeFactoriesTest.java @@ -1,5 +1,27 @@ package fr.ird.observe.client.ds.editor.tree.navigation.nodes; +/*- + * #%L + * ObServe :: Client + * %% + * 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 fr.ird.observe.client.ClientTestSupport; import fr.ird.observe.dto.IdDto; import fr.ird.observe.services.test.spi.SkipDatabaseConfiguration; @@ -49,4 +71,4 @@ public class ReferenceNavigationTreeNodeFactoriesTest extends ClientTestSupport } } -} \ No newline at end of file +} View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/0b434c78ef3ada2878afa93bf54… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/0b434c78ef3ada2878afa93bf54… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: now references can use empty dto
by Tony CHEMIT 22 Dec '17

22 Dec '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 7e0b66c4 by Tony CHEMIT at 2017-12-22T17:38:17+01:00 now references can use empty dto - - - - - f55697c2 by Tony CHEMIT at 2017-12-22T17:39:53+01:00 improve tests configuration (can now skip any database creation) - - - - - 2bb49ba8 by Tony CHEMIT at 2017-12-22T17:40:50+01:00 improve navigation tree api (align node class names with their dto) + introduce navigation tree node factories - - - - - 30 changed files: - client/pom.xml - client/src/main/java/fr/ird/observe/client/ds/editor/form/MoveDataHelper.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/longline/SetLonglineObsUIHandler.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/seine/FloatingObjectUIHandler.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/seine/SetSeineUIHandler.java - client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/ObserveNavigationTree.java - client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/longline/ActivityLonglineListNavigationTreeNode.java → client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/longline/ActivityLonglineObsListNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/longline/ActivityLonglineNavigationTreeNode.java → client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/longline/ActivityLonglineObsNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/longline/EncounterLonglineNavigationTreeNode.java → client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/longline/EncounterNavigationTreeNode.java - + client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/longline/LonglineReferenceNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/longline/SensorUsedLonglineNavigationTreeNode.java → client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/longline/SensorUsedNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/longline/SetDetailCompositionLonglineNavigationTreeNode.java → client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/longline/SetLonglineDetailCompositionObsNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/longline/SetGlobalCompositionLonglineNavigationTreeNode.java → client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/longline/SetLonglineGlobalCompositionObsNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/longline/SetLonglineNavigationTreeNode.java → client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/longline/SetLonglineObsNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/longline/TripLonglineListNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/longline/TripLonglineNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/seine/ActivitySeineNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/seine/DiscardedTargetCatchSeineNavigationTreeNode.java → client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/seine/DiscardedTargetCatchNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/seine/DiscardedTargetSampleSeineNavigationTreeNode.java → client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/seine/DiscardedTargetSampleNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/seine/FloatingObjectSeineNavigationTreeNode.java → client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/seine/FloatingObjectNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/seine/KeptTargetCatchSeineNavigationTreeNode.java → client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/seine/KeptTargetCatchNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/seine/KeptTargetSampleSeineNavigationTreeNode.java → client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/seine/KeptTargetSampleNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/seine/NonTargetCatchSeineNavigationTreeNode.java → client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/seine/NonTargetCatchNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/seine/NonTargetCatchReleasedSeineNavigationTreeNode.java → client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/seine/NonTargetCatchReleasedNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/seine/NonTargetSampleSeineNavigationTreeNode.java → client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/seine/NonTargetSampleNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/seine/FloatingObjectTransmittingBuoyNavigationTreeNode.java → client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/seine/ObjectOperationNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/seine/RouteSeineListNavigationTreeNode.java → client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/seine/RouteListNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/seine/RouteSeineNavigationTreeNode.java → client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/seine/RouteNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/seine/SchoolEstimateSeineNavigationTreeNode.java → client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/seine/SchoolEstimateNavigationTreeNode.java - + client/src/main/java/fr/ird/observe/client/ds/editor/tree/navigation/nodes/seine/SeineReferenceNavigationTreeNode.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/f2a60d0da6992eca44f639f170… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/f2a60d0da6992eca44f639f170… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] improve poms
by Tony CHEMIT 22 Dec '17

22 Dec '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f2a60d0d by Tony CHEMIT at 2017-12-22T01:10:04+01:00 improve poms - - - - - 2 changed files: - services-client/pom.xml - services-local/pom.xml Changes: ===================================== services-client/pom.xml ===================================== --- a/services-client/pom.xml +++ b/services-client/pom.xml @@ -21,7 +21,8 @@ #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> @@ -149,56 +150,82 @@ <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>io.ultreia.java4all.http</groupId> + <artifactId>http-maven-plugin</artifactId> + <configuration> + <packageName>fr.ird.observe.services.client</packageName> + <serviceType>fr.ird.observe.services.service.ObserveService</serviceType> + <serviceSupportType>fr.ird.observe.services.client.ObserveServiceClientSupport</serviceSupportType> + <gsonType>fr.ird.observe.dto.ObserveDto</gsonType> + <addAuthToken>true</addAuthToken> + <classSuffix>Client</classSuffix> + </configuration> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>services</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </pluginManagement> + <plugins> <plugin> <groupId>io.ultreia.java4all.http</groupId> <artifactId>http-maven-plugin</artifactId> <executions> <execution> - <id>generate-rest-client</id> + <id>default-generate-class-mapping</id> <goals> - <goal>generate-client</goal> <goal>generate-class-mapping</goal> </goals> - <configuration> - <packageName>fr.ird.observe.services.client</packageName> - <serviceType>fr.ird.observe.services.service.ObserveService</serviceType> - <serviceSupportType>fr.ird.observe.services.client.ObserveServiceClientSupport</serviceSupportType> - <gsonType>fr.ird.observe.dto.ObserveDto</gsonType> - <addAuthToken>true</addAuthToken> - <classSuffix>Client</classSuffix> - </configuration> </execution> - </executions> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>services</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>io.ultreia.java4all</groupId> - <artifactId>java-lang</artifactId> - <version>${lib.version.java4all.java-lang}</version> - </dependency> - </dependencies> - </plugin> - - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <executions> <execution> - <id>run-services-test</id> + <id>default-generate-client</id> <goals> - <goal>test</goal> + <goal>generate-client</goal> </goals> - <configuration> - <test>fr.ird.observe.services.client.ServiceClientTestSuite</test> - </configuration> </execution> </executions> </plugin> - </plugins> </build> + + <profiles> + <profile> + <id>run-services-test</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <defaultGoal>test</defaultGoal> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <executions> + <execution> + <id>run-services-test</id> + <goals> + <goal>test</goal> + </goals> + <configuration> + <skip>${skipITs}</skip> + <test>fr.ird.observe.services.client.ServiceClientTestSuite</test> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> + </project> ===================================== services-local/pom.xml ===================================== --- a/services-local/pom.xml +++ b/services-local/pom.xml @@ -195,6 +195,29 @@ <build> + <pluginManagement> + <plugins> + + <plugin> + <groupId>io.ultreia.java4all.http</groupId> + <artifactId>http-maven-plugin</artifactId> + <configuration> + <packageName>fr.ird.observe.services.local</packageName> + <serviceType>fr.ird.observe.services.service.ObserveService</serviceType> + <serviceSupportType>fr.ird.observe.services.local.service.ObserveServiceLocal</serviceSupportType> + <classSuffix>Local</classSuffix> + </configuration> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>services</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + </plugin> + + </plugins> + </pluginManagement> <plugins> <plugin> @@ -202,25 +225,12 @@ <artifactId>http-maven-plugin</artifactId> <executions> <execution> - <id>generate-class-mapping-local</id> + <id>default-generate-class-mapping</id> <goals> <goal>generate-class-mapping</goal> </goals> - <configuration> - <packageName>fr.ird.observe.services.local</packageName> - <serviceType>fr.ird.observe.services.service.ObserveService</serviceType> - <serviceSupportType>fr.ird.observe.services.local.service.ObserveServiceLocal</serviceSupportType> - <classSuffix>Local</classSuffix> - </configuration> </execution> </executions> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>services</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> </plugin> </plugins> @@ -294,8 +304,8 @@ <id>run-services-test</id> <activation> <property> - <name>skipITs</name> - <value>!true</value> + <name>performRelease</name> + <value>true</value> </property> </activation> <build> @@ -310,6 +320,7 @@ <goal>test</goal> </goals> <configuration> + <skip>${skipITs}</skip> <test>fr.ird.observe.services.local.ServiceLocalTestSuite</test> </configuration> </execution> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f2a60d0da6992eca44f639f1701… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f2a60d0da6992eca44f639f1701… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] use next toolkit
by Tony CHEMIT 21 Dec '17

21 Dec '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f863fe14 by Tony CHEMIT at 2017-12-22T00:36:16+01:00 use next toolkit - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -144,7 +144,7 @@  <observe.model.version>6.904</observe.model.version> - <lib.version.java4all.toolkit>2.0-alpha-2</lib.version.java4all.toolkit> + <lib.version.java4all.toolkit>2.0-alpha-3-SNAPSHOT</lib.version.java4all.toolkit>  <license.licenseName>gpl_v3</license.licenseName> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f863fe142849f4b5bc11c9f9f03… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f863fe142849f4b5bc11c9f9f03… You're receiving this email because of your account on gitlab.com.

1 0