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

[Git][ultreiaio/ird-observe][develop] Pouvoir ajouter une connexion directe ou serveur depuis l'écran de gestion des…
by Tony CHEMIT 17 Aug '17

17 Aug '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 08505b7c by Tony CHEMIT at 2017-08-17T16:17:45+02:00 Pouvoir ajouter une connexion directe ou serveur depuis l'écran de gestion des connexions (See #842) - - - - - 26 changed files: - client/src/main/java/fr/ird/observe/client/ui/actions/UIActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/actions/main/global/DeleteDataGlobalUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/main/global/NewNextDataGlobalUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/main/global/ResetDataGlobalUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/main/global/SaveDataGlobalUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/storage/SaveCurrentRemoteConfigurationUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/storage/SaveCurrentServerConfigurationUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/CreatePresetUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/DeleteRemoteUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/DeleteServerUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/PresetsUIActionSupport.java - + client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/QuitPresetsUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/ResetRemoteUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/ResetServerUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/SaveRemoteUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/SaveServerUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/TestRemoteUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/TestServerUIAction.java - client/src/main/java/fr/ird/observe/client/ui/storage/StorageUIModel.java - client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUI.jcss - client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUIModel.java - client/src/main/resources/i18n/client_en_GB.properties - client/src/main/resources/i18n/client_es_ES.properties - client/src/main/resources/i18n/client_fr_FR.properties Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/UIActionSupport.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/UIActionSupport.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/UIActionSupport.java @@ -53,7 +53,7 @@ public abstract class UIActionSupport extends AbstractAction { private static final long serialVersionUID = 1L; public static final String EDITOR = "editor"; - protected static final String CLIENT_PROPERTY_UI = "ui"; + public static final String CLIENT_PROPERTY_UI = "ui"; private final ObserveMainUI mainUI; ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/main/global/DeleteDataGlobalUIAction.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/main/global/DeleteDataGlobalUIAction.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/main/global/DeleteDataGlobalUIAction.java @@ -24,10 +24,12 @@ package fr.ird.observe.client.ui.actions.main.global; import fr.ird.observe.client.ui.ObserveKeyStrokes; import fr.ird.observe.client.ui.ObserveMainUI; +import fr.ird.observe.client.ui.ObserveUIMode; import fr.ird.observe.client.ui.actions.UIActionSupport; import fr.ird.observe.client.ui.content.ContentUI; import fr.ird.observe.client.ui.content.ref.ContentReferenceUI; import fr.ird.observe.client.ui.content.table.ContentTableUI; +import fr.ird.observe.client.ui.storage.presets.RemotePresetsUI; import java.util.Objects; import javax.swing.JButton; @@ -47,19 +49,35 @@ public class DeleteDataGlobalUIAction extends GlobalUIActionSupport { @Override protected UIActionSupport getDelegateAction(ContentUI<?, ?> contentUI) { - JButton button; - if (contentUI instanceof ContentTableUI) { - ContentTableUI ui = (ContentTableUI) contentUI; - button = ui.getDeleteEntry(); - } else if (contentUI instanceof ContentReferenceUI) { - ContentReferenceUI ui = (ContentReferenceUI) contentUI; - if (ui.getModel().isEditing()) { - button = ui.getDeleteFromDetail(); - } else { - button = ui.getDeleteFromList(); + JButton button = null; + if (contentUI == null) { + + if (ObserveUIMode.PRESETS == getMainUI().getModel().getMode()) { + RemotePresetsUI presetsUI = (RemotePresetsUI) getMainUI().getDataSourcePresets().getContentContainer(); + switch (presetsUI.getTabs().getSelectedIndex()) { + case 0: + button = presetsUI.getDeleteRemoteAction(); + break; + case 1: + button = presetsUI.getDeleteServerAction(); + break; + + } } } else { - button = (JButton) contentUI.getObjectById("delete"); + if (contentUI instanceof ContentTableUI) { + ContentTableUI ui = (ContentTableUI) contentUI; + button = ui.getDeleteEntry(); + } else if (contentUI instanceof ContentReferenceUI) { + ContentReferenceUI ui = (ContentReferenceUI) contentUI; + if (ui.getModel().isEditing()) { + button = ui.getDeleteFromDetail(); + } else { + button = ui.getDeleteFromList(); + } + } else { + button = (JButton) contentUI.getObjectById("delete"); + } } Objects.requireNonNull(button); UIActionSupport action = (UIActionSupport) button.getAction(); ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/main/global/NewNextDataGlobalUIAction.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/main/global/NewNextDataGlobalUIAction.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/main/global/NewNextDataGlobalUIAction.java @@ -24,12 +24,14 @@ package fr.ird.observe.client.ui.actions.main.global; import fr.ird.observe.client.ui.ObserveKeyStrokes; import fr.ird.observe.client.ui.ObserveMainUI; +import fr.ird.observe.client.ui.ObserveUIMode; import fr.ird.observe.client.ui.actions.UIActionSupport; import fr.ird.observe.client.ui.content.ContentUI; import fr.ird.observe.client.ui.content.list.ContentListUI; import fr.ird.observe.client.ui.content.open.ContentOpenableUI; import fr.ird.observe.client.ui.content.ref.ContentReferenceUI; import fr.ird.observe.client.ui.content.table.ContentTableUI; +import fr.ird.observe.client.ui.storage.presets.RemotePresetsUI; import javax.swing.JButton; /** @@ -49,18 +51,27 @@ public class NewNextDataGlobalUIAction extends GlobalUIActionSupport { @Override protected UIActionSupport getDelegateAction(ContentUI<?, ?> contentUI) { JButton button = null; - if (contentUI instanceof ContentListUI) { - ContentListUI ui = (ContentListUI) contentUI; - button = ui.getCreate(); - } else if (contentUI instanceof ContentOpenableUI) { - ContentOpenableUI ui = (ContentOpenableUI) contentUI; - button = ui.getCloseAndCreate(); - } else if (contentUI instanceof ContentTableUI) { - ContentTableUI ui = (ContentTableUI) contentUI; - button = ui.getNewEntry(); - } else if (contentUI instanceof ContentReferenceUI) { - ContentReferenceUI ui = (ContentReferenceUI) contentUI; - button = ui.getCreate(); + if (contentUI == null) { + + if (ObserveUIMode.PRESETS == getMainUI().getModel().getMode()) { + RemotePresetsUI presetsUI = (RemotePresetsUI) getMainUI().getDataSourcePresets().getContentContainer(); + button = presetsUI.getCreateAction(); + } + } else { + + if (contentUI instanceof ContentListUI) { + ContentListUI ui = (ContentListUI) contentUI; + button = ui.getCreate(); + } else if (contentUI instanceof ContentOpenableUI) { + ContentOpenableUI ui = (ContentOpenableUI) contentUI; + button = ui.getCloseAndCreate(); + } else if (contentUI instanceof ContentTableUI) { + ContentTableUI ui = (ContentTableUI) contentUI; + button = ui.getNewEntry(); + } else if (contentUI instanceof ContentReferenceUI) { + ContentReferenceUI ui = (ContentReferenceUI) contentUI; + button = ui.getCreate(); + } } return button == null ? null : (UIActionSupport) button.getAction(); } ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/main/global/ResetDataGlobalUIAction.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/main/global/ResetDataGlobalUIAction.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/main/global/ResetDataGlobalUIAction.java @@ -24,8 +24,10 @@ package fr.ird.observe.client.ui.actions.main.global; import fr.ird.observe.client.ui.ObserveKeyStrokes; import fr.ird.observe.client.ui.ObserveMainUI; +import fr.ird.observe.client.ui.ObserveUIMode; import fr.ird.observe.client.ui.actions.UIActionSupport; import fr.ird.observe.client.ui.content.ContentUI; +import fr.ird.observe.client.ui.storage.presets.RemotePresetsUI; import javax.swing.JButton; /** @@ -45,7 +47,24 @@ public class ResetDataGlobalUIAction extends GlobalUIActionSupport { @Override protected UIActionSupport getDelegateAction(ContentUI<?, ?> contentUI) { UIActionSupport action = null; - JButton button = (JButton) contentUI.getObjectById("reset"); + JButton button = null; + if (contentUI == null) { + + if (ObserveUIMode.PRESETS == getMainUI().getModel().getMode()) { + RemotePresetsUI presetsUI = (RemotePresetsUI) getMainUI().getDataSourcePresets().getContentContainer(); + switch (presetsUI.getTabs().getSelectedIndex()) { + case 0: + button = presetsUI.getResetRemoteAction(); + break; + case 1: + button = presetsUI.getResetServerAction(); + break; + + } + } + } else { + button = (JButton) contentUI.getObjectById("reset"); + } if (button != null) { action = (UIActionSupport) button.getAction(); } ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/main/global/SaveDataGlobalUIAction.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/main/global/SaveDataGlobalUIAction.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/main/global/SaveDataGlobalUIAction.java @@ -24,8 +24,10 @@ package fr.ird.observe.client.ui.actions.main.global; import fr.ird.observe.client.ui.ObserveKeyStrokes; import fr.ird.observe.client.ui.ObserveMainUI; +import fr.ird.observe.client.ui.ObserveUIMode; import fr.ird.observe.client.ui.actions.UIActionSupport; import fr.ird.observe.client.ui.content.ContentUI; +import fr.ird.observe.client.ui.storage.presets.RemotePresetsUI; import javax.swing.JButton; /** @@ -45,7 +47,25 @@ public class SaveDataGlobalUIAction extends GlobalUIActionSupport { @Override protected UIActionSupport getDelegateAction(ContentUI<?, ?> contentUI) { UIActionSupport action = null; - JButton button = (JButton) contentUI.getObjectById("save"); + + JButton button = null; + if (contentUI == null) { + + if (ObserveUIMode.PRESETS == getMainUI().getModel().getMode()) { + RemotePresetsUI presetsUI = (RemotePresetsUI) getMainUI().getDataSourcePresets().getContentContainer(); + switch (presetsUI.getTabs().getSelectedIndex()) { + case 0: + button = presetsUI.getSaveRemoteAction(); + break; + case 1: + button = presetsUI.getSaveServerAction(); + break; + + } + } + } else { + button = (JButton) contentUI.getObjectById("save"); + } if (button != null) { action = (UIActionSupport) button.getAction(); } ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/storage/SaveCurrentRemoteConfigurationUIAction.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/storage/SaveCurrentRemoteConfigurationUIAction.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/storage/SaveCurrentRemoteConfigurationUIAction.java @@ -24,10 +24,10 @@ package fr.ird.observe.client.ui.actions.storage; import fr.ird.observe.client.ObserveSwingApplicationContext; import fr.ird.observe.client.ui.ObserveMainUI; -import fr.ird.observe.client.ui.util.UIHelper; import fr.ird.observe.client.ui.actions.main.menu.MenuActionSupport; import fr.ird.observe.client.ui.storage.StorageUIModel; import fr.ird.observe.client.ui.storage.tabs.ConfigUI; +import fr.ird.observe.client.ui.util.UIHelper; import fr.ird.observe.services.dto.presets.RemoteDataSourceConfiguration; import java.awt.Dimension; import java.awt.GridLayout; @@ -118,6 +118,6 @@ public class SaveCurrentRemoteConfigurationUIAction extends MenuActionSupport { configuration.setPassword(new String(model.getRemotePassword())); configuration.setUseSsl(model.isUseSsl()); ObserveSwingApplicationContext.get().getConfig().addRemoteDataSourceConfiguration(configuration); - configUI.getHandler().addRemoteConfiguration(configuration); + configUI.getHandler().addRemoteConfiguration(getMainUI(), configuration, configUI.getRemoteMenu().getComponentCount() - 2); } } ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/storage/SaveCurrentServerConfigurationUIAction.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/storage/SaveCurrentServerConfigurationUIAction.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/storage/SaveCurrentServerConfigurationUIAction.java @@ -23,10 +23,10 @@ package fr.ird.observe.client.ui.actions.storage; */ import fr.ird.observe.client.ui.ObserveMainUI; -import fr.ird.observe.client.ui.util.UIHelper; import fr.ird.observe.client.ui.actions.main.menu.MenuActionSupport; import fr.ird.observe.client.ui.storage.StorageUIModel; import fr.ird.observe.client.ui.storage.tabs.ConfigUI; +import fr.ird.observe.client.ui.util.UIHelper; import fr.ird.observe.services.dto.presets.ServerDataSourceConfiguration; import java.awt.Dimension; import java.awt.GridLayout; @@ -59,10 +59,6 @@ public class SaveCurrentServerConfigurationUIAction extends MenuActionSupport { super(mainUI, ACTION_NAME, t("observe.storage.serverConfiguration.presets.save"), t("observe.storage.serverConfiguration.presets.save"), "save", 'S'); } - public SaveCurrentServerConfigurationUIAction(ConfigUI mainUI) { - super(null, ACTION_NAME, t("observe.storage.serverConfiguration.presets.save"), t("observe.storage.serverConfiguration.presets.save"), "save", 'S'); - } - @Override protected void doActionPerformed(ActionEvent e) { @@ -122,7 +118,7 @@ public class SaveCurrentServerConfigurationUIAction extends MenuActionSupport { configuration.setDatabaseName(model.getServerDatabase()); getMainUI().getConfig().addServerDataSourceConfiguration(configuration); - configUI.getHandler().addServerConfiguration(configuration); + configUI.getHandler().addServerConfiguration(getMainUI(), configuration, configUI.getServerMenu().getComponentCount() - 2); } } ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/CreatePresetUIAction.java ===================================== --- /dev/null +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/CreatePresetUIAction.java @@ -0,0 +1,76 @@ +package fr.ird.observe.client.ui.actions.storage.presets; + +/*- + * #%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.ui.ObserveKeyStrokes; +import fr.ird.observe.client.ui.ObserveMainUI; +import fr.ird.observe.client.ui.storage.presets.RemotePresetsUI; +import fr.ird.observe.services.dto.presets.RemoteDataSourceConfiguration; +import fr.ird.observe.services.dto.presets.ServerDataSourceConfiguration; +import java.util.ArrayList; +import java.util.List; + + +import static org.nuiton.i18n.I18n.n; + +/** + * Created by tchemit on 17/08/17. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public class CreatePresetUIAction extends PresetsUIActionSupport { + + public static final String ACTION_NAME = CreatePresetUIAction.class.getName(); + + public CreatePresetUIAction(ObserveMainUI mainUI) { + super(mainUI, ACTION_NAME, n("observe.action.presets.create"), n("observe.action.presets.create.tip"), "add", ObserveKeyStrokes.KEY_STROKE_NEW_NEXT_DATA); + } + + @Override + protected void doActionPerformed(RemotePresetsUI ui) { + + switch (ui.getTabs().getSelectedIndex()) { + case 0: { + RemoteDataSourceConfiguration configuration = new RemoteDataSourceConfiguration(); + configuration.setName("Change me"); + List<RemoteDataSourceConfiguration> configurations = new ArrayList<>(ui.getModel().getRemoteDataSourceConfigurations()); + configurations.add(configuration); + ui.getModel().setRemoteDataSourceConfigurations(configurations); + + ui.getRemoteConfigurations().setSelectedValue(configuration, true); + } + break; + case 1: { + ServerDataSourceConfiguration configuration = new ServerDataSourceConfiguration(); + configuration.setName("Change me"); + + List<ServerDataSourceConfiguration> configurations = new ArrayList<>(ui.getModel().getServerDataSourceConfigurations()); + configurations.add(configuration); + ui.getModel().setServerDataSourceConfigurations(configurations); + ui.getServerConfigurations().setSelectedValue(configuration, true); + } + break; + } + + } +} ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/DeleteRemoteUIAction.java ===================================== --- /dev/null +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/DeleteRemoteUIAction.java @@ -0,0 +1,75 @@ +package fr.ird.observe.client.ui.actions.storage.presets; + +/*- + * #%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.ObserveSwingApplicationContext; +import fr.ird.observe.client.ui.ObserveKeyStrokes; +import fr.ird.observe.client.ui.ObserveMainUI; +import fr.ird.observe.client.ui.storage.presets.RemotePresetsUI; +import fr.ird.observe.client.ui.util.UIHelper; +import fr.ird.observe.services.dto.presets.RemoteDataSourceConfiguration; +import fr.ird.observe.services.dto.presets.ServerDataSourceConfiguration; +import java.util.ArrayList; +import java.util.List; +import javax.swing.JOptionPane; +import org.nuiton.decorator.Decorator; + + +import static org.nuiton.i18n.I18n.n; +import static org.nuiton.i18n.I18n.t; + +/** + * Created by tchemit on 17/08/17. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public class DeleteRemoteUIAction extends PresetsUIActionSupport { + + public static final String ACTION_NAME = DeleteRemoteUIAction.class.getName(); + + public DeleteRemoteUIAction(ObserveMainUI mainUI) { + super(mainUI, ACTION_NAME, n("observe.action.delete"), n("observe.action.delete.remote.tip"), "delete", ObserveKeyStrokes.KEY_STROKE_DELETE_DATA_GLOBAL); + } + + @Override + protected void doActionPerformed(RemotePresetsUI ui) { + + Decorator<RemoteDataSourceConfiguration> decorator = ObserveSwingApplicationContext.get().getDecoratorService().getDecoratorByType(RemoteDataSourceConfiguration.class); + RemoteDataSourceConfiguration configuration = ui.getModel().getRemoteDataSourceConfiguration(); + int response = UIHelper.askUser(t("observe.storage.presets.delete.title"), + t("observe.storage.presets.delete.message", decorator.toString(configuration)), + JOptionPane.QUESTION_MESSAGE, + new Object[]{t("observe.action.delete"), t("observe.action.cancel")}, + 0); + boolean delete = response == 0; + + if (delete) { + + List<RemoteDataSourceConfiguration> configurations = new ArrayList<>(ui.getModel().getRemoteDataSourceConfigurations()); + configurations.remove(configuration); + ui.getModel().setRemoteDataSourceConfigurations(configurations); + ObserveSwingApplicationContext.get().getConfig().removeRemoteDataSourceConfiguration(configuration); + ui.getModel().setRemoteDataSourceConfiguration(null); + } + } +} ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/DeleteServerUIAction.java ===================================== --- /dev/null +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/DeleteServerUIAction.java @@ -0,0 +1,77 @@ +package fr.ird.observe.client.ui.actions.storage.presets; + +/*- + * #%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.ObserveSwingApplicationContext; +import fr.ird.observe.client.ui.ObserveKeyStrokes; +import fr.ird.observe.client.ui.ObserveMainUI; +import fr.ird.observe.client.ui.storage.presets.RemotePresetsUI; +import fr.ird.observe.client.ui.util.UIHelper; +import fr.ird.observe.services.dto.presets.ServerDataSourceConfiguration; +import java.util.ArrayList; +import java.util.List; +import javax.swing.JOptionPane; +import org.nuiton.decorator.Decorator; + + +import static org.nuiton.i18n.I18n.n; +import static org.nuiton.i18n.I18n.t; + +/** + * Created by tchemit on 17/08/17. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public class DeleteServerUIAction extends PresetsUIActionSupport { + + public static final String ACTION_NAME = DeleteServerUIAction.class.getName(); + + public DeleteServerUIAction(ObserveMainUI mainUI) { + super(mainUI, ACTION_NAME, n("observe.action.delete"), n("observe.action.delete.server.tip"), "delete", ObserveKeyStrokes.KEY_STROKE_DELETE_DATA_GLOBAL); + } + + @Override + protected void doActionPerformed(RemotePresetsUI ui) { + + Decorator<ServerDataSourceConfiguration> decorator = ObserveSwingApplicationContext.get().getDecoratorService().getDecoratorByType(ServerDataSourceConfiguration.class); + ServerDataSourceConfiguration configuration = ui.getModel().getServerDataSourceConfiguration(); + + int response = UIHelper.askUser(t("observe.storage.presets.delete.title"), + t("observe.storage.presets.delete.message", decorator.toString(configuration)), + JOptionPane.QUESTION_MESSAGE, + new Object[]{t("observe.action.delete"), t("observe.action.cancel")}, + 0 + ); + boolean delete = response == 0; + + if (delete) { + + List<ServerDataSourceConfiguration> configurations = new ArrayList<>(ui.getModel().getServerDataSourceConfigurations()); + configurations.remove(configuration); + ui.getModel().setServerDataSourceConfigurations(configurations); + ObserveSwingApplicationContext.get().getConfig().removeServerDataSourceConfiguration(configuration); + ui.getModel().setServerDataSourceConfiguration(null); + } + + } +} ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/PresetsUIActionSupport.java ===================================== --- /dev/null +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/PresetsUIActionSupport.java @@ -0,0 +1,58 @@ +package fr.ird.observe.client.ui.actions.storage.presets; + +/*- + * #%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.ui.ObserveMainUI; +import fr.ird.observe.client.ui.actions.UIActionSupport; +import fr.ird.observe.client.ui.storage.presets.RemotePresetsUI; +import java.awt.event.ActionEvent; +import javax.swing.KeyStroke; + +/** + * Created by tchemit on 17/08/17. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public abstract class PresetsUIActionSupport extends UIActionSupport { + + PresetsUIActionSupport(ObserveMainUI mainUI, String actionName, String label, String tip, String actionIcon, KeyStroke keyStroke) { + super(mainUI, actionName, label, tip, actionIcon, keyStroke); + } + PresetsUIActionSupport(ObserveMainUI mainUI, String actionName, String label, String tip, String actionIcon, char keyStroke) { + super(mainUI, actionName, label, tip, actionIcon, keyStroke); + } + + protected abstract void doActionPerformed(RemotePresetsUI ui); + + @Override + public void actionPerformed(ActionEvent event) { + if (!getEditor().isShowing()) { + return; + } + + RemotePresetsUI ui = (RemotePresetsUI) getEditor().getClientProperty(CLIENT_PROPERTY_UI); + + doActionPerformed(ui); + + } +} ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/QuitPresetsUIAction.java ===================================== --- /dev/null +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/QuitPresetsUIAction.java @@ -0,0 +1,58 @@ +package fr.ird.observe.client.ui.actions.storage.presets; + +/*- + * #%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.ObserveSwingApplicationContext; +import fr.ird.observe.client.ui.ObserveMainUI; +import fr.ird.observe.client.ui.ObserveUIMode; +import fr.ird.observe.client.ui.storage.presets.RemotePresetsUI; +import javax.swing.JPanel; + + +import static org.nuiton.i18n.I18n.n; + +/** + * Created by tchemit on 17/08/17. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public class QuitPresetsUIAction extends PresetsUIActionSupport { + + public static final String ACTION_NAME = QuitPresetsUIAction.class.getName(); + + public QuitPresetsUIAction(ObserveMainUI mainUI) { + super(mainUI, ACTION_NAME, n("observe.action.quit"), n("observe.action.quit.tip"), "exit", 'Q'); + } + + @Override + protected void doActionPerformed(RemotePresetsUI ui) { + + ObserveMainUI mainUI = ObserveSwingApplicationContext.get().getMainUI(); + mainUI.getDataSourcePresets().setContentContainer(new JPanel()); + if (ObserveSwingApplicationContext.get().getDataSourcesManager().getMainDataSource() == null) { + mainUI.getModel().setMode(ObserveUIMode.NO_DB); + } else { + mainUI.getModel().setMode(ObserveUIMode.DB); + } + } +} ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/ResetRemoteUIAction.java ===================================== --- /dev/null +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/ResetRemoteUIAction.java @@ -0,0 +1,55 @@ +package fr.ird.observe.client.ui.actions.storage.presets; + +/*- + * #%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.ui.ObserveKeyStrokes; +import fr.ird.observe.client.ui.ObserveMainUI; +import fr.ird.observe.client.ui.storage.presets.RemotePresetsUI; +import fr.ird.observe.services.dto.presets.RemoteDataSourceConfiguration; + + +import static org.nuiton.i18n.I18n.n; + +/** + * Created by tchemit on 17/08/17. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public class ResetRemoteUIAction extends PresetsUIActionSupport { + + public static final String ACTION_NAME = ResetRemoteUIAction.class.getName(); + + public ResetRemoteUIAction(ObserveMainUI mainUI) { + super(mainUI, ACTION_NAME, n("observe.action.reset"), n("observe.action.reset.remote.tip"), "revert", ObserveKeyStrokes.KEY_STROKE_RESET_DATA); + } + + @Override + protected void doActionPerformed(RemotePresetsUI ui) { + + RemoteDataSourceConfiguration selectedValue = ui.getRemoteConfigurations().getSelectedValue(); + + ui.getModel().setRemoteDataSourceConfiguration(null); + ui.getModel().setRemoteDataSourceConfiguration(selectedValue); + + } +} ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/ResetServerUIAction.java ===================================== --- /dev/null +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/ResetServerUIAction.java @@ -0,0 +1,54 @@ +package fr.ird.observe.client.ui.actions.storage.presets; + +/*- + * #%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.ui.ObserveKeyStrokes; +import fr.ird.observe.client.ui.ObserveMainUI; +import fr.ird.observe.client.ui.storage.presets.RemotePresetsUI; +import fr.ird.observe.services.dto.presets.ServerDataSourceConfiguration; + + +import static org.nuiton.i18n.I18n.n; + +/** + * Created by tchemit on 17/08/17. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public class ResetServerUIAction extends PresetsUIActionSupport { + + public static final String ACTION_NAME = ResetServerUIAction.class.getName(); + + public ResetServerUIAction(ObserveMainUI mainUI) { + super(mainUI, ACTION_NAME, n("observe.action.reset"), n("observe.action.reset.server.tip"), "revert", ObserveKeyStrokes.KEY_STROKE_RESET_DATA); + } + + @Override + protected void doActionPerformed(RemotePresetsUI ui) { + + ServerDataSourceConfiguration selectedValue = ui.getServerConfigurations().getSelectedValue(); + ui.getModel().setServerDataSourceConfiguration(null); + ui.getModel().setServerDataSourceConfiguration(selectedValue); + + } +} ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/SaveRemoteUIAction.java ===================================== --- /dev/null +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/SaveRemoteUIAction.java @@ -0,0 +1,65 @@ +package fr.ird.observe.client.ui.actions.storage.presets; + +/*- + * #%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.ObserveSwingApplicationContext; +import fr.ird.observe.client.ui.ObserveKeyStrokes; +import fr.ird.observe.client.ui.ObserveMainUI; +import fr.ird.observe.client.ui.storage.presets.RemotePresetsUI; +import fr.ird.observe.services.dto.presets.RemoteDataSourceConfiguration; + + +import static org.nuiton.i18n.I18n.n; + +/** + * Created by tchemit on 17/08/17. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public class SaveRemoteUIAction extends PresetsUIActionSupport { + + public static final String ACTION_NAME = SaveRemoteUIAction.class.getName(); + + public SaveRemoteUIAction(ObserveMainUI mainUI) { + super(mainUI, ACTION_NAME, n("observe.action.save"), n("observe.action.save.remote.tip"), "save", ObserveKeyStrokes.KEY_STROKE_SAVE_DATA); + } + + @Override + protected void doActionPerformed(RemotePresetsUI ui) { + + RemoteDataSourceConfiguration remoteDataSourceConfiguration = ui.getModel().getRemoteDataSourceConfiguration(); + + remoteDataSourceConfiguration.setName(ui.getRemoteName().getText().trim()); + remoteDataSourceConfiguration.setUrl(ui.getRemoteUrl().getText().trim()); + remoteDataSourceConfiguration.setLogin(ui.getRemoteLogin().getText().trim()); + remoteDataSourceConfiguration.setPassword(ui.getRemotePassword().getText().trim()); + remoteDataSourceConfiguration.setUseSsl(ui.getRemoteUseSsl().isSelected()); + + ObserveSwingApplicationContext.get().getConfig().updateRemoteDataSourceConfiguration(remoteDataSourceConfiguration); + + ui.getModel().setRemoteDataSourceConfiguration(null); + ui.getModel().setRemoteDataSourceConfiguration(remoteDataSourceConfiguration); + ui.getModel().setRemoteModified(false); + + } +} ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/SaveServerUIAction.java ===================================== --- /dev/null +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/SaveServerUIAction.java @@ -0,0 +1,66 @@ +package fr.ird.observe.client.ui.actions.storage.presets; + +/*- + * #%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.ObserveSwingApplicationContext; +import fr.ird.observe.client.ui.ObserveKeyStrokes; +import fr.ird.observe.client.ui.ObserveMainUI; +import fr.ird.observe.client.ui.storage.presets.RemotePresetsUI; +import fr.ird.observe.services.dto.presets.ServerDataSourceConfiguration; + + +import static org.nuiton.i18n.I18n.n; + +/** + * Created by tchemit on 17/08/17. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public class SaveServerUIAction extends PresetsUIActionSupport { + + public static final String ACTION_NAME = SaveServerUIAction.class.getName(); + + public SaveServerUIAction(ObserveMainUI mainUI) { + super(mainUI, ACTION_NAME, n("observe.action.save"), n("observe.action.save.server.tip"), "save", ObserveKeyStrokes.KEY_STROKE_SAVE_DATA); + } + + @Override + protected void doActionPerformed(RemotePresetsUI ui) { + + ServerDataSourceConfiguration serverDataSourceConfiguration = ui.getModel().getServerDataSourceConfiguration(); + + serverDataSourceConfiguration.setName(ui.getServerName().getText().trim()); + serverDataSourceConfiguration.setUrl(ui.getServerUrl().getText().trim()); + serverDataSourceConfiguration.setLogin(ui.getServerLogin().getText().trim()); + serverDataSourceConfiguration.setPassword(ui.getServerPassword().getText().trim()); + String databaseName = ui.getServerDataBase().getText().trim(); + serverDataSourceConfiguration.setDatabaseName(databaseName.isEmpty() ? null : databaseName); + + ObserveSwingApplicationContext.get().getConfig().updateServerDataSourceConfiguration(serverDataSourceConfiguration); + + ui.getModel().setServerDataSourceConfiguration(null); + ui.getModel().setServerDataSourceConfiguration(serverDataSourceConfiguration); + ui.getModel().setServerModified(false); + + } +} ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/TestRemoteUIAction.java ===================================== --- /dev/null +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/TestRemoteUIAction.java @@ -0,0 +1,109 @@ +package fr.ird.observe.client.ui.actions.storage.presets; + +/*- + * #%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.ObserveSwingApplicationContext; +import fr.ird.observe.client.db.ObserveSwingDataSource; +import fr.ird.observe.client.ui.ObserveMainUI; +import fr.ird.observe.client.ui.storage.presets.RemotePresetsUI; +import fr.ird.observe.client.ui.util.UIHelper; +import fr.ird.observe.services.configuration.ObserveDataSourceInformation; +import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaPG; +import fr.ird.observe.services.security.BadObserveWebUserPasswordException; +import fr.ird.observe.services.security.UnknownObserveWebUserException; +import fr.ird.observe.services.security.UnknownObserveWebUserForDatabaseException; +import fr.ird.observe.services.security.UserLoginNotFoundException; +import fr.ird.observe.services.security.UserPasswordNotFoundException; +import org.nuiton.version.Version; + + +import static org.nuiton.i18n.I18n.n; +import static org.nuiton.i18n.I18n.t; + +/** + * Created by tchemit on 17/08/17. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public class TestRemoteUIAction extends PresetsUIActionSupport { + + public static final String ACTION_NAME = TestRemoteUIAction.class.getName(); + + public TestRemoteUIAction(ObserveMainUI mainUI) { + super(mainUI, ACTION_NAME, n("observe.action.test.remote"), n("observe.action.test.remote.tip"), "connect_creating", 'V'); + } + + @Override + protected void doActionPerformed(RemotePresetsUI ui) { + + ObserveDataSourceConfigurationTopiaPG config = new ObserveDataSourceConfigurationTopiaPG(); + config.setJdbcUrl(ui.getRemoteUrl().getText().trim()); + config.setUsername(ui.getRemoteLogin().getText().trim()); + config.setPassword(ui.getRemotePassword().getText().trim().toCharArray()); + config.setUseSsl(ui.getRemoteUseSsl().isSelected()); + + String connexionStatusError = null; + + Version modelVersion = ObserveSwingApplicationContext.get().getConfig().getModelVersion(); + ObserveSwingDataSource dataSource = ObserveSwingApplicationContext.get().getDataSourcesManager().newDataSource(config); + try { + + ObserveDataSourceInformation dataSourceInformation = dataSource.checkCanConnect(); + + Version versionDataSource = dataSourceInformation.getVersion(); + + // en mise a jour de la base on ne test pas la version + if (!modelVersion.equals(versionDataSource)) { + + connexionStatusError = t("observe.storage.error.dbVersionMismatch", versionDataSource, modelVersion); + } + + } catch (UnknownObserveWebUserException e) { + connexionStatusError = t("observe.storage.error.rest.user.unknown", e.getUserLogin()); + } catch (BadObserveWebUserPasswordException e) { + connexionStatusError = t("observe.storage.error.rest.password.bad", e.getUserLogin()); + } catch (UnknownObserveWebUserForDatabaseException e) { + connexionStatusError = t("observe.storage.error.rest.database.unknownForUser", e.getDatabaseName(), e.getRole()); + } catch (UserLoginNotFoundException e) { + connexionStatusError = t("observe.storage.error.rest.user.required"); + } catch (UserPasswordNotFoundException e) { + connexionStatusError = t("observe.storage.error.rest.password.required"); + } catch (Exception e) { + connexionStatusError = e.getMessage(); + if (connexionStatusError == null || connexionStatusError.isEmpty()) { + connexionStatusError = e.getClass().getName(); + } + } finally { + if (dataSource.isOpen()) { + dataSource.close(); + } + } + + if (connexionStatusError == null) { + UIHelper.displayInfo("Test de connexion", "Le connexion a été établie avec succès."); + } else { + UIHelper.displayWarning("Test de connexion", "Le test de connexion a échoué :\n" + connexionStatusError); + } + + } +} ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/TestServerUIAction.java ===================================== --- /dev/null +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/TestServerUIAction.java @@ -0,0 +1,143 @@ +package fr.ird.observe.client.ui.actions.storage.presets; + +/*- + * #%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.ObserveSwingApplicationContext; +import fr.ird.observe.client.db.ObserveSwingDataSource; +import fr.ird.observe.client.ui.ObserveMainUI; +import fr.ird.observe.client.ui.storage.presets.RemotePresetsUI; +import fr.ird.observe.client.ui.util.UIHelper; +import fr.ird.observe.services.configuration.ObserveDataSourceInformation; +import fr.ird.observe.services.configuration.rest.ObserveDataSourceConfigurationRest; +import fr.ird.observe.services.security.BadObserveWebUserPasswordException; +import fr.ird.observe.services.security.UnknownObserveWebUserException; +import fr.ird.observe.services.security.UnknownObserveWebUserForDatabaseException; +import fr.ird.observe.services.security.UserLoginNotFoundException; +import fr.ird.observe.services.security.UserPasswordNotFoundException; +import fr.ird.observe.services.service.PingService; +import java.net.MalformedURLException; +import java.net.URL; +import org.nuiton.version.Version; + + +import static org.nuiton.i18n.I18n.n; +import static org.nuiton.i18n.I18n.t; + +/** + * Created by tchemit on 17/08/17. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public class TestServerUIAction extends PresetsUIActionSupport { + + public static final String ACTION_NAME = TestServerUIAction.class.getName(); + + public TestServerUIAction(ObserveMainUI mainUI) { + super(mainUI, ACTION_NAME, n("observe.action.test.server"), n("observe.action.test.server.tip"), "connect_creating", 'V'); + } + + @Override + protected void doActionPerformed(RemotePresetsUI ui) { + + String connexionStatusError = null; + ObserveDataSourceConfigurationRest config = new ObserveDataSourceConfigurationRest(); + String url = ui.getServerUrl().getText().trim(); + try { + config.setServerUrl(new URL(url)); + } catch (MalformedURLException e) { + connexionStatusError = t("observe.storage.error.badUrl", url); + } + config.setLogin(ui.getServerLogin().getText().trim()); + config.setPassword(ui.getServerPassword().getText().trim().toCharArray()); + String databaseName = ui.getServerDataBase().getText().trim(); + config.setOptionalDatabaseName(databaseName.isEmpty() ? null : databaseName); + + Version applicationVersion = ObserveSwingApplicationContext.get().getConfig().getVersion(); + Version modelVersion = ObserveSwingApplicationContext.get().getConfig().getModelVersion(); + ObserveSwingDataSource dataSource = ObserveSwingApplicationContext.get().getDataSourcesManager().newDataSource(config); + try { + + PingService pingService = dataSource.getPingService(); + + if (getMainUI().getConfig().isCheckServerVersion()) { + + Version serverVersion = pingService.getServerVersion(); + + if (!applicationVersion.equals(serverVersion)) { + + connexionStatusError = t("observe.storage.error.serverVersionMismatch", serverVersion, applicationVersion); + + } + } + + if (connexionStatusError == null) { + Version modelServerVersion = pingService.getModelVersion(); + + if (!modelVersion.equals(modelServerVersion)) { + + connexionStatusError = t("observe.storage.error.serverVersionModelMismatch", modelServerVersion, modelVersion); + + } + + } + if (connexionStatusError == null) { + + ObserveDataSourceInformation dataSourceInformation = dataSource.checkCanConnect(); + + Version versionDataSource = dataSourceInformation.getVersion(); + + // en mise a jour de la base on ne test pas la version + if (!modelVersion.equals(versionDataSource)) { + + connexionStatusError = t("observe.storage.error.dbVersionMismatch", versionDataSource, modelVersion); + } + } + + } catch (UnknownObserveWebUserException e) { + connexionStatusError = t("observe.storage.error.rest.user.unknown", e.getUserLogin()); + } catch (BadObserveWebUserPasswordException e) { + connexionStatusError = t("observe.storage.error.rest.password.bad", e.getUserLogin()); + } catch (UnknownObserveWebUserForDatabaseException e) { + connexionStatusError = t("observe.storage.error.rest.database.unknownForUser", e.getDatabaseName(), e.getRole()); + } catch (UserLoginNotFoundException e) { + connexionStatusError = t("observe.storage.error.rest.user.required"); + } catch (UserPasswordNotFoundException e) { + connexionStatusError = t("observe.storage.error.rest.password.required"); + } catch (Exception e) { + connexionStatusError = e.getMessage(); + if (connexionStatusError == null || connexionStatusError.isEmpty()) { + connexionStatusError = e.getClass().getName(); + } + } finally { + if (dataSource.isOpen()) { + dataSource.close(); + } + } + + if (connexionStatusError == null) { + UIHelper.displayInfo("Test de connexion", "Le connexion a été établie avec succès."); + } else { + UIHelper.displayWarning("Test de connexion", "Le test de connexion a échoué :\n" + connexionStatusError); + } + } +} ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/StorageUIModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/storage/StorageUIModel.java +++ b/client/src/main/java/fr/ird/observe/client/ui/storage/StorageUIModel.java @@ -1764,7 +1764,7 @@ public class StorageUIModel extends WizardModel<StorageStep> { } catch (UserPasswordNotFoundException e) { - connexionStatusError = t("observe.storage.error.rest.pasword.required"); + connexionStatusError = t("observe.storage.error.rest.password.required"); setConnexionStatus(ConnexionStatus.FAILED); } catch (ObserveWebSecurityExceptionSupport e) { ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUI.jaxx @@ -25,6 +25,17 @@ fr.ird.observe.services.dto.presets.RemoteDataSourceConfiguration fr.ird.observe.services.dto.presets.ServerDataSourceConfiguration + fr.ird.observe.client.ui.actions.storage.presets.CreatePresetUIAction + fr.ird.observe.client.ui.actions.storage.presets.DeleteRemoteUIAction + fr.ird.observe.client.ui.actions.storage.presets.DeleteServerUIAction + fr.ird.observe.client.ui.actions.storage.presets.QuitPresetsUIAction + fr.ird.observe.client.ui.actions.storage.presets.ResetRemoteUIAction + fr.ird.observe.client.ui.actions.storage.presets.ResetServerUIAction + fr.ird.observe.client.ui.actions.storage.presets.SaveRemoteUIAction + fr.ird.observe.client.ui.actions.storage.presets.SaveServerUIAction + fr.ird.observe.client.ui.actions.storage.presets.TestRemoteUIAction + fr.ird.observe.client.ui.actions.storage.presets.TestServerUIAction + org.nuiton.jaxx.widgets.select.BeanComboBox </import> @@ -33,128 +44,130 @@ <JTabbedPane id='tabs' constraints='BorderLayout.CENTER'> <tab id='remoteTab' title="observe.storage.remote.presets.title"> - <JPanel id="remotePanel" layout="{new BorderLayout()}"> - <BeanComboBox id='remoteConfigurations' constructorParams='this' genericType='RemoteDataSourceConfiguration' - constraints='BorderLayout.NORTH'/> - <JLabel id="noRemoteSelected" constraints='BorderLayout.CENTER'/> - <Table id="remoteForm" constraints='BorderLayout.SOUTH' fill="both"> - <row> - <cell anchor='west'> - <JLabel text='observe.storage.remote.name'/> - </cell> - <cell weightx='1' fill="both" anchor='east'> - <JTextField id="remoteName" onKeyReleased="model.setRemoteModified(true);"/> - </cell> - </row> - <row> - <cell anchor='west'> - <JLabel text='observe.storage.remote.url'/> - </cell> - <cell weightx='1' fill="both" anchor='east'> - <JTextField id="remoteUrl" onKeyReleased="model.setRemoteModified(true);"/> - </cell> - </row> - <row> - <cell anchor='west'> - <JLabel text='observe.storage.remote.login'/> - </cell> - <cell weightx='1' fill="both" anchor='east'> - <JTextField id="remoteLogin" onKeyReleased="model.setRemoteModified(true);"/> - </cell> - </row> - <row> - <cell anchor='west'> - <JLabel text='observe.storage.remote.password'/> - </cell> - <cell weightx='1' fill="both" anchor='east'> - <JTextField id="remotePassword" onKeyReleased="model.setRemoteModified(true);"/> - </cell> - </row> - <row> - <cell columns='2'> - <JCheckBox id="remoteUseSsl" onActionPerformed="model.setRemoteModified(true);"/> - </cell> - </row> + <JSplitPane id="remotePanel"> + <JList id='remoteConfigurations' genericType="RemoteDataSourceConfiguration"/> + <JPanel id="remoteContentPanel" layout="{new BorderLayout()}"> + <JLabel id="noRemoteSelected" constraints='BorderLayout.CENTER'/> + <Table id="remoteForm" constraints='BorderLayout.SOUTH' fill="both"> + <row> + <cell anchor='west'> + <JLabel text='observe.storage.remote.name'/> + </cell> + <cell weightx='1' fill="both" anchor='east'> + <JTextField id="remoteName" onKeyReleased="model.setRemoteModified(true);"/> + </cell> + </row> + <row> + <cell anchor='west'> + <JLabel text='observe.storage.remote.url'/> + </cell> + <cell weightx='1' fill="both" anchor='east'> + <JTextField id="remoteUrl" onKeyReleased="model.setRemoteModified(true);"/> + </cell> + </row> + <row> + <cell anchor='west'> + <JLabel text='observe.storage.remote.login'/> + </cell> + <cell weightx='1' fill="both" anchor='east'> + <JTextField id="remoteLogin" onKeyReleased="model.setRemoteModified(true);"/> + </cell> + </row> + <row> + <cell anchor='west'> + <JLabel text='observe.storage.remote.password'/> + </cell> + <cell weightx='1' fill="both" anchor='east'> + <JTextField id="remotePassword" onKeyReleased="model.setRemoteModified(true);"/> + </cell> + </row> + <row> + <cell columns='2'> + <JCheckBox id="remoteUseSsl" onActionPerformed="model.setRemoteModified(true);"/> + </cell> + </row> -  - <row> - <cell columns='2'> - <JPanel layout="{new GridLayout(1, 0)}"> - <JButton id="saveRemoteAction" onActionPerformed='handler.saveRemote()'/> - <JButton id="deleteRemoteAction" onActionPerformed='handler.deleteRemote()'/> - <JButton id="testRemoteAction" onActionPerformed='handler.testRemote()'/> - </JPanel> - </cell> - </row> - </Table> - </JPanel> + <row> + <cell columns='2'> + <JPanel layout="{new GridLayout(1, 0)}"> + <JButton id="resetRemoteAction"/> + <JButton id="saveRemoteAction"/> + <JButton id="deleteRemoteAction"/> + <JButton id="testRemoteAction"/> + </JPanel> + </cell> + </row> + </Table> + </JPanel> + </JSplitPane> </tab> <tab id='serverTab' title="observe.storage.server.presets.title"> - <JPanel id="serverPanel" layout="{new BorderLayout()}"> - <BeanComboBox id='serverConfigurations' constructorParams='this' genericType='ServerDataSourceConfiguration' - constraints='BorderLayout.NORTH'/> - <JLabel id="noServerSelected" constraints='BorderLayout.CENTER'/> - - <Table id="serverForm" constraints='BorderLayout.SOUTH' fill="both"> - <row> - <cell anchor='west'> - <JLabel text='observe.storage.remote.name'/> - </cell> - <cell weightx='1' fill="both" anchor='east'> - <JTextField id="serverName" onKeyReleased="model.setServerModified(true);"/> - </cell> - </row> - <row> - <cell anchor='west'> - <JLabel text='observe.storage.remote.url'/> - </cell> - <cell weightx='1' fill="both" anchor='east'> - <JTextField id="serverUrl" onKeyReleased="model.setServerModified(true);"/> - </cell> - </row> - <row> - <cell anchor='west'> - <JLabel text='observe.storage.remote.login'/> - </cell> - <cell weightx='1' fill="both" anchor='east'> - <JTextField id="serverLogin" onKeyReleased="model.setServerModified(true);"/> - </cell> - </row> - <row> - <cell anchor='west'> - <JLabel text='observe.storage.remote.password'/> - </cell> - <cell weightx='1' fill="both" anchor='east'> - <JTextField id="serverPassword" onKeyReleased="model.setServerModified(true);"/> - </cell> - </row> - <row> - <cell anchor='west'> - <JLabel id="serverDataBaseLabel" text='observe.storage.server.dataBase'/> - </cell> - <cell weightx='1' fill="both" anchor='east'> - <JTextField id="serverDataBase" onKeyReleased="model.setServerModified(true);"/> - </cell> - </row> + <JSplitPane id="serverPanel"> + <JList id='serverConfigurations' genericType="ServerDataSourceConfiguration"/> + <JPanel id="serverContentPanel" layout="{new BorderLayout()}"> + <JLabel id="noServerSelected" constraints='BorderLayout.CENTER'/> + <Table id="serverForm" constraints='BorderLayout.SOUTH' fill="both"> + <row> + <cell anchor='west'> + <JLabel text='observe.storage.remote.name'/> + </cell> + <cell weightx='1' fill="both" anchor='east'> + <JTextField id="serverName" onKeyReleased="model.setServerModified(true);"/> + </cell> + </row> + <row> + <cell anchor='west'> + <JLabel text='observe.storage.remote.url'/> + </cell> + <cell weightx='1' fill="both" anchor='east'> + <JTextField id="serverUrl" onKeyReleased="model.setServerModified(true);"/> + </cell> + </row> + <row> + <cell anchor='west'> + <JLabel text='observe.storage.remote.login'/> + </cell> + <cell weightx='1' fill="both" anchor='east'> + <JTextField id="serverLogin" onKeyReleased="model.setServerModified(true);"/> + </cell> + </row> + <row> + <cell anchor='west'> + <JLabel text='observe.storage.remote.password'/> + </cell> + <cell weightx='1' fill="both" anchor='east'> + <JTextField id="serverPassword" onKeyReleased="model.setServerModified(true);"/> + </cell> + </row> + <row> + <cell anchor='west'> + <JLabel id="serverDataBaseLabel" text='observe.storage.server.dataBase'/> + </cell> + <cell weightx='1' fill="both" anchor='east'> + <JTextField id="serverDataBase" onKeyReleased="model.setServerModified(true);"/> + </cell> + </row> -  - <row> - <cell columns='2'> - <JPanel layout="{new GridLayout(1, 0)}"> - <JButton id="saveServerAction" onActionPerformed='handler.saveServer()'/> - <JButton id="deleteServerAction" onActionPerformed='handler.deleteServer()'/> - <JButton id="testServerAction" onActionPerformed='handler.testServer()'/> - </JPanel> - </cell> - </row> - </Table> - </JPanel> + <row> + <cell columns='2'> + <JPanel layout="{new GridLayout(1, 0)}"> + <JButton id="resetServerAction"/> + <JButton id="saveServerAction"/> + <JButton id="deleteServerAction"/> + <JButton id="testServerAction"/> + </JPanel> + </cell> + </row> + </Table> + </JPanel> + </JSplitPane> </tab> </JTabbedPane> <JPanel constraints='BorderLayout.SOUTH' layout="{new GridLayout(1, 0)}"> - <JButton id="quitAction" onActionPerformed='handler.quit()'/> + <JButton id="createAction"/> + <JButton id="quitAction"/> </JPanel> </JPanel> ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUI.jcss ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUI.jcss +++ b/client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUI.jcss @@ -19,9 +19,6 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -#remoteConfigurations { - selectedItem: {model.getRemoteDataSourceConfiguration()}; -} #noRemoteSelected { visible: true; @@ -54,10 +51,6 @@ selected:{model.getRemoteDataSourceConfiguration().isUseSsl()}; } -#serverConfigurations { - selectedItem: {model.getServerDataSourceConfiguration()}; -} - #noServerSelected { visible: true; text:"observe.storage.presets.no.selected"; @@ -88,49 +81,45 @@ text:{SwingUtil.getStringValue(model.getServerDataSourceConfiguration().getDatabaseName())}; } +#resetRemoteAction { + enabled:{model.isRemoteModified()}; + _observeAction:{ResetRemoteUIAction.ACTION_NAME}; +} + #saveRemoteAction { - text:"observe.action.save"; - actionIcon:"save"; - mnemonic:E; enabled:{model.isRemoteModified()}; + _observeAction:{SaveRemoteUIAction.ACTION_NAME}; } #deleteRemoteAction { - text:"observe.action.delete"; - actionIcon:"delete"; - mnemonic:S; + _observeAction:{DeleteRemoteUIAction.ACTION_NAME}; } #testRemoteAction { - text:"observe.action.test.remote"; - toolTipText:"observe.action.test.remote.tip"; - actionIcon:"connect_creating"; - mnemonic:V; + _observeAction:{TestRemoteUIAction.ACTION_NAME}; +} + +#resetServerAction { + enabled:{model.isServerModified()}; + _observeAction:{ResetServerUIAction.ACTION_NAME}; } #saveServerAction { - text:"observe.action.save"; - actionIcon:"save"; - mnemonic:E; enabled:{model.isServerModified()}; + _observeAction:{SaveServerUIAction.ACTION_NAME}; } #deleteServerAction { - text:"observe.action.delete"; - actionIcon:"delete"; - mnemonic:S; + _observeAction:{DeleteServerUIAction.ACTION_NAME}; } #testServerAction { - text:"observe.action.test.remote"; - toolTipText:"observe.action.test.remote.tip"; - actionIcon:"connect_creating"; - mnemonic:V; + _observeAction:{TestServerUIAction.ACTION_NAME}; } +#createAction { + _observeAction:{CreatePresetUIAction.ACTION_NAME}; +} #quitAction { - text:"observe.action.quit"; - toolTipText:"observe.action.quit.tip"; - actionIcon:"exit"; - mnemonic:Q; + _observeAction:{QuitPresetsUIAction.ACTION_NAME}; } ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUIHandler.java @@ -24,38 +24,27 @@ package fr.ird.observe.client.ui.storage.presets; import fr.ird.observe.client.ObserveSwingApplicationContext; import fr.ird.observe.client.configuration.ClientConfig; -import fr.ird.observe.client.db.ObserveSwingDataSource; -import fr.ird.observe.client.ui.ObserveKeyStrokes; -import fr.ird.observe.client.ui.ObserveMainUI; -import fr.ird.observe.client.ui.ObserveUIMode; +import fr.ird.observe.client.ui.actions.UIActionSupport; import fr.ird.observe.client.ui.util.UIHelper; -import fr.ird.observe.services.configuration.ObserveDataSourceInformation; -import fr.ird.observe.services.configuration.rest.ObserveDataSourceConfigurationRest; -import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaPG; import fr.ird.observe.services.dto.presets.RemoteDataSourceConfiguration; import fr.ird.observe.services.dto.presets.ServerDataSourceConfiguration; -import fr.ird.observe.services.security.BadObserveWebUserPasswordException; -import fr.ird.observe.services.security.UnknownObserveWebUserException; -import fr.ird.observe.services.security.UnknownObserveWebUserForDatabaseException; -import fr.ird.observe.services.security.UserLoginNotFoundException; -import fr.ird.observe.services.security.UserPasswordNotFoundException; -import fr.ird.observe.services.service.PingService; import java.awt.BorderLayout; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.ArrayList; import java.util.List; -import javax.swing.JOptionPane; -import javax.swing.JPanel; +import java.util.Objects; +import javax.swing.AbstractButton; +import javax.swing.ActionMap; +import javax.swing.DefaultListModel; +import javax.swing.InputMap; +import javax.swing.JComponent; import javax.swing.SwingUtilities; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; -import org.nuiton.decorator.JXPathDecorator; import org.nuiton.jaxx.runtime.spi.UIHandler; -import org.nuiton.jaxx.widgets.select.BeanComboBox; -import org.nuiton.version.Version; +import org.nuiton.jaxx.runtime.swing.renderer.DecoratorListCellRenderer; -import static org.nuiton.i18n.I18n.t; +import static fr.ird.observe.client.ui.content.ContentUIInitializer.OBSERVE_ACTION; /** * Created on 20/12/16. @@ -65,6 +54,9 @@ import static org.nuiton.i18n.I18n.t; */ public class RemotePresetsUIHandler implements UIHandler<RemotePresetsUI> { + /** Logger. */ + private static final Log log = LogFactory.getLog(RemotePresetsUIHandler.class); + private RemotePresetsUI ui; @Override @@ -80,262 +72,139 @@ public class RemotePresetsUIHandler implements UIHandler<RemotePresetsUI> { @Override public void afterInit(RemotePresetsUI ui) { + ActionMap actionMap = ObserveSwingApplicationContext.get().getActionMap(); + InputMap inputMap = ui.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT); + for (Object o : ui.get$objectMap().values()) { + + if (o instanceof AbstractButton) { + init(inputMap, actionMap, (AbstractButton) o); + } + + } + Decorator<RemoteDataSourceConfiguration> remoteDecorator = ObserveSwingApplicationContext.get().getDecoratorService().getDecoratorByType(RemoteDataSourceConfiguration.class); - ui.getRemoteConfigurations().init((JXPathDecorator<RemoteDataSourceConfiguration>) remoteDecorator, ui.getModel().getRemoteDataSourceConfigurations()); - Decorator<ServerDataSourceConfiguration> serverDecorator = ObserveSwingApplicationContext.get().getDecoratorService().getDecoratorByType(ServerDataSourceConfiguration.class); - ui.getServerConfigurations().init((JXPathDecorator<ServerDataSourceConfiguration>) serverDecorator, ui.getModel().getServerDataSourceConfigurations()); + ui.getRemoteConfigurations().setCellRenderer(new DecoratorListCellRenderer<>(remoteDecorator)); + DefaultListModel<RemoteDataSourceConfiguration> remoteModel = new DefaultListModel<>(); + ui.getModel().getRemoteDataSourceConfigurations().forEach(remoteModel::addElement); - ui.getModel().addPropertyChangeListener("remoteDataSourceConfigurations", evt -> ui.getRemoteConfigurations().setData((List<RemoteDataSourceConfiguration>) evt.getNewValue())); - ui.getModel().addPropertyChangeListener("serverDataSourceConfigurations", evt -> ui.getServerConfigurations().setData((List<ServerDataSourceConfiguration>) evt.getNewValue())); + ui.getRemoteConfigurations().setModel(remoteModel); - ui.getServerConfigurations().addPropertyChangeListener(BeanComboBox.PROPERTY_SELECTED_ITEM, evt -> { + ui.getRemoteConfigurations().addListSelectionListener(evt -> { - ServerDataSourceConfiguration oldValue = (ServerDataSourceConfiguration) evt.getOldValue(); - ui.getModel().setServerDataSourceConfiguration((ServerDataSourceConfiguration) evt.getNewValue()); + if (ui.getRemoteConfigurations().isSelectionEmpty()) { - if (ui.getModel().getServerDataSourceConfiguration() == null) { - ui.getServerPanel().remove(ui.getServerForm()); - ui.getServerPanel().add(ui.getNoServerSelected(), BorderLayout.CENTER); + ui.getModel().setRemoteDataSourceConfiguration(null); + ui.getModel().setRemoteModified(false); } else { - if (oldValue == null) { - ui.getServerForm().setVisible(true); - ui.getServerPanel().remove(ui.getNoServerSelected()); - ui.getServerPanel().add(ui.getServerForm(), BorderLayout.CENTER); - } - ui.getModel().setServerModified(false); + ui.getModel().setRemoteDataSourceConfiguration(ui.getRemoteConfigurations().getSelectedValue()); } - SwingUtilities.invokeLater(ui::repaint); }); - ui.getRemoteConfigurations().addPropertyChangeListener(BeanComboBox.PROPERTY_SELECTED_ITEM, evt -> { + + ui.getModel().addPropertyChangeListener("remoteDataSourceConfigurations", evt -> { + + List newValue = (List) evt.getNewValue(); + + DefaultListModel<RemoteDataSourceConfiguration> model = (DefaultListModel<RemoteDataSourceConfiguration>) ui.getRemoteConfigurations().getModel(); + model.clear(); + for (Object remoteDataSourceConfiguration : newValue) { + model.addElement((RemoteDataSourceConfiguration) remoteDataSourceConfiguration); + } + + }); + + + ui.getModel().addPropertyChangeListener("remoteDataSourceConfiguration", evt -> { RemoteDataSourceConfiguration oldValue = (RemoteDataSourceConfiguration) evt.getOldValue(); - ui.getModel().setRemoteDataSourceConfiguration((RemoteDataSourceConfiguration) evt.getNewValue()); if (ui.getModel().getRemoteDataSourceConfiguration() == null) { - ui.getRemotePanel().remove(ui.getRemoteForm()); - ui.getRemotePanel().add(ui.getNoRemoteSelected(), BorderLayout.CENTER); + ui.getRemoteContentPanel().remove(ui.getRemoteForm()); + ui.getRemoteContentPanel().add(ui.getNoRemoteSelected(), BorderLayout.CENTER); + UIHelper.askFocus(ui.getCreateAction()); } else { if (oldValue == null) { ui.getRemoteForm().setVisible(true); - ui.getRemotePanel().remove(ui.getNoRemoteSelected()); - ui.getRemotePanel().add(ui.getRemoteForm(), BorderLayout.CENTER); + ui.getRemoteContentPanel().remove(ui.getNoRemoteSelected()); + ui.getRemoteContentPanel().add(ui.getRemoteForm(), BorderLayout.CENTER); + UIHelper.askFocus(ui.getRemoteName()); } ui.getModel().setRemoteModified(false); } SwingUtilities.invokeLater(ui::repaint); }); - ObserveKeyStrokes.addKeyStrokeFromMnemonic(ui); - } - - public void testRemote() { - - ObserveDataSourceConfigurationTopiaPG config = new ObserveDataSourceConfigurationTopiaPG(); - config.setJdbcUrl(ui.getRemoteUrl().getText().trim()); - config.setUsername(ui.getRemoteLogin().getText().trim()); - config.setPassword(ui.getRemotePassword().getText().trim().toCharArray()); - config.setUseSsl(ui.getRemoteUseSsl().isSelected()); - - String connexionStatusError = null; - - Version modelVersion = ObserveSwingApplicationContext.get().getConfig().getModelVersion(); - ObserveSwingDataSource dataSource = ObserveSwingApplicationContext.get().getDataSourcesManager().newDataSource(config); - try { - - ObserveDataSourceInformation dataSourceInformation = dataSource.checkCanConnect(); + Decorator<ServerDataSourceConfiguration> serverDecorator = ObserveSwingApplicationContext.get().getDecoratorService().getDecoratorByType(ServerDataSourceConfiguration.class); + ui.getServerConfigurations().setCellRenderer(new DecoratorListCellRenderer<>(serverDecorator)); + DefaultListModel<ServerDataSourceConfiguration> ServerModel = new DefaultListModel<>(); + ui.getModel().getServerDataSourceConfigurations().forEach(ServerModel::addElement); - Version versionDataSource = dataSourceInformation.getVersion(); + ui.getServerConfigurations().setModel(ServerModel); - // en mise a jour de la base on ne test pas la version - if (!modelVersion.equals(versionDataSource)) { + ui.getServerConfigurations().addListSelectionListener(evt -> { - connexionStatusError = t("observe.storage.error.dbVersionMismatch", versionDataSource, modelVersion); - } + if (ui.getServerConfigurations().isSelectionEmpty()) { - } catch (UnknownObserveWebUserException e) { - connexionStatusError = t("observe.storage.error.rest.user.unknown", e.getUserLogin()); - } catch (BadObserveWebUserPasswordException e) { - connexionStatusError = t("observe.storage.error.rest.password.bad", e.getUserLogin()); - } catch (UnknownObserveWebUserForDatabaseException e) { - connexionStatusError = t("observe.storage.error.rest.database.unknownForUser", e.getDatabaseName(), e.getRole()); - } catch (UserLoginNotFoundException e) { - connexionStatusError = t("observe.storage.error.rest.user.required"); - } catch (UserPasswordNotFoundException e) { - connexionStatusError = t("observe.storage.error.rest.pasword.required"); - } catch (Exception e) { - connexionStatusError = e.getMessage(); - if (connexionStatusError == null || connexionStatusError.isEmpty()) { - connexionStatusError = e.getClass().getName(); - } - } finally { - if (dataSource.isOpen()) { - dataSource.close(); + ui.getModel().setServerDataSourceConfiguration(null); + ui.getModel().setServerModified(false); + } else { + ui.getModel().setServerDataSourceConfiguration(ui.getServerConfigurations().getSelectedValue()); } - } - - if (connexionStatusError == null) { - UIHelper.displayInfo("Test de connexion", "Le connexion a été établie avec succès."); - } else { - UIHelper.displayWarning("Test de connexion", "Le test de connexion a échoué :\n" + connexionStatusError); - } - } - - public void testServer() { - - String connexionStatusError = null; - ObserveDataSourceConfigurationRest config = new ObserveDataSourceConfigurationRest(); - String url = ui.getServerUrl().getText().trim(); - try { - config.setServerUrl(new URL(url)); - } catch (MalformedURLException e) { - connexionStatusError = t("observe.storage.error.badUrl", url); - } - config.setLogin(ui.getServerLogin().getText().trim()); - config.setPassword(ui.getServerPassword().getText().trim().toCharArray()); - String databaseName = ui.getServerDataBase().getText().trim(); - config.setOptionalDatabaseName(databaseName.isEmpty() ? null : databaseName); - - Version modelVersion = ObserveSwingApplicationContext.get().getConfig().getModelVersion(); - ObserveSwingDataSource dataSource = ObserveSwingApplicationContext.get().getDataSourcesManager().newDataSource(config); - try { - - PingService pingService = dataSource.getPingService(); - - Version modelServerVersion = pingService.getModelVersion(); + }); - if (!modelVersion.equals(modelServerVersion)) { + ui.getModel().addPropertyChangeListener("serverDataSourceConfigurations", evt -> { - connexionStatusError = t("observe.storage.error.serverVersionMismatch", modelServerVersion, modelVersion); + List newValue = (List) evt.getNewValue(); + DefaultListModel<ServerDataSourceConfiguration> model = (DefaultListModel<ServerDataSourceConfiguration>) ui.getServerConfigurations().getModel(); + model.clear(); + for (Object ServerDataSourceConfiguration : newValue) { + model.addElement((ServerDataSourceConfiguration) ServerDataSourceConfiguration); } - if (connexionStatusError == null) { + }); - ObserveDataSourceInformation dataSourceInformation = dataSource.checkCanConnect(); - Version versionDataSource = dataSourceInformation.getVersion(); + ui.getModel().addPropertyChangeListener("serverDataSourceConfiguration", evt -> { - // en mise a jour de la base on ne test pas la version - if (!modelVersion.equals(versionDataSource)) { + ServerDataSourceConfiguration oldValue = (ServerDataSourceConfiguration) evt.getOldValue(); - connexionStatusError = t("observe.storage.error.dbVersionMismatch", versionDataSource, modelVersion); + if (ui.getModel().getServerDataSourceConfiguration() == null) { + ui.getServerContentPanel().remove(ui.getServerForm()); + ui.getServerContentPanel().add(ui.getNoServerSelected(), BorderLayout.CENTER); + UIHelper.askFocus(ui.getCreateAction()); + } else { + if (oldValue == null) { + ui.getServerForm().setVisible(true); + ui.getServerContentPanel().remove(ui.getNoServerSelected()); + ui.getServerContentPanel().add(ui.getServerForm(), BorderLayout.CENTER); + UIHelper.askFocus(ui.getServerName()); } + ui.getModel().setServerModified(false); } + SwingUtilities.invokeLater(ui::repaint); + }); - } catch (UnknownObserveWebUserException e) { - connexionStatusError = t("observe.storage.error.rest.user.unknown", e.getUserLogin()); - } catch (BadObserveWebUserPasswordException e) { - connexionStatusError = t("observe.storage.error.rest.password.bad", e.getUserLogin()); - } catch (UnknownObserveWebUserForDatabaseException e) { - connexionStatusError = t("observe.storage.error.rest.database.unknownForUser", e.getDatabaseName(), e.getRole()); - } catch (UserLoginNotFoundException e) { - connexionStatusError = t("observe.storage.error.rest.user.required"); - } catch (UserPasswordNotFoundException e) { - connexionStatusError = t("observe.storage.error.rest.pasword.required"); - } catch (Exception e) { - connexionStatusError = e.getMessage(); - if (connexionStatusError == null || connexionStatusError.isEmpty()) { - connexionStatusError = e.getClass().getName(); - } - } finally { - if (dataSource.isOpen()) { - dataSource.close(); - } - } + UIHelper.askFocus(ui.getCreateAction()); - if (connexionStatusError == null) { - UIHelper.displayInfo("Test de connexion", "Le connexion a été établie avec succès."); - } else { - UIHelper.displayWarning("Test de connexion", "Le test de connexion a échoué :\n" + connexionStatusError); - } } - public void saveRemote() { - - RemoteDataSourceConfiguration remoteDataSourceConfiguration = ui.getModel().getRemoteDataSourceConfiguration(); - - remoteDataSourceConfiguration.setName(ui.getRemoteName().getText().trim()); - remoteDataSourceConfiguration.setUrl(ui.getRemoteUrl().getText().trim()); - remoteDataSourceConfiguration.setLogin(ui.getRemoteLogin().getText().trim()); - remoteDataSourceConfiguration.setPassword(ui.getRemotePassword().getText().trim()); - remoteDataSourceConfiguration.setUseSsl(ui.getRemoteUseSsl().isSelected()); - - ObserveSwingApplicationContext.get().getConfig().updateRemoteDataSourceConfiguration(remoteDataSourceConfiguration); + protected void init(InputMap inputMap, ActionMap actionMap, AbstractButton editor) { + String actionId = (String) editor.getClientProperty(OBSERVE_ACTION); + if (actionId == null) { - ui.getModel().setRemoteDataSourceConfiguration(null); - ui.getModel().setRemoteDataSourceConfiguration(remoteDataSourceConfiguration); - ui.getModel().setRemoteModified(false); - - } - - public void deleteRemote() { - - int response = UIHelper.askUser(t("observe.storage.presets.delete.title"), - t("observe.storage.presets.delete.message"), - JOptionPane.QUESTION_MESSAGE, - new Object[]{t("observe.action.delete"), t("observe.action.cancel")}, - 0); - boolean delete = response == 0; - - if (delete) { - RemoteDataSourceConfiguration remoteDataSourceConfiguration = ui.getModel().getRemoteDataSourceConfiguration(); - List<RemoteDataSourceConfiguration> remoteDataSourceConfigurations = new ArrayList<>(ui.getModel().getRemoteDataSourceConfigurations()); - remoteDataSourceConfigurations.remove(remoteDataSourceConfiguration); - ui.getModel().setRemoteDataSourceConfigurations(remoteDataSourceConfigurations); - ObserveSwingApplicationContext.get().getConfig().removeRemoteDataSourceConfiguration(remoteDataSourceConfiguration); - ui.getModel().setRemoteDataSourceConfiguration(null); + return; } - } - public void saveServer() { + UIActionSupport action = (UIActionSupport) actionMap.get(actionId); + Objects.requireNonNull(action, "action [" + actionId + "] not found for ui " + ui.getClass().getName()); - ServerDataSourceConfiguration serverDataSourceConfiguration = ui.getModel().getServerDataSourceConfiguration(); - - serverDataSourceConfiguration.setName(ui.getServerName().getText().trim()); - serverDataSourceConfiguration.setUrl(ui.getServerUrl().getText().trim()); - serverDataSourceConfiguration.setLogin(ui.getServerLogin().getText().trim()); - serverDataSourceConfiguration.setPassword(ui.getServerPassword().getText().trim()); - String databaseName = ui.getServerDataBase().getText().trim(); - serverDataSourceConfiguration.setDatabaseName(databaseName.isEmpty() ? null : databaseName); - - ObserveSwingApplicationContext.get().getConfig().updateServerDataSourceConfiguration(serverDataSourceConfiguration); - - ui.getModel().setServerDataSourceConfiguration(null); - ui.getModel().setServerDataSourceConfiguration(serverDataSourceConfiguration); - ui.getModel().setServerModified(false); - - } - - public void deleteServer() { - - int response = UIHelper.askUser(t("observe.storage.presets.delete.title"), - t("observe.storage.presets.delete.message"), - JOptionPane.QUESTION_MESSAGE, - new Object[]{t("observe.action.delete"), t("observe.action.cancel")}, - 0 - ); - boolean delete = response == 0; - - if (delete) { - ServerDataSourceConfiguration serverDataSourceConfiguration = ui.getModel().getServerDataSourceConfiguration(); - List<ServerDataSourceConfiguration> serverDataSourceConfigurations = new ArrayList<>(ui.getModel().getServerDataSourceConfigurations()); - serverDataSourceConfigurations.remove(serverDataSourceConfiguration); - ui.getModel().setServerDataSourceConfigurations(serverDataSourceConfigurations); - ObserveSwingApplicationContext.get().getConfig().removeServerDataSourceConfiguration(serverDataSourceConfiguration); - ui.getModel().setServerDataSourceConfiguration(null); + if (log.isDebugEnabled()) { + log.debug("init common action " + actionId); } - } - public void quit() { - - ObserveMainUI mainUI = ObserveSwingApplicationContext.get().getMainUI(); - mainUI.getDataSourcePresets().setContentContainer(new JPanel()); - if (ObserveSwingApplicationContext.get().getDataSourcesManager().getMainDataSource() == null) { - mainUI.getModel().setMode(ObserveUIMode.NO_DB); - } else { - mainUI.getModel().setMode(ObserveUIMode.DB); - } + action.initForMainUi(editor, inputMap, actionMap); + editor.putClientProperty(UIActionSupport.CLIENT_PROPERTY_UI, ui); } } ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUIModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUIModel.java +++ b/client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUIModel.java @@ -66,8 +66,9 @@ public class RemotePresetsUIModel extends AbstractBean { } public void setRemoteDataSourceConfiguration(RemoteDataSourceConfiguration remoteDataSourceConfiguration) { + RemoteDataSourceConfiguration oldValue = getRemoteDataSourceConfiguration(); this.remoteDataSourceConfiguration = remoteDataSourceConfiguration; - firePropertyChange("remoteDataSourceConfiguration", null, remoteDataSourceConfiguration); + firePropertyChange("remoteDataSourceConfiguration", oldValue, remoteDataSourceConfiguration); } public ServerDataSourceConfiguration getServerDataSourceConfiguration() { @@ -75,8 +76,9 @@ public class RemotePresetsUIModel extends AbstractBean { } public void setServerDataSourceConfiguration(ServerDataSourceConfiguration serverDataSourceConfiguration) { + ServerDataSourceConfiguration oldValue = getServerDataSourceConfiguration(); this.serverDataSourceConfiguration = serverDataSourceConfiguration; - firePropertyChange("serverDataSourceConfiguration", null, serverDataSourceConfiguration); + firePropertyChange("serverDataSourceConfiguration", oldValue, serverDataSourceConfiguration); } public boolean isRemoteModified() { ===================================== client/src/main/resources/i18n/client_en_GB.properties ===================================== --- a/client/src/main/resources/i18n/client_en_GB.properties +++ b/client/src/main/resources/i18n/client_en_GB.properties @@ -71,7 +71,9 @@ observe.action.delete.activity.tip=Delete activity observe.action.delete.entry.tip=Delete entry in edition observe.action.delete.floatingObject.tip=Delete floating object observe.action.delete.maree.tip=Delete trip +observe.action.delete.remote.tip=Delete remote configuration observe.action.delete.route.tip=Delete route +observe.action.delete.server.tip=Delete server configuration observe.action.delete.set.tip=Delete set observe.action.delete.tip=Delete observe.action.detail=Details @@ -108,6 +110,8 @@ observe.action.modify=Modify observe.action.new.entry=Add observe.action.new.entry.tip=Create a new entry observe.action.open.screen=Opening screen <%1$s> +observe.action.presets.create=New configuration +observe.action.presets.create.tip=Create a new configuration observe.action.quit=Quit observe.action.quit.tip=Quit manager observe.action.reload.application=reload application @@ -120,12 +124,17 @@ observe.action.reloadResources=Reload i18n observe.action.reloadResources.tip=Reload i18n translations observe.action.remove.floatingObjectReference=Remove as reference observe.action.remove.floatingObjectReference.tip=Remove as reference +observe.action.reset=Reset +observe.action.reset.remote.tip=Cancel modifications on remote configuration +observe.action.reset.server.tip=Cancel modifications on server configuration observe.action.resetComment.tip=Reset comment observe.action.restart.application=Restart observe.action.restart.application.tip=Restart application observe.action.save=Save observe.action.save.all.tip=Save all modifications observe.action.save.entry.tip=Save modifications +observe.action.save.remote.tip=Save remote configuration +observe.action.save.server.tip=Save server configuration observe.action.save.tip=Save modifications observe.action.save.to.file=Backup storage observe.action.save.to.file.tip=Make a backup of opened storage @@ -148,6 +157,8 @@ observe.action.stop.server.mode.tip=Stop server mode on local database observe.action.storage.applyAction=Apply observe.action.test.remote=Test connexion observe.action.test.remote.tip=Click here to validate remote connexion +observe.action.test.server=Test connexion +observe.action.test.server.tip=Click here to validate server connexion observe.action.toFullScreen=Full screen mode observe.action.toFullScreen.tip=Reload application in full screen mode observe.action.toWindowScreen=Window screen mode @@ -1488,7 +1499,7 @@ observe.storage.error.badUrl=The url format is not valid (%s) observe.storage.error.dbVersionMismatch=Version of remote database (%s) is not compliant with the model version (%s) observe.storage.error.rest.database.unknownForUser=Database "%s" is not defined for user "%s" observe.storage.error.rest.password.bad=Password is not valid -observe.storage.error.rest.pasword.required=Password is mandatory +observe.storage.error.rest.password.required=Password is mandatory observe.storage.error.rest.user.required=User login is mandatory observe.storage.error.rest.user.unknown=User "%s" is not defined on server observe.storage.error.serverVersionMismatch=Remote server version (%s) is not compliant with the client version (%s) ===================================== client/src/main/resources/i18n/client_es_ES.properties ===================================== --- a/client/src/main/resources/i18n/client_es_ES.properties +++ b/client/src/main/resources/i18n/client_es_ES.properties @@ -71,7 +71,9 @@ observe.action.delete.activity.tip=Eliminar la actividad observe.action.delete.entry.tip=Cancelar la edición de la entrada actual observe.action.delete.floatingObject.tip=Eliminar el objeto flotante actual observe.action.delete.maree.tip=Eliminar la marea +observe.action.delete.remote.tip=Delete remote configuration \#TODO observe.action.delete.route.tip=Eliminar la ruta +observe.action.delete.server.tip=Delete server configuration \#TODO observe.action.delete.set.tip=Eliminar el lance observe.action.delete.tip=Eliminar observe.action.detail=Ver detalles @@ -108,6 +110,8 @@ observe.action.modify=Modificar observe.action.new.entry=Nuevo observe.action.new.entry.tip=Crear una nueva entrada observe.action.open.screen=Abrir pantalla <%1$s> +observe.action.presets.create=Nouvelle configuration \#TODO +observe.action.presets.create.tip=Créer une nouvelle configuration \#TODO observe.action.quit=Quitter \#TODO observe.action.quit.tip=Quitter le gestionnaire \#TODO observe.action.reload.application=Reinicializar la aplicación @@ -120,12 +124,17 @@ observe.action.reloadResources=Recargar las traducciones observe.action.reloadResources.tip=Recargar las traducciones i18n observe.action.remove.floatingObjectReference=Supprimer la référence \#TODO observe.action.remove.floatingObjectReference.tip=Supprimer la référence \#TODO +observe.action.reset=Reset \#TODO +observe.action.reset.remote.tip=Reset remote configuration \#TODO +observe.action.reset.server.tip=Cancel modifications on server configuration \#TODO observe.action.resetComment.tip=Supprimer le commentaire \#TODO observe.action.restart.application=Reiniciar observe.action.restart.application.tip=Reiniciar la aplicación observe.action.save=Grabar observe.action.save.all.tip=Guardar todas las modificaciones observe.action.save.entry.tip=Guardar la edición en curso +observe.action.save.remote.tip=Save remote configuration \#TODO +observe.action.save.server.tip=Save server configuration \#TODO observe.action.save.tip=Guardar las modificaciones observe.action.save.to.file=Guardar la base de datos observe.action.save.to.file.tip=Hacer una copia de seguridad de la base de datos abierta @@ -148,6 +157,8 @@ observe.action.stop.server.mode.tip=Parar el modo servidor de la base local observe.action.storage.applyAction=Aplicar observe.action.test.remote=Comprobar la conexión observe.action.test.remote.tip=Pulsar para comprobar la conexión con el servidor remoto +observe.action.test.server=Comprobar la conexión +observe.action.test.server.tip=Pulsar para comprobar la conexión con el servidor \#TODO observe.action.toFullScreen=Mode plein écran \#TODO observe.action.toFullScreen.tip=Recharcher l'application en mode plein écran \#TODO observe.action.toWindowScreen=Mode fenêtre \#TODO @@ -1488,7 +1499,7 @@ observe.storage.error.badUrl=Error en el formato de la dirección (URL) %s observe.storage.error.dbVersionMismatch=La versión de la base remota (%s) no es compatible con la versión del modelo (%s). observe.storage.error.rest.database.unknownForUser=La base de datos "%s" no está configurada para el usuario "%s" observe.storage.error.rest.password.bad=Le contraseña es invalida -observe.storage.error.rest.pasword.required=Le contraseña es obligatoria +observe.storage.error.rest.password.required=Le contraseña es obligatoria observe.storage.error.rest.user.required=El usuario es obligatorio observe.storage.error.rest.user.unknown=El usuario "%s" no es conocido del servidor observe.storage.error.serverVersionMismatch=La versión del servidor remoto (%s) no es compatible con la versión del modelo (%s) ===================================== client/src/main/resources/i18n/client_fr_FR.properties ===================================== --- a/client/src/main/resources/i18n/client_fr_FR.properties +++ b/client/src/main/resources/i18n/client_fr_FR.properties @@ -71,7 +71,9 @@ observe.action.delete.activity.tip=Supprimer l'activité observe.action.delete.entry.tip=Supprimer l'entrée en cours d'édition observe.action.delete.floatingObject.tip=Supprimer l'objet flottant courant observe.action.delete.maree.tip=Supprimer la marée +observe.action.delete.remote.tip=Supprimer la configuration observe.action.delete.route.tip=Supprimer la route +observe.action.delete.server.tip=Supprimer la configuration observe.action.delete.set.tip=Supprimer la calée observe.action.delete.tip=Supprimer observe.action.detail=Voir les détails @@ -108,6 +110,8 @@ observe.action.modify=Modifier observe.action.new.entry=Nouveau observe.action.new.entry.tip=Créer une nouvelle entrée observe.action.open.screen=Ouverture de l'écran <%1$s> +observe.action.presets.create=Nouvelle configuration +observe.action.presets.create.tip=Créer une nouvelle configuration observe.action.quit=Quitter observe.action.quit.tip=Quitter le gestionnaire observe.action.reload.application=Redémarrer l'application @@ -120,12 +124,17 @@ observe.action.reloadResources=Ressources par défaut observe.action.reloadResources.tip=Rétablir les ressources par défaut (toute modification sera perdue) observe.action.remove.floatingObjectReference=Supprimer la référence observe.action.remove.floatingObjectReference.tip=Supprimer la référence +observe.action.reset=Réinitialiser +observe.action.reset.remote.tip=Annuler les modifications +observe.action.reset.server.tip=Annuler les modifications observe.action.resetComment.tip=Supprimer le commentaire observe.action.restart.application=Redémarrer observe.action.restart.application.tip=Redémarrer l'application observe.action.save=Enregistrer observe.action.save.all.tip=Sauver toutes les modifications observe.action.save.entry.tip=Sauver l'entrée en cours d'édition +observe.action.save.remote.tip=Enregister la configuration +observe.action.save.server.tip=Enregister la configuration observe.action.save.tip=Sauver les modifications observe.action.save.to.file=Sauver la base observe.action.save.to.file.tip=Effectuer une sauvegarde de la base ouverte @@ -148,6 +157,8 @@ observe.action.stop.server.mode.tip=Arrêter le mode serveur de la base locale observe.action.storage.applyAction=Appliquer observe.action.test.remote=Valider la connexion observe.action.test.remote.tip=Cliquer pour valider la connexion au serveur distant +observe.action.test.server=Valider la connexion +observe.action.test.server.tip=Cliquer pour valider la connexion au serveur observe.action.toFullScreen=Mode plein écran observe.action.toFullScreen.tip=Recharcher l'application en mode plein écran observe.action.toWindowScreen=Mode fenêtre @@ -1488,7 +1499,7 @@ observe.storage.error.badUrl=Erreur dans le format de l'URL %s observe.storage.error.dbVersionMismatch=La version de la base distante (%s) n'est pas compatible avec la version du modèle (%s) observe.storage.error.rest.database.unknownForUser=La base de données "%s" n'est pas définie pour l'utilisateur "%s" observe.storage.error.rest.password.bad=Le mot de passe est invalide -observe.storage.error.rest.pasword.required=Le mot de passe est obligatoire +observe.storage.error.rest.password.required=Le mot de passe est obligatoire observe.storage.error.rest.user.required=L'utilisateur est obligatoire observe.storage.error.rest.user.unknown=L'utilisateur "%s" est inconnu sur le serveur observe.storage.error.serverVersionMismatch=La version du serveur distant (%s) n'est pas compatible avec la version du client (%s) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/08505b7ca91cbf74a9de7f199a1… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/08505b7ca91cbf74a9de7f199a1… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Trier les connexions sauevgardées (see #852)
by Tony CHEMIT 17 Aug '17

17 Aug '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 1abcfeb2 by Tony CHEMIT at 2017-08-17T12:54:24+02:00 Trier les connexions sauevgardées (see #852) - - - - - 3726e998 by Tony CHEMIT at 2017-08-17T13:27:39+02:00 ajout raccourcis clavier (See #852) - - - - - 6 changed files: - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/src/main/java/fr/ird/observe/client/ui/actions/UIActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseRemoteConfigurationUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseServerConfigurationUIAction.java - client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ConfigUIHandler.java Changes: ===================================== 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 @@ -38,6 +38,7 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; +import java.util.Comparator; import java.util.Date; import java.util.LinkedList; import java.util.List; @@ -417,32 +418,54 @@ public class ClientConfig extends GeneratedClientConfig { return option == null ? new RemoteDataSourceConfiguration[0] : new Gson().fromJson(option, RemoteDataSourceConfiguration[].class); } - public void addRemoteDataSourceConfiguration(RemoteDataSourceConfiguration remoteDataSourceConfiguration) { + public void addRemoteDataSourceConfiguration(RemoteDataSourceConfiguration configuration) { List<RemoteDataSourceConfiguration> remoteDataSourceConfigurations = new ArrayList<>(Arrays.asList(getRemoteDataSourceConfigurations())); - remoteDataSourceConfigurations.add(remoteDataSourceConfiguration); + remoteDataSourceConfigurations.add(configuration); setRemoteDataSourceConfigurations(remoteDataSourceConfigurations.toArray(new RemoteDataSourceConfiguration[remoteDataSourceConfigurations.size()])); saveForUser(); } - public void updateRemoteDataSourceConfiguration(RemoteDataSourceConfiguration remoteDataSourceConfiguration) { + public void updateRemoteDataSourceConfiguration(RemoteDataSourceConfiguration configuration) { List<RemoteDataSourceConfiguration> remoteDataSourceConfigurations = new ArrayList<>(Arrays.asList(getRemoteDataSourceConfigurations())); - remoteDataSourceConfigurations.remove(remoteDataSourceConfiguration); - remoteDataSourceConfigurations.add(remoteDataSourceConfiguration); + remoteDataSourceConfigurations.remove(configuration); + remoteDataSourceConfigurations.add(configuration); setRemoteDataSourceConfigurations(remoteDataSourceConfigurations.toArray(new RemoteDataSourceConfiguration[remoteDataSourceConfigurations.size()])); saveForUser(); } - public void removeRemoteDataSourceConfiguration(RemoteDataSourceConfiguration remoteDataSourceConfiguration) { + public void removeRemoteDataSourceConfiguration(RemoteDataSourceConfiguration configuration) { List<RemoteDataSourceConfiguration> remoteDataSourceConfigurations = new ArrayList<>(Arrays.asList(getRemoteDataSourceConfigurations())); - remoteDataSourceConfigurations.remove(remoteDataSourceConfiguration); + remoteDataSourceConfigurations.remove(configuration); setRemoteDataSourceConfigurations(remoteDataSourceConfigurations.toArray(new RemoteDataSourceConfiguration[remoteDataSourceConfigurations.size()])); saveForUser(); } @Override - public void setRemoteDataSourceConfigurations(RemoteDataSourceConfiguration[] remoteDataSourceConfigurations) { - String option = new Gson().toJson(remoteDataSourceConfigurations); + public void setRemoteDataSourceConfigurations(RemoteDataSourceConfiguration[] configurations) { + String option = new Gson().toJson(configurations); get().setOption(ClientConfigOption.REMOTE_DATA_SOURCE_CONFIGURATIONS.getKey(), option); + remoteDataSourceConfigurationList=null; + } + + ImmutableList<ServerDataSourceConfiguration> serverDataSourceConfigurationList; + ImmutableList<RemoteDataSourceConfiguration> remoteDataSourceConfigurationList; + + public ImmutableList<RemoteDataSourceConfiguration> getRemoteDataSourceConfigurationList() { + if (remoteDataSourceConfigurationList == null) { + List<RemoteDataSourceConfiguration> configurations = new ArrayList<>(Arrays.asList(getRemoteDataSourceConfigurations())); + configurations.sort(Comparator.comparing(RemoteDataSourceConfiguration::getName)); + remoteDataSourceConfigurationList = ImmutableList.copyOf(configurations); + } + return remoteDataSourceConfigurationList; + } + + public ImmutableList<ServerDataSourceConfiguration> getServerDataSourceConfigurationList() { + if (serverDataSourceConfigurationList == null) { + List<ServerDataSourceConfiguration> configurations = new ArrayList<>(Arrays.asList(getServerDataSourceConfigurations())); + configurations.sort(Comparator.comparing(ServerDataSourceConfiguration::getName)); + serverDataSourceConfigurationList = ImmutableList.copyOf(configurations); + } + return serverDataSourceConfigurationList; } @Override @@ -451,32 +474,33 @@ public class ClientConfig extends GeneratedClientConfig { return option == null ? new ServerDataSourceConfiguration[0] : new Gson().fromJson(option, ServerDataSourceConfiguration[].class); } - public void addServerDataSourceConfiguration(ServerDataSourceConfiguration remoteDataSourceConfiguration) { + public void addServerDataSourceConfiguration(ServerDataSourceConfiguration configuration) { List<ServerDataSourceConfiguration> remoteDataSourceConfigurations = new ArrayList<>(Arrays.asList(getServerDataSourceConfigurations())); - remoteDataSourceConfigurations.add(remoteDataSourceConfiguration); + remoteDataSourceConfigurations.add(configuration); setServerDataSourceConfigurations(remoteDataSourceConfigurations.toArray(new ServerDataSourceConfiguration[remoteDataSourceConfigurations.size()])); saveForUser(); } - public void updateServerDataSourceConfiguration(ServerDataSourceConfiguration remoteDataSourceConfiguration) { + public void updateServerDataSourceConfiguration(ServerDataSourceConfiguration configuration) { List<ServerDataSourceConfiguration> remoteDataSourceConfigurations = new ArrayList<>(Arrays.asList(getServerDataSourceConfigurations())); - remoteDataSourceConfigurations.remove(remoteDataSourceConfiguration); - remoteDataSourceConfigurations.add(remoteDataSourceConfiguration); + remoteDataSourceConfigurations.remove(configuration); + remoteDataSourceConfigurations.add(configuration); setServerDataSourceConfigurations(remoteDataSourceConfigurations.toArray(new ServerDataSourceConfiguration[remoteDataSourceConfigurations.size()])); saveForUser(); } - public void removeServerDataSourceConfiguration(ServerDataSourceConfiguration serverDataSourceConfiguration) { + public void removeServerDataSourceConfiguration(ServerDataSourceConfiguration configuration) { List<ServerDataSourceConfiguration> serverDataSourceConfigurations = new ArrayList<>(Arrays.asList(getServerDataSourceConfigurations())); - serverDataSourceConfigurations.remove(serverDataSourceConfiguration); + serverDataSourceConfigurations.remove(configuration); setServerDataSourceConfigurations(serverDataSourceConfigurations.toArray(new ServerDataSourceConfiguration[serverDataSourceConfigurations.size()])); saveForUser(); } @Override - public void setServerDataSourceConfigurations(ServerDataSourceConfiguration[] serverDataSourceConfigurations) { - String option = new Gson().toJson(serverDataSourceConfigurations); + public void setServerDataSourceConfigurations(ServerDataSourceConfiguration[] configurations) { + String option = new Gson().toJson(configurations); get().setOption(ClientConfigOption.SERVER_DATA_SOURCE_CONFIGURATIONS.getKey(), option); + serverDataSourceConfigurationList=null; } private final SimpleDateFormat dateFormat = new SimpleDateFormat(); ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/UIActionSupport.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/UIActionSupport.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/UIActionSupport.java @@ -25,8 +25,8 @@ import fr.ird.observe.client.ObserveSwingApplicationContext; import fr.ird.observe.client.db.ObserveSwingDataSource; import fr.ird.observe.client.ui.ObserveKeyStrokes; import fr.ird.observe.client.ui.ObserveMainUI; -import fr.ird.observe.client.ui.util.UIHelper; import fr.ird.observe.client.ui.content.ContentUI; +import fr.ird.observe.client.ui.util.UIHelper; import fr.ird.observe.services.ObserveServicesProvider; import java.awt.event.ActionEvent; import java.awt.event.InputEvent; @@ -84,7 +84,7 @@ public abstract class UIActionSupport extends AbstractAction { return (KeyStroke) getValue(ACCELERATOR_KEY); } - protected String getActionCommandKey() { + public String getActionCommandKey() { return (String) getValue(ACTION_COMMAND_KEY); } @@ -110,7 +110,16 @@ public abstract class UIActionSupport extends AbstractAction { } public void initForMainUi(AbstractButton editor, InputMap inputMap, ActionMap actionMap) { + String text = editor.getText(); + String tip = editor.getToolTipText(); + editor.setAction(this); + if (text != null && editor.getText() == null) { + editor.setText(text); + } + if (tip != null && editor.getToolTipText() == null) { + editor.setToolTipText(tip); + } editor.putClientProperty(CLIENT_PROPERTY_UI, mainUI); //FIXME Attention on introduit un état dans l'action et si l'action est utilisée plusieurs fois dans un même écran //FIXME cela va introduire des effets de bord ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseRemoteConfigurationUIAction.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseRemoteConfigurationUIAction.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseRemoteConfigurationUIAction.java @@ -30,7 +30,8 @@ import fr.ird.observe.client.ui.storage.StorageUIModel; import fr.ird.observe.client.ui.storage.tabs.ConfigUI; import fr.ird.observe.services.dto.presets.RemoteDataSourceConfiguration; import java.awt.event.ActionEvent; -import javax.swing.AbstractButton; +import javax.swing.JMenuItem; +import javax.swing.KeyStroke; import javax.swing.SwingUtilities; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -48,20 +49,22 @@ public class UseRemoteConfigurationUIAction extends UIActionSupport { public static final String ACTION_NAME = UseRemoteConfigurationUIAction.class.getName(); - public UseRemoteConfigurationUIAction(ConfigUI mainUI) { - super(null, ACTION_NAME, null, null, "db-remote", null); - } + private final ConfigUI configUI; + private final RemoteDataSourceConfiguration configuration; + private StorageUI parentContainer; - public UseRemoteConfigurationUIAction(ObserveMainUI mainUI) { - super(mainUI, ACTION_NAME, null, null, "db-remote", null); + public UseRemoteConfigurationUIAction(ObserveMainUI mainUI, ConfigUI configUI, String actionName, RemoteDataSourceConfiguration configuration, KeyStroke acceleratorKey) { + super(mainUI, actionName, configuration.getName(), null, "db-remote", acceleratorKey); + this.configUI = configUI; + this.configuration = configuration; } @Override public void actionPerformed(ActionEvent e) { - AbstractButton value = (AbstractButton) getValue(EDITOR); - ConfigUI configUI = (ConfigUI) value.getClientProperty(CLIENT_PROPERTY_UI); - RemoteDataSourceConfiguration configuration = (RemoteDataSourceConfiguration) value.getClientProperty("configuration"); + if (!((JMenuItem)getEditor()).isArmed()) { + return; + } if (log.isInfoEnabled()) { log.info("Use remote configuration: " + configuration.getName()); @@ -74,7 +77,7 @@ public class UseRemoteConfigurationUIAction extends UIActionSupport { model.setUseSsl(configuration.isUseSsl()); configUI.getTestRemoteAction().requestFocusInWindow(); - StorageUI parentContainer = configUI.getParentContainer(StorageUI.class); + parentContainer = configUI.getParentContainer(StorageUI.class); SwingUtilities.invokeLater(() -> { configUI.getTestRemoteAction().doClick(); if (ConnexionStatus.SUCCESS == configUI.getModel().getConnexionStatus()) { ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseServerConfigurationUIAction.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseServerConfigurationUIAction.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseServerConfigurationUIAction.java @@ -30,7 +30,8 @@ import fr.ird.observe.client.ui.storage.StorageUIModel; import fr.ird.observe.client.ui.storage.tabs.ConfigUI; import fr.ird.observe.services.dto.presets.ServerDataSourceConfiguration; import java.awt.event.ActionEvent; -import javax.swing.AbstractButton; +import javax.swing.JMenuItem; +import javax.swing.KeyStroke; import javax.swing.SwingUtilities; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -47,21 +48,22 @@ public class UseServerConfigurationUIAction extends UIActionSupport { private static final Log log = LogFactory.getLog(UseServerConfigurationUIAction.class); public static final String ACTION_NAME = UseServerConfigurationUIAction.class.getName(); + private final ConfigUI configUI; + private final ServerDataSourceConfiguration configuration; + private StorageUI parentContainer; - public UseServerConfigurationUIAction(ConfigUI mainUI) { - super(null, ACTION_NAME, null, null, "db-server", null); - } - - public UseServerConfigurationUIAction(ObserveMainUI mainUI) { - super(mainUI, ACTION_NAME, null, null, "db-server", null); + public UseServerConfigurationUIAction(ObserveMainUI mainUI, ConfigUI configUI, String actionName, ServerDataSourceConfiguration configuration, KeyStroke acceleratorKey) { + super(mainUI, actionName, configuration.getName(), null, "db-remote", acceleratorKey); + this.configUI = configUI; + this.configuration = configuration; } @Override public void actionPerformed(ActionEvent e) { - AbstractButton value = (AbstractButton) getValue(EDITOR); - ConfigUI configUI = (ConfigUI) value.getClientProperty(CLIENT_PROPERTY_UI); - ServerDataSourceConfiguration configuration = (ServerDataSourceConfiguration) value.getClientProperty("configuration"); + if (!((JMenuItem) getEditor()).isArmed()) { + return; + } if (log.isInfoEnabled()) { log.info("Use server configuration: " + configuration.getName()); } @@ -73,7 +75,7 @@ public class UseServerConfigurationUIAction extends UIActionSupport { model.setRemotePassword(configuration.getPassword().toCharArray()); model.setServerDatabase(configuration.getDatabaseName()); - StorageUI parentContainer = configUI.getParentContainer(StorageUI.class); + parentContainer = configUI.getParentContainer(StorageUI.class); configUI.getTestRemoteAction().requestFocusInWindow(); SwingUtilities.invokeLater(() -> { ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUIHandler.java @@ -44,7 +44,6 @@ import java.awt.BorderLayout; import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import javax.swing.JOptionPane; import javax.swing.JPanel; @@ -73,10 +72,8 @@ public class RemotePresetsUIHandler implements UIHandler<RemotePresetsUI> { this.ui = ui; RemotePresetsUIModel model = new RemotePresetsUIModel(); ClientConfig config = ObserveSwingApplicationContext.get().getConfig(); - List<ServerDataSourceConfiguration> serverDataSourceConfigurations = new ArrayList<>(Arrays.asList(config.getServerDataSourceConfigurations())); - model.setServerDataSourceConfigurations(serverDataSourceConfigurations); - List<RemoteDataSourceConfiguration> remoteDataSourceConfigurations = new ArrayList<>(Arrays.asList(config.getRemoteDataSourceConfigurations())); - model.setRemoteDataSourceConfigurations(remoteDataSourceConfigurations); + model.setServerDataSourceConfigurations(config.getServerDataSourceConfigurationList()); + model.setRemoteDataSourceConfigurations(config.getRemoteDataSourceConfigurationList()); ui.setContextValue(model); } ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ConfigUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ConfigUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ConfigUIHandler.java @@ -27,13 +27,14 @@ import fr.ird.observe.client.ObserveTextGenerator; import fr.ird.observe.client.constants.ConnexionStatus; import fr.ird.observe.client.constants.DbMode; import fr.ird.observe.client.ui.ObserveKeyStrokes; +import fr.ird.observe.client.ui.ObserveMainUI; import fr.ird.observe.client.ui.actions.UIActionSupport; -import fr.ird.observe.client.ui.util.UIHelper; import fr.ird.observe.client.ui.actions.storage.UseRemoteConfigurationUIAction; import fr.ird.observe.client.ui.actions.storage.UseServerConfigurationUIAction; import fr.ird.observe.client.ui.content.ObserveActionMap; import fr.ird.observe.client.ui.storage.StorageStep; import fr.ird.observe.client.ui.storage.StorageUIModel; +import fr.ird.observe.client.ui.util.UIHelper; import fr.ird.observe.services.dto.presets.RemoteDataSourceConfiguration; import fr.ird.observe.services.dto.presets.ServerDataSourceConfiguration; import java.awt.BorderLayout; @@ -132,34 +133,33 @@ public class ConfigUIHandler extends StorageTabUIHandler<ConfigUI> implements UI init(ui.getServerMenu()); init(ui.getRemoteMenu()); - for (RemoteDataSourceConfiguration configuration : ObserveSwingApplicationContext.get().getConfig().getRemoteDataSourceConfigurations()) { - addRemoteConfiguration(configuration); + int index = 1; + ObserveMainUI mainUI = ObserveSwingApplicationContext.get().getMainUI(); + for (RemoteDataSourceConfiguration configuration : ObserveSwingApplicationContext.get().getConfig().getRemoteDataSourceConfigurationList()) { + addRemoteConfiguration(mainUI,configuration, index++); } - for (ServerDataSourceConfiguration configuration : ObserveSwingApplicationContext.get().getConfig().getServerDataSourceConfigurations()) { - addServerConfiguration(configuration); + index = 1; + for (ServerDataSourceConfiguration configuration : ObserveSwingApplicationContext.get().getConfig().getServerDataSourceConfigurationList()) { + addServerConfiguration(mainUI,configuration, index++); } } - public void addRemoteConfiguration(RemoteDataSourceConfiguration configuration) { + public void addRemoteConfiguration(ObserveMainUI mainUI, RemoteDataSourceConfiguration configuration, int position) { JMenuItem item = new JMenuItem(configuration.getName()); item.putClientProperty("configuration", configuration); - item.putClientProperty("text", configuration.getName()); - item.putClientProperty("toolTipText", configuration.getName()); - item.putClientProperty(OBSERVE_ACTION, UseRemoteConfigurationUIAction.ACTION_NAME); - UIActionSupport action = init(item); - action.updateAction(ui, item); + UIActionSupport action = new UseRemoteConfigurationUIAction(mainUI,ui, UseRemoteConfigurationUIAction.ACTION_NAME + position, configuration, KeyStroke.getKeyStroke("F" + position)); + action.initForMainUi(item, ui.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT), observeActionMap); + ui.getRemoteMenu().add(item); } - public void addServerConfiguration(ServerDataSourceConfiguration configuration) { + public void addServerConfiguration(ObserveMainUI mainUI, ServerDataSourceConfiguration configuration, int position) { JMenuItem item = new JMenuItem(configuration.getName()); item.putClientProperty("configuration", configuration); - item.putClientProperty("text", configuration.getName()); - item.putClientProperty("toolTipText", configuration.getName()); - item.putClientProperty(OBSERVE_ACTION, UseServerConfigurationUIAction.ACTION_NAME); - UIActionSupport action = init(item); - action.updateAction(ui, item); + UIActionSupport action = new UseServerConfigurationUIAction(mainUI,ui, UseServerConfigurationUIAction.ACTION_NAME + position, configuration, KeyStroke.getKeyStroke("F" + position)); + action.initForMainUi(item, ui.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT), observeActionMap); + ui.getServerMenu().add(item); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/6bca338ce3fe6324686a6c9a12… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/6bca338ce3fe6324686a6c9a12… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Certains raccourcis claviers peuvent être déclanché alors que cela ne devrait…
by Tony CHEMIT 17 Aug '17

17 Aug '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e28ca625 by Tony CHEMIT at 2017-08-17T12:34:49+02:00 Certains raccourcis claviers peuvent être déclanché alors que cela ne devrait pas être possible (see #851) - - - - - 6bca338c by Tony CHEMIT at 2017-08-17T12:36:47+02:00 at last, update jcss license header - - - - - 30 changed files: - client/pom.xml - client/src/main/java/fr/ird/observe/client/ObserveRunner.java - client/src/main/java/fr/ird/observe/client/ObserveSwingApplicationContext.java - client/src/main/java/fr/ird/observe/client/db/ObserveDataSourcesManager.java - client/src/main/java/fr/ird/observe/client/ui/ObserveCommon.jcss - client/src/main/java/fr/ird/observe/client/ui/ObserveKeyStrokes.java - client/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jcss - client/src/main/java/fr/ird/observe/client/ui/ObserveMainUIInitializer.java - client/src/main/java/fr/ird/observe/client/ui/ObserveMainUIModel.java - client/src/main/java/fr/ird/observe/client/ui/ObserveUICallback.java - client/src/main/java/fr/ird/observe/client/ui/actions/AbstractObserveAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/ObserveActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/actions/menu/storage/StopH2WebServerAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/SelectRadioButtonAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/AbstractUIAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/UIActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/AbstractContentUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/AddActivityLonglineSetUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/AddActivitySeineFloatingObjectUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/AddActivitySeineSetUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/AddFloatingObjectReferenceUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/CopyFloatingObjectPartToLeftAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/CopyFloatingObjectPartToRightAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/EditFloatingObjectReferenceUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/EditReferentialFromListUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveMultipleDataUIActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveSingleDataUIActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/RemoveFloatingObjectReferenceUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/dcprefs/DeleteReferenceUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/dcprefs/QuitUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/dcprefs/SaveReferenceUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/h2/StartH2WebServerAction.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/cefb17076a1893685b690bc5dc… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/cefb17076a1893685b690bc5dc… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Déplacer le menu traduire dans le menu Aide (See #849)
by Tony CHEMIT 17 Aug '17

17 Aug '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 769fa9ff by Tony CHEMIT at 2017-08-16T16:40:33+02:00 Déplacer le menu traduire dans le menu Aide (See #849) - - - - - cefb1707 by Tony CHEMIT at 2017-08-17T09:54:14+02:00 Amélioration de la disposition des racourcis claviers dans les menus (See #848) - - - - - 30 changed files: - client/pom.xml - client/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jcss - client/src/main/java/fr/ird/observe/client/ui/ObserveMainUIModel.java - client/src/main/java/fr/ird/observe/client/ui/actions/AbstractUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/AbstractContentUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/h2/StartH2WebServerAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/h2/StopH2WebServerAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/menu/config/ChangeDbLanguageActionSupport.java → client/src/main/java/fr/ird/observe/client/ui/actions/h2/StopServerModeAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/menu/MenuActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/actions/menu/action/LaunchAdminActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/actions/menu/config/ChangeApplicationLanguageActionSupport.java → client/src/main/java/fr/ird/observe/client/ui/actions/menu/config/ChangeLanguageActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/actions/menu/config/ChangeApplicationLanguageToEnglishAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/menu/config/ChangeLanguageToEnglishAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/menu/config/ChangeApplicationLanguageToFrenchAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/menu/config/ChangeLanguageToFrenchAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/menu/config/ChangeApplicationLanguageToSpanishAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/menu/config/ChangeLanguageToSpanishAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/menu/config/ReloadDefaultConfigurationAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/menu/config/ReloadResourcesAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/menu/config/ShowConfigAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/menu/config/ShowDataSourcePresetsAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/menu/config/ShowFloatingObjectReferencesAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/menu/config/TranslateAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/menu/file/CloseApplicationAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/menu/file/ReloadApplicationAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/menu/file/ToFullScreenAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/menu/file/ToWindowScreenAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/menu/help/GotoSiteAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/menu/help/ShowAboutAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/menu/navigation/GotoActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/actions/menu/storage/ChangeStorageAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/menu/config/ChangeDbLanguageToSpanishAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/menu/storage/ChangeStorageAction2.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/24de97b44be23625767defab5a… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/24de97b44be23625767defab5a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Amélioration de la disposition des racourcis claviers dans les menus (See #848)
by Tony CHEMIT 16 Aug '17

16 Aug '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 24de97b4 by Tony CHEMIT at 2017-08-16T16:30:06+02:00 Amélioration de la disposition des racourcis claviers dans les menus (See #848) - - - - - 30 changed files: - client/src/main/java/fr/ird/observe/client/ui/ObserveKeyStrokes.java - client/src/main/java/fr/ird/observe/client/ui/actions/AbstractUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/menu/MenuActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/actions/menu/action/LaunchAdminActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/actions/menu/config/ChangeApplicationLanguageActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/actions/menu/config/ChangeApplicationLanguageToEnglishAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/menu/config/ChangeApplicationLanguageToFrenchAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/menu/config/ChangeApplicationLanguageToSpanishAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/menu/config/ChangeDbLanguageActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/actions/menu/config/ChangeDbLanguageToEnglishAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/menu/config/ChangeDbLanguageToFrenchAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/menu/config/ChangeDbLanguageToSpanishAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/menu/config/ReloadDefaultConfigurationAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/menu/config/ReloadResourcesAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/menu/config/ShowConfigAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/menu/config/ShowDataSourcePresetsAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/menu/config/ShowFloatingObjectReferencesAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/menu/config/TranslateAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/menu/file/CloseApplicationAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/menu/file/ReloadApplicationAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/menu/file/ToFullScreenAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/menu/file/ToWindowScreenAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/menu/help/GotoSiteAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/menu/help/ShowAboutAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/menu/navigation/GotoActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/actions/menu/storage/ChangeStorageAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/menu/storage/CloseStorageAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/menu/storage/ImportStorageFromFileAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/menu/storage/ReloadStorageAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/menu/storage/SaveStorageToFileAction.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/24de97b44be23625767defab5a4… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/24de97b44be23625767defab5a4… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] simplify ui packages names (remove the impl sub package)
by Tony CHEMIT 15 Aug '17

15 Aug '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 43b7a843 by Tony CHEMIT at 2017-08-15T19:13:58+02:00 simplify ui packages names (remove the impl sub package) - - - - - 30 changed files: - client/src/main/java/fr/ird/observe/client/ObserveTextGenerator.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/AddFloatingObjectReferenceUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/CloseAndCreateUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/CloseOpenUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/CopyFloatingObjectPartToLeftAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/CopyFloatingObjectPartToRightAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/EditFloatingObjectReferenceUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivityLonglinesUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivitySeinesUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveRoutesUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveTripLonglinesUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveTripSeinesUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/RemoveFloatingObjectReferenceUIAction.java - client/src/main/java/fr/ird/observe/client/ui/admin/config/ConfigModel.java - client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroModel.java - client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/admin/validate/ValidateModel.java - client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/ObserveFocusManager.java - client/src/main/java/fr/ird/observe/client/ui/content/list/impl/CommonListUI.jcss → client/src/main/java/fr/ird/observe/client/ui/content/list/CommonListUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/list/impl/longline/ActivityLonglinesUI.jaxx → client/src/main/java/fr/ird/observe/client/ui/content/list/longline/ActivityLonglinesUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/list/impl/longline/ActivityLonglinesUI.jcss → client/src/main/java/fr/ird/observe/client/ui/content/list/longline/ActivityLonglinesUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java → client/src/main/java/fr/ird/observe/client/ui/content/list/longline/ActivityLonglinesUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/list/impl/longline/ActivityLonglinesUIModel.java → client/src/main/java/fr/ird/observe/client/ui/content/list/longline/ActivityLonglinesUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/list/impl/longline/TripLonglinesUI.jaxx → client/src/main/java/fr/ird/observe/client/ui/content/list/longline/TripLonglinesUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/list/impl/longline/TripLonglinesUI.jcss → client/src/main/java/fr/ird/observe/client/ui/content/list/longline/TripLonglinesUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/list/impl/longline/TripLonglinesUIHandler.java → client/src/main/java/fr/ird/observe/client/ui/content/list/longline/TripLonglinesUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/list/impl/longline/TripLonglinesUIModel.java → client/src/main/java/fr/ird/observe/client/ui/content/list/longline/TripLonglinesUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/list/impl/seine/ActivitySeinesUI.jaxx → client/src/main/java/fr/ird/observe/client/ui/content/list/seine/ActivitySeinesUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/list/impl/seine/ActivitySeinesUI.jcss → client/src/main/java/fr/ird/observe/client/ui/content/list/seine/ActivitySeinesUI.jcss The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/43b7a84300b0803d953d257cc74… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/43b7a84300b0803d953d257cc74… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] fix method name
by Tony CHEMIT 15 Aug '17

15 Aug '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ccee346a by Tony CHEMIT at 2017-08-15T17:24:59+02:00 fix method name - - - - - 1 changed file: - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetSampleUI.jaxx Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetSampleUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetSampleUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetSampleUI.jaxx @@ -74,7 +74,7 @@ </BeanValidator> <ButtonGroup id='acquisitionModeGroup' - onStateChanged='getHandler().updateModeSaisie((AcquisitionMode) acquisitionModeGroup.getSelectedValue())'/> + onStateChanged='getHandler().updateAcquisitionMode((AcquisitionMode) acquisitionModeGroup.getSelectedValue())'/> <script><![CDATA[ View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ccee346a6d1aee08990d3745395… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ccee346a6d1aee08990d3745395… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Dans les écrans de sélections de marées (export, backup, ...) il faudrait…
by Tony CHEMIT 15 Aug '17

15 Aug '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 3db9e63c by Tony CHEMIT at 2017-08-15T17:07:00+02:00 Dans les écrans de sélections de marées (export, backup, ...) il faudrait supprimer les programmes sans marée (See #847) - - - - - 5 changed files: - client/src/main/java/fr/ird/observe/client/ui/admin/config/SelectDataModel.java - client/src/main/java/fr/ird/observe/client/ui/admin/config/SelectDataUI.jcss - client/src/main/java/fr/ird/observe/client/ui/storage/StorageUIModel.java - client/src/main/java/fr/ird/observe/client/ui/storage/tabs/SelectDataUI.jcss - client/src/main/java/fr/ird/observe/client/ui/tree/selection/SelectionTree.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/admin/config/SelectDataModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/admin/config/SelectDataModel.java +++ b/client/src/main/java/fr/ird/observe/client/ui/admin/config/SelectDataModel.java @@ -74,9 +74,7 @@ public class SelectDataModel extends AdminActionModel { ObserveSwingDataSource dataSource = uiModel.getConfigModel().getSafeLocalSource(true); - if (dataSource.isLocal()) { - selectionDataModel.setShowEmptyTrips(false); - } + selectionDataModel.setShowEmptyTrips(false); boolean selectAllTrips = true; if (uiModel.containsOperation(AdminStep.REPORT)) { ===================================== client/src/main/java/fr/ird/observe/client/ui/admin/config/SelectDataUI.jcss ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/admin/config/SelectDataUI.jcss +++ b/client/src/main/java/fr/ird/observe/client/ui/admin/config/SelectDataUI.jcss @@ -25,7 +25,6 @@ } #selectTree { - minimumSize:{UIHelper.newMinDimension()}; font-size:11; } ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/StorageUIModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/storage/StorageUIModel.java +++ b/client/src/main/java/fr/ird/observe/client/ui/storage/StorageUIModel.java @@ -25,11 +25,11 @@ import fr.ird.observe.client.I18nEnumHelper; import fr.ird.observe.client.ObserveSwingApplicationContext; import fr.ird.observe.client.ObserveSwingTechnicalException; import fr.ird.observe.client.configuration.ClientConfig; +import fr.ird.observe.client.constants.ConnexionStatus; import fr.ird.observe.client.constants.CreationMode; import fr.ird.observe.client.constants.DbMode; import fr.ird.observe.client.db.ObserveDataSourcesManager; import fr.ird.observe.client.db.ObserveSwingDataSource; -import fr.ird.observe.client.constants.ConnexionStatus; import fr.ird.observe.client.ui.storage.tabs.SecurityModel; import fr.ird.observe.client.ui.tree.selection.SelectionTreeModel; import fr.ird.observe.client.ui.util.ProgressModel; @@ -1106,14 +1106,19 @@ public class StorageUIModel extends WizardModel<StorageStep> { public String getLabelWithUrl() { String txt; - if (DbMode.USE_LOCAL == dbMode) { - txt = h2Config.getDatabaseFile().getAbsolutePath(); - } else { - if (isRemote()) { + switch (dbMode) { + + case USE_LOCAL: + txt = h2Config.getDatabaseFile().getAbsolutePath(); + break; + case USE_SERVER: + txt = restConfig.getServerUrl() == null ? "" : restConfig.getServerUrl().toString(); + break; + case USE_REMOTE: txt = pgConfig.getJdbcUrl(); - } else { - txt = restConfig.getServerUrl().toString(); - } + break; + default: + throw new IllegalStateException(String.format("Can't have a such mode: %s", dbMode)); } return String.format("%s (%s)", getLabel(), txt); } ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/tabs/SelectDataUI.jcss ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/storage/tabs/SelectDataUI.jcss +++ b/client/src/main/java/fr/ird/observe/client/ui/storage/tabs/SelectDataUI.jcss @@ -30,8 +30,6 @@ #selectTree { rootVisible:false; - largeModel:true; font-size:11; - toggleClickCount:100; } ===================================== client/src/main/java/fr/ird/observe/client/ui/tree/selection/SelectionTree.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/tree/selection/SelectionTree.java +++ b/client/src/main/java/fr/ird/observe/client/ui/tree/selection/SelectionTree.java @@ -23,8 +23,11 @@ package fr.ird.observe.client.ui.tree.selection; */ import fr.ird.observe.client.ui.ObserveKeyStrokes; +import fr.ird.observe.client.ui.UIHelper; import fr.ird.observe.client.ui.tree.selection.nodes.SelectionTreeNodeSupport; import java.awt.event.ActionEvent; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; import javax.swing.AbstractAction; import javax.swing.ActionMap; import javax.swing.InputMap; @@ -46,7 +49,8 @@ public class SelectionTree extends JXTree { setRootVisible(false); setRowHeight(30); getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION); - + setMinimumSize(UIHelper.newMinDimension()); + setToggleClickCount(100); } public void installUI() { @@ -57,13 +61,16 @@ public class SelectionTree extends JXTree { actionMap.put("select/unselect", new AbstractAction() { @Override public void actionPerformed(ActionEvent e) { - Object selectedRow = getLastSelectedPathComponent(); - if (selectedRow == null) { - return; - } + selectUnSelect(SelectionTree.this); + } + }); - SelectionTreeNodeSupport node = (SelectionTreeNodeSupport) selectedRow; - getTreeModel().setValueAt(node, !node.isSelected()); + addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + if (e.getClickCount() == 2) { + selectUnSelect(SelectionTree.this); + } } }); } @@ -78,27 +85,38 @@ public class SelectionTree extends JXTree { @Override public void actionPerformed(ActionEvent e) { - if (isFocusOwner()) { - forTree(SelectionTree.this); - } else { - forTree(oppositeTree); - } + selectUnSelectWithOpposite(oppositeTree); } - - private void forTree(SelectionTree tree) { - Object selectedRow = tree.getLastSelectedPathComponent(); - if (selectedRow == null) { - return; + }); + addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + if (e.getClickCount() == 2) { + selectUnSelectWithOpposite(oppositeTree); } - - SelectionTreeNodeSupport node = (SelectionTreeNodeSupport) selectedRow; - tree.getTreeModel().setValueAt(node, !node.isSelected()); } }); } + private void selectUnSelectWithOpposite(SelectionTree oppositeTree) { + if (isFocusOwner()) { + selectUnSelect(SelectionTree.this); + } else { + selectUnSelect(oppositeTree); + } + } + public SelectionTreeModel getTreeModel() { return (SelectionTreeModel) getModel(); } + private void selectUnSelect(SelectionTree tree) { + Object selectedRow = tree.getLastSelectedPathComponent(); + if (selectedRow == null) { + return; + } + + SelectionTreeNodeSupport node = (SelectionTreeNodeSupport) selectedRow; + tree.getTreeModel().setValueAt(node, !node.isSelected()); + } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/3db9e63c852da18d700a344cc33… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/3db9e63c852da18d700a344cc33… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [PS][Echantillons] Afficher le type de mensuration utilisé dans le tableau…
by Tony CHEMIT 15 Aug '17

15 Aug '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: c636d115 by Tony CHEMIT at 2017-08-15T16:33:09+02:00 [PS][Echantillons] Afficher le type de mensuration utilisé dans le tableau d'empilement des échantillons (See #836) - - - - - 7 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetSampleUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetSampleUIModel.java - client/src/main/resources/i18n/client_en_GB.properties - client/src/main/resources/i18n/client_es_ES.properties - client/src/main/resources/i18n/client_fr_FR.properties - services/src/main/java/fr/ird/observe/services/validation/validators/AbstractSpeciesFieldDtoValidator.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchUIHandler.java @@ -373,9 +373,9 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeineNonTa addReferentialFilter(NonTargetCatchDto.PROPERTY_SPECIES, (ReferentialReferencesFilter<SpeciesDto>) incomingReferences -> { String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineNonTargetCatchId(); - String tripLonglineId = getDataContext().getSelectedTripLonglineId(); + String tripId = getDataContext().getSelectedTripSeineId(); - List<ReferentialReference<SpeciesDto>> result = getTripSeineService().getSpeciesByListAndTrip(tripLonglineId, speciesListId); + List<ReferentialReference<SpeciesDto>> result = getTripSeineService().getSpeciesByListAndTrip(tripId, speciesListId); return ReferentialReferences.filterEnabled(result); ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetSampleUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetSampleUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetSampleUIHandler.java @@ -189,13 +189,19 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS protected void initTableUI(DefaultTableCellRenderer renderer) { JTable table = getUi().getTable(); - UIHelper.fixTableColumnWidth(table, 1, 100); + UIHelper.fixTableColumnWidth(table, 1, 200); UIHelper.fixTableColumnWidth(table, 2, 100); + UIHelper.fixTableColumnWidth(table, 3, 100); + UIHelper.fixTableColumnWidth(table, 4, 75); + UIHelper.fixTableColumnWidth(table, 4, 75); + UIHelper.fixTableColumnWidth(table, 5, 150); UIHelper.setI18nTableHeaderRenderer( table, - n("observe.content.nonTargetSample.table.speciesFaune"), - n("observe.content.nonTargetSample.table.speciesFaune.tip"), + n("observe.content.nonTargetSample.table.nonTargetSpecies"), + n("observe.content.nonTargetSample.table.nonTargetSpecies.tip"), + n("observe.content.nonTargetSample.table.sizeMeasureType"), + n("observe.content.nonTargetSample.table.sizeMeasureType.tip"), n("observe.content.nonTargetSample.table.length"), n("observe.content.nonTargetSample.table.length.tip"), n("observe.content.nonTargetSample.table.meanWeight"), @@ -208,11 +214,12 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS n("observe.content.nonTargetSample.table.picturesReferences.tip")); UIHelper.setTableColumnRenderer(table, 0, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, SpeciesDto.class)); - UIHelper.setTableColumnRenderer(table, 1, UIHelper.newEmptyNumberTableCellRenderer(renderer)); + UIHelper.setTableColumnRenderer(table, 1, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, SizeMeasureTypeDto.class)); UIHelper.setTableColumnRenderer(table, 2, UIHelper.newEmptyNumberTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 3, UIHelper.newEmptyNumberTableCellRenderer(renderer)); - UIHelper.setTableColumnRenderer(table, 4, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, SexDto.class)); - UIHelper.setTableColumnRenderer(table, 5, renderer); + UIHelper.setTableColumnRenderer(table, 4, UIHelper.newEmptyNumberTableCellRenderer(renderer)); + UIHelper.setTableColumnRenderer(table, 5, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, SexDto.class)); + UIHelper.setTableColumnRenderer(table, 6, renderer); } @Override @@ -244,10 +251,10 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS * @param newMode le nouveau de mode de saisie à utiliser * @since 3.0 */ - void updateModeSaisie(AcquisitionMode newMode) { + void updateAcquisitionMode(AcquisitionMode newMode) { if (log.isDebugEnabled()) { - log.debug("Change mode saisie to " + newMode); + log.debug(String.format("Change acquisition mode to %s", newMode)); } if (newMode == null) { ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetSampleUIModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetSampleUIModel.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetSampleUIModel.java @@ -70,11 +70,13 @@ public class NonTargetSampleUIModel extends ContentTableUIModel<NonTargetSampleD NonTargetLengthDto.PROPERTY_COUNT, NonTargetLengthDto.PROPERTY_SPECIES_FATE, NonTargetLengthDto.PROPERTY_ACQUISITION_MODE, + NonTargetLengthDto.PROPERTY_SIZE_MEASURE_TYPE, NonTargetLengthDto.PROPERTY_PICTURES_REFERENCES }); List<ContentTableMeta<NonTargetLengthDto>> metas = Arrays.asList( ContentTableModel.newTableMeta(NonTargetLengthDto.class, NonTargetLengthDto.PROPERTY_SPECIES, false), + ContentTableModel.newTableMeta(NonTargetLengthDto.class, NonTargetLengthDto.PROPERTY_SIZE_MEASURE_TYPE, false), ContentTableModel.newTableMeta(NonTargetLengthDto.class, NonTargetLengthDto.PROPERTY_LENGTH, false), ContentTableModel.newTableMeta(NonTargetLengthDto.class, NonTargetLengthDto.PROPERTY_WEIGHT, false), ContentTableModel.newTableMeta(NonTargetLengthDto.class, NonTargetLengthDto.PROPERTY_COUNT, false), @@ -127,6 +129,7 @@ public class NonTargetSampleUIModel extends ContentTableUIModel<NonTargetSampleD @Override public <R extends ReferentialDto> Optional<Set<ReferentialReference<R>>> tryToGetReferentialReferenceSet(String propertyName) { + //noinspection unchecked ReferentialReferenceSet<R> referenceSet = (ReferentialReferenceSet) this.referentialReferenceSetsByPropertyName.get(propertyName); Set<ReferentialReference<R>> references = null; if (referenceSet != null) { ===================================== client/src/main/resources/i18n/client_en_GB.properties ===================================== --- a/client/src/main/resources/i18n/client_en_GB.properties +++ b/client/src/main/resources/i18n/client_en_GB.properties @@ -1002,10 +1002,12 @@ observe.content.nonTargetSample.table.length=Length observe.content.nonTargetSample.table.length.tip=Length observe.content.nonTargetSample.table.meanWeight=Indiv. Weight observe.content.nonTargetSample.table.meanWeight.tip=Individual weight (en Kg) +observe.content.nonTargetSample.table.nonTargetSpecies=Species +observe.content.nonTargetSample.table.nonTargetSpecies.tip=Non target species observe.content.nonTargetSample.table.picturesReferences=Pictures references observe.content.nonTargetSample.table.picturesReferences.tip=Pictures references -observe.content.nonTargetSample.table.speciesFaune=Species -observe.content.nonTargetSample.table.speciesFaune.tip=Non target species +observe.content.nonTargetSample.table.sizeMeasureType=Measure type +observe.content.nonTargetSample.table.sizeMeasureType.tip=Size measure type observe.content.objectObservedSpecies.table.count=Count observe.content.objectObservedSpecies.table.count.tip=Count observe.content.objectObservedSpecies.table.speciesFaune=Species ===================================== client/src/main/resources/i18n/client_es_ES.properties ===================================== --- a/client/src/main/resources/i18n/client_es_ES.properties +++ b/client/src/main/resources/i18n/client_es_ES.properties @@ -1002,10 +1002,12 @@ observe.content.nonTargetSample.table.length=Talla observe.content.nonTargetSample.table.length.tip=Talla observe.content.nonTargetSample.table.meanWeight=Peso observe.content.nonTargetSample.table.meanWeight.tip=Peso del individuo +observe.content.nonTargetSample.table.nonTargetSpecies=Especie +observe.content.nonTargetSample.table.nonTargetSpecies.tip=Especie observe.content.nonTargetSample.table.picturesReferences=Ref. foto observe.content.nonTargetSample.table.picturesReferences.tip=Referencia foto -observe.content.nonTargetSample.table.speciesFaune=Especie -observe.content.nonTargetSample.table.speciesFaune.tip=Especie +observe.content.nonTargetSample.table.sizeMeasureType=Typo de medida +observe.content.nonTargetSample.table.sizeMeasureType.tip=Typo de medida observe.content.objectObservedSpecies.table.count=Número observe.content.objectObservedSpecies.table.count.tip=Número observe.content.objectObservedSpecies.table.speciesFaune=Especie ===================================== client/src/main/resources/i18n/client_fr_FR.properties ===================================== --- a/client/src/main/resources/i18n/client_fr_FR.properties +++ b/client/src/main/resources/i18n/client_fr_FR.properties @@ -1002,10 +1002,12 @@ observe.content.nonTargetSample.table.length=Longueur observe.content.nonTargetSample.table.length.tip=Longueur observe.content.nonTargetSample.table.meanWeight=Poids ind. observe.content.nonTargetSample.table.meanWeight.tip=Poids individuel (en Kg) +observe.content.nonTargetSample.table.nonTargetSpecies=Espèce faune +observe.content.nonTargetSample.table.nonTargetSpecies.tip=Espèce faune observe.content.nonTargetSample.table.picturesReferences=Ref photo observe.content.nonTargetSample.table.picturesReferences.tip=référence photo -observe.content.nonTargetSample.table.speciesFaune=Espèce faune -observe.content.nonTargetSample.table.speciesFaune.tip=Espèce faune +observe.content.nonTargetSample.table.sizeMeasureType=Type de mensuration +observe.content.nonTargetSample.table.sizeMeasureType.tip=Le type de mensuration utilisé (LF ou LD1) observe.content.objectObservedSpecies.table.count=Nombre observe.content.objectObservedSpecies.table.count.tip=Nombre observe.content.objectObservedSpecies.table.speciesFaune=Espèce de faune ===================================== services/src/main/java/fr/ird/observe/services/validation/validators/AbstractSpeciesFieldDtoValidator.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/validation/validators/AbstractSpeciesFieldDtoValidator.java +++ b/services/src/main/java/fr/ird/observe/services/validation/validators/AbstractSpeciesFieldDtoValidator.java @@ -148,7 +148,9 @@ public abstract class AbstractSpeciesFieldDtoValidator extends FieldValidatorSup if (this.enable != enable) { - log.info("Skip speed validation"); + if (log.isDebugEnabled()) { + log.debug("Skip speed validation"); + } return false; } @@ -208,8 +210,8 @@ public abstract class AbstractSpeciesFieldDtoValidator extends FieldValidatorSup log.debug("data to validate : " + data); } - // l'species associée - ReferentialReference<SpeciesDto> speciesRef = (ReferentialReference<SpeciesDto>) getFieldValue(speciesFieldName, object); + //noinspection unchecked + ReferentialReference<SpeciesDto> speciesRef = (ReferentialReference) getFieldValue(speciesFieldName, object); if (speciesRef == null) { @@ -218,7 +220,7 @@ public abstract class AbstractSpeciesFieldDtoValidator extends FieldValidatorSup } if (log.isDebugEnabled()) { - log.debug("Espece to validate : " + speciesRef); + log.debug("Species to validate : " + speciesRef); } SpeciesDto speciesDto = (SpeciesDto) stack.findValue("getSpecies(\"" + speciesRef.getId() + "\")"); @@ -226,7 +228,7 @@ public abstract class AbstractSpeciesFieldDtoValidator extends FieldValidatorSup Bound bound = getBound(speciesDto); if (log.isDebugEnabled()) { - log.debug("Espece Bound to validate : " + bound); + log.debug("Species Bound to validate : " + bound); } if (bound == null) { @@ -237,10 +239,10 @@ public abstract class AbstractSpeciesFieldDtoValidator extends FieldValidatorSup Bound boundWithRatio = bound.applyRatio(ratio); - if (log.isInfoEnabled()) { - log.info("Bound : " + bound); - log.info("Ratio to validate : " + ratio); - log.info("Bound with ratio : " + boundWithRatio); + if (log.isDebugEnabled()) { + log.debug("Bound : " + bound); + log.debug("Ratio to validate : " + ratio); + log.debug("Bound with ratio : " + boundWithRatio); } boolean valid = validateBound(data, boundWithRatio); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/c636d115f82cb2d2132b904e3ce… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/c636d115f82cb2d2132b904e3ce… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Ajout de l'url de la base sélectionné dans l'écran de configuration d'une action
by Tony CHEMIT 15 Aug '17

15 Aug '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: db7e2df5 by Tony CHEMIT at 2017-08-15T16:07:02+02:00 Ajout de l'url de la base sélectionné dans l'écran de configuration d'une action - - - - - 1 changed file: - client/src/main/java/fr/ird/observe/client/ui/admin/config/ConfigUIHandler.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/admin/config/ConfigUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/admin/config/ConfigUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/admin/config/ConfigUIHandler.java @@ -103,7 +103,7 @@ public class ConfigUIHandler extends AdminTabUIHandler<ConfigUI> implements UIHa if (serviceValid) { // on recupere le label du service - text = service.getLabel(); + text = service.getLabelWithUrl(); } else { // aucun service configuré View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/db7e2df55d645cee4b7fcf4802c… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/db7e2df55d645cee4b7fcf4802c… You're receiving this email because of your account on gitlab.com.

1 0