Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 5ffad006 by Tony Chemit at 2020-12-22T16:26:21+01:00 Ajouter un onglet cartographie dans la configuration - Closes #1689 - - - - - 6 changed files: - client/core/src/main/i18n/getters/java.getter - client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - client/datasource/editor/api/src/main/i18n/getters/jaxx.getter - client/i18n/src/main/i18n/translations/observe_en_GB.properties - client/i18n/src/main/i18n/translations/observe_es_ES.properties - client/i18n/src/main/i18n/translations/observe_fr_FR.properties Changes: ===================================== client/core/src/main/i18n/getters/java.getter ===================================== @@ -7,6 +7,8 @@ observe.config.category.application observe.config.category.application.description observe.config.category.expert observe.config.category.expert.description +observe.config.category.map +observe.config.category.map.description observe.config.category.observation observe.config.category.observation.description observe.config.category.speciesList.longline ===================================== client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java ===================================== @@ -107,7 +107,7 @@ public class ClientConfigUI extends JXTitledPanel { private final SpeciesListsTableCellRenderer speciesListsTableCellRenderer; protected ObserveConfigUIBuilder(ClientConfig config, - ObserveUICallbackManager uiCallbackManager, SpeciesListTableCellEditor speciesListTableCellEditor, + SpeciesListTableCellEditor speciesListTableCellEditor, SpeciesListsTableCellRenderer speciesListsTableCellRenderer) { super(config, config.get(), config.get().getUserConfigFile()); this.speciesListTableCellEditor = speciesListTableCellEditor; @@ -189,7 +189,6 @@ public class ClientConfigUI extends JXTitledPanel { @Override public void setValue(Object value) { if (value instanceof String) { - value = SpeciesListTableCellEditor.this.entityMap.get(String.valueOf(value)); } component.setSelectedItem((SpeciesListReference) value); @@ -197,10 +196,8 @@ public class ClientConfigUI extends JXTitledPanel { @Override public Object getCellEditorValue() { - String result = null; SpeciesListReference selectedItem = component.getModel().getSelectedItem(); - result = selectedItem.getId(); - return result; + return selectedItem.getId(); } @Override @@ -216,15 +213,12 @@ public class ClientConfigUI extends JXTitledPanel { public boolean stopCellEditing() { if (component.getConfig().isEditable()) { // Commit edited value. - component.getCombobox().actionPerformed( - new ActionEvent(SpeciesListTableCellEditor.this, 0, "")); + component.getCombobox().actionPerformed(new ActionEvent(SpeciesListTableCellEditor.this, 0, "")); } return super.stopCellEditing(); } }; - } - } private void quit() { @@ -232,24 +226,17 @@ public class ClientConfigUI extends JXTitledPanel { } private ObserveConfigUIBuilder buildUI(ObserveUICallbackManager uiCallbackManager, ClientConfig config, ObserveSwingDataSource dataSource, DecoratorService decoratorService) { - SpeciesListTableCellEditor editor = null; SpeciesListsTableCellRenderer renderer = null; - if (dataSource != null && dataSource.isOpen()) { - Set<SpeciesListReference> speciesLists = dataSource.getReferentialReferences(SpeciesListReference.class); - Map<String, SpeciesListReference> speciesListMap = ReferentialDtoReference.splitById(speciesLists); - ReferentialReferenceDecorator<SpeciesListReference> referenceDecorator = decoratorService.getReferentialReferenceDecorator(SpeciesListReference.class); - editor = new SpeciesListTableCellEditor(speciesLists, speciesListMap, referenceDecorator); renderer = new SpeciesListsTableCellRenderer(speciesListMap, referenceDecorator); - } - ObserveConfigUIBuilder helper = new ObserveConfigUIBuilder(config, uiCallbackManager, editor, renderer); + ObserveConfigUIBuilder helper = new ObserveConfigUIBuilder(config, editor, renderer); uiCallbackManager.getCallbacks().forEach(helper::registerCallBack); @@ -264,6 +251,7 @@ public class ClientConfigUI extends JXTitledPanel { addApplicationOptions(helper); addUiOptions(helper); addNavigationOptions(helper); + addMapOptions(helper); addDataOptions(helper, dataSource); addExpertOptions(helper); addTechnicalOptions(helper); @@ -304,6 +292,13 @@ public class ClientConfigUI extends JXTitledPanel { helper.addOption(ClientConfigOption.DEFAULT_DB_MODE); helper.addOption(ClientConfigOption.DEFAULT_CREATION_MODE); helper.addOption(ClientConfigOption.STORE_REMOTE_STORAGE); + } + + private void addMapOptions(ObserveConfigUIBuilder helper) { + + helper.addCategory(n("observe.config.category.map"), + n("observe.config.category.map.description"), + "ui"); helper.addOption(ClientConfigOption.MAP_BACKGROUND_COLOR); ClientConfig.MAP_LAYERS.forEach(helper::addOption); ===================================== client/datasource/editor/api/src/main/i18n/getters/jaxx.getter ===================================== @@ -69,4 +69,3 @@ observe.ui.usage.action.shouldReplace observe.ui.usage.replaceTitle observe.ui.usage.usageTitle observe.ui.view.message -observe.ui.view.navigation ===================================== client/i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -39,6 +39,8 @@ observe.config.category.application=Application observe.config.category.application.description=Application options observe.config.category.expert=Expert observe.config.category.expert.description=Export mode options +observe.config.category.map=Map +observe.config.category.map.description=Maps configuration observe.config.category.observation=Qualification of observations observe.config.category.observation.description=Qualification of observations observe.config.category.speciesList.longline=Species lists for longline @@ -1689,6 +1691,5 @@ observe.ui.usage.action.shouldReplace=Remplace desactivated referential ? observe.ui.usage.replaceTitle=Replacement object observe.ui.usage.usageTitle=Founded references observe.ui.view.message=Messages -observe.ui.view.navigation=Navigation observe.warning.nimbus.landf=Could not use Look and Fell Nimbus, need at least version 1.6u10 of java. observe.warning.no.ui=No gui environment found ===================================== client/i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -39,6 +39,8 @@ observe.config.category.application=Aplicación observe.config.category.application.description=Opciones de la aplicación observe.config.category.expert=Experto observe.config.category.expert.description=Opciones de modo experto +observe.config.category.map=Mapa +observe.config.category.map.description=Mapa Configuración observe.config.category.observation=Calificación de las observaciones observe.config.category.observation.description=Gestion de los indicadores de calificación de los programas observe.config.category.speciesList.longline=Configuración de las listas de especies (Palangre) @@ -1689,6 +1691,5 @@ observe.ui.usage.action.shouldReplace=Reemplaza referencial desactivado? observe.ui.usage.replaceTitle=Objeto de sustitución observe.ui.usage.usageTitle=Referencias encontradas observe.ui.view.message=Mensajes -observe.ui.view.navigation=Navegación observe.warning.nimbus.landf=El look and Feel Nimbus no fue encontrado, se necesita como mínimo la versión 1.6 ó 10 de java. observe.warning.no.ui=Ninguno entorno gráfico fue detectado ===================================== client/i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -39,6 +39,8 @@ observe.config.category.application=Application observe.config.category.application.description=Options applicatives observe.config.category.expert=Avancé observe.config.category.expert.description=Configuration avancée +observe.config.category.map=Cartographie +observe.config.category.map.description=Configuration de la cartographie observe.config.category.observation=Qualification des observations observe.config.category.observation.description=Gestion des indicateurs de qualification des programmes observe.config.category.speciesList.longline=Configuration des listes d'espèces (Palangre) @@ -1689,6 +1691,5 @@ observe.ui.usage.action.shouldReplace=Remplacer le référentiel désactivé ? observe.ui.usage.replaceTitle=Objet de remplacement observe.ui.usage.usageTitle=Références trouvées observe.ui.view.message=Messages -observe.ui.view.navigation=Navigation observe.warning.nimbus.landf=Le look and Feel Nimbus n'a pas été trouvé, il faut au moins la version 1.6u10 de java. observe.warning.no.ui=Aucun environnement graphique détecté View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/5ffad0061b1ace8710dd1c0a00... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/5ffad0061b1ace8710dd1c0a00... You're receiving this email because of your account on gitlab.com.