This is an automated email from the git hooks/post-receive script. New commit to branch feature/7702 in repository observe. See http://git.codelutin.com/observe.git commit 494870bb0546ec9c80908393ef2a16587ea2b556 Author: Kevin Morin <morin@codelutin.com> Date: Thu Nov 12 10:53:28 2015 +0100 Certaines Actions sur une base ouverte sont disponibles alors que la base n'est pas ouverte (fixes #7702) --- .../main/java/fr/ird/observe/ui/ObserveMainUI.css | 38 ++++++++++++++-------- .../main/java/fr/ird/observe/ui/ObserveMainUI.jaxx | 12 +++++++ .../observe/ui/actions/AbstractObserveAction.java | 32 ++++++++++++++++++ .../ird/observe/ui/actions/CloseStorageAction.java | 3 +- .../observe/ui/actions/ReloadStorageAction.java | 3 +- .../ui/actions/SaveStorageToFileAction.java | 3 +- 6 files changed, 72 insertions(+), 19 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.css index 8162b7b..5e740ea 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.css @@ -168,14 +168,26 @@ JSplitPane { action: {new fr.ird.observe.ui.actions.ShowStorageInfoAction(this)}; } +#reloadStorageAction { + enabled: {getHandler().acceptMode(getMode(), getConfig().isMainStorageOpened(), ObserveUIMode.DB)}; +} + +#closeStorageAction { + enabled: {getHandler().acceptMode(getMode(), getConfig().isMainStorageOpened(), ObserveUIMode.DB)}; +} + +#saveStorageToFileAction { + enabled: {getHandler().acceptMode(getMode(), getConfig().isMainStorageOpened(), ObserveUIMode.DB)}; +} + #menuStorageReload { - action: {new fr.ird.observe.ui.actions.ReloadStorageAction(this)}; - enabled: {getHandler().acceptMode(getMode(), true, ObserveUIMode.DB)}; + action: {reloadStorageAction}; + enabled: {reloadStorageAction.isEnabled()}; } #menuStorageClose { - action: {new fr.ird.observe.ui.actions.CloseStorageAction(this)}; - enabled: {getHandler().acceptMode(getMode(), true, ObserveUIMode.DB)}; + action: {closeStorageAction}; + enabled: {closeStorageAction.isEnabled()}; } #menuStorageStartServerMode { @@ -184,7 +196,7 @@ JSplitPane { } #menuStorageChange { - action: {new fr.ird.observe.ui.actions.ChangeStorageAction(this)}; + action: {changeStorageAction}; } #menuStorageLoadFromFile { @@ -193,8 +205,8 @@ JSplitPane { } #menuStorageSaveToFile { - action: {new fr.ird.observe.ui.actions.SaveStorageToFileAction(this)}; - enabled: {getHandler().acceptMode(getMode(), true, ObserveUIMode.DB)}; + action: {saveStorageToFileAction}; + enabled: {saveStorageToFileAction.isEnabled()}; } #menuActions { @@ -315,21 +327,21 @@ JSplitPane { } #storageStatusInfo { - action: {new fr.ird.observe.ui.actions.ShowStorageInfoAction(this)}; + action: {showStorageInfoAction}; } #storageStatusChange { - action: {new fr.ird.observe.ui.actions.ChangeStorageAction(this)}; + action: {changeStorageAction}; } #storageStatusClose { - action: {new fr.ird.observe.ui.actions.CloseStorageAction(this)}; - enabled: {getHandler().acceptMode(getMode(), true, ObserveUIMode.DB)}; + action: {closeStorageAction}; + enabled: {closeStorageAction.isEnabled()}; } #storageStatusReload { - action: {new fr.ird.observe.ui.actions.ReloadStorageAction(this)}; - enabled: {getHandler().acceptMode(getMode(), true, ObserveUIMode.DB)}; + action: {reloadStorageAction}; + enabled: {reloadStorageAction.isEnabled()}; } #closeHelp { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.jaxx index 0d78c74..100fe39 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.jaxx @@ -34,6 +34,11 @@ fr.ird.observe.ui.actions.shared.ReOpenUIAction fr.ird.observe.ui.admin.AdminStep + fr.ird.observe.ui.actions.ChangeStorageAction + fr.ird.observe.ui.actions.CloseStorageAction + fr.ird.observe.ui.actions.ReloadStorageAction + fr.ird.observe.ui.actions.SaveStorageToFileAction + fr.ird.observe.ui.actions.ShowStorageInfoAction fr.ird.observe.ui.content.ContentUIManager fr.ird.observe.ui.tree.ObserveTreeHelper fr.ird.observe.ui.tree.NavigationTreeCellRenderer @@ -63,6 +68,13 @@ <Boolean id='h2WebServer' javaBean='Boolean.FALSE'/> + <ChangeStorageAction id="changeStorageAction" constructorParams='this'/> + <CloseStorageAction id="closeStorageAction" constructorParams='this'/> + <ReloadStorageAction id="reloadStorageAction" constructorParams='this'/> + <SaveStorageToFileAction id="saveStorageToFileAction" constructorParams='this'/> + <ShowStorageInfoAction id="showStorageInfoAction" constructorParams='this'/> + + <ContentUIManager id='contentManager' constructorParams='this'/> <JPopupMenu id='scopeUpPopup'/> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/AbstractObserveAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/AbstractObserveAction.java new file mode 100644 index 0000000..a47a9ae --- /dev/null +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/AbstractObserveAction.java @@ -0,0 +1,32 @@ +package fr.ird.observe.ui.actions; + +import javax.swing.AbstractAction; +import javax.swing.Icon; +import java.beans.PropertyChangeListener; + +/** + * Created on 03/11/15. + * + * @author Tony Chemit - chemit@codelutin.com + */ +public abstract class AbstractObserveAction extends AbstractAction { + + private static final long serialVersionUID = 1L; + + protected AbstractObserveAction(String name, Icon icon) { + super(name, icon); + } + + public synchronized void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) { + if (changeSupport != null) { + changeSupport.addPropertyChangeListener(propertyName,listener); + } + + } + + public synchronized void removePropertyChangeListener(String propertyName,PropertyChangeListener listener) { + if (changeSupport != null) { + changeSupport.removePropertyChangeListener(propertyName,listener); + } + } +} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/CloseStorageAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/CloseStorageAction.java index 3440932..6f03adf 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/CloseStorageAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/CloseStorageAction.java @@ -29,7 +29,6 @@ import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.AbstractAction; import java.awt.event.ActionEvent; import static org.nuiton.i18n.I18n.t; @@ -40,7 +39,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 3.13 */ -public class CloseStorageAction extends AbstractAction { +public class CloseStorageAction extends AbstractObserveAction { private static final long serialVersionUID = 1L; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ReloadStorageAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ReloadStorageAction.java index a2c870c..0a7491b 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ReloadStorageAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ReloadStorageAction.java @@ -33,7 +33,6 @@ import jaxx.runtime.swing.ErrorDialogUI; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.AbstractAction; import java.awt.event.ActionEvent; import static org.nuiton.i18n.I18n.t; @@ -43,7 +42,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 3.13 */ -public class ReloadStorageAction extends AbstractAction { +public class ReloadStorageAction extends AbstractObserveAction { private static final long serialVersionUID = 1L; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/SaveStorageToFileAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/SaveStorageToFileAction.java index dab2b45..750f6e9 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/SaveStorageToFileAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/SaveStorageToFileAction.java @@ -29,7 +29,6 @@ import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.storage.StorageBackupUILauncher; import jaxx.runtime.SwingUtil; -import javax.swing.AbstractAction; import javax.swing.JOptionPane; import java.awt.event.ActionEvent; @@ -41,7 +40,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 3.13 */ -public class SaveStorageToFileAction extends AbstractAction { +public class SaveStorageToFileAction extends AbstractObserveAction { private static final long serialVersionUID = 1L; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.