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 observe. See https://gitlab.nuiton.org/codelutin/observe.git commit b77a0ace04d8802059b28e2c024fb82cacaf10ee Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Wed Aug 3 11:52:57 2016 +0200 Revert "Deactivate saveStorageToFile action when connected to a distant server" This reverts commit 35d777aebcddfd20675e1f78e1577de7b6128362. --- .../main/java/fr/ird/observe/ui/ObserveMainUI.jcss | 2 +- .../fr/ird/observe/ui/ObserveMainUIHandler.java | 24 ---------------------- 2 files changed, 1 insertion(+), 25 deletions(-) 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 0bf6b41..50f53e1 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().acceptSqlSourceMode(getMode(), getConfig().isMainStorageOpened(), ObserveUIMode.DB)}; + enabled: {getHandler().acceptMode(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 706c1ca..4bdcd19 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,30 +447,6 @@ 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>.