[Observe-commits] 01/02: [iso] revue des anciennes actions

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>.