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

[Git][ultreiaio/ird-observe] Pushed new tag v6.0-RC-2
by Tony CHEMIT March 31, 2017

March 31, 2017

Tony CHEMIT pushed new tag v6.0-RC-2 at ultreiaio / ird-observe

1 0

[Git][ultreiaio/ird-observe][master] 11 commits: [jgitflow-maven-plugin]updating poms for 6.0-RC-3-SNAPSHOT development
by Tony CHEMIT March 31, 2017

March 31, 2017

Tony CHEMIT pushed to branch master at ultreiaio / ird-observe Commits: 219df83f by Tony CHEMIT at 2017-03-30T16:12:24+02:00 [jgitflow-maven-plugin]updating poms for 6.0-RC-3-SNAPSHOT development - - - - - fd2b5069 by Tony CHEMIT at 2017-03-30T16:18:23+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts - - - - - dc848ed4 by Tony CHEMIT at 2017-03-30T16:18:23+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 991c3c98 by Tony CHEMIT at 2017-03-30T16:18:24+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - b0e8e5e8 by Tony CHEMIT at 2017-03-30T16:25:57+02:00 Update changelog after stage of milestone 6.0-RC-2 - - - - - e684cde8 by Tony CHEMIT at 2017-03-30T16:31:25+02:00 update changelog - - - - - 3f222899 by Tony CHEMIT at 2017-03-30T16:38:02+02:00 fix release build (for site generation and demo deployement) - - - - - 64bc6735 by Tony CHEMIT at 2017-03-31T14:20:48+02:00 impossible de lancer l'assistant migration (See #764) - - - - - 92a50481 by Tony CHEMIT at 2017-03-31T14:22:52+02:00 reroll 6.0-RC-2 - - - - - 2144b5ef by Tony CHEMIT at 2017-03-31T14:24:05+02:00 [jgitflow-maven-plugin]updating poms for branch'release/6.0-RC-2' with non-snapshot versions - - - - - 00c4a3a0 by Tony CHEMIT at 2017-03-31T14:30:08+02:00 [jgitflow-maven-plugin]merging 'release/6.0-RC-2' into 'master' - - - - - 9 changed files: - .gitlab-ci.yml - CHANGELOG.md - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentRemoteConfigurationUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentServerConfigurationUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseRemoteConfigurationUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseServerConfigurationUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveActionMap.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUIHandler.java - pom.xml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -49,7 +49,7 @@ stages: .deploy_site: &deploy_site script: - - mvn clean verify site -DperformRelease scm-publish:publish-scm + - mvn clean install site -DperformRelease scm-publish:publish-scm .deploy_demo_latest: &deploy_demo_latest stage: Test ===================================== CHANGELOG.md ===================================== --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,33 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2017-03-29 18:02. + * Last generated at 2017-03-30 16:25. -## Version [6.0-RC-1](https://gitlab.com/ultreiaio/ird-observe/milestones/85) - -**Closed at *In progress*.** +## Version [6.0-RC-2](https://gitlab.com/ultreiaio/ird-observe/milestones/87) ### Download -* [Application (observe-6.0-RC-1.zip)](https://oss.sonatype.org/content/repositories/frirdo…) -* [Serveur (observe-6.0-RC-1.war)](https://oss.sonatype.org/content/repositories/frirdo…) +* [Application (observe-6.0-RC-2.zip)](https://oss.sonatype.org/content/repositories/frirdo…) +* [Serveur (observe-6.0-RC-2.war)](https://oss.sonatype.org/content/repositories/frirdo…) + +### Issues + * [[Anomalie 749]](https://gitlab.com/ultreiaio/ird-observe/issues/749) **Problème de fonctionnement de la fenêtre d'erreur** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 752]](https://gitlab.com/ultreiaio/ird-observe/issues/752) **Problème à la première ouverture de la v6, lorsqu'une base v5 est présente dans /db** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 754]](https://gitlab.com/ultreiaio/ird-observe/issues/754) **Le raccourci F6 semble ne pas fonctionner** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 759]](https://gitlab.com/ultreiaio/ird-observe/issues/759) **Perte des messages de validations** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 761]](https://gitlab.com/ultreiaio/ird-observe/issues/761) **Sur les doubles listes les boutons du mileu n'ont plus d'icones** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 762]](https://gitlab.com/ultreiaio/ird-observe/issues/762) **Possibilité d'insérer un capteur alors que son type n'a pas été renseigné** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 763]](https://gitlab.com/ultreiaio/ird-observe/issues/763) **Dans certaisn référentiels, les doubles listes ne prennent pas toute la place disponible à cet effet** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 750]](https://gitlab.com/ultreiaio/ird-observe/issues/750) **Filtres d'affichage de l'arbre** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 751]](https://gitlab.com/ultreiaio/ird-observe/issues/751) **Filtrage de l'arbre** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 753]](https://gitlab.com/ultreiaio/ird-observe/issues/753) **[UI] Mise en page de la fenêtre d'application** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 755]](https://gitlab.com/ultreiaio/ird-observe/issues/755) **[UI] Sortie au clavier d'une zone de texte** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 756]](https://gitlab.com/ultreiaio/ird-observe/issues/756) **[UI] Code couleur** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 757]](https://gitlab.com/ultreiaio/ird-observe/issues/757) **Ne pas faire une sauvegarde de la base si aucune action de modification n'a été effectuée sur la base locale** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 760]](https://gitlab.com/ultreiaio/ird-observe/issues/760) **Suppression des autres raccourcis claiviers lorsqu'un raccourci global existe pour la même action** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + +## Version [6.0-RC-1](https://gitlab.com/ultreiaio/ird-observe/milestones/85) + +**Closed at 2017-03-30.** ### Issues * [[Anomalie 529]](https://gitlab.com/ultreiaio/ird-observe/issues/529) **[LL] Problème sur l'ordre des sections/baskets dans le schéma de palangre selon le tri** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentRemoteConfigurationUIAction.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentRemoteConfigurationUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentRemoteConfigurationUIAction.java @@ -61,6 +61,10 @@ public class SaveCurrentRemoteConfigurationUIAction extends AbstractUIAction { super(mainUI, ACTION_NAME, t("observe.storage.remoteConfiguration.presets.save"), t("observe.storage.remoteConfiguration.presets.save"), "save", ObserveKeyStrokes.KEY_STROKE_SAVE); } + public SaveCurrentRemoteConfigurationUIAction(ConfigUI mainUI) { + super(null, ACTION_NAME, t("observe.storage.remoteConfiguration.presets.save"), t("observe.storage.remoteConfiguration.presets.save"), "save", ObserveKeyStrokes.KEY_STROKE_SAVE); + } + @Override public void actionPerformed(ActionEvent e) { ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentServerConfigurationUIAction.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentServerConfigurationUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentServerConfigurationUIAction.java @@ -60,6 +60,10 @@ public class SaveCurrentServerConfigurationUIAction extends AbstractUIAction { super(mainUI, ACTION_NAME, t("observe.storage.serverConfiguration.presets.save"), t("observe.storage.serverConfiguration.presets.save"), "save", ObserveKeyStrokes.KEY_STROKE_SAVE); } + public SaveCurrentServerConfigurationUIAction(ConfigUI mainUI) { + super(null, ACTION_NAME, t("observe.storage.serverConfiguration.presets.save"), t("observe.storage.serverConfiguration.presets.save"), "save", ObserveKeyStrokes.KEY_STROKE_SAVE); + } + @Override public void actionPerformed(ActionEvent e) { ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseRemoteConfigurationUIAction.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseRemoteConfigurationUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseRemoteConfigurationUIAction.java @@ -48,6 +48,10 @@ public class UseRemoteConfigurationUIAction extends AbstractUIAction { public static final String ACTION_NAME = UseRemoteConfigurationUIAction.class.getName(); + public UseRemoteConfigurationUIAction(ConfigUI mainUI) { + super(null, ACTION_NAME, null, null, "db-remote", null); + } + public UseRemoteConfigurationUIAction(ObserveMainUI mainUI) { super(mainUI, ACTION_NAME, null, null, "db-remote", null); } ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseServerConfigurationUIAction.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseServerConfigurationUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseServerConfigurationUIAction.java @@ -48,6 +48,10 @@ public class UseServerConfigurationUIAction extends AbstractUIAction { public static final String ACTION_NAME = UseServerConfigurationUIAction.class.getName(); + 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); } ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveActionMap.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveActionMap.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveActionMap.java @@ -27,18 +27,19 @@ import fr.ird.observe.application.swing.ObserveSwingTechnicalException; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.actions.AbstractUIAction; import fr.ird.observe.application.swing.ui.actions.global.AbstractGlobalUIAction; -import org.apache.commons.beanutils.ConstructorUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.reflections.Reflections; - +import java.awt.Component; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Modifier; +import java.util.Optional; +import java.util.Set; import javax.swing.Action; import javax.swing.ActionMap; import javax.swing.InputMap; import javax.swing.JComponent; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Modifier; -import java.util.Set; +import org.apache.commons.beanutils.ConstructorUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.reflections.Reflections; /** * Created on 10/11/16. @@ -51,16 +52,22 @@ public class ObserveActionMap extends ActionMap { /** Logger */ private static final Log log = LogFactory.getLog(ObserveActionMap.class); - private final ObserveMainUI ui; + private final Component ui; private final ImmutableMap<String, Class<? extends AbstractUIAction>> mapping; private final ImmutableMap<String, ? extends AbstractGlobalUIAction> globalActions; public ObserveActionMap(ObserveMainUI ui) { + this(ui, ui.getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW)); + } + + public ObserveActionMap(JComponent ui) { + this(ui, ui.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW)); + } + + public ObserveActionMap(Component ui, InputMap inputMap) { this.ui = ui; Set<Class<? extends AbstractUIAction>> actionTypes = new Reflections("fr.ird.observe.application.swing.ui.actions").getSubTypesOf(AbstractUIAction.class); - InputMap inputMap = ui.getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW); - ImmutableMap.Builder<String, Class<? extends AbstractUIAction>> mappingBuilder = ImmutableMap.builder(); ImmutableMap.Builder<String, AbstractGlobalUIAction> globalActionsBuilder = ImmutableMap.builder(); for (Class<? extends AbstractUIAction> actionType : actionTypes) { @@ -79,13 +86,16 @@ public class ObserveActionMap extends ActionMap { if (AbstractGlobalUIAction.class.isAssignableFrom(actionType)) { // action globale - Class<? extends AbstractGlobalUIAction> globalActionType = (Class) actionType; + Class<AbstractGlobalUIAction> globalActionType = (Class) actionType; if (log.isInfoEnabled()) { log.info("Register global action: " + actionId + " - type: " + globalActionType.getName()); } - AbstractGlobalUIAction globalUIAction = newAction(actionId, globalActionType); - globalActionsBuilder.put(actionId, globalUIAction); - inputMap.put(globalUIAction.getAcceleratorKey(), actionId); + Optional<AbstractGlobalUIAction> globalUIAction = newAction(actionId, globalActionType); + if (globalUIAction.isPresent()) { + + globalActionsBuilder.put(actionId, globalUIAction.get()); + inputMap.put(globalUIAction.get().getAcceleratorKey(), actionId); + } } else { @@ -104,6 +114,7 @@ public class ObserveActionMap extends ActionMap { } + @Override public Action get(Object key) { @@ -118,7 +129,8 @@ public class ObserveActionMap extends ActionMap { return super.get(key); } - return newAction((String) key, actionType); + Optional<? extends AbstractUIAction> optional = newAction((String) key, actionType); + return optional.orElse(null); } @@ -126,15 +138,16 @@ public class ObserveActionMap extends ActionMap { return globalActions; } - private <A extends AbstractUIAction> A newAction(String key, Class<A> actionType) { + private <A extends AbstractUIAction> Optional<A> newAction(String key, Class<A> actionType) { try { if (log.isDebugEnabled()) { log.debug("Create action: " + key + ", type: " + actionType.getName()); } - return ConstructorUtils.invokeConstructor(actionType, ui); + return Optional.of(ConstructorUtils.invokeConstructor(actionType, ui)); } catch (NoSuchMethodException | IllegalAccessException | InstantiationException | InvocationTargetException e) { - throw new ObserveSwingTechnicalException("Hum, can't creation action for type: " + actionType.getName(), e); + return Optional.empty(); +// throw new ObserveSwingTechnicalException("Hum, can't creation action for type: " + actionType.getName(), e); } } ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUIHandler.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUIHandler.java @@ -36,22 +36,22 @@ import fr.ird.observe.application.swing.ui.storage.StorageStep; import fr.ird.observe.application.swing.ui.storage.StorageUIModel; import fr.ird.observe.services.dto.presets.RemoteDataSourceConfiguration; import fr.ird.observe.services.dto.presets.ServerDataSourceConfiguration; -import org.nuiton.jaxx.runtime.spi.UIHandler; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import javax.swing.AbstractAction; -import javax.swing.AbstractButton; -import javax.swing.ActionMap; -import javax.swing.Icon; -import javax.swing.JComponent; -import javax.swing.JMenuItem; import java.awt.BorderLayout; import java.awt.Color; import java.awt.event.ActionEvent; import java.beans.PropertyChangeListener; import java.io.File; import java.util.Objects; +import javax.swing.AbstractAction; +import javax.swing.AbstractButton; +import javax.swing.ActionMap; +import javax.swing.Icon; +import javax.swing.JComponent; +import javax.swing.JMenuItem; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.jaxx.runtime.spi.UIHandler; + import static fr.ird.observe.application.swing.ui.content.ContentUIInitializer.OBSERVE_ACTION; import static javax.swing.JComponent.WHEN_IN_FOCUSED_WINDOW; @@ -70,10 +70,15 @@ public class ConfigUIHandler extends StorageTabUIHandler<ConfigUI> implements UI public static final String ACTION_DO_CHOOSE_FILE = "doChooseFile"; public static final String ACTION_DO_USE_SSL = "doUseSsl"; + private ObserveActionMap observeActionMap; @Override public void afterInit(ConfigUI ui) { + observeActionMap = ObserveSwingApplicationContext.get().getActionMap(); + if (observeActionMap ==null) { + observeActionMap = new ObserveActionMap(ui); + } PropertyChangeListener listener = evt -> { StorageUIModel model = (StorageUIModel) evt.getSource(); String propertyName = evt.getPropertyName(); @@ -119,41 +124,38 @@ public class ConfigUIHandler extends StorageTabUIHandler<ConfigUI> implements UI ui.getInputMap(WHEN_IN_FOCUSED_WINDOW).put(ObserveKeyStrokes.KEY_STROKE_STORAGE_DO_USE_SSL, ACTION_DO_USE_SSL); ObserveKeyStrokes.addKeyStroke(ui.getRemoteUseSsl(), ObserveKeyStrokes.KEY_STROKE_STORAGE_DO_USE_SSL); - ObserveActionMap observeActionMap = ObserveSwingApplicationContext.get().getMainUI().getObserveActionMap(); - init(observeActionMap, ui.getSaveRemoteConfiguration()); - init(observeActionMap, ui.getSaveServerConfiguration()); - init(observeActionMap, ui.getServerMenu()); - init(observeActionMap, ui.getRemoteMenu()); + init(ui.getSaveRemoteConfiguration()); + init(ui.getSaveServerConfiguration()); + init(ui.getServerMenu()); + init(ui.getRemoteMenu()); - for (RemoteDataSourceConfiguration configuration : ObserveSwingApplicationContext.get().getMainUI().getConfig().getRemoteDataSourceConfigurations()) { + for (RemoteDataSourceConfiguration configuration : ObserveSwingApplicationContext.get().getConfig().getRemoteDataSourceConfigurations()) { addRemoteConfiguration(configuration); } - for (ServerDataSourceConfiguration configuration : ObserveSwingApplicationContext.get().getMainUI().getConfig().getServerDataSourceConfigurations()) { + for (ServerDataSourceConfiguration configuration : ObserveSwingApplicationContext.get().getConfig().getServerDataSourceConfigurations()) { addServerConfiguration(configuration); } } public void addRemoteConfiguration(RemoteDataSourceConfiguration configuration) { - ObserveActionMap observeActionMap = ObserveSwingApplicationContext.get().getMainUI().getObserveActionMap(); 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); - AbstractUIAction action = init(observeActionMap, item); + AbstractUIAction action = init(item); action.updateAction(ui, item); ui.getRemoteMenu().add(item); } public void addServerConfiguration(ServerDataSourceConfiguration configuration) { - ObserveActionMap observeActionMap = ObserveSwingApplicationContext.get().getMainUI().getObserveActionMap(); 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); - AbstractUIAction action = init(observeActionMap, item); + AbstractUIAction action = init(item); action.updateAction(ui, item); ui.getServerMenu().add(item); } @@ -205,7 +207,7 @@ public class ConfigUIHandler extends StorageTabUIHandler<ConfigUI> implements UI } - protected AbstractUIAction init(ActionMap actionMap, AbstractButton editor) { + protected AbstractUIAction init(AbstractButton editor) { String actionId = (String) editor.getClientProperty(OBSERVE_ACTION); if (actionId == null) { // le boutton n'est pas commun @@ -213,7 +215,7 @@ public class ConfigUIHandler extends StorageTabUIHandler<ConfigUI> implements UI } // on a trouve une action commune - AbstractUIAction action = (AbstractUIAction) actionMap.get(actionId); + AbstractUIAction action = (AbstractUIAction) this.observeActionMap.get(actionId); Objects.requireNonNull(action, "action [" + actionId + "] not found for ui " + ui.getClass().getName()); if (log.isDebugEnabled()) { ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -757,6 +757,15 @@ <build> +  + <extensions> + <extension> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-ssh-external</artifactId> + <version>2.2</version> + </extension> + </extensions> + <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/2d4a14277aa8fd82c9a59e7e14…

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: [jgitflow-maven-plugin]updating poms for branch'release/6.0-RC-2' with non-snapshot versions
by Tony CHEMIT March 31, 2017

March 31, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 2144b5ef by Tony CHEMIT at 2017-03-31T14:24:05+02:00 [jgitflow-maven-plugin]updating poms for branch'release/6.0-RC-2' with non-snapshot versions - - - - - 00c4a3a0 by Tony CHEMIT at 2017-03-31T14:30:08+02:00 [jgitflow-maven-plugin]merging 'release/6.0-RC-2' into 'master' - - - - - 424821f9 by Tony CHEMIT at 2017-03-31T14:30:11+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts - - - - - 46b120b7 by Tony CHEMIT at 2017-03-31T14:30:11+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 20316936 by Tony CHEMIT at 2017-03-31T14:30:12+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/ea8a6138d2b4953bd078e9ec77…

1 0

[Git][ultreiaio/ird-observe][develop] [jgitflow-maven-plugin]updating poms for 6.0-RC-3-SNAPSHOT development
by Tony CHEMIT March 31, 2017

March 31, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ea8a6138 by Tony CHEMIT at 2017-03-31T14:23:45+02:00 [jgitflow-maven-plugin]updating poms for 6.0-RC-3-SNAPSHOT development - - - - - 20 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - common/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - services-binder/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia/pom.xml - services-validation/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>application-web</artifactId> ===================================== common/pom.xml ===================================== --- a/common/pom.xml +++ b/common/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>common</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe</name> ===================================== services-binder/pom.xml ===================================== --- a/services-binder/pom.xml +++ b/services-binder/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>services-binder</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>services-topia</artifactId> ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>services-validation</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ea8a6138d2b4953bd078e9ec774…

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/6.0-RC-2
by Tony CHEMIT March 31, 2017

March 31, 2017

Tony CHEMIT pushed new branch release/6.0-RC-2 at ultreiaio / ird-observe

1 0

[Git][ultreiaio/ird-observe][develop] reroll 6.0-RC-2
by Tony CHEMIT March 31, 2017

March 31, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 92a50481 by Tony CHEMIT at 2017-03-31T14:22:52+02:00 reroll 6.0-RC-2 - - - - - 20 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - common/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - services-binder/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia/pom.xml - services-validation/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-3-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-3-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-3-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-3-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-3-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-3-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-web</artifactId> ===================================== common/pom.xml ===================================== --- a/common/pom.xml +++ b/common/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-3-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>common</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-3-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-3-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-3-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe</name> ===================================== services-binder/pom.xml ===================================== --- a/services-binder/pom.xml +++ b/services-binder/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-3-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-binder</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-3-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-3-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-3-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-topia</artifactId> ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-3-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-validation</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-3-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-3-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-3-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-3-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-3-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/92a5048148ccf10af80f26e6b8b…

1 0

[Git][ultreiaio/ird-observe] Deleted tag v6.0-RC-2
by Tony CHEMIT March 31, 2017

March 31, 2017

Tony CHEMIT deleted tag v6.0-RC-2 at ultreiaio / ird-observe

1 0

[Git][ultreiaio/ird-observe][develop] impossible de lancer l'assistant migration (See #764)
by Tony CHEMIT March 31, 2017

March 31, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 64bc6735 by Tony CHEMIT at 2017-03-31T14:20:48+02:00 impossible de lancer l'assistant migration (See #764) - - - - - 6 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentRemoteConfigurationUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentServerConfigurationUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseRemoteConfigurationUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseServerConfigurationUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveActionMap.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUIHandler.java Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentRemoteConfigurationUIAction.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentRemoteConfigurationUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentRemoteConfigurationUIAction.java @@ -61,6 +61,10 @@ public class SaveCurrentRemoteConfigurationUIAction extends AbstractUIAction { super(mainUI, ACTION_NAME, t("observe.storage.remoteConfiguration.presets.save"), t("observe.storage.remoteConfiguration.presets.save"), "save", ObserveKeyStrokes.KEY_STROKE_SAVE); } + public SaveCurrentRemoteConfigurationUIAction(ConfigUI mainUI) { + super(null, ACTION_NAME, t("observe.storage.remoteConfiguration.presets.save"), t("observe.storage.remoteConfiguration.presets.save"), "save", ObserveKeyStrokes.KEY_STROKE_SAVE); + } + @Override public void actionPerformed(ActionEvent e) { ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentServerConfigurationUIAction.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentServerConfigurationUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentServerConfigurationUIAction.java @@ -60,6 +60,10 @@ public class SaveCurrentServerConfigurationUIAction extends AbstractUIAction { super(mainUI, ACTION_NAME, t("observe.storage.serverConfiguration.presets.save"), t("observe.storage.serverConfiguration.presets.save"), "save", ObserveKeyStrokes.KEY_STROKE_SAVE); } + public SaveCurrentServerConfigurationUIAction(ConfigUI mainUI) { + super(null, ACTION_NAME, t("observe.storage.serverConfiguration.presets.save"), t("observe.storage.serverConfiguration.presets.save"), "save", ObserveKeyStrokes.KEY_STROKE_SAVE); + } + @Override public void actionPerformed(ActionEvent e) { ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseRemoteConfigurationUIAction.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseRemoteConfigurationUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseRemoteConfigurationUIAction.java @@ -48,6 +48,10 @@ public class UseRemoteConfigurationUIAction extends AbstractUIAction { public static final String ACTION_NAME = UseRemoteConfigurationUIAction.class.getName(); + public UseRemoteConfigurationUIAction(ConfigUI mainUI) { + super(null, ACTION_NAME, null, null, "db-remote", null); + } + public UseRemoteConfigurationUIAction(ObserveMainUI mainUI) { super(mainUI, ACTION_NAME, null, null, "db-remote", null); } ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseServerConfigurationUIAction.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseServerConfigurationUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseServerConfigurationUIAction.java @@ -48,6 +48,10 @@ public class UseServerConfigurationUIAction extends AbstractUIAction { public static final String ACTION_NAME = UseServerConfigurationUIAction.class.getName(); + 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); } ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveActionMap.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveActionMap.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveActionMap.java @@ -27,18 +27,19 @@ import fr.ird.observe.application.swing.ObserveSwingTechnicalException; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.actions.AbstractUIAction; import fr.ird.observe.application.swing.ui.actions.global.AbstractGlobalUIAction; -import org.apache.commons.beanutils.ConstructorUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.reflections.Reflections; - +import java.awt.Component; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Modifier; +import java.util.Optional; +import java.util.Set; import javax.swing.Action; import javax.swing.ActionMap; import javax.swing.InputMap; import javax.swing.JComponent; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Modifier; -import java.util.Set; +import org.apache.commons.beanutils.ConstructorUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.reflections.Reflections; /** * Created on 10/11/16. @@ -51,16 +52,22 @@ public class ObserveActionMap extends ActionMap { /** Logger */ private static final Log log = LogFactory.getLog(ObserveActionMap.class); - private final ObserveMainUI ui; + private final Component ui; private final ImmutableMap<String, Class<? extends AbstractUIAction>> mapping; private final ImmutableMap<String, ? extends AbstractGlobalUIAction> globalActions; public ObserveActionMap(ObserveMainUI ui) { + this(ui, ui.getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW)); + } + + public ObserveActionMap(JComponent ui) { + this(ui, ui.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW)); + } + + public ObserveActionMap(Component ui, InputMap inputMap) { this.ui = ui; Set<Class<? extends AbstractUIAction>> actionTypes = new Reflections("fr.ird.observe.application.swing.ui.actions").getSubTypesOf(AbstractUIAction.class); - InputMap inputMap = ui.getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW); - ImmutableMap.Builder<String, Class<? extends AbstractUIAction>> mappingBuilder = ImmutableMap.builder(); ImmutableMap.Builder<String, AbstractGlobalUIAction> globalActionsBuilder = ImmutableMap.builder(); for (Class<? extends AbstractUIAction> actionType : actionTypes) { @@ -79,13 +86,16 @@ public class ObserveActionMap extends ActionMap { if (AbstractGlobalUIAction.class.isAssignableFrom(actionType)) { // action globale - Class<? extends AbstractGlobalUIAction> globalActionType = (Class) actionType; + Class<AbstractGlobalUIAction> globalActionType = (Class) actionType; if (log.isInfoEnabled()) { log.info("Register global action: " + actionId + " - type: " + globalActionType.getName()); } - AbstractGlobalUIAction globalUIAction = newAction(actionId, globalActionType); - globalActionsBuilder.put(actionId, globalUIAction); - inputMap.put(globalUIAction.getAcceleratorKey(), actionId); + Optional<AbstractGlobalUIAction> globalUIAction = newAction(actionId, globalActionType); + if (globalUIAction.isPresent()) { + + globalActionsBuilder.put(actionId, globalUIAction.get()); + inputMap.put(globalUIAction.get().getAcceleratorKey(), actionId); + } } else { @@ -104,6 +114,7 @@ public class ObserveActionMap extends ActionMap { } + @Override public Action get(Object key) { @@ -118,7 +129,8 @@ public class ObserveActionMap extends ActionMap { return super.get(key); } - return newAction((String) key, actionType); + Optional<? extends AbstractUIAction> optional = newAction((String) key, actionType); + return optional.orElse(null); } @@ -126,15 +138,16 @@ public class ObserveActionMap extends ActionMap { return globalActions; } - private <A extends AbstractUIAction> A newAction(String key, Class<A> actionType) { + private <A extends AbstractUIAction> Optional<A> newAction(String key, Class<A> actionType) { try { if (log.isDebugEnabled()) { log.debug("Create action: " + key + ", type: " + actionType.getName()); } - return ConstructorUtils.invokeConstructor(actionType, ui); + return Optional.of(ConstructorUtils.invokeConstructor(actionType, ui)); } catch (NoSuchMethodException | IllegalAccessException | InstantiationException | InvocationTargetException e) { - throw new ObserveSwingTechnicalException("Hum, can't creation action for type: " + actionType.getName(), e); + return Optional.empty(); +// throw new ObserveSwingTechnicalException("Hum, can't creation action for type: " + actionType.getName(), e); } } ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUIHandler.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUIHandler.java @@ -36,22 +36,22 @@ import fr.ird.observe.application.swing.ui.storage.StorageStep; import fr.ird.observe.application.swing.ui.storage.StorageUIModel; import fr.ird.observe.services.dto.presets.RemoteDataSourceConfiguration; import fr.ird.observe.services.dto.presets.ServerDataSourceConfiguration; -import org.nuiton.jaxx.runtime.spi.UIHandler; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import javax.swing.AbstractAction; -import javax.swing.AbstractButton; -import javax.swing.ActionMap; -import javax.swing.Icon; -import javax.swing.JComponent; -import javax.swing.JMenuItem; import java.awt.BorderLayout; import java.awt.Color; import java.awt.event.ActionEvent; import java.beans.PropertyChangeListener; import java.io.File; import java.util.Objects; +import javax.swing.AbstractAction; +import javax.swing.AbstractButton; +import javax.swing.ActionMap; +import javax.swing.Icon; +import javax.swing.JComponent; +import javax.swing.JMenuItem; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.jaxx.runtime.spi.UIHandler; + import static fr.ird.observe.application.swing.ui.content.ContentUIInitializer.OBSERVE_ACTION; import static javax.swing.JComponent.WHEN_IN_FOCUSED_WINDOW; @@ -70,10 +70,15 @@ public class ConfigUIHandler extends StorageTabUIHandler<ConfigUI> implements UI public static final String ACTION_DO_CHOOSE_FILE = "doChooseFile"; public static final String ACTION_DO_USE_SSL = "doUseSsl"; + private ObserveActionMap observeActionMap; @Override public void afterInit(ConfigUI ui) { + observeActionMap = ObserveSwingApplicationContext.get().getActionMap(); + if (observeActionMap ==null) { + observeActionMap = new ObserveActionMap(ui); + } PropertyChangeListener listener = evt -> { StorageUIModel model = (StorageUIModel) evt.getSource(); String propertyName = evt.getPropertyName(); @@ -119,41 +124,38 @@ public class ConfigUIHandler extends StorageTabUIHandler<ConfigUI> implements UI ui.getInputMap(WHEN_IN_FOCUSED_WINDOW).put(ObserveKeyStrokes.KEY_STROKE_STORAGE_DO_USE_SSL, ACTION_DO_USE_SSL); ObserveKeyStrokes.addKeyStroke(ui.getRemoteUseSsl(), ObserveKeyStrokes.KEY_STROKE_STORAGE_DO_USE_SSL); - ObserveActionMap observeActionMap = ObserveSwingApplicationContext.get().getMainUI().getObserveActionMap(); - init(observeActionMap, ui.getSaveRemoteConfiguration()); - init(observeActionMap, ui.getSaveServerConfiguration()); - init(observeActionMap, ui.getServerMenu()); - init(observeActionMap, ui.getRemoteMenu()); + init(ui.getSaveRemoteConfiguration()); + init(ui.getSaveServerConfiguration()); + init(ui.getServerMenu()); + init(ui.getRemoteMenu()); - for (RemoteDataSourceConfiguration configuration : ObserveSwingApplicationContext.get().getMainUI().getConfig().getRemoteDataSourceConfigurations()) { + for (RemoteDataSourceConfiguration configuration : ObserveSwingApplicationContext.get().getConfig().getRemoteDataSourceConfigurations()) { addRemoteConfiguration(configuration); } - for (ServerDataSourceConfiguration configuration : ObserveSwingApplicationContext.get().getMainUI().getConfig().getServerDataSourceConfigurations()) { + for (ServerDataSourceConfiguration configuration : ObserveSwingApplicationContext.get().getConfig().getServerDataSourceConfigurations()) { addServerConfiguration(configuration); } } public void addRemoteConfiguration(RemoteDataSourceConfiguration configuration) { - ObserveActionMap observeActionMap = ObserveSwingApplicationContext.get().getMainUI().getObserveActionMap(); 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); - AbstractUIAction action = init(observeActionMap, item); + AbstractUIAction action = init(item); action.updateAction(ui, item); ui.getRemoteMenu().add(item); } public void addServerConfiguration(ServerDataSourceConfiguration configuration) { - ObserveActionMap observeActionMap = ObserveSwingApplicationContext.get().getMainUI().getObserveActionMap(); 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); - AbstractUIAction action = init(observeActionMap, item); + AbstractUIAction action = init(item); action.updateAction(ui, item); ui.getServerMenu().add(item); } @@ -205,7 +207,7 @@ public class ConfigUIHandler extends StorageTabUIHandler<ConfigUI> implements UI } - protected AbstractUIAction init(ActionMap actionMap, AbstractButton editor) { + protected AbstractUIAction init(AbstractButton editor) { String actionId = (String) editor.getClientProperty(OBSERVE_ACTION); if (actionId == null) { // le boutton n'est pas commun @@ -213,7 +215,7 @@ public class ConfigUIHandler extends StorageTabUIHandler<ConfigUI> implements UI } // on a trouve une action commune - AbstractUIAction action = (AbstractUIAction) actionMap.get(actionId); + AbstractUIAction action = (AbstractUIAction) this.observeActionMap.get(actionId); Objects.requireNonNull(action, "action [" + actionId + "] not found for ui " + ui.getClass().getName()); if (log.isDebugEnabled()) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/64bc673581da96f1a4029e85055…

1 0

[Git][ultreiaio/ird-observe][develop] fix release build (for site generation and demo deployement)
by Tony CHEMIT March 30, 2017

March 30, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 3f222899 by Tony CHEMIT at 2017-03-30T16:38:02+02:00 fix release build (for site generation and demo deployement) - - - - - 2 changed files: - .gitlab-ci.yml - pom.xml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -49,7 +49,7 @@ stages: .deploy_site: &deploy_site script: - - mvn clean verify site -DperformRelease scm-publish:publish-scm + - mvn clean install site -DperformRelease scm-publish:publish-scm .deploy_demo_latest: &deploy_demo_latest stage: Test ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -757,6 +757,15 @@ <build> +  + <extensions> + <extension> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-ssh-external</artifactId> + <version>2.2</version> + </extension> + </extensions> + <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/3f22289994a00454eb32d52df4b…

1 0

[Git][ultreiaio/ird-observe][develop] update changelog
by Tony CHEMIT March 30, 2017

March 30, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e684cde8 by Tony CHEMIT at 2017-03-30T16:31:25+02:00 update changelog - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,8 +5,9 @@ ## Version [6.0-RC-2](https://gitlab.com/ultreiaio/ird-observe/milestones/87) -**Closed at *In progress*.** - +### Download +* [Application (observe-6.0-RC-2.zip)](https://oss.sonatype.org/content/repositories/frirdo…) +* [Serveur (observe-6.0-RC-2.war)](https://oss.sonatype.org/content/repositories/frirdo…) ### Issues * [[Anomalie 749]](https://gitlab.com/ultreiaio/ird-observe/issues/749) **Problème de fonctionnement de la fenêtre d'erreur** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) @@ -26,8 +27,7 @@ ## Version [6.0-RC-1](https://gitlab.com/ultreiaio/ird-observe/milestones/85) -**Closed at *In progress*.** - +**Closed at 2017-03-30.** ### Issues * [[Anomalie 529]](https://gitlab.com/ultreiaio/ird-observe/issues/529) **[LL] Problème sur l'ordre des sections/baskets dans le schéma de palangre selon le tri** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/e684cde819af7a14392120047ca…

1 0