branch develop updated (24ccdc8 -> fdf844d)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 24ccdc8 Reapply fix for issue refs #8671 new 6aa8503 [iso] revue des anciennes actions new fdf844d [iso] Utilisation d'un vrai modèle pour l'ui principale The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit fdf844d1308d5ec3495bec146742deadc67e779a Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Dec 5 12:24:09 2016 +0100 [iso] Utilisation d'un vrai modèle pour l'ui principale commit 6aa85033c9c5f6c5a2db1f077591992b729d613a Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Dec 5 10:33:35 2016 +0100 [iso] revue des anciennes actions Summary of changes: .../application/swing/LocalDatabaseBackupTask.java | 4 +- .../application/swing/ObserveActionExecutor.java | 4 +- .../ObserveSwingApplicationDataSourcesManager.java | 8 +- .../application/swing/ui/ObserveMainUI.jaxx | 50 +-- .../application/swing/ui/ObserveMainUI.jcss | 181 ++++----- .../application/swing/ui/ObserveMainUIHandler.java | 84 +--- .../swing/ui/ObserveMainUIInitializer.java | 25 +- .../application/swing/ui/ObserveMainUIModel.java | 445 +++++++++++++++++++++ .../ird/observe/application/swing/ui/UIHelper.java | 13 +- .../ui/actions/content/DeleteDataUIAction.java | 4 +- .../actions/content/DeleteReferenceUIAction.java | 4 +- .../ui/actions/global/AbstractGlobalUIAction.java | 2 +- .../actions/global/ChangeFocusGlobalUIAction.java | 6 +- ...inAction.java => LaunchAdminActionSupport.java} | 16 +- .../menu/action/LaunchConsolidateAction.java | 20 + .../menu/action/LaunchDataSynchronizeAction.java | 20 + .../menu/action/LaunchExportDataAction.java | 20 + .../action/LaunchReferentialSynchronizeAction.java | 20 + .../ui/actions/menu/action/LaunchReportAction.java | 20 + .../menu/action/LaunchSynchronizeAction.java | 20 + .../actions/menu/action/LaunchValidateAction.java | 20 + ...=> ChangeApplicationLanguageActionSupport.java} | 17 +- .../ChangeApplicationLanguageToEnglishAction.java | 22 + .../ChangeApplicationLanguageToFrenchAction.java | 22 + .../ChangeApplicationLanguageToSpanishAction.java | 22 + ...ion.java => ChangeDbLanguageActionSupport.java} | 17 +- .../config/ChangeDbLanguageToEnglishAction.java | 21 + .../config/ChangeDbLanguageToFrenchAction.java | 21 + .../config/ChangeDbLanguageToSpanishAction.java | 21 + .../config/ReloadDefaultConfigurationAction.java | 15 +- .../actions/menu/config/ReloadResourcesAction.java | 19 +- .../ui/actions/menu/config/ShowConfigAction.java | 13 +- .../actions/menu/file/CloseApplicationAction.java | 20 +- .../actions/menu/file/ReloadApplicationAction.java | 12 +- .../ui/actions/menu/file/ToFullScreenAction.java | 17 +- .../ui/actions/menu/file/ToWindowScreenAction.java | 17 +- .../swing/ui/actions/menu/help/GotoSiteAction.java | 17 +- .../ui/actions/menu/help/ShowAboutAction.java | 14 +- .../actions/menu/storage/ChangeStorageAction.java | 12 +- .../actions/menu/storage/CloseStorageAction.java | 17 +- .../menu/storage/ImportStorageFromFileAction.java | 12 +- .../actions/menu/storage/ReloadStorageAction.java | 17 +- .../menu/storage/SaveStorageToFileAction.java | 19 +- .../menu/storage/ShowStorageInfoAction.java | 15 +- .../menu/storage/StartH2WebServerAction.java | 19 +- .../menu/storage/StartServerModeAction.java | 14 +- .../menu/storage/StopH2WebServerAction.java | 19 +- .../actions/menu/storage/StopServerModeAction.java | 16 +- .../swing/ui/admin/AdminUILauncher.java | 10 +- .../swing/ui/content/ContentUIManager.java | 4 +- .../LonglineDetailCompositionUIHandler.java | 6 +- .../open/impl/longline/TripLonglineUIHandler.java | 4 +- .../open/impl/seine/TripSeineUIHandler.java | 4 +- .../ui/content/table/ContentTableUIHandler.java | 2 +- .../swing/ui/util/tripMap/TripMapUIHandler.java | 4 +- 55 files changed, 1006 insertions(+), 481 deletions(-) create mode 100644 application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIModel.java rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/{LaunchAdminAction.java => LaunchAdminActionSupport.java} (84%) create mode 100644 application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchConsolidateAction.java create mode 100644 application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchDataSynchronizeAction.java create mode 100644 application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchExportDataAction.java create mode 100644 application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchReferentialSynchronizeAction.java create mode 100644 application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchReportAction.java create mode 100644 application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchSynchronizeAction.java create mode 100644 application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchValidateAction.java rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/{ChangeApplicationLanguageAction.java => ChangeApplicationLanguageActionSupport.java} (81%) create mode 100644 application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeApplicationLanguageToEnglishAction.java create mode 100644 application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeApplicationLanguageToFrenchAction.java create mode 100644 application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeApplicationLanguageToSpanishAction.java rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/{ChangeDbLanguageAction.java => ChangeDbLanguageActionSupport.java} (80%) create mode 100644 application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeDbLanguageToEnglishAction.java create mode 100644 application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeDbLanguageToFrenchAction.java create mode 100644 application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeDbLanguageToSpanishAction.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 6aa85033c9c5f6c5a2db1f077591992b729d613a Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Dec 5 10:33:35 2016 +0100 [iso] revue des anciennes actions --- .../application/swing/ui/ObserveMainUI.jaxx | 24 +++--- .../application/swing/ui/ObserveMainUI.jcss | 96 +++++++++------------- .../ird/observe/application/swing/ui/UIHelper.java | 9 +- ...inAction.java => LaunchAdminActionSupport.java} | 16 ++-- .../menu/action/LaunchConsolidateAction.java | 20 +++++ .../menu/action/LaunchDataSynchronizeAction.java | 20 +++++ .../menu/action/LaunchExportDataAction.java | 20 +++++ .../action/LaunchReferentialSynchronizeAction.java | 20 +++++ .../ui/actions/menu/action/LaunchReportAction.java | 20 +++++ .../menu/action/LaunchSynchronizeAction.java | 20 +++++ .../actions/menu/action/LaunchValidateAction.java | 20 +++++ ...=> ChangeApplicationLanguageActionSupport.java} | 17 ++-- .../ChangeApplicationLanguageToEnglishAction.java | 22 +++++ .../ChangeApplicationLanguageToFrenchAction.java | 22 +++++ .../ChangeApplicationLanguageToSpanishAction.java | 22 +++++ ...ion.java => ChangeDbLanguageActionSupport.java} | 17 ++-- .../config/ChangeDbLanguageToEnglishAction.java | 21 +++++ .../config/ChangeDbLanguageToFrenchAction.java | 21 +++++ .../config/ChangeDbLanguageToSpanishAction.java | 21 +++++ .../config/ReloadDefaultConfigurationAction.java | 15 ++-- .../actions/menu/config/ReloadResourcesAction.java | 19 ++--- .../ui/actions/menu/config/ShowConfigAction.java | 13 ++- .../actions/menu/file/CloseApplicationAction.java | 20 ++--- .../actions/menu/file/ReloadApplicationAction.java | 12 +-- .../ui/actions/menu/file/ToFullScreenAction.java | 17 ++-- .../ui/actions/menu/file/ToWindowScreenAction.java | 17 ++-- .../swing/ui/actions/menu/help/GotoSiteAction.java | 17 ++-- .../ui/actions/menu/help/ShowAboutAction.java | 14 ++-- .../actions/menu/storage/ChangeStorageAction.java | 12 ++- .../actions/menu/storage/CloseStorageAction.java | 13 ++- .../menu/storage/ImportStorageFromFileAction.java | 12 ++- .../actions/menu/storage/ReloadStorageAction.java | 13 ++- .../menu/storage/SaveStorageToFileAction.java | 19 ++--- .../menu/storage/ShowStorageInfoAction.java | 15 ++-- .../menu/storage/StartH2WebServerAction.java | 15 ++-- .../menu/storage/StartServerModeAction.java | 12 ++- .../menu/storage/StopH2WebServerAction.java | 15 ++-- .../actions/menu/storage/StopServerModeAction.java | 12 ++- 38 files changed, 465 insertions(+), 265 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jaxx index 67ad4bd..7527ea7 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jaxx @@ -34,13 +34,22 @@ fr.ird.observe.services.dto.seine.TripSeineDto fr.ird.observe.services.dto.constants.ReferentialLocale - fr.ird.observe.application.swing.ui.admin.AdminStep - - fr.ird.observe.application.swing.ui.actions.menu.config.ChangeApplicationLanguageAction - fr.ird.observe.application.swing.ui.actions.menu.config.ChangeDbLanguageAction - fr.ird.observe.application.swing.ui.actions.menu.action.LaunchAdminAction + fr.ird.observe.application.swing.ui.actions.menu.action.LaunchConsolidateAction + fr.ird.observe.application.swing.ui.actions.menu.action.LaunchDataSynchronizeAction + fr.ird.observe.application.swing.ui.actions.menu.action.LaunchExportDataAction + fr.ird.observe.application.swing.ui.actions.menu.action.LaunchReferentialSynchronizeAction + fr.ird.observe.application.swing.ui.actions.menu.action.LaunchReportAction + fr.ird.observe.application.swing.ui.actions.menu.action.LaunchSynchronizeAction + fr.ird.observe.application.swing.ui.actions.menu.action.LaunchValidateAction + fr.ird.observe.application.swing.ui.actions.menu.config.ChangeApplicationLanguageToEnglishAction + fr.ird.observe.application.swing.ui.actions.menu.config.ChangeApplicationLanguageToFrenchAction + fr.ird.observe.application.swing.ui.actions.menu.config.ChangeApplicationLanguageToSpanishAction + fr.ird.observe.application.swing.ui.actions.menu.config.ChangeDbLanguageToEnglishAction + fr.ird.observe.application.swing.ui.actions.menu.config.ChangeDbLanguageToFrenchAction + fr.ird.observe.application.swing.ui.actions.menu.config.ChangeDbLanguageToSpanishAction fr.ird.observe.application.swing.ui.actions.menu.config.ReloadDefaultConfigurationAction fr.ird.observe.application.swing.ui.actions.menu.config.ReloadResourcesAction + fr.ird.observe.application.swing.ui.actions.menu.config.ShowConfigAction fr.ird.observe.application.swing.ui.actions.menu.file.CloseApplicationAction fr.ird.observe.application.swing.ui.actions.menu.file.ReloadApplicationAction fr.ird.observe.application.swing.ui.actions.menu.file.ToFullScreenAction @@ -94,11 +103,6 @@ <Boolean id='h2WebServer' javaBean='Boolean.FALSE'/> <ObserveActionMap id="observeActionMap" constructorParams='this'/> - <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'/> <ObserveMainUIInitializer id='initializer' constructorParams='this'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jcss index 844e19c..e2d3165 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jcss @@ -78,7 +78,7 @@ JSplitPane { } #menuConfigurationConfiguration { - action: {new fr.ird.observe.application.swing.ui.actions.menu.config.ShowConfigAction(this)}; + _observeAction:{ShowConfigAction.ACTION_NAME}; } #menuConfiguration { @@ -104,17 +104,17 @@ JSplitPane { } #menuApplicationLanguageFR { - action: {new ChangeApplicationLanguageAction(this, Locale.FRANCE, t("observe.action.locale.fr"), t("observe.action.locale.fr.tip"))}; + _observeAction:{ChangeApplicationLanguageToFrenchAction.ACTION_NAME}; enabled: {!getHandler().acceptLocale(getConfig().getLocale(), "fr_FR")}; } #menuApplicationLanguageUK { - action: {new ChangeApplicationLanguageAction(this, Locale.UK, t("observe.action.locale.uk"), t("observe.action.locale.uk.tip"))}; + _observeAction:{ChangeApplicationLanguageToEnglishAction.ACTION_NAME}; enabled: {!getHandler().acceptLocale(getConfig().getLocale(), "en_GB")}; } #menuApplicationLanguageES { - action: {new ChangeApplicationLanguageAction(this, new Locale("es","ES"), t("observe.action.locale.es"), t("observe.action.locale.es.tip"))}; + _observeAction:{ChangeApplicationLanguageToSpanishAction.ACTION_NAME}; enabled: {!getHandler().acceptLocale(getConfig().getLocale(), "es_ES")}; } @@ -126,35 +126,35 @@ JSplitPane { } #menuDbLanguageFR { - action: {new ChangeDbLanguageAction(this, ReferentialLocale.FR, t("observe.action.locale.fr"), t("observe.action.db.locale.fr.tip"))}; + _observeAction:{ChangeDbLanguageToFrenchAction.ACTION_NAME}; enabled: {!getHandler().acceptLocale(getConfig().getDbLocale(), "fr_FR")}; } #menuDbLanguageUK { - action: {new ChangeDbLanguageAction(this, ReferentialLocale.UK, t("observe.action.locale.uk"), t("observe.action.db.locale.uk.tip"))}; + _observeAction:{ChangeDbLanguageToEnglishAction.ACTION_NAME}; enabled: {!getHandler().acceptLocale(getConfig().getDbLocale(), "en_GB")}; } #menuDbLanguageES { - action: {new ChangeDbLanguageAction(this, ReferentialLocale.ES, t("observe.action.locale.es"), t("observe.action.db.locale.es.tip"))}; + _observeAction:{ChangeDbLanguageToSpanishAction.ACTION_NAME}; enabled: {!getHandler().acceptLocale(getConfig().getDbLocale(), "es_ES")}; } #menuConfigurationReloadDefault { - action: {new ReloadDefaultConfigurationAction(this)}; + _observeAction:{ReloadDefaultConfigurationAction.ACTION_NAME}; } #menuConfigurationReloadResources { - action: {new ReloadResourcesAction(this)}; + _observeAction:{ReloadResourcesAction.ACTION_NAME}; visible: {getConfig().isDevMode()}; } #menuFileReloadApplication { - action: {new ReloadApplicationAction(this)}; + _observeAction:{ReloadApplicationAction.ACTION_NAME}; } #menuFileCloseApplication { - action: {new CloseApplicationAction(this)}; + _observeAction:{CloseApplicationAction.ACTION_NAME}; } #menuStorage { @@ -164,48 +164,36 @@ JSplitPane { } #menuStorageInfo { - action: {new 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)}; + _observeAction:{ShowStorageInfoAction.ACTION_NAME}; } #menuStorageReload { - action: {reloadStorageAction}; - enabled: {reloadStorageAction.isEnabled()}; + _observeAction:{ReloadStorageAction.ACTION_NAME}; + enabled: {getHandler().acceptMode(getMode(), getConfig().isMainStorageOpened(), ObserveUIMode.DB)}; } #menuStorageClose { - action: {closeStorageAction}; - enabled: {closeStorageAction.isEnabled()}; + _observeAction:{CloseStorageAction.ACTION_NAME}; + enabled: {getHandler().acceptMode(getMode(), getConfig().isMainStorageOpened(), ObserveUIMode.DB)}; } #menuStorageStartServerMode { - action: {new StartServerModeAction(this)}; + _observeAction:{StartServerModeAction.ACTION_NAME}; visible: {getHandler().acceptMode(getMode(), getConfig().isLocalStorageExist() && !isBusy() && !isMainFromSynchro(), ObserveUIMode.NO_DB)}; } #menuStorageChange { - action: {changeStorageAction}; + _observeAction:{ChangeStorageAction.ACTION_NAME}; } #menuStorageLoadFromFile { - action: {new ImportStorageFromFileAction(this)}; + _observeAction:{ImportStorageFromFileAction.ACTION_NAME}; enabled: {getHandler().acceptMode(getMode(), ObserveUIMode.DB, ObserveUIMode.NO_DB)}; } #menuStorageSaveToFile { - action: {saveStorageToFileAction}; - enabled: {saveStorageToFileAction.isEnabled()}; + _observeAction:{SaveStorageToFileAction.ACTION_NAME}; + enabled: {getHandler().acceptMode(getMode(), getConfig().isMainStorageOpened(), ObserveUIMode.DB)}; } #menuActions { @@ -215,31 +203,31 @@ JSplitPane { } #menuActionsDataSynchro { - action: {new LaunchAdminAction(this, AdminStep.DATA_SYNCHRONIZE)}; + _observeAction:{LaunchDataSynchronizeAction.ACTION_NAME}; } #menuActionsReferentialSynchro { - action: {new LaunchAdminAction(this, AdminStep.REFERENTIAL_SYNCHRONIZE)}; + _observeAction:{LaunchReferentialSynchronizeAction.ACTION_NAME}; } #menuActionsSynchronize { - action: {new LaunchAdminAction(this, AdminStep.SYNCHRONIZE)}; + _observeAction:{LaunchSynchronizeAction.ACTION_NAME}; } #menuActionsValidateData { - action: {new LaunchAdminAction(this, AdminStep.VALIDATE)}; + _observeAction:{LaunchValidateAction.ACTION_NAME}; } #menuActionsExportData { - action: {new LaunchAdminAction(this, AdminStep.EXPORT_DATA)}; + _observeAction:{LaunchExportDataAction.ACTION_NAME}; } #menuActionsReport { - action: {new LaunchAdminAction(this, AdminStep.REPORT)}; + _observeAction:{LaunchReportAction.ACTION_NAME}; } #menuActionsConsolidate { - action: {new LaunchAdminAction(this, AdminStep.CONSOLIDATE)}; + _observeAction:{LaunchConsolidateAction.ACTION_NAME}; } #menuNavigation { @@ -270,10 +258,6 @@ JSplitPane { #menuNavigationReferentiel { _observeAction:{GotoReferentialAction.ACTION_NAME}; - text: "observe.action.goto.referentiel.short"; - toolTipText: "observe.action.goto.referentiel.tip"; - icon: "navigation.referentiel"; - mnemonic: f; } #menuHelp { @@ -290,11 +274,11 @@ JSplitPane { } #menuHelpSite { - action: {new GotoSiteAction(this)}; + _observeAction:{GotoSiteAction.ACTION_NAME}; } #menuHelpAbout { - action: {new ShowAboutAction(this)}; + _observeAction:{ShowAboutAction.ACTION_NAME}; } #storageStatus { @@ -311,25 +295,25 @@ JSplitPane { } #storageStatusInfo { - action: {showStorageInfoAction}; + _observeAction:{ShowStorageInfoAction.ACTION_NAME}; } #storageStatusChange { - action: {changeStorageAction}; + _observeAction:{ChangeStorageAction.ACTION_NAME}; } #storageStatusClose { - action: {closeStorageAction}; - enabled: {closeStorageAction.isEnabled()}; + _observeAction:{CloseStorageAction.ACTION_NAME}; + enabled: {getHandler().acceptMode(getMode(), getConfig().isMainStorageOpened(), ObserveUIMode.DB)}; } #storageStatusReload { - action: {reloadStorageAction}; - enabled: {reloadStorageAction.isEnabled()}; + _observeAction:{ReloadStorageAction.ACTION_NAME}; + enabled: {getHandler().acceptMode(getMode(), getConfig().isMainStorageOpened(), ObserveUIMode.DB)}; } #closeHelp { - action: {new CloseHelpAction(this)}; + _observeAction:{CloseHelpAction.ACTION_NAME}; borderPainted: false; rolloverEnabled: false; focusable: false; @@ -420,17 +404,17 @@ JSplitPane { } #startH2WebServer{ - action: {new StartH2WebServerAction(this)}; + _observeAction:{StartH2WebServerAction.ACTION_NAME}; enabled: {!isH2WebServer()}; } #stopH2WebServer{ - action: {new StopH2WebServerAction(this)}; + _observeAction:{StopH2WebServerAction.ACTION_NAME}; enabled: {isH2WebServer()}; } #stopServerMode { - action: {new StopServerModeAction(this)}; + _observeAction:{StopServerModeAction.ACTION_NAME}; } #serverModeParameters { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/UIHelper.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/UIHelper.java index ac9e3f1..6118600 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/UIHelper.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/UIHelper.java @@ -25,6 +25,9 @@ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.ObserveSwingTechnicalException; import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper; +import fr.ird.observe.application.swing.ui.actions.menu.storage.ChangeStorageAction; +import fr.ird.observe.application.swing.ui.actions.menu.storage.CloseStorageAction; +import fr.ird.observe.application.swing.ui.actions.menu.storage.ReloadStorageAction; import fr.ird.observe.application.swing.ui.util.table.ObserveBooleanTableCellRenderer; import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.DataFileDto; @@ -467,13 +470,13 @@ public class UIHelper extends SwingUtil { // FIXME SBavencoff 23/03/2016 est on sùr que l'erreur proviens du main storage ? switch (result) { case 0: - observeMainUI.getReloadStorageAction().run(); + new ReloadStorageAction(observeMainUI).run(); break; case 1: - observeMainUI.getChangeStorageAction().run(); + new ChangeStorageAction(observeMainUI).run(); break; default: - observeMainUI.getCloseStorageAction().run(); + new CloseStorageAction(observeMainUI).run(); break; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchAdminAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchAdminActionSupport.java similarity index 84% rename from application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchAdminAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchAdminActionSupport.java index 2292df0..ef35efa 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchAdminAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchAdminActionSupport.java @@ -25,12 +25,12 @@ package fr.ird.observe.application.swing.ui.actions.menu.action; import fr.ird.observe.application.swing.I18nEnumHelper; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.ui.ObserveMainUI; +import fr.ird.observe.application.swing.ui.actions.AbstractUIAction; import fr.ird.observe.application.swing.ui.admin.AdminStep; import fr.ird.observe.application.swing.ui.admin.AdminUILauncher; 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; @@ -41,23 +41,19 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 3.13 */ -public class LaunchAdminAction extends AbstractAction { +public abstract class LaunchAdminActionSupport extends AbstractUIAction { private static final long serialVersionUID = 1L; /** Logger. */ - private static final Log log = LogFactory.getLog(LaunchAdminAction.class); - - private final ObserveMainUI ui; + private static final Log log = LogFactory.getLog(LaunchAdminActionSupport.class); private final AdminStep action; - public LaunchAdminAction(ObserveMainUI ui, AdminStep action) { + public LaunchAdminActionSupport(ObserveMainUI ui, String actionName, AdminStep action) { - super(t(action.getOperationLabel()), action.getIcon()); - this.ui = ui; + super(ui, actionName, t(action.getOperationLabel()), t(action.getOperationDescription()), action.getIconName(), null); this.action = action; - putValue(SHORT_DESCRIPTION, t(action.getOperationDescription())); putValue(MNEMONIC_KEY, (int) t(action.getOperationLabel()).charAt(0)); } @@ -71,7 +67,7 @@ public class LaunchAdminAction extends AbstractAction { if (log.isInfoEnabled()) { log.info("Will start admin action: " + I18nEnumHelper.getLabel(action)); } - AdminUILauncher launcher = AdminUILauncher.newLauncher(ui, action); + AdminUILauncher launcher = AdminUILauncher.newLauncher(getMainUI(), action); launcher.start(); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchConsolidateAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchConsolidateAction.java new file mode 100644 index 0000000..0e7a9ea --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchConsolidateAction.java @@ -0,0 +1,20 @@ +package fr.ird.observe.application.swing.ui.actions.menu.action; + +import fr.ird.observe.application.swing.ui.ObserveMainUI; +import fr.ird.observe.application.swing.ui.admin.AdminStep; + +/** + * Created on 05/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class LaunchConsolidateAction extends LaunchAdminActionSupport { + + public static final String ACTION_NAME=LaunchConsolidateAction.class.getSimpleName(); + + public LaunchConsolidateAction(ObserveMainUI ui) { + super(ui, ACTION_NAME, AdminStep.CONSOLIDATE); + } + +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchDataSynchronizeAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchDataSynchronizeAction.java new file mode 100644 index 0000000..7fcdf2a --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchDataSynchronizeAction.java @@ -0,0 +1,20 @@ +package fr.ird.observe.application.swing.ui.actions.menu.action; + +import fr.ird.observe.application.swing.ui.ObserveMainUI; +import fr.ird.observe.application.swing.ui.admin.AdminStep; + +/** + * Created on 05/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class LaunchDataSynchronizeAction extends LaunchAdminActionSupport { + + public static final String ACTION_NAME=LaunchDataSynchronizeAction.class.getSimpleName(); + + public LaunchDataSynchronizeAction(ObserveMainUI ui) { + super(ui, ACTION_NAME, AdminStep.DATA_SYNCHRONIZE); + } + +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchExportDataAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchExportDataAction.java new file mode 100644 index 0000000..47d9a86 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchExportDataAction.java @@ -0,0 +1,20 @@ +package fr.ird.observe.application.swing.ui.actions.menu.action; + +import fr.ird.observe.application.swing.ui.ObserveMainUI; +import fr.ird.observe.application.swing.ui.admin.AdminStep; + +/** + * Created on 05/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class LaunchExportDataAction extends LaunchAdminActionSupport { + + public static final String ACTION_NAME=LaunchExportDataAction.class.getSimpleName(); + + public LaunchExportDataAction(ObserveMainUI ui) { + super(ui, ACTION_NAME, AdminStep.EXPORT_DATA); + } + +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchReferentialSynchronizeAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchReferentialSynchronizeAction.java new file mode 100644 index 0000000..3739c9e --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchReferentialSynchronizeAction.java @@ -0,0 +1,20 @@ +package fr.ird.observe.application.swing.ui.actions.menu.action; + +import fr.ird.observe.application.swing.ui.ObserveMainUI; +import fr.ird.observe.application.swing.ui.admin.AdminStep; + +/** + * Created on 05/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class LaunchReferentialSynchronizeAction extends LaunchAdminActionSupport { + + public static final String ACTION_NAME = LaunchReferentialSynchronizeAction.class.getSimpleName(); + + public LaunchReferentialSynchronizeAction(ObserveMainUI ui) { + super(ui, ACTION_NAME, AdminStep.REFERENTIAL_SYNCHRONIZE); + } + +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchReportAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchReportAction.java new file mode 100644 index 0000000..c8c5fb2 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchReportAction.java @@ -0,0 +1,20 @@ +package fr.ird.observe.application.swing.ui.actions.menu.action; + +import fr.ird.observe.application.swing.ui.ObserveMainUI; +import fr.ird.observe.application.swing.ui.admin.AdminStep; + +/** + * Created on 05/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class LaunchReportAction extends LaunchAdminActionSupport { + + public static final String ACTION_NAME=LaunchReportAction.class.getSimpleName(); + + public LaunchReportAction(ObserveMainUI ui) { + super(ui, ACTION_NAME, AdminStep.REPORT); + } + +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchSynchronizeAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchSynchronizeAction.java new file mode 100644 index 0000000..f9da0c9 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchSynchronizeAction.java @@ -0,0 +1,20 @@ +package fr.ird.observe.application.swing.ui.actions.menu.action; + +import fr.ird.observe.application.swing.ui.ObserveMainUI; +import fr.ird.observe.application.swing.ui.admin.AdminStep; + +/** + * Created on 05/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class LaunchSynchronizeAction extends LaunchAdminActionSupport { + + public static final String ACTION_NAME=LaunchSynchronizeAction.class.getSimpleName(); + + public LaunchSynchronizeAction(ObserveMainUI ui) { + super(ui, ACTION_NAME, AdminStep.SYNCHRONIZE); + } + +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchValidateAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchValidateAction.java new file mode 100644 index 0000000..84dfd62 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchValidateAction.java @@ -0,0 +1,20 @@ +package fr.ird.observe.application.swing.ui.actions.menu.action; + +import fr.ird.observe.application.swing.ui.ObserveMainUI; +import fr.ird.observe.application.swing.ui.admin.AdminStep; + +/** + * Created on 05/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class LaunchValidateAction extends LaunchAdminActionSupport { + + public static final String ACTION_NAME=LaunchValidateAction.class.getSimpleName(); + + public LaunchValidateAction(ObserveMainUI ui) { + super(ui, ACTION_NAME, AdminStep.VALIDATE); + } + +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeApplicationLanguageAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeApplicationLanguageActionSupport.java similarity index 81% rename from application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeApplicationLanguageAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeApplicationLanguageActionSupport.java index f1ae4d7..229157c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeApplicationLanguageAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeApplicationLanguageActionSupport.java @@ -26,11 +26,10 @@ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.ObserveUICallback; -import jaxx.runtime.SwingUtil; +import fr.ird.observe.application.swing.ui.actions.AbstractUIAction; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.AbstractAction; import java.awt.event.ActionEvent; import java.util.Locale; @@ -40,21 +39,17 @@ import java.util.Locale; * @author Tony Chemit - chemit@codelutin.com * @since 3.13 */ -public class ChangeApplicationLanguageAction extends AbstractAction { +public abstract class ChangeApplicationLanguageActionSupport extends AbstractUIAction { private static final long serialVersionUID = 1L; /** Logger. */ - private static final Log log = LogFactory.getLog(ChangeApplicationLanguageAction.class); - - private final ObserveMainUI ui; - + private static final Log log = LogFactory.getLog(ChangeApplicationLanguageActionSupport.class); private final Locale newLocale; - public ChangeApplicationLanguageAction(ObserveMainUI ui, Locale newLocale, String name, String description) { + public ChangeApplicationLanguageActionSupport(ObserveMainUI ui, String actionName, Locale newLocale, String name, String description) { - super(name, SwingUtil.getUIManagerActionIcon("i18n-" + newLocale.getLanguage())); - this.ui = ui; + super(ui, actionName, name,description, "i18n-" + newLocale.getLanguage(), null); this.newLocale = newLocale; putValue(SHORT_DESCRIPTION, description); putValue(MNEMONIC_KEY, (int) newLocale.getLanguage().toUpperCase().charAt(0)); @@ -69,7 +64,7 @@ public class ChangeApplicationLanguageAction extends AbstractAction { } boolean canContinue = ObserveSwingApplicationContext.get().getContentUIManager().closeSelectedContentUI(); if (canContinue) { - ObserveSwingApplicationConfig config = ui.getConfig(); + ObserveSwingApplicationConfig config = getMainUI().getConfig(); // sauvegarde de la nouvelle locale config.setLocale(newLocale); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeApplicationLanguageToEnglishAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeApplicationLanguageToEnglishAction.java new file mode 100644 index 0000000..5da9106 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeApplicationLanguageToEnglishAction.java @@ -0,0 +1,22 @@ +package fr.ird.observe.application.swing.ui.actions.menu.config; + +import fr.ird.observe.application.swing.ui.ObserveMainUI; + +import java.util.Locale; + +import static org.nuiton.i18n.I18n.t; + +/** + * Created on 05/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class ChangeApplicationLanguageToEnglishAction extends ChangeApplicationLanguageActionSupport { + + public static final String ACTION_NAME = ChangeApplicationLanguageToEnglishAction.class.getSimpleName(); + + public ChangeApplicationLanguageToEnglishAction(ObserveMainUI ui) { + super(ui, ACTION_NAME, Locale.UK, t("observe.action.locale.uk"), t("observe.action.locale.uk.tip")); + } +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeApplicationLanguageToFrenchAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeApplicationLanguageToFrenchAction.java new file mode 100644 index 0000000..dc88275 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeApplicationLanguageToFrenchAction.java @@ -0,0 +1,22 @@ +package fr.ird.observe.application.swing.ui.actions.menu.config; + +import fr.ird.observe.application.swing.ui.ObserveMainUI; + +import java.util.Locale; + +import static org.nuiton.i18n.I18n.t; + +/** + * Created on 05/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class ChangeApplicationLanguageToFrenchAction extends ChangeApplicationLanguageActionSupport { + + public static final String ACTION_NAME = ChangeApplicationLanguageToFrenchAction.class.getSimpleName(); + + public ChangeApplicationLanguageToFrenchAction(ObserveMainUI ui) { + super(ui, ACTION_NAME, Locale.FRANCE, t("observe.action.locale.fr"), t("observe.action.locale.fr.tip")); + } +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeApplicationLanguageToSpanishAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeApplicationLanguageToSpanishAction.java new file mode 100644 index 0000000..bfbd183 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeApplicationLanguageToSpanishAction.java @@ -0,0 +1,22 @@ +package fr.ird.observe.application.swing.ui.actions.menu.config; + +import fr.ird.observe.application.swing.ui.ObserveMainUI; + +import java.util.Locale; + +import static org.nuiton.i18n.I18n.t; + +/** + * Created on 05/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class ChangeApplicationLanguageToSpanishAction extends ChangeApplicationLanguageActionSupport { + + public static final String ACTION_NAME = ChangeApplicationLanguageToSpanishAction.class.getSimpleName(); + + public ChangeApplicationLanguageToSpanishAction(ObserveMainUI ui) { + super(ui, ACTION_NAME, new Locale("es","ES"), t("observe.action.locale.es"), t("observe.action.locale.es.tip")); + } +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeDbLanguageAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeDbLanguageActionSupport.java similarity index 80% rename from application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeDbLanguageAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeDbLanguageActionSupport.java index 3eaa181..e779bfc 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeDbLanguageAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeDbLanguageActionSupport.java @@ -26,12 +26,11 @@ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.ObserveUICallback; +import fr.ird.observe.application.swing.ui.actions.AbstractUIAction; import fr.ird.observe.services.dto.constants.ReferentialLocale; -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; /** @@ -40,23 +39,19 @@ import java.awt.event.ActionEvent; * @author Tony Chemit - chemit@codelutin.com * @since 3.13 */ -public class ChangeDbLanguageAction extends AbstractAction { +public abstract class ChangeDbLanguageActionSupport extends AbstractUIAction { private static final long serialVersionUID = 1L; /** Logger. */ - private static final Log log = LogFactory.getLog(ChangeDbLanguageAction.class); - - private final ObserveMainUI ui; + private static final Log log = LogFactory.getLog(ChangeDbLanguageActionSupport.class); private final ReferentialLocale newLocale; - public ChangeDbLanguageAction(ObserveMainUI ui, ReferentialLocale newLocale, String name, String description) { + public ChangeDbLanguageActionSupport(ObserveMainUI ui, String actionName, ReferentialLocale newLocale, String name, String description) { - super(name, SwingUtil.getUIManagerActionIcon("i18n-" + newLocale.getLocale().getLanguage())); - this.ui = ui; + super(ui, actionName, name, description, "i18n-" + newLocale.getLocale().getLanguage(), null); this.newLocale = newLocale; - putValue(SHORT_DESCRIPTION, description); putValue(MNEMONIC_KEY, (int) newLocale.getLocale().getLanguage().toUpperCase().charAt(0)); } @@ -71,7 +66,7 @@ public class ChangeDbLanguageAction extends AbstractAction { if (!canContinue) { return; } - ObserveSwingApplicationConfig config = ui.getConfig(); + ObserveSwingApplicationConfig config = getMainUI().getConfig(); // sauvegarde de la nouvelle locale config.setDbLocale(newLocale.getLocale()); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeDbLanguageToEnglishAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeDbLanguageToEnglishAction.java new file mode 100644 index 0000000..a6e53d9 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeDbLanguageToEnglishAction.java @@ -0,0 +1,21 @@ +package fr.ird.observe.application.swing.ui.actions.menu.config; + +import fr.ird.observe.application.swing.ui.ObserveMainUI; +import fr.ird.observe.services.dto.constants.ReferentialLocale; + +import static org.nuiton.i18n.I18n.t; + +/** + * Created on 05/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class ChangeDbLanguageToEnglishAction extends ChangeDbLanguageActionSupport { + + public static final String ACTION_NAME = ChangeDbLanguageToEnglishAction.class.getSimpleName(); + + public ChangeDbLanguageToEnglishAction(ObserveMainUI ui) { + super(ui, ACTION_NAME, ReferentialLocale.UK, t("observe.action.locale.uk"), t("observe.action.locale.uk.tip")); + } +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeDbLanguageToFrenchAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeDbLanguageToFrenchAction.java new file mode 100644 index 0000000..ae62b87 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeDbLanguageToFrenchAction.java @@ -0,0 +1,21 @@ +package fr.ird.observe.application.swing.ui.actions.menu.config; + +import fr.ird.observe.application.swing.ui.ObserveMainUI; +import fr.ird.observe.services.dto.constants.ReferentialLocale; + +import static org.nuiton.i18n.I18n.t; + +/** + * Created on 05/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class ChangeDbLanguageToFrenchAction extends ChangeDbLanguageActionSupport { + + public static final String ACTION_NAME = ChangeDbLanguageToFrenchAction.class.getSimpleName(); + + public ChangeDbLanguageToFrenchAction(ObserveMainUI ui) { + super(ui, ACTION_NAME, ReferentialLocale.FR, t("observe.action.locale.fr"), t("observe.action.locale.fr.tip")); + } +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeDbLanguageToSpanishAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeDbLanguageToSpanishAction.java new file mode 100644 index 0000000..3fc1594 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeDbLanguageToSpanishAction.java @@ -0,0 +1,21 @@ +package fr.ird.observe.application.swing.ui.actions.menu.config; + +import fr.ird.observe.application.swing.ui.ObserveMainUI; +import fr.ird.observe.services.dto.constants.ReferentialLocale; + +import static org.nuiton.i18n.I18n.t; + +/** + * Created on 05/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class ChangeDbLanguageToSpanishAction extends ChangeDbLanguageActionSupport { + + public static final String ACTION_NAME = ChangeDbLanguageToSpanishAction.class.getSimpleName(); + + public ChangeDbLanguageToSpanishAction(ObserveMainUI ui) { + super(ui, ACTION_NAME, ReferentialLocale.ES, t("observe.action.locale.es"), t("observe.action.locale.es.tip")); + } +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ReloadDefaultConfigurationAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ReloadDefaultConfigurationAction.java index b8cce05..5be8401 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ReloadDefaultConfigurationAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ReloadDefaultConfigurationAction.java @@ -26,12 +26,11 @@ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.ObserveUICallback; -import jaxx.runtime.SwingUtil; +import fr.ird.observe.application.swing.ui.actions.AbstractUIAction; import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.AbstractAction; import java.awt.event.ActionEvent; import java.io.File; import java.io.IOException; @@ -44,22 +43,18 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class ReloadDefaultConfigurationAction extends AbstractAction { +public class ReloadDefaultConfigurationAction extends AbstractUIAction { private static final long serialVersionUID = 1L; /** Logger. */ private static final Log log = LogFactory.getLog(ReloadDefaultConfigurationAction.class); - private final ObserveMainUI ui; + public static final String ACTION_NAME = ReloadDefaultConfigurationAction.class.getSimpleName(); public ReloadDefaultConfigurationAction(ObserveMainUI ui) { - - super(t("observe.action.reloadDefaultConfiguration"), SwingUtil.getUIManagerActionIcon("application-reload")); - this.ui = ui; - putValue(SHORT_DESCRIPTION, t("observe.action.reloadDefaultConfiguration.tip")); + super(ui, ACTION_NAME, t("observe.action.reloadDefaultConfiguration"), t("observe.action.reloadDefaultConfiguration.tip"), "application-reload", null); putValue(MNEMONIC_KEY, (int) 'R'); - } @Override @@ -71,7 +66,7 @@ public class ReloadDefaultConfigurationAction extends AbstractAction { boolean canContinue = ObserveSwingApplicationContext.get().getContentUIManager().closeSelectedContentUI(); if (canContinue) { - ObserveSwingApplicationConfig config = ui.getConfig(); + ObserveSwingApplicationConfig config = getMainUI().getConfig(); File directory = config.getResourcesDirectory(); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ReloadResourcesAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ReloadResourcesAction.java index 6bf1579..5f5d26a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ReloadResourcesAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ReloadResourcesAction.java @@ -22,19 +22,18 @@ package fr.ird.observe.application.swing.ui.actions.menu.config; * #L% */ -import fr.ird.observe.application.swing.decoration.DecoratorService; -import fr.ird.observe.application.swing.configuration.ObserveSwingApplicationConfig; -import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.ObserveRunner; +import fr.ird.observe.application.swing.ObserveSwingApplicationContext; +import fr.ird.observe.application.swing.configuration.ObserveSwingApplicationConfig; +import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.ObserveUICallback; -import jaxx.runtime.SwingUtil; +import fr.ird.observe.application.swing.ui.actions.AbstractUIAction; import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.i18n.I18n; -import javax.swing.AbstractAction; import java.awt.event.ActionEvent; import java.io.File; import java.io.IOException; @@ -47,20 +46,18 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 3.13 */ -public class ReloadResourcesAction extends AbstractAction { +public class ReloadResourcesAction extends AbstractUIAction { private static final long serialVersionUID = 1L; /** Logger. */ private static final Log log = LogFactory.getLog(ReloadResourcesAction.class); - private final ObserveMainUI ui; + public static final String ACTION_NAME = ReloadResourcesAction.class.getSimpleName(); public ReloadResourcesAction(ObserveMainUI ui) { - super(t("observe.action.reloadResources"), SwingUtil.getUIManagerActionIcon("application-reload")); - this.ui = ui; - putValue(SHORT_DESCRIPTION, t("observe.action.reloadResources.tip")); + super(ui, ACTION_NAME, t("observe.action.reloadResources"), t("observe.action.reloadResources.tip"), "application-reload", null); putValue(MNEMONIC_KEY, (int) 'R'); } @@ -74,7 +71,7 @@ public class ReloadResourcesAction extends AbstractAction { boolean canContinue = ObserveSwingApplicationContext.get().getContentUIManager().closeSelectedContentUI(); if (canContinue) { - ObserveSwingApplicationConfig config = ui.getConfig(); + ObserveSwingApplicationConfig config = getMainUI().getConfig(); File directory = config.getResourcesDirectory(); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ShowConfigAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ShowConfigAction.java index 008d038..ba319f6 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ShowConfigAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ShowConfigAction.java @@ -30,9 +30,9 @@ import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.ObserveUICallback; +import fr.ird.observe.application.swing.ui.actions.AbstractUIAction; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.SpeciesListDto; -import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.config.ConfigUIHelper; import jaxx.runtime.swing.config.model.ConfigUIModelBuilder; import jaxx.runtime.swing.config.model.MainCallBackFinalizer; @@ -43,7 +43,6 @@ import org.jdesktop.swingx.renderer.DefaultTableRenderer; import org.nuiton.config.ConfigOptionDef; import org.nuiton.decorator.Decorator; -import javax.swing.AbstractAction; import javax.swing.DefaultCellEditor; import javax.swing.Icon; import javax.swing.JComboBox; @@ -65,20 +64,17 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 3.13 */ -public class ShowConfigAction extends AbstractAction { +public class ShowConfigAction extends AbstractUIAction { private static final long serialVersionUID = 3038774900992805790L; /** Logger. */ private static final Log log = LogFactory.getLog(ShowConfigAction.class); - private final ObserveMainUI ui; + public static final String ACTION_NAME = ShowConfigAction.class.getSimpleName(); public ShowConfigAction(ObserveMainUI ui) { - - super(t("observe.action.configuration"), SwingUtil.getUIManagerActionIcon("config")); - this.ui = ui; - putValue(SHORT_DESCRIPTION, t("observe.action.configuration.tip")); + super(ui, ACTION_NAME, t("observe.action.configuration"), t("observe.action.configuration.tip"), "config", null); putValue(MNEMONIC_KEY, (int) 'C'); } @@ -95,6 +91,7 @@ public class ShowConfigAction extends AbstractAction { ObserveSwingDataSource dataSource = ObserveSwingApplicationContext.get().getDataSourcesManager().getMainDataSource(); + ObserveMainUI ui = getMainUI(); ObserveSwingApplicationConfig config = ui.getConfig(); ObserveConfigUIBuilder helper; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/file/CloseApplicationAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/file/CloseApplicationAction.java index e89f387..d8c0d39 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/file/CloseApplicationAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/file/CloseApplicationAction.java @@ -25,11 +25,10 @@ package fr.ird.observe.application.swing.ui.actions.menu.file; import fr.ird.observe.application.swing.ObserveRunner; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.ui.ObserveMainUI; -import jaxx.runtime.SwingUtil; +import fr.ird.observe.application.swing.ui.actions.AbstractUIAction; 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,40 +39,35 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 3.13 */ -public class CloseApplicationAction extends AbstractAction { +public class CloseApplicationAction extends AbstractUIAction { private static final long serialVersionUID = 1L; /** Logger. */ private static final Log log = LogFactory.getLog(CloseApplicationAction.class); - private final ObserveMainUI ui; + public static final String ACTION_NAME = "CloseApplicationAction"; public CloseApplicationAction(ObserveMainUI ui) { - - super(t("observe.action.exit"), SwingUtil.getUIManagerActionIcon("exit")); - this.ui = ui; - putValue(SHORT_DESCRIPTION, t("observe.action.exit.tip")); - putValue(MNEMONIC_KEY, (int) 'X'); + super(ui, ACTION_NAME, t("observe.action.exit"), t("observe.action.exit.tip"), "exit", null); + putValue(MNEMONIC_KEY, (int) 'Q'); } @Override public void actionPerformed(ActionEvent e) { - - run(); } public void run() { - + if (log.isInfoEnabled()) { log.info("ObServe quitting..."); } boolean canContinue = ObserveSwingApplicationContext.get().getContentUIManager().closeSelectedContentUI(); if (canContinue) { try { - ui.dispose(); + getMainUI().dispose(); } finally { if (log.isDebugEnabled()) { log.debug("Ask to release runner."); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/file/ReloadApplicationAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/file/ReloadApplicationAction.java index 20aba71..6d98817 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/file/ReloadApplicationAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/file/ReloadApplicationAction.java @@ -25,11 +25,10 @@ package fr.ird.observe.application.swing.ui.actions.menu.file; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.ObserveUICallback; -import jaxx.runtime.SwingUtil; +import fr.ird.observe.application.swing.ui.actions.AbstractUIAction; 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,18 +39,19 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class ReloadApplicationAction extends AbstractAction { +public class ReloadApplicationAction extends AbstractUIAction { private static final long serialVersionUID = 1L; /** Logger. */ private static final Log log = LogFactory.getLog(ReloadApplicationAction.class); + public static final String ACTION_NAME = "ReloadApplicationAction"; + public ReloadApplicationAction(ObserveMainUI ui) { - super(t("observe.action.restart.application"), SwingUtil.getUIManagerActionIcon("application-reload")); - putValue(SHORT_DESCRIPTION, t("observe.action.restart.application.tip")); - putValue(MNEMONIC_KEY, (int) 'X'); + super(ui, ACTION_NAME, t("observe.action.restart.application"), t("observe.action.restart.application.tip"), "application-reload", null); + putValue(MNEMONIC_KEY, (int) 'R'); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/file/ToFullScreenAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/file/ToFullScreenAction.java index f1e45df..c5b045b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/file/ToFullScreenAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/file/ToFullScreenAction.java @@ -23,10 +23,10 @@ package fr.ird.observe.application.swing.ui.actions.menu.file; */ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; +import fr.ird.observe.application.swing.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.application.swing.ui.ObserveMainUI; -import jaxx.runtime.SwingUtil; +import fr.ird.observe.application.swing.ui.actions.AbstractUIAction; -import javax.swing.AbstractAction; import java.awt.event.ActionEvent; import static org.nuiton.i18n.I18n.t; @@ -37,17 +37,15 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 6.0 */ -public class ToFullScreenAction extends AbstractAction { +public class ToFullScreenAction extends AbstractUIAction { private static final long serialVersionUID = 3038774900992805790L; - private final ObserveMainUI ui; + public static final String ACTION_NAME = ToFullScreenAction.class.getSimpleName(); public ToFullScreenAction(ObserveMainUI ui) { - super(t("observe.action.toFullScreen"), SwingUtil.getUIManagerActionIcon("full-screen")); - this.ui = ui; - putValue(SHORT_DESCRIPTION, t("observe.action.toFullScreen.tip")); + super(ui, ACTION_NAME, t("observe.action.toFullScreen"), t("observe.action.toFullScreen.tip"), "full-screen", null); putValue(MNEMONIC_KEY, (int) 'S'); } @@ -55,9 +53,10 @@ public class ToFullScreenAction extends AbstractAction { @Override public void actionPerformed(ActionEvent e) { - ui.getConfig().setFullScreen(true); + ObserveSwingApplicationConfig config = getMainUI().getConfig(); + config.setFullScreen(true); - ui.getInitializer().reloadUI(ObserveSwingApplicationContext.get(), ui.getConfig()); + getMainUI().getInitializer().reloadUI(ObserveSwingApplicationContext.get(), config); } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/file/ToWindowScreenAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/file/ToWindowScreenAction.java index bfba161..a8e1991 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/file/ToWindowScreenAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/file/ToWindowScreenAction.java @@ -23,10 +23,10 @@ package fr.ird.observe.application.swing.ui.actions.menu.file; */ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; +import fr.ird.observe.application.swing.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.application.swing.ui.ObserveMainUI; -import jaxx.runtime.SwingUtil; +import fr.ird.observe.application.swing.ui.actions.AbstractUIAction; -import javax.swing.AbstractAction; import java.awt.event.ActionEvent; import static org.nuiton.i18n.I18n.t; @@ -37,17 +37,15 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 6.0 */ -public class ToWindowScreenAction extends AbstractAction { +public class ToWindowScreenAction extends AbstractUIAction { private static final long serialVersionUID = 3038774900992805790L; - private final ObserveMainUI ui; + public static final String ACTION_NAME = ToWindowScreenAction.class.getSimpleName(); public ToWindowScreenAction(ObserveMainUI ui) { - super(t("observe.action.toWindowScreen"), SwingUtil.getUIManagerActionIcon("window-screen")); - this.ui = ui; - putValue(SHORT_DESCRIPTION, t("observe.action.toWindowScreen.tip")); + super(ui, ACTION_NAME, t("observe.action.toWindowScreen"), t("observe.action.toWindowScreen.tip"), "window-screen", null); putValue(MNEMONIC_KEY, (int) 'S'); } @@ -55,8 +53,9 @@ public class ToWindowScreenAction extends AbstractAction { @Override public void actionPerformed(ActionEvent e) { - ui.getConfig().setFullScreen(false); - ui.getInitializer().reloadUI(ObserveSwingApplicationContext.get(), ui.getConfig()); + ObserveSwingApplicationConfig config = getMainUI().getConfig(); + config.setFullScreen(false); + getMainUI().getInitializer().reloadUI(ObserveSwingApplicationContext.get(), config); } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/help/GotoSiteAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/help/GotoSiteAction.java index 7922ec8..b58139f 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/help/GotoSiteAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/help/GotoSiteAction.java @@ -25,11 +25,10 @@ package fr.ird.observe.application.swing.ui.actions.menu.help; import fr.ird.observe.application.swing.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.UIHelper; -import jaxx.runtime.SwingUtil; +import fr.ird.observe.application.swing.ui.actions.AbstractUIAction; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.AbstractAction; import java.awt.Desktop; import java.awt.event.ActionEvent; import java.net.URL; @@ -42,20 +41,18 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class GotoSiteAction extends AbstractAction { +public class GotoSiteAction extends AbstractUIAction { private static final long serialVersionUID = 1L; /** Logger. */ private static final Log log = LogFactory.getLog(GotoSiteAction.class); - - private final ObserveMainUI ui; + + public static final String ACTION_NAME = GotoSiteAction.class.getSimpleName(); public GotoSiteAction(ObserveMainUI ui) { - super(t("observe.action.site"), SwingUtil.getUIManagerActionIcon("site")); - this.ui = ui; - putValue(SHORT_DESCRIPTION, t("observe.action.site.tip")); + super(ui, ACTION_NAME, t("observe.action.site"), t("observe.action.site.tip"), "site", null); putValue(MNEMONIC_KEY, (int) 's'); } @@ -63,7 +60,7 @@ public class GotoSiteAction extends AbstractAction { @Override public void actionPerformed(ActionEvent e) { - ObserveSwingApplicationConfig config = ui.getConfig(); + ObserveSwingApplicationConfig config = getMainUI().getConfig(); URL siteURL = config.get().getOptionAsURL("application.site.url"); @@ -74,7 +71,7 @@ public class GotoSiteAction extends AbstractAction { log.info("goto " + siteURL); } if (Desktop.isDesktopSupported() && - Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) { + Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) { try { Desktop.getDesktop().browse(siteURL.toURI()); } catch (Exception ex) { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/help/ShowAboutAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/help/ShowAboutAction.java index 978e247..67cddd2 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/help/ShowAboutAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/help/ShowAboutAction.java @@ -25,12 +25,11 @@ package fr.ird.observe.application.swing.ui.actions.menu.help; import fr.ird.observe.application.swing.ObserveRunner; import fr.ird.observe.application.swing.ObserveSwingTechnicalException; import fr.ird.observe.application.swing.ui.ObserveMainUI; -import jaxx.runtime.SwingUtil; +import fr.ird.observe.application.swing.ui.actions.AbstractUIAction; import org.nuiton.jaxx.widgets.about.AboutUI; import org.nuiton.jaxx.widgets.about.AboutUIBuilder; import org.nuiton.util.Resource; -import javax.swing.AbstractAction; import javax.swing.JLabel; import javax.swing.JPanel; import java.awt.BorderLayout; @@ -47,17 +46,14 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 3.13 */ -public class ShowAboutAction extends AbstractAction { +public class ShowAboutAction extends AbstractUIAction { private static final long serialVersionUID = 1L; - - private final ObserveMainUI ui; + public static final String ACTION_NAME = ShowAboutAction.class.getSimpleName(); public ShowAboutAction(ObserveMainUI ui) { - super(t("observe.action.about"), SwingUtil.getUIManagerActionIcon("about")); - this.ui = ui; - putValue(SHORT_DESCRIPTION, t("observe.action.about.tip")); + super(ui, ACTION_NAME, t("observe.action.about"), t("observe.action.about.tip"), "about", null); putValue(MNEMONIC_KEY, KeyEvent.VK_P); } @@ -65,6 +61,8 @@ public class ShowAboutAction extends AbstractAction { @Override public void actionPerformed(ActionEvent event) { + ObserveMainUI ui = getMainUI(); + File csvFile = new File(ui.getConfig().getI18nDirectory(), "observe-i18n.csv"); String translateText; try { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/ChangeStorageAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/ChangeStorageAction.java index e727c9e..4c2bdf1 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/ChangeStorageAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/ChangeStorageAction.java @@ -25,12 +25,11 @@ package fr.ird.observe.application.swing.ui.actions.menu.storage; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.configuration.constants.DbMode; import fr.ird.observe.application.swing.ui.ObserveMainUI; +import fr.ird.observe.application.swing.ui.actions.AbstractUIAction; import fr.ird.observe.application.swing.ui.storage.StorageUILauncher; -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 java.util.EnumSet; import java.util.Set; @@ -44,7 +43,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 3.13 */ -public class ChangeStorageAction extends AbstractAction { +public class ChangeStorageAction extends AbstractUIAction { private static final long serialVersionUID = 1L; @@ -52,7 +51,7 @@ public class ChangeStorageAction extends AbstractAction { /** Logger. */ private static final Log log = LogFactory.getLog(ChangeStorageAction.class); - private final ObserveMainUI ui; + public static final String ACTION_NAME = ChangeStorageAction.class.getSimpleName(); private final Set<DbMode> dbModes; @@ -64,11 +63,9 @@ public class ChangeStorageAction extends AbstractAction { public ChangeStorageAction(ObserveMainUI ui, Set<DbMode> dbModes, String title) { - super(t("observe.action.change.storage"), SwingUtil.getUIManagerActionIcon("db-change")); - this.ui = ui; + super(ui, ACTION_NAME, t("observe.action.change.storage"), t("observe.action.change.storage.tip"), "db-change", null); this.dbModes = dbModes == null ? EnumSet.noneOf(DbMode.class) : dbModes; this.title = title; - putValue(SHORT_DESCRIPTION, t("observe.action.change.storage.tip")); putValue(MNEMONIC_KEY, (int) 'C'); } @@ -89,6 +86,7 @@ public class ChangeStorageAction extends AbstractAction { log.info("Start change storage with dbMode: " + dbModes.stream().map(DbMode::name).collect(Collectors.joining(", "))); } + ObserveMainUI ui = getMainUI(); StorageUILauncher.changeStorage(ui, ui, dbModes, t(title)); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/CloseStorageAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/CloseStorageAction.java index 90ab336..f3c41dc 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/CloseStorageAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/CloseStorageAction.java @@ -25,8 +25,7 @@ package fr.ird.observe.application.swing.ui.actions.menu.storage; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.application.swing.ui.ObserveMainUI; -import fr.ird.observe.application.swing.ui.actions.AbstractObserveAction; -import jaxx.runtime.SwingUtil; +import fr.ird.observe.application.swing.ui.actions.AbstractUIAction; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -40,20 +39,18 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 3.13 */ -public class CloseStorageAction extends AbstractObserveAction { +public class CloseStorageAction extends AbstractUIAction { private static final long serialVersionUID = 1L; /** Logger. */ private static final Log log = LogFactory.getLog(CloseStorageAction.class); - private final ObserveMainUI ui; + public static final String ACTION_NAME = CloseStorageAction.class.getSimpleName(); public CloseStorageAction(ObserveMainUI ui) { - super(t("observe.action.close.storage"), SwingUtil.getUIManagerActionIcon("db-none")); - this.ui = ui; - putValue(SHORT_DESCRIPTION, t("observe.action.close.storage.tip")); + super(ui, ACTION_NAME, t("observe.action.close.storage"), t("observe.action.close.storage.tip"), "db-none", null); putValue(MNEMONIC_KEY, (int) 'F'); } @@ -67,6 +64,8 @@ public class CloseStorageAction extends AbstractObserveAction { public void run() { + ObserveMainUI ui = getMainUI(); + boolean canContinue = ObserveSwingApplicationContext.get().getContentUIManager().closeSelectedContentUI(); if (canContinue) { ui.setBusy(true); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/ImportStorageFromFileAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/ImportStorageFromFileAction.java index e27081a..010eb3a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/ImportStorageFromFileAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/ImportStorageFromFileAction.java @@ -26,14 +26,13 @@ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.configuration.constants.CreationMode; import fr.ird.observe.application.swing.configuration.constants.DbMode; import fr.ird.observe.application.swing.ui.ObserveMainUI; +import fr.ird.observe.application.swing.ui.actions.AbstractUIAction; import fr.ird.observe.application.swing.ui.storage.StorageStep; import fr.ird.observe.application.swing.ui.storage.StorageUI; import fr.ird.observe.application.swing.ui.storage.StorageUIHandler; import fr.ird.observe.application.swing.ui.storage.StorageUILauncher; import fr.ird.observe.application.swing.ui.storage.StorageUIModel; -import jaxx.runtime.SwingUtil; -import javax.swing.AbstractAction; import java.awt.event.ActionEvent; import static org.nuiton.i18n.I18n.t; @@ -44,17 +43,15 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 3.13 */ -public class ImportStorageFromFileAction extends AbstractAction { +public class ImportStorageFromFileAction extends AbstractUIAction { private static final long serialVersionUID = 1L; - private final ObserveMainUI ui; + public static final String ACTION_NAME = ImportStorageFromFileAction.class.getSimpleName(); public ImportStorageFromFileAction(ObserveMainUI ui) { - super(t("observe.action.load.from.file"), SwingUtil.getUIManagerActionIcon("local-import")); - this.ui = ui; - putValue(SHORT_DESCRIPTION, t("observe.action.load.from.file.tip")); + super(ui, ACTION_NAME, t("observe.action.load.from.file"), t("observe.action.load.from.file.tip"), "local-import", null); putValue(MNEMONIC_KEY, (int) 'I'); } @@ -65,6 +62,7 @@ public class ImportStorageFromFileAction extends AbstractAction { boolean canContinue = ObserveSwingApplicationContext.get().getContentUIManager().closeSelectedContentUI(); if (canContinue) { + ObserveMainUI ui = getMainUI(); new StorageUILauncher(ui, ui, t("observe.title.import.localDB")) { @Override protected void init(StorageUI ui) { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/ReloadStorageAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/ReloadStorageAction.java index 8284ce7..4edaccb 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/ReloadStorageAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/ReloadStorageAction.java @@ -27,10 +27,9 @@ import fr.ird.observe.application.swing.configuration.ObserveSwingApplicationCon import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.UIHelper; -import fr.ird.observe.application.swing.ui.actions.AbstractObserveAction; +import fr.ird.observe.application.swing.ui.actions.AbstractUIAction; import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2; import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaPG; -import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -44,7 +43,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 3.13 */ -public class ReloadStorageAction extends AbstractObserveAction { +public class ReloadStorageAction extends AbstractUIAction { private static final long serialVersionUID = 1L; @@ -52,13 +51,11 @@ public class ReloadStorageAction extends AbstractObserveAction { /** Logger. */ private static final Log log = LogFactory.getLog(ReloadStorageAction.class); - private final ObserveMainUI ui; + public static final String ACTION_NAME = ReloadStorageAction.class.getSimpleName(); public ReloadStorageAction(ObserveMainUI ui) { - super(t("observe.action.reload.storage"), SwingUtil.getUIManagerActionIcon("db-reload")); - this.ui = ui; - putValue(SHORT_DESCRIPTION, t("observe.action.reload.storage.tip")); + super(ui, ACTION_NAME, t("observe.action.reload.storage"), t("observe.action.reload.storage.tip"), "db-reload", null); putValue(MNEMONIC_KEY, (int) 'R'); } @@ -79,6 +76,8 @@ public class ReloadStorageAction extends AbstractObserveAction { if (canContinue && storage != null) { + ObserveMainUI ui = getMainUI(); + ui.setBusy(false); Object[] ids = ui.getNavigation().getSelectedIds(); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/SaveStorageToFileAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/SaveStorageToFileAction.java index ecaafef..90e4267 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/SaveStorageToFileAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/SaveStorageToFileAction.java @@ -26,9 +26,8 @@ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.UIHelper; -import fr.ird.observe.application.swing.ui.actions.AbstractObserveAction; +import fr.ird.observe.application.swing.ui.actions.AbstractUIAction; import fr.ird.observe.application.swing.ui.storage.StorageBackupUILauncher; -import jaxx.runtime.SwingUtil; import javax.swing.JOptionPane; import java.awt.event.ActionEvent; @@ -41,17 +40,15 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 3.13 */ -public class SaveStorageToFileAction extends AbstractObserveAction { +public class SaveStorageToFileAction extends AbstractUIAction { private static final long serialVersionUID = 1L; - private final ObserveMainUI ui; + public static final String ACTION_NAME = SaveStorageToFileAction.class.getSimpleName(); public SaveStorageToFileAction(ObserveMainUI ui) { - super(t("observe.action.save.to.file"), SwingUtil.getUIManagerActionIcon("local-export")); - this.ui = ui; - putValue(SHORT_DESCRIPTION, t("observe.action.save.to.file.tip")); + super(ui, ACTION_NAME, t("observe.action.save.to.file"), t("observe.action.save.to.file.tip"), "local-export", null); putValue(MNEMONIC_KEY, (int) 'L'); } @@ -80,11 +77,11 @@ public class SaveStorageToFileAction extends AbstractObserveAction { } String title = service.isLocal() ? - t("observe.title.save.localDB") : - t("observe.title.save.remoteDB"); + t("observe.title.save.localDB") : + t("observe.title.save.remoteDB"); - StorageBackupUILauncher launcher = - new StorageBackupUILauncher(ui, ui, title); + ObserveMainUI ui = getMainUI(); + StorageBackupUILauncher launcher = new StorageBackupUILauncher(ui, ui, title); launcher.start(); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/ShowStorageInfoAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/ShowStorageInfoAction.java index 7155469..831f17f 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/ShowStorageInfoAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/ShowStorageInfoAction.java @@ -26,9 +26,8 @@ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.ObserveTextGenerator; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.application.swing.ui.ObserveMainUI; -import jaxx.runtime.SwingUtil; +import fr.ird.observe.application.swing.ui.actions.AbstractUIAction; -import javax.swing.AbstractAction; import javax.swing.JLabel; import javax.swing.JOptionPane; import java.awt.event.ActionEvent; @@ -41,17 +40,15 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 3.13 */ -public class ShowStorageInfoAction extends AbstractAction { +public class ShowStorageInfoAction extends AbstractUIAction { private static final long serialVersionUID = 1L; - private final ObserveMainUI ui; + public static final String ACTION_NAME = ""; public ShowStorageInfoAction(ObserveMainUI ui) { - super(t("observe.action.info.storage"), SwingUtil.getUIManagerActionIcon("information")); - this.ui = ui; - putValue(SHORT_DESCRIPTION, t("observe.action.info.storage.tip")); + super(ui, ACTION_NAME, t("observe.action.info.storage"), t("observe.action.info.storage.tip"), "information", null); putValue(MNEMONIC_KEY, (int) 'I'); } @@ -62,7 +59,7 @@ public class ShowStorageInfoAction extends AbstractAction { ObserveSwingApplicationContext applicationContext = ObserveSwingApplicationContext.get(); ObserveSwingDataSource source; - if (ui.getConfig().isMainStorageOpened()) { + if (getMainUI().getConfig().isMainStorageOpened()) { source = applicationContext.getDataSourcesManager().getMainDataSource(); } else { source = null; @@ -71,7 +68,7 @@ public class ShowStorageInfoAction extends AbstractAction { ObserveTextGenerator textGenerator = applicationContext.getTextGenerator(); String text = textGenerator.getDataSourceInfo(source); JOptionPane.showMessageDialog( - ui, + getMainUI(), new JLabel(text), t("observe.title.storage.info"), JOptionPane.INFORMATION_MESSAGE); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/StartH2WebServerAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/StartH2WebServerAction.java index 882c966..c7784fc 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/StartH2WebServerAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/StartH2WebServerAction.java @@ -25,12 +25,11 @@ package fr.ird.observe.application.swing.ui.actions.menu.storage; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.UIHelper; -import jaxx.runtime.SwingUtil; +import fr.ird.observe.application.swing.ui.actions.AbstractUIAction; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.h2.tools.Server; -import javax.swing.AbstractAction; import java.awt.event.ActionEvent; import static org.nuiton.i18n.I18n.t; @@ -41,27 +40,26 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 3.13 */ -public class StartH2WebServerAction extends AbstractAction { +public class StartH2WebServerAction extends AbstractUIAction { private static final long serialVersionUID = 1L; /** Logger. */ private static final Log log = LogFactory.getLog(StartH2WebServerAction.class); - private final ObserveMainUI ui; + public static final String ACTION_NAME = StartH2WebServerAction.class.getSimpleName(); public StartH2WebServerAction(ObserveMainUI ui) { - super(t("observe.action.start.h2.web.server"), SwingUtil.getUIManagerActionIcon("db-start-server")); - this.ui = ui; - putValue(SHORT_DESCRIPTION, t("observe.action.start.h2.web.server.tip")); - putValue(MNEMONIC_KEY, (int) 'S'); + super(ui, ACTION_NAME, t("observe.action.start.h2.web.server"), t("observe.action.start.h2.web.server.tip"), "db-start-server", null); + putValue(MNEMONIC_KEY, (int) 'W'); } @Override public void actionPerformed(ActionEvent event) { + ObserveMainUI ui = getMainUI(); if (ui.isH2WebServer()) { if (log.isWarnEnabled()) { @@ -94,7 +92,6 @@ public class StartH2WebServerAction extends AbstractAction { } - } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/StartServerModeAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/StartServerModeAction.java index e8cfbd1..85fdbf9 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/StartServerModeAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/StartServerModeAction.java @@ -27,13 +27,12 @@ import fr.ird.observe.application.swing.configuration.ObserveSwingApplicationCon import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.ObserveMainUIHandler; import fr.ird.observe.application.swing.ui.ObserveUIMode; -import jaxx.runtime.SwingUtil; +import fr.ird.observe.application.swing.ui.actions.AbstractUIAction; import jaxx.runtime.swing.ErrorDialogUI; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.h2.tools.Server; -import javax.swing.AbstractAction; import java.awt.event.ActionEvent; import java.io.File; import java.sql.SQLException; @@ -46,20 +45,18 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 3.13 */ -public class StartServerModeAction extends AbstractAction { +public class StartServerModeAction extends AbstractUIAction { private static final long serialVersionUID = 1L; /** Logger. */ private static final Log log = LogFactory.getLog(StartServerModeAction.class); - private final ObserveMainUI ui; + public static final String ACTION_NAME = StartServerModeAction.class.getSimpleName(); public StartServerModeAction(ObserveMainUI ui) { - super(t("observe.action.start.server.mode"), SwingUtil.getUIManagerActionIcon("db-start-server")); - this.ui = ui; - putValue(SHORT_DESCRIPTION, t("observe.action.start.server.mode.tip")); + super(ui, ACTION_NAME, t("observe.action.start.server.mode"), t("observe.action.start.server.mode.tip"), "db-start-server", null); putValue(MNEMONIC_KEY, (int) 'S'); } @@ -76,6 +73,7 @@ public class StartServerModeAction extends AbstractAction { if (log.isInfoEnabled()) { log.info("Will start server mode..."); } + ObserveMainUI ui = getMainUI(); ObserveSwingApplicationConfig config = ui.getConfig(); File dbDirectory = new File(config.getLocalDBDirectory(), "obstuna"); String h2Login = config.getH2Login(); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/StopH2WebServerAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/StopH2WebServerAction.java index e726743..fb5241f 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/StopH2WebServerAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/StopH2WebServerAction.java @@ -24,12 +24,11 @@ package fr.ird.observe.application.swing.ui.actions.menu.storage; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.ui.ObserveMainUI; -import jaxx.runtime.SwingUtil; +import fr.ird.observe.application.swing.ui.actions.AbstractUIAction; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.h2.tools.Server; -import javax.swing.AbstractAction; import java.awt.event.ActionEvent; import static org.nuiton.i18n.I18n.t; @@ -40,28 +39,26 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 3.13 */ -public class StopH2WebServerAction extends AbstractAction { +public class StopH2WebServerAction extends AbstractUIAction { private static final long serialVersionUID = 1L; /** Logger. */ private static final Log log = LogFactory.getLog(StopH2WebServerAction.class); - private final ObserveMainUI ui; + public static final String ACTION_NAME = StopH2WebServerAction.class.getSimpleName(); public StopH2WebServerAction(ObserveMainUI ui) { - super(t("observe.action.stop.h2.web.server"), SwingUtil.getUIManagerActionIcon("db-stop-server")); - this.ui = ui; - putValue(SHORT_DESCRIPTION, t("observe.action.stop.h2.web.server.tip")); - putValue(MNEMONIC_KEY, (int) 'S'); + super(ui, ACTION_NAME, t("observe.action.stop.h2.web.server"), t("observe.action.stop.h2.web.server.tip"), "db-stop-server", null); + putValue(MNEMONIC_KEY, (int) 'A'); } @Override public void actionPerformed(ActionEvent e) { - launchStopH2WebServer(ui); + launchStopH2WebServer(getMainUI()); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/StopServerModeAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/StopServerModeAction.java index d657858..30f5edd 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/StopServerModeAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/StopServerModeAction.java @@ -25,12 +25,11 @@ package fr.ird.observe.application.swing.ui.actions.menu.storage; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.ObserveUIMode; -import jaxx.runtime.SwingUtil; +import fr.ird.observe.application.swing.ui.actions.AbstractUIAction; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.h2.tools.Server; -import javax.swing.AbstractAction; import java.awt.event.ActionEvent; import static org.nuiton.i18n.I18n.t; @@ -41,20 +40,18 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 3.13 */ -public class StopServerModeAction extends AbstractAction { +public class StopServerModeAction extends AbstractUIAction { private static final long serialVersionUID = 1L; /** Logger. */ private static final Log log = LogFactory.getLog(StopServerModeAction.class); - private final ObserveMainUI ui; + public static final String ACTION_NAME = StopServerModeAction.class.getSimpleName(); public StopServerModeAction(ObserveMainUI ui) { - super(t("observe.action.stop.server.mode"), SwingUtil.getUIManagerActionIcon("db-stop-server")); - this.ui = ui; - putValue(SHORT_DESCRIPTION, t("observe.action.stop.server.mode.tip")); + super(ui, ACTION_NAME, t("observe.action.stop.server.mode"), t("observe.action.stop.server.mode.tip"), "db-stop-server", null); putValue(MNEMONIC_KEY, (int) 'S'); } @@ -71,6 +68,7 @@ public class StopServerModeAction extends AbstractAction { if (server != null) { server.stop(); } + ObserveMainUI ui = getMainUI(); ui.setMode(ObserveUIMode.NO_DB); if (ui.isH2WebServer()) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit fdf844d1308d5ec3495bec146742deadc67e779a Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Dec 5 12:24:09 2016 +0100 [iso] Utilisation d'un vrai modèle pour l'ui principale --- .../application/swing/LocalDatabaseBackupTask.java | 4 +- .../application/swing/ObserveActionExecutor.java | 4 +- .../ObserveSwingApplicationDataSourcesManager.java | 8 +- .../application/swing/ui/ObserveMainUI.jaxx | 26 +- .../application/swing/ui/ObserveMainUI.jcss | 97 ++--- .../application/swing/ui/ObserveMainUIHandler.java | 84 +--- .../swing/ui/ObserveMainUIInitializer.java | 25 +- .../application/swing/ui/ObserveMainUIModel.java | 445 +++++++++++++++++++++ .../ird/observe/application/swing/ui/UIHelper.java | 4 +- .../ui/actions/content/DeleteDataUIAction.java | 4 +- .../actions/content/DeleteReferenceUIAction.java | 4 +- .../ui/actions/global/AbstractGlobalUIAction.java | 2 +- .../actions/global/ChangeFocusGlobalUIAction.java | 6 +- .../actions/menu/storage/CloseStorageAction.java | 4 +- .../actions/menu/storage/ReloadStorageAction.java | 4 +- .../menu/storage/StartH2WebServerAction.java | 4 +- .../menu/storage/StartServerModeAction.java | 2 +- .../menu/storage/StopH2WebServerAction.java | 4 +- .../actions/menu/storage/StopServerModeAction.java | 4 +- .../swing/ui/admin/AdminUILauncher.java | 10 +- .../swing/ui/content/ContentUIManager.java | 4 +- .../LonglineDetailCompositionUIHandler.java | 6 +- .../open/impl/longline/TripLonglineUIHandler.java | 4 +- .../open/impl/seine/TripSeineUIHandler.java | 4 +- .../ui/content/table/ContentTableUIHandler.java | 2 +- .../swing/ui/util/tripMap/TripMapUIHandler.java | 4 +- 26 files changed, 547 insertions(+), 222 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/LocalDatabaseBackupTask.java b/application-swing/src/main/java/fr/ird/observe/application/swing/LocalDatabaseBackupTask.java index 982aaf7..052e108 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/LocalDatabaseBackupTask.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/LocalDatabaseBackupTask.java @@ -82,7 +82,7 @@ public class LocalDatabaseBackupTask implements Runnable { log.info(startMessage + " - " + file); } long t0 = System.nanoTime(); - mainUI.setBusy(true); + mainUI.getModel().setBusy(true); try { mainDataSource.newDataSourceService().backup(file); } finally { @@ -91,7 +91,7 @@ public class LocalDatabaseBackupTask implements Runnable { if (log.isInfoEnabled()) { log.info(endMessage + " - " + file); } - mainUI.setBusy(false); + mainUI.getModel().setBusy(false); } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveActionExecutor.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveActionExecutor.java index 9e5514f..4abe990 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveActionExecutor.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveActionExecutor.java @@ -74,7 +74,7 @@ public class ObserveActionExecutor extends ActionExecutor { } ObserveMainUI ui = ObserveSwingApplicationContext.get().getMainUI(); if (ui != null) { - ui.setBusy(true); + ui.getModel().setBusy(true); } } @@ -184,7 +184,7 @@ public class ObserveActionExecutor extends ActionExecutor { } ObserveMainUI ui = ObserveSwingApplicationContext.get().getMainUI(); if (count < 1 && ui != null) { - ui.setBusy(false); + ui.getModel().setBusy(false); } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationDataSourcesManager.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationDataSourcesManager.java index 5e58b62..a29de90 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationDataSourcesManager.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationDataSourcesManager.java @@ -306,13 +306,13 @@ public class ObserveSwingApplicationDataSourcesManager implements Closeable { if (success) { // on peut retourner sur cette base - mainUI.setMode(ObserveUIMode.DB); + mainUI.getModel().setMode(ObserveUIMode.DB); } } else { // on peut retourner sur cette base - mainUI.setMode(ObserveUIMode.NO_DB); + mainUI.getModel().setMode(ObserveUIMode.NO_DB); if (askToCreate) { @@ -445,7 +445,7 @@ public class ObserveSwingApplicationDataSourcesManager implements Closeable { log.debug("dispose ui from storage " + source.getLabel() + ": " + mainUI.getName()); } - mainUI.setMode(ObserveUIMode.NO_DB); + mainUI.getModel().setMode(ObserveUIMode.NO_DB); displayInfo(t("observe.message.db.closed", source.getLabel())); @@ -491,7 +491,7 @@ public class ObserveSwingApplicationDataSourcesManager implements Closeable { dataContext.populateOpens(openIds); mainUI.getInitializer().loadNavigationUI(); - mainUI.setMode(ObserveUIMode.DB); + mainUI.getModel().setMode(ObserveUIMode.DB); mainUI.getStatus().setStatus(t("observe.message.db.loaded", source.getLabel())); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jaxx index 7527ea7..833c73a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jaxx @@ -98,9 +98,7 @@ </import> - <ObserveUIMode id='mode' javaBean='ObserveUIMode.NO_DB'/> - - <Boolean id='h2WebServer' javaBean='Boolean.FALSE'/> + <ObserveMainUIModel id='model' initializer='getContextValue(ObserveMainUIModel.class)'/> <ObserveActionMap id="observeActionMap" constructorParams='this'/> @@ -124,14 +122,6 @@ <DataContext id='dataContext' initializer='ObserveSwingApplicationContext.get().getDataContext()'/> - <Boolean id='mainFromSynchro' javaBean='false'/> - - <Boolean id='busy' javaBean='false'/> - - <Boolean id='focusOnNavigation' javaBean='false'/> - - <Boolean id='showMnemonic' javaBean='config.isShowMnemonic()'/> - <CardLayout2 id='contentLayout'/> <CardLayout2Ext id='bodyLayout' constructorParams='this, "body"'/> @@ -140,18 +130,6 @@ <script><![CDATA[ -protected Icon updateStorageSatutIcon(boolean isOpened) { - return handler.updateStorageSatutIcon(); -} - -protected String updateStorageSatutText(boolean isOpened) { - return handler.updateStorageSatutText(); -} - -protected String updateStorageStatutToolTipText(boolean isOpened) { - return handler.updateStorageStatutToolTipText(); -} - @Override public void dispose() { log.debug("dispose main ui " + this); @@ -169,7 +147,6 @@ protected void finalize() throws Throwable { super.finalize(); destroy(); } - ]]> </script> @@ -246,7 +223,6 @@ protected void finalize() throws Throwable { <!-- pour afficher le status du service de persistance et changer de service de persistance --> <JButton id='storageStatus' - enabled='{getHandler().acceptMode(getMode(), !isBusy(), ObserveUIMode.DB, ObserveUIMode.NO_DB)}' onActionPerformed="JComponent c = (JComponent) event.getSource(); storageStatusPopup.show(c, 0, c.getHeight());"/> </JToolBar> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jcss index e2d3165..b22cf77 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jcss @@ -34,11 +34,11 @@ JSplitPane { #mainFrame { defaultCloseOperation: "do_nothing_on_close"; - iconImage: {SwingUtil.createImageIcon("logo-OT_web.png").getImage()}; + iconImage: {UIHelper.createImageIcon("logo-OT_web.png").getImage()}; } #menu { - enabled: {!isBusy()}; + enabled:{!model.isBusy()}; } #navigationNoAction { @@ -50,31 +50,31 @@ JSplitPane { // trip menu #navigationOpenAction { - action: {new ReOpenUIAction(this)}; + _observeAction:{ReOpenUIAction.ACTION_NAME}; } #navigationCloseAction { - action: {new CloseOpenUIAction(this)}; + _observeAction:{CloseOpenUIAction.ACTION_NAME}; } #navigationDeleteAction { - action: {new DeleteDataUIAction(this)}; + _observeAction:{DeleteDataUIAction.ACTION_NAME}; } #menuFile { text: "observe.menu.file"; mnemonic: F; - enabled: {getHandler().acceptMode(getMode(), !isBusy(), !isMainFromSynchro(), ObserveUIMode.NO_DB, ObserveUIMode.DB)}; + enabled: {model.isFileEnabled()}; } #menuFileToFullScreen { - action:{new ToFullScreenAction(this)}; - visible:{!config.isFullScreen()} + _observeAction:{ToFullScreenAction.ACTION_NAME}; + visible:{!model.isFullScreen()} } #menuFileToWindowScreen { - action:{new ToWindowScreenAction(this)}; - visible:{config.isFullScreen()} + _observeAction:{ToWindowScreenAction.ACTION_NAME}; + visible:{model.isFullScreen()} } #menuConfigurationConfiguration { @@ -85,7 +85,7 @@ JSplitPane { text: "observe.menu.configuration"; toolTipText: "observe.menu.configuration.tip"; mnemonic: C; - enabled: {getHandler().acceptMode(getMode(), !isBusy(), !isMainFromSynchro(), ObserveUIMode.DB, ObserveUIMode.NO_DB)}; + enabled: {model.isConfigEnabled()}; } #menuLanguage { @@ -93,7 +93,6 @@ JSplitPane { toolTipText: "observe.menu.locale"; actionIcon: "translate"; mnemonic: L; - enabled: {getHandler().acceptMode(getMode(), !isBusy(), !isMainFromSynchro(), ObserveUIMode.DB, ObserveUIMode.NO_DB)}; } #menuApplicationLanguage { @@ -105,17 +104,17 @@ JSplitPane { #menuApplicationLanguageFR { _observeAction:{ChangeApplicationLanguageToFrenchAction.ACTION_NAME}; - enabled: {!getHandler().acceptLocale(getConfig().getLocale(), "fr_FR")}; + enabled:{model.isChangeApplicationLanguageToFrenchEnabled()}; } #menuApplicationLanguageUK { _observeAction:{ChangeApplicationLanguageToEnglishAction.ACTION_NAME}; - enabled: {!getHandler().acceptLocale(getConfig().getLocale(), "en_GB")}; + enabled: {model.isChangeApplicationLanguageToEnglishEnabled()}; } #menuApplicationLanguageES { _observeAction:{ChangeApplicationLanguageToSpanishAction.ACTION_NAME}; - enabled: {!getHandler().acceptLocale(getConfig().getLocale(), "es_ES")}; + enabled: {model.isChangeApplicationLanguageToSpanishEnabled()}; } #menuDbLanguage { @@ -127,17 +126,17 @@ JSplitPane { #menuDbLanguageFR { _observeAction:{ChangeDbLanguageToFrenchAction.ACTION_NAME}; - enabled: {!getHandler().acceptLocale(getConfig().getDbLocale(), "fr_FR")}; + enabled: {model.isChangeDbLanguageToFrenchEnabled()}; } #menuDbLanguageUK { _observeAction:{ChangeDbLanguageToEnglishAction.ACTION_NAME}; - enabled: {!getHandler().acceptLocale(getConfig().getDbLocale(), "en_GB")}; + enabled: {model.isChangeDbLanguageToEnglishEnabled()}; } #menuDbLanguageES { _observeAction:{ChangeDbLanguageToSpanishAction.ACTION_NAME}; - enabled: {!getHandler().acceptLocale(getConfig().getDbLocale(), "es_ES")}; + enabled: {model.isChangeDbLanguageToSpanishEnabled()}; } #menuConfigurationReloadDefault { @@ -146,7 +145,7 @@ JSplitPane { #menuConfigurationReloadResources { _observeAction:{ReloadResourcesAction.ACTION_NAME}; - visible: {getConfig().isDevMode()}; + visible: {model.isDevMode()}; } #menuFileReloadApplication { @@ -160,7 +159,7 @@ JSplitPane { #menuStorage { text: "observe.menu.storage"; mnemonic: S; - enabled: {getHandler().acceptMode(getMode(), !isBusy(), !isMainFromSynchro(), ObserveUIMode.DB, ObserveUIMode.NO_DB)}; + enabled: {model.isStorageEnabled()}; } #menuStorageInfo { @@ -169,17 +168,17 @@ JSplitPane { #menuStorageReload { _observeAction:{ReloadStorageAction.ACTION_NAME}; - enabled: {getHandler().acceptMode(getMode(), getConfig().isMainStorageOpened(), ObserveUIMode.DB)}; + enabled: {model.isStorageReloadEnabled()}; } #menuStorageClose { _observeAction:{CloseStorageAction.ACTION_NAME}; - enabled: {getHandler().acceptMode(getMode(), getConfig().isMainStorageOpened(), ObserveUIMode.DB)}; + enabled: {model.isStorageCloseEnabled()}; } #menuStorageStartServerMode { _observeAction:{StartServerModeAction.ACTION_NAME}; - visible: {getHandler().acceptMode(getMode(), getConfig().isLocalStorageExist() && !isBusy() && !isMainFromSynchro(), ObserveUIMode.NO_DB)}; + visible: {model.isStartServerVisible()}; } #menuStorageChange { @@ -188,18 +187,18 @@ JSplitPane { #menuStorageLoadFromFile { _observeAction:{ImportStorageFromFileAction.ACTION_NAME}; - enabled: {getHandler().acceptMode(getMode(), ObserveUIMode.DB, ObserveUIMode.NO_DB)}; + enabled: {model.isStorageImportEnabled()}; } #menuStorageSaveToFile { _observeAction:{SaveStorageToFileAction.ACTION_NAME}; - enabled: {getHandler().acceptMode(getMode(), getConfig().isMainStorageOpened(), ObserveUIMode.DB)}; + enabled: {model.isStorageSaveEnabled()}; } #menuActions { text: "observe.menu.actions"; mnemonic: A; - enabled: {getHandler().acceptMode(getMode(), !isBusy() && !isMainFromSynchro(), ObserveUIMode.DB, ObserveUIMode.NO_DB)}; + enabled: {model.isActionsEnabled()}; } #menuActionsDataSynchro { @@ -233,7 +232,7 @@ JSplitPane { #menuNavigation { text: "observe.menu.navigation"; mnemonic: N; - enabled:{getHandler().acceptMode(getMode(), !isBusy(), ObserveUIMode.DB)}; + enabled:{model.isNavigationEnabled()}; } #menuNavigationProgram { @@ -262,15 +261,7 @@ JSplitPane { #menuHelp { text: "observe.menu.help"; - mnemonic: e; - enabled: {!isBusy()}; -} - -#menuHelpHelp { - text: "observe.action.help"; - toolTipText: "observe.action.help.tip"; - actionIcon: "help"; - mnemonic: e; + mnemonic: E; } #menuHelpSite { @@ -285,13 +276,10 @@ JSplitPane { opaque: false; borderPainted: false; focusable: false; - toolTipText: {updateStorageStatutToolTipText(getConfig().isMainStorageOpened())}; - text: {updateStorageSatutText(getConfig().isMainStorageOpened())}; - icon: {updateStorageSatutIcon(getConfig().isMainStorageOpened())}; - _localIcon: {SwingUtil.getUIManagerActionIcon("db-local")}; - _remoteIcon: {SwingUtil.getUIManagerActionIcon("db-remote")}; - _serverIcon: {SwingUtil.getUIManagerActionIcon("db-server")}; - _noneIcon: {SwingUtil.getUIManagerActionIcon("db-none")}; + enabled:{model.isStorageStatusEnabled()}; + toolTipText: {model.getStorageStatusTip()}; + text: {model.getStorageStatusText()}; + icon: {model.getStorageStatusIcon()}; } #storageStatusInfo { @@ -304,19 +292,12 @@ JSplitPane { #storageStatusClose { _observeAction:{CloseStorageAction.ACTION_NAME}; - enabled: {getHandler().acceptMode(getMode(), getConfig().isMainStorageOpened(), ObserveUIMode.DB)}; + enabled: {model.isStorageCloseEnabled()}; } #storageStatusReload { _observeAction:{ReloadStorageAction.ACTION_NAME}; - enabled: {getHandler().acceptMode(getMode(), getConfig().isMainStorageOpened(), ObserveUIMode.DB)}; -} - -#closeHelp { - _observeAction:{CloseHelpAction.ACTION_NAME}; - borderPainted: false; - rolloverEnabled: false; - focusable: false; + enabled: {model.isStorageReloadEnabled()}; } #errorTable { @@ -332,7 +313,7 @@ JSplitPane { #busyBlockLayerUI { useIcon: false; blockingColor: {UIManager.getColor("BlockingLayerUI.blockingColor")}; - block: {isBusy()}; + block: {model.isBusy()}; acceptedComponentNames: {UIHelper.ACCEPTABLE_COMPONENTS}; } @@ -405,12 +386,12 @@ JSplitPane { #startH2WebServer{ _observeAction:{StartH2WebServerAction.ACTION_NAME}; - enabled: {!isH2WebServer()}; + enabled: {!model.isH2WebServer()}; } #stopH2WebServer{ _observeAction:{StopH2WebServerAction.ACTION_NAME}; - enabled: {isH2WebServer()}; + enabled: {model.isH2WebServer()}; } #stopServerMode { @@ -422,7 +403,7 @@ JSplitPane { } #bodyLayout { - selected: {getMode().name()}; + selected: {model.getMode().name()}; } #body { layout: {bodyLayout}; @@ -434,12 +415,12 @@ JSplitPane { #status { showBusy: {true}; - busy: {isBusy()}; + busy: {model.isBusy()}; } #toolbar { layout: {new BoxLayout(toolbar, 0)}; - enabled: {!isBusy()}; + //enabled: {!model.isBusy()}; } #emptySelectionLabel { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIHandler.java index f9bdaba..e8bbe9f 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIHandler.java @@ -22,14 +22,8 @@ package fr.ird.observe.application.swing.ui; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; -import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import jaxx.runtime.spi.UIHandler; -import javax.swing.Icon; -import java.util.Locale; - -import static org.nuiton.i18n.I18n.t; - /** * Le handler de l'ui principale. * @@ -41,83 +35,11 @@ public class ObserveMainUIHandler implements UIHandler<ObserveMainUI> { public static final String H2_SERVER_URL_PATTERN = "jdbc:h2:%s/%s/obstuna"; - private ObserveMainUI ui; - - protected Icon updateStorageSatutIcon() { - Icon icon; - - if (ui.getConfig().isMainStorageOpened()) { - - ObserveSwingDataSource service = ObserveSwingApplicationContext.get().getDataSourcesManager().getMainDataSource(); - - if (service.isLocal()) { - icon = (Icon) ui.storageStatus.getClientProperty("localIcon"); - } else if (service.isRemote()) { - icon = (Icon) ui.storageStatus.getClientProperty("remoteIcon"); - } else { - icon = (Icon) ui.storageStatus.getClientProperty("serverIcon"); - } - } else { - icon = (Icon) ui.storageStatus.getClientProperty("noneIcon"); - } - return icon; - } - - protected String updateStorageSatutText() { - String text; - if (ui.getConfig().isMainStorageOpened()) { - ObserveSwingDataSource source = ObserveSwingApplicationContext.get().getDataSourcesManager().getMainDataSource(); - text = source.getLabel(); - } else { - text = t("observe.message.db.none.loaded"); - } - return text; - } - - protected String updateStorageStatutToolTipText() { - String text; - if (ui.getConfig().isMainStorageOpened()) { - ObserveSwingDataSource source = ObserveSwingApplicationContext.get().getDataSourcesManager().getMainDataSource(); - text = t("observe.message.loaded.tip", source.getLabel()); - } else { - text = t("observe.message.db.none.loaded.tip"); - } - return text; - } - - public boolean acceptMode(ObserveUIMode mode, ObserveUIMode... modes) { - return acceptMode(mode, true, modes); - } - - public boolean acceptMode(ObserveUIMode mode, boolean condition, ObserveUIMode... modes) { - if (condition) { - for (ObserveUIMode m : modes) { - if (m.equals(mode)) { - return true; - } - } - } - return false; - } - - public boolean acceptMode(ObserveUIMode mode, boolean notBusy, boolean condition, ObserveUIMode... modes) { - if (notBusy && condition) { - for (ObserveUIMode m : modes) { - if (m.equals(mode)) { - return true; - } - } - } - return false; - } - - public boolean acceptLocale(Locale l, String expected) { - return l != null && l.toString().equals(expected); - } - @Override public void beforeInit(ObserveMainUI ui) { - this.ui = ui; + ObserveMainUIModel model = new ObserveMainUIModel(); + model.init(ObserveSwingApplicationContext.get().getConfig()); + ui.setContextValue(model); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIInitializer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIInitializer.java index c3eb9b6..e56106f 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIInitializer.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIInitializer.java @@ -133,7 +133,7 @@ public class ObserveMainUIInitializer { return; } - ui.setBusy(true); + ui.getModel().setBusy(true); try { @@ -142,7 +142,7 @@ public class ObserveMainUIInitializer { } catch (Exception e) { UIHelper.handlingError(e); } finally { - ui.setBusy(false); + ui.getModel().setBusy(false); String params; if (node instanceof StringNavigationTreeNodeSupport) { params = t(((StringNavigationTreeNodeSupport) node).getData()); @@ -317,7 +317,7 @@ public class ObserveMainUIInitializer { Object[] ids = null; if (ui != null) { - oldMode = ui.getMode(); + oldMode = ui.getModel().getMode(); ids = ui.getNavigation().getSelectedIds(); @@ -345,7 +345,7 @@ public class ObserveMainUIInitializer { } } - ui.setMode(oldMode); + ui.getModel().setMode(oldMode); if (oldMode == ObserveUIMode.DB) { @@ -373,6 +373,8 @@ public class ObserveMainUIInitializer { protected void initialize() { + ui.getModel().reload(ui.getConfig()); + //FIXME Je ne sais pas comment ces bindings sont générés et on n'en veut pas!!! ui.removeDataBinding(ObserveMainUI.BINDING_MENU_NAVIGATION_PROGRAM_ENABLED); ui.removeDataBinding(ObserveMainUI.BINDING_MENU_NAVIGATION_TRIP_ENABLED); @@ -386,7 +388,6 @@ public class ObserveMainUIInitializer { if (o instanceof AbstractButton) { init(actionMap, (AbstractButton) o); - continue; } } @@ -408,12 +409,12 @@ public class ObserveMainUIInitializer { UIHelper.setLayerUI(ui.getBody(), ui.getBusyBlockLayerUI()); // ecoute des changements de l'état busy - ui.addPropertyChangeListener(ObserveMainUI.PROPERTY_BUSY, evt -> { + ui.getModel().addPropertyChangeListener("busy", evt -> { boolean newvalue = (boolean) evt.getNewValue(); updateBusyState(newvalue); }); - ui.addPropertyChangeListener(ObserveMainUI.PROPERTY_FOCUS_ON_NAVIGATION, evt -> { + ui.getModel().addPropertyChangeListener("focusOnNavigation", evt -> { boolean newvalue = (boolean) evt.getNewValue(); updateFocusOnNavigation(newvalue); }); @@ -421,25 +422,25 @@ public class ObserveMainUIInitializer { ui.getNavigationView().addMouseListener(new MouseAdapter() { @Override public void mouseEntered(MouseEvent e) { - ui.setFocusOnNavigation(true); + ui.getModel().setFocusOnNavigation(true); } }); ui.getNavigation().addMouseListener(new MouseAdapter() { @Override public void mouseEntered(MouseEvent e) { - ui.setFocusOnNavigation(true); + ui.getModel().setFocusOnNavigation(true); } }); ui.getNavigationTreeHeader().addMouseListener(new MouseAdapter() { @Override public void mouseEntered(MouseEvent e) { - ui.setFocusOnNavigation(true); + ui.getModel().setFocusOnNavigation(true); } }); ui.getSplitpane2().addMouseListener(new MouseAdapter() { @Override public void mouseEntered(MouseEvent e) { - ui.setFocusOnNavigation(false); + ui.getModel().setFocusOnNavigation(false); } }); } @@ -552,7 +553,7 @@ public class ObserveMainUIInitializer { tree.setVisible(true); - ui.setFocusOnNavigation(true); + ui.getModel().setFocusOnNavigation(true); SwingUtilities.invokeLater(tree::requestFocusInWindow); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIModel.java new file mode 100644 index 0000000..498d029 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIModel.java @@ -0,0 +1,445 @@ +package fr.ird.observe.application.swing.ui; + +import fr.ird.observe.application.swing.ObserveSwingApplicationContext; +import fr.ird.observe.application.swing.configuration.ObserveSwingApplicationConfig; +import fr.ird.observe.application.swing.db.ObserveSwingDataSource; +import jaxx.runtime.SwingUtil; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jdesktop.beans.AbstractBean; + +import javax.swing.Icon; +import java.util.Locale; + +import static org.nuiton.i18n.I18n.t; + +/** + * Created on 05/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class ObserveMainUIModel extends AbstractBean { + + /** Logger */ + private static final Log log = LogFactory.getLog(ObserveMainUIModel.class); + + private static final Icon DB_LOCAL_ICON = SwingUtil.getUIManagerActionIcon("db-local"); + private static final Icon DB_REMOTE_ICON = SwingUtil.getUIManagerActionIcon("db-remote"); + private static final Icon DB_SERVER_ICON = SwingUtil.getUIManagerActionIcon("db-server"); + private static final Icon DB_NONE_ICON = SwingUtil.getUIManagerActionIcon("db-none"); + + private ObserveUIMode mode = ObserveUIMode.NO_DB; + private boolean h2WebServer; + private boolean mainFromSynchro; + private boolean busy; + private boolean focusOnNavigation; + private boolean showMnemonic; + + private boolean storageStatusEnabled; + private String storageStatusText; + private String storageStatusTip; + private Icon storageStatusIcon; + private boolean storageCloseEnabled; + private boolean storageReloadEnabled; + private boolean storageImportEnabled; + private boolean storageSaveEnabled; + private boolean startServerVisible; + private boolean navigationEnabled; + private boolean actionsEnabled; + private boolean storageEnabled; + private boolean configEnabled; + private boolean fileEnabled; + private boolean changeApplicationLanguageToFrenchEnabled; + private boolean changeApplicationLanguageToEnglishEnabled; + private boolean changeApplicationLanguageToSpanishEnabled; + + private boolean changeDbLanguageToFrenchEnabled; + private boolean changeDbLanguageToEnglishEnabled; + private boolean changeDbLanguageToSpanishEnabled; + private boolean devMode; + private boolean fullScreen; + + private boolean adjusting; + + public void init(ObserveSwingApplicationConfig config) { + setShowMnemonic(config.isShowMnemonic()); + config.addPropertyChangeListener(evt -> { + if (adjusting) { + return; + } + reload(config); + }); + + addPropertyChangeListener(evt -> { + if (adjusting) { + return; + } + reload(config); + }); + } + + public void reload(ObserveSwingApplicationConfig config) { + + if (log.isInfoEnabled()) { + log.info("Reload ui model"); + } + adjusting = true; + + try { + + setShowMnemonic(config.isShowMnemonic()); + setStorageStatusEnabled(acceptMode(getMode(), !isBusy(), ObserveUIMode.DB, ObserveUIMode.NO_DB)); + setStorageStatusText(updateStorageSatutText(config)); + setStorageStatusTip(updateStorageStatutToolTipText(config)); + setStorageStatusIcon(updateStorageSatutIcon(config)); + setStorageCloseEnabled(acceptMode(getMode(), config.isMainStorageOpened(), ObserveUIMode.DB)); + setStorageReloadEnabled(acceptMode(getMode(), config.isMainStorageOpened(), ObserveUIMode.DB)); + setNavigationEnabled(acceptMode(getMode(), !isBusy(), ObserveUIMode.DB)); + setActionsEnabled(acceptMode(getMode(), !isBusy() && !isMainFromSynchro(), ObserveUIMode.DB, ObserveUIMode.NO_DB)); + setFileEnabled(acceptMode(getMode(), !isBusy(), !isMainFromSynchro(), ObserveUIMode.NO_DB, ObserveUIMode.DB)); + setConfigEnabled(acceptMode(getMode(), !isBusy(), !isMainFromSynchro(), ObserveUIMode.DB, ObserveUIMode.NO_DB)); + setStorageEnabled(acceptMode(getMode(), !isBusy(), !isMainFromSynchro(), ObserveUIMode.DB, ObserveUIMode.NO_DB)); + setStartServerVisible(acceptMode(getMode(), config.isLocalStorageExist() && !isBusy() && !isMainFromSynchro(), ObserveUIMode.NO_DB)); + setStorageImportEnabled(acceptMode(getMode(), ObserveUIMode.DB, ObserveUIMode.NO_DB)); + setStorageSaveEnabled(acceptMode(getMode(), config.isMainStorageOpened(), ObserveUIMode.DB)); + setChangeApplicationLanguageToEnglishEnabled(acceptLocale(config.getLocale(), "en_GB")); + setChangeApplicationLanguageToFrenchEnabled(acceptLocale(config.getLocale(), "fr_FR")); + setChangeApplicationLanguageToSpanishEnabled(acceptLocale(config.getLocale(), "es_ES")); + setChangeDbLanguageToEnglishEnabled(acceptLocale(config.getDbLocale(), "en_GB")); + setChangeDbLanguageToFrenchEnabled(acceptLocale(config.getDbLocale(), "fr_FR")); + setChangeDbLanguageToSpanishEnabled(acceptLocale(config.getDbLocale(), "es_ES")); + setBusy(isBusy()); + } finally { + adjusting = false; + } + + + } + + public ObserveUIMode getMode() { + return mode; + } + + public void setMode(ObserveUIMode mode) { + this.mode = mode; + firePropertyChange("mode", null, mode); + } + + public boolean isH2WebServer() { + return h2WebServer; + } + + public void setH2WebServer(boolean h2WebServer) { + this.h2WebServer = h2WebServer; + firePropertyChange("h2WebServer", null, h2WebServer); + } + + public boolean isMainFromSynchro() { + return mainFromSynchro; + } + + public void setMainFromSynchro(boolean mainFromSynchro) { + this.mainFromSynchro = mainFromSynchro; + firePropertyChange("mainFromSynchro", null, mainFromSynchro); + } + + public boolean isBusy() { + return busy; + } + + public void setBusy(boolean busy) { + this.busy = busy; + firePropertyChange("busy", null, busy); + } + + public boolean isFocusOnNavigation() { + return focusOnNavigation; + } + + public void setFocusOnNavigation(boolean focusOnNavigation) { + this.focusOnNavigation = focusOnNavigation; + firePropertyChange("focusOnNavigation", null, focusOnNavigation); + } + + public boolean isShowMnemonic() { + return showMnemonic; + } + + public void setShowMnemonic(boolean showMnemonic) { + this.showMnemonic = showMnemonic; + firePropertyChange("showMnemonic", null, showMnemonic); + } + + public boolean isStorageStatusEnabled() { + return storageStatusEnabled; + } + + public void setStorageStatusEnabled(boolean storageStatusEnabled) { + this.storageStatusEnabled = storageStatusEnabled; + firePropertyChange("storageStatusEnabled", null, storageStatusEnabled); + } + + public String getStorageStatusText() { + return storageStatusText; + } + + public void setStorageStatusText(String storageStatusText) { + this.storageStatusText = storageStatusText; + firePropertyChange("storageStatusText", null, storageStatusText); + } + + public String getStorageStatusTip() { + return storageStatusTip; + } + + public void setStorageStatusTip(String storageStatusTip) { + this.storageStatusTip = storageStatusTip; + firePropertyChange("storageStatusTip", null, storageStatusTip); + } + + public Icon getStorageStatusIcon() { + return storageStatusIcon; + } + + public void setStorageStatusIcon(Icon storageStatusIcon) { + this.storageStatusIcon = storageStatusIcon; + firePropertyChange("storageStatusIcon", null, storageStatusIcon); + } + + public boolean isStorageCloseEnabled() { + return storageCloseEnabled; + } + + public void setStorageCloseEnabled(boolean storageCloseEnabled) { + this.storageCloseEnabled = storageCloseEnabled; + firePropertyChange("storageCloseEnabled", null, storageCloseEnabled); + } + + public boolean isStorageReloadEnabled() { + return storageReloadEnabled; + } + + public void setStorageReloadEnabled(boolean storageReloadEnabled) { + this.storageReloadEnabled = storageReloadEnabled; + firePropertyChange("storageReloadEnabled", null, storageReloadEnabled); + } + + public boolean isNavigationEnabled() { + return navigationEnabled; + } + + public void setNavigationEnabled(boolean navigationEnabled) { + this.navigationEnabled = navigationEnabled; + firePropertyChange("navigationEnabled", null, navigationEnabled); + } + + public boolean isActionsEnabled() { + return actionsEnabled; + } + + public void setActionsEnabled(boolean actionsEnabled) { + this.actionsEnabled = actionsEnabled; + firePropertyChange("actionsEnabled", null, actionsEnabled); + } + + public boolean isStorageImportEnabled() { + return storageImportEnabled; + } + + public void setStorageImportEnabled(boolean storageImportEnabled) { + this.storageImportEnabled = storageImportEnabled; + firePropertyChange("storageImportEnabled", null, storageImportEnabled); + } + + public boolean isStorageSaveEnabled() { + return storageSaveEnabled; + } + + public void setStorageSaveEnabled(boolean storageSaveEnabled) { + this.storageSaveEnabled = storageSaveEnabled; + firePropertyChange("storageSaveEnabled", null, storageSaveEnabled); + } + + public boolean isStartServerVisible() { + return startServerVisible; + } + + public void setStartServerVisible(boolean startServerVisible) { + this.startServerVisible = startServerVisible; + firePropertyChange("startServerVisible", null, startServerVisible); + } + + public boolean isStorageEnabled() { + return storageEnabled; + } + + public void setStorageEnabled(boolean storageEnabled) { + this.storageEnabled = storageEnabled; + firePropertyChange("storageEnabled", null, storageEnabled); + } + + public boolean isConfigEnabled() { + return configEnabled; + } + + public void setConfigEnabled(boolean configEnabled) { + this.configEnabled = configEnabled; + firePropertyChange("configEnabled", null, configEnabled); + } + + public boolean isFileEnabled() { + return fileEnabled; + } + + public void setFileEnabled(boolean fileEnabled) { + this.fileEnabled = fileEnabled; + firePropertyChange("fileEnabled", null, fileEnabled); + } + + public boolean isChangeApplicationLanguageToFrenchEnabled() { + return changeApplicationLanguageToFrenchEnabled; + } + + public void setChangeApplicationLanguageToFrenchEnabled(boolean changeApplicationLanguageToFrenchEnabled) { + this.changeApplicationLanguageToFrenchEnabled = changeApplicationLanguageToFrenchEnabled; + firePropertyChange("changeApplicationLanguageToFrenchEnabled", null, changeApplicationLanguageToFrenchEnabled); + } + + public boolean isChangeApplicationLanguageToEnglishEnabled() { + return changeApplicationLanguageToEnglishEnabled; + } + + public void setChangeApplicationLanguageToEnglishEnabled(boolean changeApplicationLanguageToEnglishEnabled) { + this.changeApplicationLanguageToEnglishEnabled = changeApplicationLanguageToEnglishEnabled; + firePropertyChange("changeApplicationLanguageToEnglishEnabled", null, changeApplicationLanguageToEnglishEnabled); + } + + public boolean isChangeApplicationLanguageToSpanishEnabled() { + return changeApplicationLanguageToSpanishEnabled; + } + + public void setChangeApplicationLanguageToSpanishEnabled(boolean changeApplicationLanguageToSpanishEnabled) { + this.changeApplicationLanguageToSpanishEnabled = changeApplicationLanguageToSpanishEnabled; + firePropertyChange("changeApplicationLanguageToSpanishEnabled", null, changeApplicationLanguageToSpanishEnabled); + } + + public boolean isChangeDbLanguageToFrenchEnabled() { + return changeDbLanguageToFrenchEnabled; + } + + public void setChangeDbLanguageToFrenchEnabled(boolean changeDbLanguageToFrenchEnabled) { + this.changeDbLanguageToFrenchEnabled = changeDbLanguageToFrenchEnabled; + firePropertyChange("changeDbLanguageToFrenchEnabled", null, changeDbLanguageToFrenchEnabled); + } + + public boolean isChangeDbLanguageToEnglishEnabled() { + return changeDbLanguageToEnglishEnabled; + } + + public void setChangeDbLanguageToEnglishEnabled(boolean changeDbLanguageToEnglishEnabled) { + this.changeDbLanguageToEnglishEnabled = changeDbLanguageToEnglishEnabled; + firePropertyChange("changeDbLanguageToEnglishEnabled", null, changeDbLanguageToEnglishEnabled); + } + + public boolean isChangeDbLanguageToSpanishEnabled() { + return changeDbLanguageToSpanishEnabled; + } + + public void setChangeDbLanguageToSpanishEnabled(boolean changeDbLanguageToSpanishEnabled) { + this.changeDbLanguageToSpanishEnabled = changeDbLanguageToSpanishEnabled; + firePropertyChange("changeDbLanguageToSpanishEnabled", null, changeDbLanguageToSpanishEnabled); + } + + public boolean isDevMode() { + return devMode; + } + + public void setDevMode(boolean devMode) { + this.devMode = devMode; + firePropertyChange("devMode", null, devMode); + } + + public boolean isFullScreen() { + return fullScreen; + } + + public void setFullScreen(boolean fullScreen) { + this.fullScreen = fullScreen; + firePropertyChange("fullScreen", null, fullScreen); + } + + protected Icon updateStorageSatutIcon(ObserveSwingApplicationConfig config) { + Icon icon; + + if (config.isMainStorageOpened()) { + + ObserveSwingDataSource service = ObserveSwingApplicationContext.get().getDataSourcesManager().getMainDataSource(); + + if (service.isLocal()) { + icon = DB_LOCAL_ICON; + } else if (service.isRemote()) { + icon = DB_REMOTE_ICON; + } else { + icon = DB_SERVER_ICON; + } + } else { + icon = DB_NONE_ICON; + } + return icon; + } + + protected String updateStorageSatutText(ObserveSwingApplicationConfig config) { + String text; + if (config.isMainStorageOpened()) { + ObserveSwingDataSource source = ObserveSwingApplicationContext.get().getDataSourcesManager().getMainDataSource(); + text = source.getLabel(); + } else { + text = t("observe.message.db.none.loaded"); + } + return text; + } + + protected String updateStorageStatutToolTipText(ObserveSwingApplicationConfig config) { + String text; + if (config.isMainStorageOpened()) { + ObserveSwingDataSource source = ObserveSwingApplicationContext.get().getDataSourcesManager().getMainDataSource(); + text = t("observe.message.loaded.tip", source.getLabel()); + } else { + text = t("observe.message.db.none.loaded.tip"); + } + return text; + } + + public boolean acceptMode(ObserveUIMode mode, ObserveUIMode... modes) { + return acceptMode(mode, true, modes); + } + + public boolean acceptMode(ObserveUIMode mode, boolean condition, ObserveUIMode... modes) { + if (condition) { + for (ObserveUIMode m : modes) { + if (m.equals(mode)) { + return true; + } + } + } + return false; + } + + public boolean acceptMode(ObserveUIMode mode, boolean notBusy, boolean condition, ObserveUIMode... modes) { + if (notBusy && condition) { + for (ObserveUIMode m : modes) { + if (m.equals(mode)) { + return true; + } + } + } + return false; + } + + public boolean acceptLocale(Locale l, String expected) { + return l != null && l.toString().equals(expected); + } + + +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/UIHelper.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/UIHelper.java index 6118600..60bcd4a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/UIHelper.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/UIHelper.java @@ -296,7 +296,7 @@ public class UIHelper extends SwingUtil { } if (mainUI != null) { - mainUI.setBusy(true); + mainUI.getModel().setBusy(true); } DecoratorService decoratorService = ObserveSwingApplicationContext.get().getDecoratorService(); Decorator<E> decorator = decoratorService.getDecoratorByType(beanClass); @@ -330,7 +330,7 @@ public class UIHelper extends SwingUtil { t("observe.choice.cancel")}, 1); if (mainUI != null) { - mainUI.setBusy(true); + mainUI.getModel().setBusy(true); } return response == 0; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/DeleteDataUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/DeleteDataUIAction.java index 10327c0..37837e7 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/DeleteDataUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/DeleteDataUIAction.java @@ -54,13 +54,13 @@ public class DeleteDataUIAction extends AbstractContentUIAction { @Override protected void actionPerformed(ContentUI<?, ?> contentUI) { - getMainUI().setBusy(true); + getMainUI().getModel().setBusy(true); SwingUtilities.invokeLater(() -> { try { contentUI.delete(); } finally { - getMainUI().setBusy(false); + getMainUI().getModel().setBusy(false); } }); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/DeleteReferenceUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/DeleteReferenceUIAction.java index e205d04..d00c65c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/DeleteReferenceUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/DeleteReferenceUIAction.java @@ -52,11 +52,11 @@ public class DeleteReferenceUIAction extends AbstractContentUIAction { @Override protected void actionPerformed(ContentUI<?, ?> ui) { - getMainUI().setBusy(true); + getMainUI().getModel().setBusy(true); try { ui.delete(); } finally { - getMainUI().setBusy(false); + getMainUI().getModel().setBusy(false); } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/AbstractGlobalUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/AbstractGlobalUIAction.java index 61d781b..2e13c2a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/AbstractGlobalUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/AbstractGlobalUIAction.java @@ -42,7 +42,7 @@ public abstract class AbstractGlobalUIAction extends AbstractUIAction { public void actionPerformed(Runnable r) { - boolean focusOnNavigation = getMainUI().isFocusOnNavigation(); + boolean focusOnNavigation = getMainUI().getModel().isFocusOnNavigation(); JComponent focusOwner = (JComponent) getMainUI().getFocusOwner(); r.run(); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/ChangeFocusGlobalUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/ChangeFocusGlobalUIAction.java index 423dd3f..8c76d2c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/ChangeFocusGlobalUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/ChangeFocusGlobalUIAction.java @@ -51,14 +51,14 @@ public class ChangeFocusGlobalUIAction extends AbstractGlobalUIAction { @Override public void actionPerformed(ActionEvent e) { - boolean navigation = getMainUI().isFocusOnNavigation(); + boolean navigation = getMainUI().getModel().isFocusOnNavigation(); JComponent focusComponent; if (navigation) { if (log.isInfoEnabled()) { log.info("Focus to content"); } - getMainUI().setFocusOnNavigation(false); + getMainUI().getModel().setFocusOnNavigation(false); ContentUI<?, ?> contentUI = getContentUI(e); FocusTraversalPolicy focusTraversalPolicy = contentUI.getFocusTraversalPolicy(); focusComponent = (JComponent) focusTraversalPolicy.getFirstComponent(contentUI); @@ -74,7 +74,7 @@ public class ChangeFocusGlobalUIAction extends AbstractGlobalUIAction { if (log.isInfoEnabled()) { log.info("Focus to navigation"); } - getMainUI().setFocusOnNavigation(true); + getMainUI().getModel().setFocusOnNavigation(true); focusComponent = getMainUI().getNavigation(); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/CloseStorageAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/CloseStorageAction.java index f3c41dc..e41be83 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/CloseStorageAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/CloseStorageAction.java @@ -68,7 +68,7 @@ public class CloseStorageAction extends AbstractUIAction { boolean canContinue = ObserveSwingApplicationContext.get().getContentUIManager().closeSelectedContentUI(); if (canContinue) { - ui.setBusy(true); + ui.getModel().setBusy(true); try { ObserveSwingDataSource source = ObserveSwingApplicationContext.get().getDataSourcesManager().getMainDataSource(); @@ -78,7 +78,7 @@ public class CloseStorageAction extends AbstractUIAction { // on doit fermer le storage en cours d'utilisation source.close(); } finally { - ui.setBusy(false); + ui.getModel().setBusy(false); } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/ReloadStorageAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/ReloadStorageAction.java index 4edaccb..52efa91 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/ReloadStorageAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/ReloadStorageAction.java @@ -78,7 +78,7 @@ public class ReloadStorageAction extends AbstractUIAction { ObserveMainUI ui = getMainUI(); - ui.setBusy(false); + ui.getModel().setBusy(false); Object[] ids = ui.getNavigation().getSelectedIds(); @@ -118,7 +118,7 @@ public class ReloadStorageAction extends AbstractUIAction { } } finally { - ui.setBusy(false); + ui.getModel().setBusy(false); } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/StartH2WebServerAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/StartH2WebServerAction.java index c7784fc..a7027da 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/StartH2WebServerAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/StartH2WebServerAction.java @@ -60,7 +60,7 @@ public class StartH2WebServerAction extends AbstractUIAction { public void actionPerformed(ActionEvent event) { ObserveMainUI ui = getMainUI(); - if (ui.isH2WebServer()) { + if (ui.getModel().isH2WebServer()) { if (log.isWarnEnabled()) { log.warn("Can not start h2 web server... (web server already found)"); @@ -83,7 +83,7 @@ public class StartH2WebServerAction extends AbstractUIAction { // par exemple lorsque l'on souhaitera arrêter le server. ObserveSwingApplicationContext.get().setH2WebServer(server); - ui.setH2WebServer(true); + ui.getModel().setH2WebServer(true); } catch (Exception e) { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/StartServerModeAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/StartServerModeAction.java index 85fdbf9..cddd50f 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/StartServerModeAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/StartServerModeAction.java @@ -80,7 +80,7 @@ public class StartServerModeAction extends AbstractUIAction { String h2Password = config.getH2Password(); Integer port = config.getH2ServerPort(); - ui.setMode(ObserveUIMode.SERVER); + ui.getModel().setMode(ObserveUIMode.SERVER); try { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/StopH2WebServerAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/StopH2WebServerAction.java index fb5241f..e8ab7e4 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/StopH2WebServerAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/StopH2WebServerAction.java @@ -64,7 +64,7 @@ public class StopH2WebServerAction extends AbstractUIAction { public static void launchStopH2WebServer(ObserveMainUI ui) { - if (ui.isH2WebServer()) { + if (ui.getModel().isH2WebServer()) { if (log.isInfoEnabled()) { log.info("Will stop web server mode..."); } @@ -73,7 +73,7 @@ public class StopH2WebServerAction extends AbstractUIAction { if (server != null) { server.stop(); } - ui.setH2WebServer(false); + ui.getModel().setH2WebServer(false); } else { if (log.isWarnEnabled()) { log.warn("Can not stop h2 web server... (no web server found)"); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/StopServerModeAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/StopServerModeAction.java index 30f5edd..1a60d49 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/StopServerModeAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/StopServerModeAction.java @@ -69,9 +69,9 @@ public class StopServerModeAction extends AbstractUIAction { server.stop(); } ObserveMainUI ui = getMainUI(); - ui.setMode(ObserveUIMode.NO_DB); + ui.getModel().setMode(ObserveUIMode.NO_DB); - if (ui.isH2WebServer()) { + if (ui.getModel().isH2WebServer()) { // stop also the h2 web server StopH2WebServerAction.launchStopH2WebServer(ui); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUILauncher.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUILauncher.java index 43697c7..62e9061 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUILauncher.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUILauncher.java @@ -110,7 +110,7 @@ public class AdminUILauncher extends WizardUILancher<AdminStep, AdminUIModel, Ad log.debug("Busy for component " + ui); } if (parent instanceof ObserveMainUI) { - ((ObserveMainUI) parent).setBusy(true); + ((ObserveMainUI) parent).getModel().setBusy(true); super.setBusy(parent); } super.setBusy(ui); @@ -122,7 +122,7 @@ public class AdminUILauncher extends WizardUILancher<AdminStep, AdminUIModel, Ad log.debug("UnBusy for component " + ui); } if (parent instanceof ObserveMainUI) { - ((ObserveMainUI) parent).setBusy(false); + ((ObserveMainUI) parent).getModel().setBusy(false); super.setUnBusy(parent); } super.setUnBusy(ui); @@ -204,7 +204,7 @@ public class AdminUILauncher extends WizardUILancher<AdminStep, AdminUIModel, Ad panel.setToolTipText(t(tip)); panel.setContentContainer(ui); mainUI.setContextValue(ui.getModel()); - mainUI.setMode(ObserveUIMode.SYNCHRO); + mainUI.getModel().setMode(ObserveUIMode.SYNCHRO); // refresh selected tab (otherwise it does NOT display (white screen...) SwingUtilities.invokeLater(() -> ui.getTabs().getSelectedComponent().validate()); @@ -252,7 +252,7 @@ public class AdminUILauncher extends WizardUILancher<AdminStep, AdminUIModel, Ad if (source == null) { // pas de service auparavant - mainUI.setMode(ObserveUIMode.NO_DB); + mainUI.getModel().setMode(ObserveUIMode.NO_DB); return; } @@ -269,7 +269,7 @@ public class AdminUILauncher extends WizardUILancher<AdminStep, AdminUIModel, Ad UIHelper.handlingError("Could not close", e); if (mainUI != null) { - mainUI.setMode(ObserveUIMode.NO_DB); + mainUI.getModel().setMode(ObserveUIMode.NO_DB); } } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java index 14cb25d..cf2d349 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java @@ -109,7 +109,7 @@ public class ContentUIManager { if (log.isInfoEnabled()) { log.info("grab enter focus: " + e); } - getMainUI().setFocusOnNavigation(false); + getMainUI().getModel().setFocusOnNavigation(false); } @Override @@ -118,7 +118,7 @@ public class ContentUIManager { if (log.isInfoEnabled()) { log.info("grab moved focus: " + e); } - getMainUI().setFocusOnNavigation(false); + getMainUI().getModel().setFocusOnNavigation(false); } } }); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java index 7875656..2e8b77a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java @@ -694,7 +694,7 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong boolean accept = UIHelper.confirmForEntityDelete(ui, SectionDto.class, selectedSection); ObserveMainUI mainUI = ObserveSwingApplicationContext.get().getMainUI(); - mainUI.setBusy(false); + mainUI.getModel().setBusy(false); if (!accept) { return; @@ -796,7 +796,7 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong boolean accept = UIHelper.confirmForEntityDelete(ui, BasketDto.class, selectedBasket); ObserveMainUI mainUI = ObserveSwingApplicationContext.get().getMainUI(); - mainUI.setBusy(false); + mainUI.getModel().setBusy(false); if (!accept) { return; @@ -907,7 +907,7 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong boolean accept = UIHelper.confirmForEntityDelete(ui, BranchlineDto.class, selectedBranchline); ObserveMainUI mainUI = ObserveSwingApplicationContext.get().getMainUI(); - mainUI.setBusy(false); + mainUI.getModel().setBusy(false); if (!accept) { return; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIHandler.java index 9e6dea6..e0e4e93 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIHandler.java @@ -102,14 +102,14 @@ class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLonglineDto,Tri if (buildTripMap) { SwingUtilities.invokeLater(() -> { - ObserveSwingApplicationContext.get().getMainUI().setBusy(true); + ObserveSwingApplicationContext.get().getMainUI().getModel().setBusy(true); try { TripLonglineUI ui11 = getUi(); TripMapUI tripMap11 = ui11.getTripMap(); TripMapDto tripLonglineMap = getTripLonglineService().getTripLonglineMap(getSelectedId()); tripMap11.getHandler().doOpenMap(tripLonglineMap); } finally { - ObserveSwingApplicationContext.get().getMainUI().setBusy(false); + ObserveSwingApplicationContext.get().getMainUI().getModel().setBusy(false); } }); buildTripMap = false; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIHandler.java index f2ef463..d790fe7 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIHandler.java @@ -103,14 +103,14 @@ class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto, TripSein if (buildTripMap) { SwingUtilities.invokeLater(() -> { - ObserveSwingApplicationContext.get().getMainUI().setBusy(true); + ObserveSwingApplicationContext.get().getMainUI().getModel().setBusy(true); try { TripSeineUI ui11 = getUi(); TripMapUI tripMap11 = ui11.getTripMap(); TripMapDto tripSeineMap = getTripSeineService().getTripSeineMap(getSelectedId()); tripMap11.getHandler().doOpenMap(tripSeineMap); } finally { - ObserveSwingApplicationContext.get().getMainUI().setBusy(false); + ObserveSwingApplicationContext.get().getMainUI().getModel().setBusy(false); } }); buildTripMap = false; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIHandler.java index 71d9bbb..afc18c3 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIHandler.java @@ -294,7 +294,7 @@ public abstract class ContentTableUIHandler<E extends IdDto, D extends IdDto, U } finally { // always reset busy model to false - ObserveSwingApplicationContext.get().getMainUI().setBusy(false); + ObserveSwingApplicationContext.get().getMainUI().getModel().setBusy(false); } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/TripMapUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/TripMapUIHandler.java index 7b20422..c19cd1b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/TripMapUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/TripMapUIHandler.java @@ -110,7 +110,7 @@ public class TripMapUIHandler { try { ((CardLayout) view.getLayout()).first(view); - ObserveSwingApplicationContext.get().getMainUI().setBusy(true); + ObserveSwingApplicationContext.get().getMainUI().getModel().setBusy(true); ObserveMapPane mapPane = getObserveMapPane(); @@ -155,7 +155,7 @@ public class TripMapUIHandler { } catch (Exception e) { throw new ObserveSwingTechnicalException("Unable to load trip map activity points", e); } finally { - ObserveSwingApplicationContext.get().getMainUI().setBusy(false); + ObserveSwingApplicationContext.get().getMainUI().getModel().setBusy(false); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm