This is an automated email from the git hooks/post-receive script. New commit to branch feature/8384_sauver_la_base_mode_serveur in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 35d777aebcddfd20675e1f78e1577de7b6128362 Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Mon Jul 25 15:23:17 2016 +0200 Deactivate saveStorageToFile action when connected to a distant server refs #8384 --- .../main/java/fr/ird/observe/ui/ObserveMainUI.jcss | 2 +- .../fr/ird/observe/ui/ObserveMainUIHandler.java | 24 ++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.jcss b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.jcss index 50f53e1..0bf6b41 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.jcss +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.jcss @@ -166,7 +166,7 @@ JSplitPane { } #saveStorageToFileAction { - enabled: {getHandler().acceptMode(getMode(), getConfig().isMainStorageOpened(), ObserveUIMode.DB)}; + enabled: {getHandler().acceptSqlSourceMode(getMode(), getConfig().isMainStorageOpened(), ObserveUIMode.DB)}; } #menuStorageReload { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUIHandler.java index 4bdcd19..706c1ca 100755 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUIHandler.java @@ -447,6 +447,30 @@ public class ObserveMainUIHandler { return false; } + public boolean acceptSqlSourceMode(ObserveUIMode mode, ObserveUIMode... modes) { + ObserveSwingDataSource source = ObserveSwingApplicationContext.get().getDataSource(); + if (source != null && source.isSqlDataSource()) { + return acceptMode(mode, modes); + } + return false; + } + + public boolean acceptSqlSourceMode(ObserveUIMode mode, boolean condition, ObserveUIMode... modes) { + ObserveSwingDataSource source = ObserveSwingApplicationContext.get().getDataSource(); + if (source != null && source.isSqlDataSource()) { + return acceptMode(mode, condition, modes); + } + return false; + } + + public boolean acceptSqlSourceMode(ObserveUIMode mode, boolean notBusy, boolean condition, ObserveUIMode... modes) { + ObserveSwingDataSource source = ObserveSwingApplicationContext.get().getDataSource(); + if (source != null && source.isSqlDataSource()) { + return acceptMode(mode, notBusy, condition, modes); + } + return false; + } + public boolean rejectMode(ObserveUIMode mode, ObserveUIMode... modes) { for (ObserveUIMode m : modes) { if (m.equals(mode)) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.