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

[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

[Git][ultreiaio/ird-observe][develop] La synchro avancée de référentiel ne fonctionne plus (See #841)
by Tony CHEMIT 15 Aug '17

15 Aug '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: c4301b93 by Tony CHEMIT at 2017-08-15T15:42:56+02:00 La synchro avancée de référentiel ne fonctionne plus (See #841) - - - - - 2 changed files: - client/src/main/java/fr/ird/observe/client/ui/storage/StorageUIHandler.java - services/src/main/java/fr/ird/observe/services/service/DataSourceService.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/StorageUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/storage/StorageUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/storage/StorageUIHandler.java @@ -792,7 +792,9 @@ public class StorageUIHandler implements UIHandler<StorageUI> { Boolean apply = (Boolean) abstractButton.getClientProperty("apply"); if (apply != null && apply) { SwingUtilities.invokeLater(() -> { - ui.getNextAction().doClick(); + if (ui.getModel().getNextStep()!=null) { + ui.getNextAction().doClick(); + } ui.getApplyAction().doClick(); }); } ===================================== services/src/main/java/fr/ird/observe/services/service/DataSourceService.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/service/DataSourceService.java +++ b/services/src/main/java/fr/ird/observe/services/service/DataSourceService.java @@ -63,7 +63,7 @@ public interface DataSourceService extends ObserveService, Closeable { @Get(addAuthtoken = false) void migrateData(ObserveDataSourceConfiguration dataSourceConfiguration); - @Get(addAuthtoken = false) + @Get Set<Class<? extends ReferentialDto>> getReferentialTypesInShell(); @Get View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/c4301b93939f06d5737dcd0febf… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/c4301b93939f06d5737dcd0febf… You're receiving this email because of your account on gitlab.com.

1 0