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

[Git][ultreiaio/ird-observe][develop-7.x] UI référentiel liste d'affichage d'espèces non classée - Closes #1474
by Tony CHEMIT 08 May '20

08 May '20

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 2480a0be by Tony Chemit at 2020-05-08T16:13:27+02:00 UI référentiel liste d'affichage d'espèces non classée - Closes #1474 - - - - - 2 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/ObserveCommon.jcss - pom.xml Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/ObserveCommon.jcss ===================================== @@ -70,8 +70,9 @@ CoordinatesEditor { FilterableDoubleList { showDecorator:false; showReset:true; - showSelectPopupEnabled: true; + showSelectPopupEnabled: false; filterable:false; + autoSortSelectedList:true; _notBlocking: true; } ===================================== pom.xml ===================================== @@ -163,7 +163,7 @@  <lib.version.h2>1.4.196</lib.version.h2> <lib.version.java4all.eugene>3.0-alpha-26</lib.version.java4all.eugene> - + <lib.version.java4all.jaxx>3.0-alpha-68-SNAPSHOT</lib.version.java4all.jaxx>  <lib.version.java4all.topia>1.1.17</lib.version.java4all.topia> <lib.version.nuiton.utils>3.0</lib.version.nuiton.utils> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/2480a0be7a7b5f5bb7da25cad… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/2480a0be7a7b5f5bb7da25cad… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] [PS] Affichage altéré/tronqué en 7.5.1 (régression) - Closes #1473
by Tony CHEMIT 08 May '20

08 May '20

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 5179bd99 by Tony Chemit at 2020-05-08T12:29:17+02:00 [PS] Affichage altéré/tronqué en 7.5.1 (régression) - Closes #1473 - - - - - 4 changed files: - validation/src/main/resources/fr/ird/observe/dto/data/seine/TargetCatchDto-update-targetCatch-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/seine/TargetCatchDto-update-targetCatch-warning-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/seine/TargetCatchDto-update-targetDiscarded-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/seine/TargetCatchDto-update-targetDiscarded-warning-validation.xml Changes: ===================================== validation/src/main/resources/fr/ird/observe/dto/data/seine/TargetCatchDto-update-targetCatch-error-validation.xml ===================================== @@ -25,9 +25,36 @@ "-//Apache Struts//XWork Validator 1.0.3//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> + <field name="species"> +  + <field-validator type="mandatory" short-circuit="true"> + <message/> + </field-validator> +  + <field-validator type="checkDisabledReferentialOnErrorScope" short-circuit="true"> + <message/> + </field-validator> + </field> + <field name="weightCategory"> +  + <field-validator type="mandatory" short-circuit="true"> + <message/> + </field-validator> +  + <field-validator type="checkDisabledReferentialOnErrorScope" short-circuit="true"> + <message/> + </field-validator> + </field> <field name="well"> +  <field-validator type="mandatoryString" short-circuit="true"> <message/> </field-validator> </field> + <field name="catchWeight"> +  + <field-validator type="mandatory" short-circuit="true"> + <message/> + </field-validator> + </field> </validators> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/seine/TargetCatchDto-update-targetCatch-warning-validation.xml ===================================== @@ -25,6 +25,18 @@ "-//Apache Struts//XWork Validator 1.0.3//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> +  + <field name="species"> + <field-validator type="checkDisabledReferentialOnWarningScope" short-circuit="true"> + <message/> + </field-validator> + </field> +  + <field name="weightCategory"> + <field-validator type="checkDisabledReferentialOnWarningScope" short-circuit="true"> + <message/> + </field-validator> + </field> <field name="catchWeight"> <field-validator type="boundNumber" short-circuit="true"> <param name="min">0.0</param> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/seine/TargetCatchDto-update-targetDiscarded-error-validation.xml ===================================== @@ -25,7 +25,38 @@ "-//Apache Struts//XWork Validator 1.0.3//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> + <field name="species"> +  + <field-validator type="mandatory" short-circuit="true"> + <message/> + </field-validator> +  + <field-validator type="checkDisabledReferentialOnErrorScope" short-circuit="true"> + <message/> + </field-validator> + </field> + <field name="weightCategory"> +  + <field-validator type="mandatory" short-circuit="true"> + <message/> + </field-validator> +  + <field-validator type="checkDisabledReferentialOnErrorScope" short-circuit="true"> + <message/> + </field-validator> + </field> <field name="reasonForDiscard"> +  + <field-validator type="mandatory" short-circuit="true"> + <message/> + </field-validator> +  + <field-validator type="checkDisabledReferentialOnErrorScope" short-circuit="true"> + <message/> + </field-validator> + </field> + <field name="catchWeight"> +  <field-validator type="mandatory" short-circuit="true"> <message/> </field-validator> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/seine/TargetCatchDto-update-targetDiscarded-warning-validation.xml ===================================== @@ -23,6 +23,25 @@ "-//Apache Struts//XWork Validator 1.0.3//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> + + <field name="species"> +  + <field-validator type="checkDisabledReferentialOnWarningScope" short-circuit="true"> + <message/> + </field-validator> + </field> + <field name="weightCategory"> +  + <field-validator type="checkDisabledReferentialOnWarningScope" short-circuit="true"> + <message/> + </field-validator> + </field> + <field name="reasonForDiscard"> +  + <field-validator type="checkDisabledReferentialOnWarningScope" short-circuit="true"> + <message/> + </field-validator> + </field> <field name="catchWeight"> <field-validator type="boundNumber" short-circuit="true"> <param name="min">0.0</param> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/5179bd999663224d3eeb83a6d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/5179bd999663224d3eeb83a6d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Dans le gestionnaire de connexions, un bouton 'dupliquer le profil' serait pratique - Closes #1477
by Tony CHEMIT 07 May '20

07 May '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a4408bcb by Tony Chemit at 2020-05-07T12:49:38+02:00 Dans le gestionnaire de connexions, un bouton 'dupliquer le profil' serait pratique - Closes #1477 - - - - - ce1e84ab by Tony Chemit at 2020-05-07T13:22:48+02:00 Quelques améliorations dans le gestionnaire de connexion - Closes #1479 - - - - - 12 changed files: - client-core/src/main/java/fr/ird/observe/client/util/ObserveKeyStrokesSupport.java - client-datasource-editor-api/src/main/i18n/getters/java.getter - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/presets/RemotePresetsUI.jaxx - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/presets/RemotePresetsUI.jcss - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/presets/RemotePresetsUIHandler.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/presets/actions/DeleteRemote.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/presets/actions/DeleteServer.java - + client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/presets/actions/DuplicateRemote.java - + client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/presets/actions/DuplicateServer.java - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/util/ObserveKeyStrokesSupport.java ===================================== @@ -100,6 +100,7 @@ public abstract class ObserveKeyStrokesSupport { public static final KeyStroke KEY_STROKE_NEW_DATA = KeyStroke.getKeyStroke("pressed F4"); public static final KeyStroke KEY_STROKE_NEW_NEXT_DATA = KeyStroke.getKeyStroke("pressed F9"); public static final KeyStroke KEY_STROKE_DELETE_DATA_GLOBAL = KeyStroke.getKeyStroke("pressed F6"); + public static final KeyStroke KEY_STROKE_DUPLICATE = KeyStroke.getKeyStroke("pressed F2"); public static final KeyStroke KEY_STROKE_MOVE_DATA_GLOBAL = KeyStroke.getKeyStroke("pressed F8"); public static final KeyStroke KEY_STROKE_OPEN_DATA = KeyStroke.getKeyStroke("pressed F2"); public static final KeyStroke KEY_STROKE_CLOSE_DATA = KeyStroke.getKeyStroke("pressed F3"); ===================================== client-datasource-editor-api/src/main/i18n/getters/java.getter ===================================== @@ -32,6 +32,9 @@ observe.action.delete.tip observe.action.detail observe.action.do.backup observe.action.do.backup.tip +observe.action.duplicate +observe.action.duplicate.remote.tip +observe.action.duplicate.server.tip observe.action.goDown observe.action.goDown.tip observe.action.goUp ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/presets/RemotePresetsUI.jaxx ===================================== @@ -39,7 +39,7 @@ <JLabel text='observe.storage.remote.name'/> </cell> <cell weightx='1' fill="both" anchor='east'> - <JTextField id="remoteName" onKeyReleased="model.setRemoteModified(true);"/> + <JTextField id="remoteName" onKeyReleased="handler.setRemoteModified(event);"/> </cell> </row> <row> @@ -47,7 +47,7 @@ <JLabel text='observe.storage.remote.url'/> </cell> <cell weightx='1' fill="both" anchor='east'> - <JTextField id="remoteUrl" onKeyReleased="model.setRemoteModified(true);"/> + <JTextField id="remoteUrl" onKeyReleased="handler.setRemoteModified(event);"/> </cell> </row> <row> @@ -55,7 +55,7 @@ <JLabel text='observe.storage.remote.login'/> </cell> <cell weightx='1' fill="both" anchor='east'> - <JTextField id="remoteLogin" onKeyReleased="model.setRemoteModified(true);"/> + <JTextField id="remoteLogin" onKeyReleased="handler.setRemoteModified(event);"/> </cell> </row> <row> @@ -63,7 +63,7 @@ <JLabel text='observe.storage.remote.password'/> </cell> <cell weightx='1' fill="both" anchor='east'> - <JTextField id="remotePassword" onKeyReleased="model.setRemoteModified(true);"/> + <JTextField id="remotePassword" onKeyReleased="handler.setRemoteModified(event);"/> </cell> </row> <row> @@ -80,6 +80,7 @@ <JButton id="saveRemoteAction"/> <JButton id="deleteRemoteAction"/> <JButton id="testRemoteAction"/> + <JButton id="duplicateRemoteAction"/> </JPanel> </cell> </row> @@ -99,7 +100,7 @@ <JLabel text='observe.storage.remote.name'/> </cell> <cell weightx='1' fill="both" anchor='east'> - <JTextField id="serverName" onKeyReleased="model.setServerModified(true);"/> + <JTextField id="serverName" onKeyReleased="handler.setServerModified(event);"/> </cell> </row> <row> @@ -107,7 +108,7 @@ <JLabel text='observe.storage.remote.url'/> </cell> <cell weightx='1' fill="both" anchor='east'> - <JTextField id="serverUrl" onKeyReleased="model.setServerModified(true);"/> + <JTextField id="serverUrl" onKeyReleased="handler.setServerModified(event);"/> </cell> </row> <row> @@ -115,7 +116,7 @@ <JLabel text='observe.storage.remote.login'/> </cell> <cell weightx='1' fill="both" anchor='east'> - <JTextField id="serverLogin" onKeyReleased="model.setServerModified(true);"/> + <JTextField id="serverLogin" onKeyReleased="handler.setServerModified(event);"/> </cell> </row> <row> @@ -123,7 +124,7 @@ <JLabel text='observe.storage.remote.password'/> </cell> <cell weightx='1' fill="both" anchor='east'> - <JTextField id="serverPassword" onKeyReleased="model.setServerModified(true);"/> + <JTextField id="serverPassword" onKeyReleased="handler.setServerModified(event);"/> </cell> </row> <row> @@ -131,7 +132,7 @@ <JLabel id="serverDataBaseLabel" text='observe.storage.server.dataBase'/> </cell> <cell weightx='1' fill="both" anchor='east'> - <JTextField id="serverDataBase" onKeyReleased="model.setServerModified(true);"/> + <JTextField id="serverDataBase" onKeyReleased="handler.setServerModified(event);"/> </cell> </row> @@ -143,6 +144,7 @@ <JButton id="saveServerAction"/> <JButton id="deleteServerAction"/> <JButton id="testServerAction"/> + <JButton id="duplicateServerAction"/> </JPanel> </cell> </row> ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/presets/RemotePresetsUI.jcss ===================================== @@ -85,6 +85,10 @@ text:{SwingUtil.getStringValue(model.getServerDataSourceConfiguration().getDatabaseName())}; } +#resetRemoteAction { + enabled:{model.isRemoteModified()}; +} + #saveRemoteAction { enabled:{model.isRemoteModified()}; } ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/presets/RemotePresetsUIHandler.java ===================================== @@ -55,11 +55,11 @@ public class RemotePresetsUIHandler implements UIHandler<RemotePresetsUI>, WithC private static final Logger log = LogManager.getLogger(RemotePresetsUIHandler.class); -// private RemotePresetsUI ui; + private RemotePresetsUI ui; @Override public void beforeInit(RemotePresetsUI ui) { -// this.ui = ui; + this.ui = ui; RemotePresetsUIModel model = new RemotePresetsUIModel(); ClientConfig config = getClientConfig(); model.setServerDataSourceConfigurations(config.getServerDataSourceConfigurationList()); @@ -98,6 +98,7 @@ public class RemotePresetsUIHandler implements UIHandler<RemotePresetsUI>, WithC ui.getModel().setRemoteModified(false); } else { ui.getModel().setRemoteDataSourceConfiguration(ui.getRemoteConfigurations().getSelectedValue()); + ui.getRemoteName().requestFocusInWindow(); } }); @@ -126,7 +127,6 @@ public class RemotePresetsUIHandler implements UIHandler<RemotePresetsUI>, WithC ui.getRemoteForm().setVisible(true); ui.getRemoteContentPanel().remove(ui.getNoRemoteSelected()); ui.getRemoteContentPanel().add(ui.getRemoteForm(), BorderLayout.CENTER); - ui.getRemoteName().requestFocusInWindow(); } ui.getModel().setRemoteModified(false); } @@ -137,10 +137,12 @@ public class RemotePresetsUIHandler implements UIHandler<RemotePresetsUI>, WithC if ((Boolean) evt.getNewValue()) { remoteActions.remove(ui.getResetRemoteAction()); remoteActions.remove(ui.getDeleteRemoteAction()); + remoteActions.remove(ui.getDuplicateRemoteAction()); remoteActions.add(ui.getCancelRemoteAction(), 0); } else { remoteActions.add(ui.getResetRemoteAction(), 0); remoteActions.add(ui.getDeleteRemoteAction(), 2); + remoteActions.add(ui.getDeleteRemoteAction()); remoteActions.remove(ui.getCancelRemoteAction()); } }); @@ -160,6 +162,7 @@ public class RemotePresetsUIHandler implements UIHandler<RemotePresetsUI>, WithC ui.getModel().setServerModified(false); } else { ui.getModel().setServerDataSourceConfiguration(ui.getServerConfigurations().getSelectedValue()); + ui.getServerName().requestFocusInWindow(); } }); @@ -188,7 +191,6 @@ public class RemotePresetsUIHandler implements UIHandler<RemotePresetsUI>, WithC ui.getServerForm().setVisible(true); ui.getServerContentPanel().remove(ui.getNoServerSelected()); ui.getServerContentPanel().add(ui.getServerForm(), BorderLayout.CENTER); - ui.getServerName().requestFocusInWindow(); } ui.getModel().setServerModified(false); } @@ -200,11 +202,13 @@ public class RemotePresetsUIHandler implements UIHandler<RemotePresetsUI>, WithC if ((Boolean) evt.getNewValue()) { serverActions.remove(ui.getResetServerAction()); serverActions.remove(ui.getDeleteServerAction()); + serverActions.remove(ui.getDuplicateServerAction()); serverActions.add(ui.getCancelServerAction(), 0); } else { serverActions.add(ui.getResetServerAction(), 0); serverActions.add(ui.getDeleteServerAction(), 2); + serverActions.add(ui.getDuplicateServerAction()); serverActions.remove(ui.getCancelServerAction()); } }); @@ -218,7 +222,21 @@ public class RemotePresetsUIHandler implements UIHandler<RemotePresetsUI>, WithC editor.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT) .put(KeyStroke.getKeyStroke(KeyEvent.VK_F6, 0), "none"); } -// + + protected void setServerModified(KeyEvent event) { + if (event.isActionKey()) { + return; + } + ui.getModel().setServerModified(true); + } + + protected void setRemoteModified(KeyEvent event) { + if (event.isActionKey()) { + return; + } + ui.getModel().setRemoteModified(true); + } + // protected void init(InputMap inputMap, ActionMap actionMap, AbstractButton editor) { // String actionId = (String) editor.getClientProperty(OBSERVE_ACTION); // if (actionId == null) { ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/presets/actions/DeleteRemote.java ===================================== @@ -65,6 +65,8 @@ public class DeleteRemote extends RemoteActionSupport { ui.getModel().setRemoteDataSourceConfigurations(configurations); getClientConfig().removeRemoteDataSourceConfiguration(configuration); ui.getModel().setRemoteDataSourceConfiguration(null); + int newConfiguration = configurations.isEmpty() ? -1 : 0; + ui.getRemoteConfigurations().setSelectedIndex(newConfiguration); } } } ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/presets/actions/DeleteServer.java ===================================== @@ -31,6 +31,7 @@ import javax.swing.JOptionPane; import java.awt.event.ActionEvent; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import static io.ultreia.java4all.i18n.I18n.n; import static io.ultreia.java4all.i18n.I18n.t; @@ -67,6 +68,8 @@ public class DeleteServer extends ServerActionSupport { ui.getModel().setServerDataSourceConfigurations(configurations); getClientConfig().removeServerDataSourceConfiguration(configuration); ui.getModel().setServerDataSourceConfiguration(null); + int newConfiguration = configurations.isEmpty() ? -1 : 0; + ui.getServerConfigurations().setSelectedIndex(newConfiguration); } } ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/presets/actions/DuplicateRemote.java ===================================== @@ -0,0 +1,59 @@ +package fr.ird.observe.client.datasource.editor.wizard.presets.actions; + +/*- + * #%L + * ObServe :: Client DataSource Editor API + * %% + * Copyright (C) 2008 - 2020 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.datasource.editor.wizard.presets.RemotePresetsUI; +import fr.ird.observe.client.util.ObserveKeyStrokesSupport; +import fr.ird.observe.dto.presets.RemoteDataSourceConfiguration; + +import java.awt.event.ActionEvent; +import java.util.ArrayList; +import java.util.List; + +import static io.ultreia.java4all.i18n.I18n.n; + +public class DuplicateRemote extends RemoteActionSupport { + + public DuplicateRemote() { + super(n("observe.action.duplicate"), n("observe.action.duplicate.remote.tip"), "mode-create", ObserveKeyStrokesSupport.KEY_STROKE_DUPLICATE); + } + + @Override + protected void doActionPerformed(ActionEvent event, RemotePresetsUI ui) { + + RemoteDataSourceConfiguration incomingConfiguration = ui.getModel().getRemoteDataSourceConfiguration(); + + RemoteDataSourceConfiguration configuration = new RemoteDataSourceConfiguration(); + + configuration.setLogin(incomingConfiguration.getLogin()); + configuration.setPassword(incomingConfiguration.getPassword()); + configuration.setName(incomingConfiguration.getName() + " (Copie)"); + configuration.setUrl(incomingConfiguration.getUrl()); + + List<RemoteDataSourceConfiguration> configurations = new ArrayList<>(ui.getModel().getRemoteDataSourceConfigurations()); + configurations.add(configuration); + ui.getModel().setRemoteDataSourceConfigurations(configurations); + ui.getModel().setRemoteCreateMode(true); + ui.getRemoteConfigurations().setSelectedValue(configuration, true); + } +} ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/presets/actions/DuplicateServer.java ===================================== @@ -0,0 +1,62 @@ +package fr.ird.observe.client.datasource.editor.wizard.presets.actions; + +/*- + * #%L + * ObServe :: Client DataSource Editor API + * %% + * Copyright (C) 2008 - 2020 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.datasource.editor.wizard.presets.RemotePresetsUI; +import fr.ird.observe.client.util.ObserveKeyStrokesSupport; +import fr.ird.observe.dto.presets.ServerDataSourceConfiguration; + +import java.awt.event.ActionEvent; +import java.util.ArrayList; +import java.util.List; + +import static io.ultreia.java4all.i18n.I18n.n; + +public class DuplicateServer extends ServerActionSupport { + + public DuplicateServer() { + super(n("observe.action.duplicate"), n("observe.action.duplicate.server.tip"), "mode-create", ObserveKeyStrokesSupport.KEY_STROKE_DUPLICATE); + } + + @Override + protected void doActionPerformed(ActionEvent event, RemotePresetsUI ui) { + + ServerDataSourceConfiguration incomingConfiguration = ui.getModel().getServerDataSourceConfiguration(); + ServerDataSourceConfiguration configuration = new ServerDataSourceConfiguration(); + + configuration.setDatabaseName(incomingConfiguration.getDatabaseName()); + configuration.setLogin(incomingConfiguration.getLogin()); + configuration.setPassword(incomingConfiguration.getPassword()); + configuration.setName(incomingConfiguration.getName()+" (Copie)"); + configuration.setUrl(incomingConfiguration.getUrl()); + + List<ServerDataSourceConfiguration> configurations = new ArrayList<>(ui.getModel().getServerDataSourceConfigurations()); + configurations.add(configuration); + ui.getModel().setServerDataSourceConfigurations(configurations); + ui.getModel().setServerCreateMode(true); + ui.getServerConfigurations().setSelectedValue(configuration, true); + + } + + +} ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -98,6 +98,9 @@ observe.action.delete.tip=Delete observe.action.detail=Details observe.action.do.backup=Backup local database observe.action.do.backup.tip=Make a backup of local database before applying modifications. +observe.action.duplicate=Duplicate +observe.action.duplicate.remote.tip=Duplicate remote +observe.action.duplicate.server.tip=Duplicate server observe.action.exit=Quit observe.action.exit.tip=quit Observe observe.action.export.requiredInsertMissingReferentials=Insert into central source missing referentials ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -98,6 +98,9 @@ observe.action.delete.tip=Eliminar observe.action.detail=Ver detalles observe.action.do.backup=Guardar la base local observe.action.do.backup.tip=Hacer copia de seguridad de la base local antes de aplicar los cambios +observe.action.duplicate=Duplicate \#TODO +observe.action.duplicate.remote.tip=Duplicate remote \#TODO +observe.action.duplicate.server.tip=Duplicate server \#TODO observe.action.exit=Salir observe.action.exit.tip=Salir de ObServe observe.action.export.requiredInsertMissingReferentials=Insérer les référentiels manquant dans la source centrale. \#TODO ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -98,6 +98,9 @@ observe.action.delete.tip=Supprimer observe.action.detail=Voir les détails observe.action.do.backup=Sauver la base locale observe.action.do.backup.tip=Effectuer une sauvegarde de la base locale avant d'appliquer les changements +observe.action.duplicate=Dupliquer +observe.action.duplicate.remote.tip=Duplicate la connexion distante +observe.action.duplicate.server.tip=Duplicate la connexion server observe.action.exit=Quitter observe.action.exit.tip=Quitter ObServe observe.action.export.requiredInsertMissingReferentials=Insérer les référentiels manquant dans la source centrale. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/b0a06df8d54f9ea01274ecbf… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/b0a06df8d54f9ea01274ecbf… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Absence du gestionnaire de connexions - Closes #1476
by Tony CHEMIT 07 May '20

07 May '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b0a06df8 by Tony Chemit at 2020-05-07T12:04:38+02:00 Absence du gestionnaire de connexions - Closes #1476 - - - - - 1 changed file: - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/DataSourceEditorBodyContent.java Changes: ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/DataSourceEditorBodyContent.java ===================================== @@ -94,7 +94,7 @@ public class DataSourceEditorBodyContent extends MainUIBodyContent<DataSourceEdi navigationMenu.getUiModel().init(); getClientUIContext().getBusyModel().addPropertyChangeListener(BusyModel.BUSY_PROPERTY_NAME, evt -> reload()); - ShowDataSourcePresetsAction.init(mainUI, mainUI.getShowDataSourcePresets()); + ShowDataSourcePresetsAction.init(mainUI, mainUI.getShowDataSourcePresets(), ShowDataSourcePresetsAction.class); } // @Override View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/b0a06df8d54f9ea01274ecbfe… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/b0a06df8d54f9ea01274ecbfe… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] update pom
by Tony CHEMIT 07 May '20

07 May '20

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 4a0ed593 by Tony Chemit at 2020-05-07T11:57:10+02:00 update pom - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2020.19</version> + <version>2020.21</version> </parent> <groupId>fr.ird.observe</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/4a0ed59368166bc4615954762… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/4a0ed59368166bc4615954762… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Fichiers de traductions manquants - Closes #1478
by Tony CHEMIT 07 May '20

07 May '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 06bf6f53 by Tony Chemit at 2020-05-07T11:51:09+02:00 Fichiers de traductions manquants - Closes #1478 - - - - - 3 changed files: - + client-core/src/main/i18n/templates/initStorage_en_GB.ftl - + client-core/src/main/i18n/templates/initStorage_es_ES.ftl - + client-core/src/main/i18n/templates/initStorage_fr_FR.ftl Changes: ===================================== client-core/src/main/i18n/templates/initStorage_en_GB.ftl ===================================== @@ -0,0 +1,43 @@ +<#-- + #%L + ObServe :: Client Core + %% + Copyright (C) 2008 - 2020 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% +--> + +<html> +<body> + +<h3>Loading a data sourced</h3> + +<p> + The local database does not exist (path ${localDb.absolutePath}). +</p> + +You can now: + +<ul> +<#if withBackup> + <li>use last automatic backup (${backupDate})</li> +</#if> + <li>create a new local database</li> + <li>connect to a remote database</li> +</ul> + +</body> +</html> ===================================== client-core/src/main/i18n/templates/initStorage_es_ES.ftl ===================================== @@ -0,0 +1,42 @@ +<#-- + #%L + ObServe :: Client Core + %% + Copyright (C) 2008 - 2020 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% +--> +<html> +<body> + +<h3>Importar una base de datos</h3> + +<p> + La base local no existe (ruta ${localDb.absolutePath}). +</p> + +Ahora puede: + +<ul> +<#if withBackup> + <li>Utilizar la última copia de seguridad automática (${backupDate})</li> +</#if> + <li>Crear una base local nueva</li> + <li>Conectar a una base remota</li> +</ul> + +</body> +</html> ===================================== client-core/src/main/i18n/templates/initStorage_fr_FR.ftl ===================================== @@ -0,0 +1,42 @@ +<#-- + #%L + ObServe :: Client Core + %% + Copyright (C) 2008 - 2020 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% +--> +<html> +<body> + +<h3>Chargement d'une source de donnée</h3> + +<p> + La base locale n'existe pas (emplacement ${localDb.absolutePath}). +</p> + +Vous pouvez à ce stade + +<ul> +<#if withBackup> + <li>utiliser la dernière sauvegarde automatique (${backupDate})</li> +</#if> + <li>créer la base locale</li> + <li>vous connecter à une base distante.</li> +</ul> + +</body> +</html> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/06bf6f53bb7b0208cce758e69… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/06bf6f53bb7b0208cce758e69… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] update pom
by Tony CHEMIT 05 May '20

05 May '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 2c347a6e by Tony Chemit at 2020-04-25T17:41:55+02:00 update pom - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2020.19</version> + <version>2020.21</version> </parent> <groupId>fr.ird.observe</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/2c347a6e62b3d1659360eee49… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/2c347a6e62b3d1659360eee49… You're receiving this email because of your account on gitlab.com.

1 0