[Observe-commits] 02/02: Use new configuration generation (bis)

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 530987a9eb3574224b48502e5e6a32f78b7c23cb Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Sep 15 21:35:56 2016 +0200 Use new configuration generation (bis) --- .../ObserveSwingApplicationConfig.java | 61 ++++++-------------- ...va => ObserveSwingApplicationConfigAction.java} | 67 +++++++++++----------- .../ObserveSwingApplicationConfigProvider.java | 2 +- ...pplication-swing-configuration_fr_FR.properties | 4 +- .../observe/application/swing/ObserveCLAction.java | 8 +-- .../application/swing/ObserveResourceManager.java | 6 +- .../observe/application/swing/ObserveRunner.java | 7 +-- .../swing/ui/actions/GotoSiteAction.java | 2 +- .../swing/ui/actions/ShowConfigAction.java | 15 ++--- .../ObserveWebApplicationConfiguration.java | 10 ++-- 10 files changed, 80 insertions(+), 102 deletions(-) diff --git a/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfig.java b/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfig.java index e9c7a41..b017de2 100644 --- a/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfig.java +++ b/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfig.java @@ -30,7 +30,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.config.ApplicationConfig; import org.nuiton.config.ArgumentsParserException; -import org.nuiton.config.ConfigActionDef; import org.nuiton.version.Version; import org.nuiton.version.Versions; @@ -39,7 +38,6 @@ import java.beans.PropertyChangeSupport; import java.io.File; import java.io.IOException; import java.nio.charset.StandardCharsets; -import java.util.ArrayList; import java.util.Calendar; import java.util.Date; import java.util.LinkedList; @@ -122,7 +120,11 @@ public class ObserveSwingApplicationConfig extends GeneratedObserveSwingApplicat * * @since 1.5 */ - private String[] unsavables; + private final String[] unsavables = new String[]{ + ObserveSwingApplicationConfigOption.OBSTUNA_PASSWORD.getKey(), + ObserveSwingApplicationConfigOption.H2_PASSWORD.getKey(), + ObserveSwingApplicationConfigOption.OBSTUNA_CAN_MIGRATE.getKey(), + }; protected final PropertyChangeSupport pcs; @@ -144,21 +146,16 @@ public class ObserveSwingApplicationConfig extends GeneratedObserveSwingApplicat } public ObserveSwingApplicationConfig(String confFileName) { - ApplicationConfig delegate = getApplicationConfig(); + ApplicationConfig delegate = get(); delegate.setEncoding(StandardCharsets.UTF_8.name()); delegate.setConfigFileName(confFileName); pcs = new PropertyChangeSupport(this); } - @Override - public ApplicationConfig getApplicationConfig() { - return super.getApplicationConfig(); - } - public void initConfig(Properties p, String... args) throws IOException, ArgumentsParserException { Version version = null; - ApplicationConfig delegate = getApplicationConfig(); + ApplicationConfig applicationConfig = get(); for (Object k : p.keySet()) { String key = String.valueOf(k); @@ -175,7 +172,7 @@ public class ObserveSwingApplicationConfig extends GeneratedObserveSwingApplicat } else { - delegate.setDefaultOption(key, strValue); + applicationConfig.setDefaultOption(key, strValue); } } @@ -184,29 +181,21 @@ public class ObserveSwingApplicationConfig extends GeneratedObserveSwingApplicat } setVersion(version); - delegate.setDefaultOption(VERSION, version.getVersion()); - delegate.setDefaultOption(APPLICATION_VERSION, version.getVersion()); + applicationConfig.setDefaultOption(VERSION, version.getVersion()); + applicationConfig.setDefaultOption(APPLICATION_VERSION, version.getVersion()); - // creation des actions disponibles - for (ConfigActionDef a : ObserveSwingApplicationActionDefinition.values()) { - - for (String alias : a.getAliases()) { - delegate.addActionAlias(alias, a.getAction()); - } - } - - delegate.parse(args); + applicationConfig.parse(args); } @Override public DbMode getDefaultDbMode() { - return DbMode.valueOf(getApplicationConfig().getOption(ObserveSwingApplicationConfigOption.DEFAULT_DB_MODE.key)); + return DbMode.valueOf(get().getOption(ObserveSwingApplicationConfigOption.DEFAULT_DB_MODE.key)); } @Override public CreationMode getDefaultCreationMode() { - return CreationMode.valueOf(getApplicationConfig().getOption(ObserveSwingApplicationConfigOption.DEFAULT_CREATION_MODE.key)); + return CreationMode.valueOf(get().getOption(ObserveSwingApplicationConfigOption.DEFAULT_CREATION_MODE.key)); } public String getCopyrightText() { @@ -300,7 +289,7 @@ public class ObserveSwingApplicationConfig extends GeneratedObserveSwingApplicat List<File> layers = new LinkedList<>(); for (ObserveSwingApplicationConfigOption layerOption : ObserveSwingApplicationConfigOption.MAP_LAYERS) { - File layerFile = getApplicationConfig().getOptionAsFile(layerOption.key); + File layerFile = get().getOptionAsFile(layerOption.key); if (layerFile != null && layerFile.exists()) { layers.add(layerFile); } @@ -321,23 +310,11 @@ public class ObserveSwingApplicationConfig extends GeneratedObserveSwingApplicat setTreeOpenNodes(StringUtils.join(ids, ",")); } - private String[] getUnsavables() { - if (unsavables == null) { - List<String> tmp = new ArrayList<>(); - tmp.add(ObserveSwingApplicationConfigOption.OBSTUNA_PASSWORD.getKey()); - tmp.add(ObserveSwingApplicationConfigOption.H2_PASSWORD.getKey()); - tmp.add(ObserveSwingApplicationConfigOption.OBSTUNA_CAN_MIGRATE.getKey()); - - unsavables = tmp.toArray(new String[tmp.size()]); - } - return unsavables; - } - public void saveForUser() { if (log.isInfoEnabled()) { - log.info(t("observe.message.save.configuration", getApplicationConfig().getUserConfigFile())); + log.info(t("observe.message.save.configuration", get().getUserConfigFile())); } - getApplicationConfig().saveForUser(getUnsavables()); + get().saveForUser(unsavables); } public void removeJaxxPropertyChangeListener() { @@ -387,16 +364,16 @@ public class ObserveSwingApplicationConfig extends GeneratedObserveSwingApplicat } public String replaceRecursiveOptions(String option) { - return getApplicationConfig().replaceRecursiveOptions(option); + return get().replaceRecursiveOptions(option); } public String getConfigurationDescription() { StringBuilder builder = new StringBuilder(); builder.append("\n====================================================================================================================="); builder.append("\n=== Observe Swing configuration ====================================================================================="); - builder.append(String.format("\n=== %1$-40s = %2$s", "Filename", getApplicationConfig().getConfigFileName())); + builder.append(String.format("\n=== %1$-40s = %2$s", "Filename", get().getConfigFileName())); for (ObserveSwingApplicationConfigOption option : ObserveSwingApplicationConfigOption.orderedByKey()) { - builder.append(String.format("\n=== %1$-40s = %2$s", option.getKey(), getApplicationConfig().getOption(option))); + builder.append(String.format("\n=== %1$-40s = %2$s", option.getKey(), get().getOption(option))); } builder.append("\n====================================================================================================================="); return builder.toString(); diff --git a/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationActionDefinition.java b/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfigAction.java similarity index 58% rename from application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationActionDefinition.java rename to application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfigAction.java index 9aff2a7..38eb231 100644 --- a/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationActionDefinition.java +++ b/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfigAction.java @@ -24,6 +24,7 @@ package fr.ird.observe.application.swing.configuration; import org.nuiton.config.ConfigActionDef; +import static org.nuiton.i18n.I18n.n; import static org.nuiton.i18n.I18n.t; /** @@ -32,78 +33,86 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public enum ObserveSwingApplicationActionDefinition implements ConfigActionDef { +public enum ObserveSwingApplicationConfigAction implements ConfigActionDef { /** * Afficher l'aide dans la console. * * @since 1.0 */ - HELP(false, t("observe.action.commandline.help"), - "fr.ird.observe.application.swing.ObserveCLAction#help", "-h", "--help"), + HELP( + n("observe.action.commandline.help"), + "fr.ird.observe.application.swing.ObserveCLAction#help", "-h", "--help"), /** * Afficher l'aide embarqué de l'application (dans une interface * graphique). * * @since 1.0 */ - HELP_UI(false, t("observe.action.commandline.help.ui"), + HELP_UI( + n("observe.action.commandline.help.ui"), "fr.ird.observe.application.swing.ObserveCLAction#helpUI", "--help-ui"), /** * Pour désactiver le lancement de l'application graphique. * * @since 1.0 */ - NO_MAIN_UI(false, t("observe.action.commandline.disable.main.ui"), - "fr.ird.observe.application.swing.ObserveCLAction#disableMainUI", "-n", - "--no-main"), + NO_MAIN_UI( + n("observe.action.commandline.disable.main.ui"), + "fr.ird.observe.application.swing.ObserveCLAction#disableMainUI", "-n", + "--no-main"), /** * Pour lancer l'interface graphique du configuration de l'application. * * @since 1.0 */ - CONFIGURE_UI(false, t("observe.action.commandline.configure.ui"), - "fr.ird.observe.application.swing.ObserveCLAction#configure", - "--configure"), + CONFIGURE_UI( + n("observe.action.commandline.configure.ui"), + "fr.ird.observe.application.swing.ObserveCLAction#configure", + "--configure"), /** * Pour lancer une opération d'administration via un assistant * graphique. * * @since 1.4 */ - ADMIN_UI(true, t("observe.action.commandline.launch.admin.ui"), - "fr.ird.observe.application.swing.ObserveCLAction#launchAdminUI", "-a", - "--admin"), + ADMIN_UI( + n("observe.action.commandline.launch.admin.ui"), + "fr.ird.observe.application.swing.ObserveCLAction#launchAdminUI", "-a", + "--admin"), /** * Pour lancer une opération d'administration via un assistant * graphique. * * @since 1.4 */ - OBSTUNA_ADMIN_UI(true, t("observe.action.commandline.launch.obstuna.admin.ui"), - "fr.ird.observe.application.swing.ObserveCLAction#launchObstunaAdminUI", - "--obstuna-admin"), + OBSTUNA_ADMIN_UI( + n("observe.action.commandline.launch.obstuna.admin.ui"), + "fr.ird.observe.application.swing.ObserveCLAction#launchObstunaAdminUI", + "--obstuna-admin"), /** * Pour lancer la base locale en mode serveur. * * @since 2.1 */ - H2_SERVER_MODE(true, t("observe.action.commandline.launch.h2.server.mode"), - "fr.ird.observe.application.swing.ObserveCLAction#launchH2ServerMode", - "--h2-server"), + H2_SERVER_MODE( + n("observe.action.commandline.launch.h2.server.mode"), + "fr.ird.observe.application.swing.ObserveCLAction#launchH2ServerMode", + "--h2-server"), /** * Pour activer le support JMX pour les source de données. * * @since 1.4 */ - USE_JMX(true, t("observe.action.commandline.use.jmx"), + USE_JMX( + n("observe.action.commandline.use.jmx"), "fr.ird.observe.application.swing.ObserveCLAction#useJMX", "--jmx"), - CREATE_ID(true, - t("observe.action.commandline.create.id"), - "fr.ird.observe.application.swing.ObserveCLAction#createId", - "--create-id"); + CREATE_ID( + n("observe.action.commandline.create.id"), + "fr.ird.observe.application.swing.ObserveCLAction#createId", + "--create-id"); public final String description; @@ -112,17 +121,14 @@ public enum ObserveSwingApplicationActionDefinition implements ConfigActionDef { public final String[] aliases; - public final boolean admin; - - ObserveSwingApplicationActionDefinition(boolean admin, String description, String action, String... aliases) { + ObserveSwingApplicationConfigAction(String description, String action, String... aliases) { this.description = description; this.action = action; this.aliases = aliases; - this.admin = admin; } public String getDescription() { - return description; + return t(description); } public String getAction() { @@ -133,7 +139,4 @@ public enum ObserveSwingApplicationActionDefinition implements ConfigActionDef { return aliases; } - public boolean isAdmin() { - return admin; - } } diff --git a/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfigProvider.java b/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfigProvider.java index 9d0dc57..eda57ac 100644 --- a/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfigProvider.java +++ b/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfigProvider.java @@ -54,6 +54,6 @@ public class ObserveSwingApplicationConfigProvider implements ApplicationConfigP @Override public ConfigActionDef[] getActions() { - return ObserveSwingApplicationActionDefinition.values(); + return ObserveSwingApplicationConfigAction.values(); } } diff --git a/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties b/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties index 029e34f..3106d75 100644 --- a/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties +++ b/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties @@ -61,7 +61,7 @@ observe.config.server.password.description=Le mot de passe de l'utilisateur observe.config.server.url.description=L'url du serveur observe.config.showMigrationProgression=Affichier dans les logs la progression de la mise à jour d'une base observe.config.showMigrationSql=Afficher dans les logs les requêtes jouées lors de la mise à jour d'une base -observe.config.showSql=Afficher dans les logs toutes les requêtes sql exétžs +observe.config.showSql=Afficher dans les logs toutes les requêtes sql executées observe.config.speciesList.longline.catch=Espèces pour les captures - TDR observe.config.speciesList.longline.encounter=Espèces pour les rencontre observe.config.speciesList.seine.nonTargetCatch=Espèces pour les captures non cible @@ -69,7 +69,7 @@ observe.config.speciesList.seine.objectObservedSpecies=Espèces pour les espèce observe.config.speciesList.seine.objectSchoolEstimate=Espèces pour les estimations banc objet observe.config.speciesList.seine.schoolEstimate=Espèces pour les estimations observe.config.speciesList.seine.targetCatch=Espèces pour les captures cible -observe.config.ui.autoPopupNumberEditor=Pour afficher automatiquement l'éditeur numérique lors de l'édition d'un count +observe.config.ui.autoPopupNumberEditor=Pour afficher automatiquement l'éditeur numérique lors de l'édition d'un nombre observe.config.ui.changeSynchroSrc=Pour autoriser la sélection de la base source dans les opérations sur base observe.config.ui.fullscreen=Pour afficher l'application en mode pleine écran observe.config.ui.loadLocalStorage=Charger la base locale au démarrage de l'application diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveCLAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveCLAction.java index becaf3d..f3d1514 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveCLAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveCLAction.java @@ -21,7 +21,7 @@ */ package fr.ird.observe.application.swing; -import fr.ird.observe.application.swing.configuration.ObserveSwingApplicationActionDefinition; +import fr.ird.observe.application.swing.configuration.ObserveSwingApplicationConfigAction; import fr.ird.observe.application.swing.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.application.swing.configuration.ObserveSwingApplicationConfigOption; import fr.ird.observe.application.swing.ui.ObserveMainUIHandler; @@ -43,7 +43,7 @@ import static org.nuiton.i18n.I18n.t; /** * Les actions appellables via {@link ObserveRunner}. * - * Consulter la classe {@link ObserveSwingApplicationActionDefinition} pour connaitre les actions + * Consulter la classe {@link ObserveSwingApplicationConfigAction} pour connaitre les actions * possibles. * * @author Tony Chemit - chemit@codelutin.com @@ -90,7 +90,7 @@ public class ObserveCLAction { out.append("Actions:"); out.append('\n'); - for (ObserveSwingApplicationActionDefinition a : ObserveSwingApplicationActionDefinition.values()) { + for (ObserveSwingApplicationConfigAction a : ObserveSwingApplicationConfigAction.values()) { out.append("\t"); out.append(Arrays.toString(a.aliases)); out.append("("); @@ -192,7 +192,7 @@ public class ObserveCLAction { ObserveSwingApplicationContext.get().setContextValue( true, - ObserveSwingApplicationActionDefinition.H2_SERVER_MODE.name()); + ObserveSwingApplicationConfigAction.H2_SERVER_MODE.name()); } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveResourceManager.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveResourceManager.java index 9d329fc..1750a7f 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveResourceManager.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveResourceManager.java @@ -236,7 +236,7 @@ public class ObserveResourceManager { */ protected File createDirectory(ObserveSwingApplicationConfig config, ObserveSwingApplicationConfigOption option) throws IOException { - File dir = config.getApplicationConfig().getOptionAsFile(option.getKey()); + File dir = config.get().getOptionAsFile(option.getKey()); createDirectory(dir); return dir; } @@ -252,7 +252,7 @@ public class ObserveResourceManager { protected void createParentDirectory(ObserveSwingApplicationConfig config, ObserveSwingApplicationConfigOption... options) throws IOException { for (ObserveSwingApplicationConfigOption option : options) { - File dir = config.getApplicationConfig().getOptionAsFile(option.getKey()).getParentFile(); + File dir = config.get().getOptionAsFile(option.getKey()).getParentFile(); createDirectory(dir); } } @@ -306,7 +306,7 @@ public class ObserveResourceManager { public File unzipToDirectory(Resource resource, ObserveSwingApplicationConfig config, ObserveSwingApplicationConfigOption option, String message) throws IOException { - File dir = config.getApplicationConfig().getOptionAsFile(option.getKey()); + File dir = config.get().getOptionAsFile(option.getKey()); createDirectory(dir); InputStream inputStream = openInternalStream(resource.getUrl()); try { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveRunner.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveRunner.java index 7929f61..04f143f 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveRunner.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveRunner.java @@ -248,7 +248,7 @@ public abstract class ObserveRunner extends ApplicationRunner { log.info("Chargement du fichier de de log4j depuis " + resource); } Properties logConfigurationProperties = resourceManager.load(resource); - Properties finalLogConfigurationProperties = ObserveUtil.loadProperties(logConfigurationProperties, config.getApplicationConfig()); + Properties finalLogConfigurationProperties = ObserveUtil.loadProperties(logConfigurationProperties, config.get()); LogManager.resetConfiguration(); PropertyConfigurator.configure(finalLogConfigurationProperties); @@ -277,7 +277,7 @@ public abstract class ObserveRunner extends ApplicationRunner { ObserveSwingApplicationConfig config = context.getConfig(); - config.getApplicationConfig().doAction(ObserveSwingApplicationConfig.Step.AfterInit.ordinal()); + config.get().doAction(ObserveSwingApplicationConfig.Step.AfterInit.ordinal()); if (!config.isDisplayMainUI()) { if (log.isInfoEnabled()) { @@ -381,9 +381,6 @@ public abstract class ObserveRunner extends ApplicationRunner { // init config config.initConfig(resourceManager.getResource(ObserveResourceManager.Resource.application), args); -// // install save action on option modification -// config.installSaveAction(); - if (log.isInfoEnabled()) { String message = config.getConfigurationDescription(); log.info(message); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/GotoSiteAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/GotoSiteAction.java index d4f733b..97f253a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/GotoSiteAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/GotoSiteAction.java @@ -65,7 +65,7 @@ public class GotoSiteAction extends AbstractAction { ObserveSwingApplicationConfig config = ui.getConfig(); - URL siteURL = config.getApplicationConfig().getOptionAsURL("application.site.url"); + URL siteURL = config.get().getOptionAsURL("application.site.url"); UIHelper.displayInfo( t("observe.message.goto.site", siteURL)); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ShowConfigAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ShowConfigAction.java index a8fc9a3..f39dd0d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ShowConfigAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ShowConfigAction.java @@ -41,6 +41,7 @@ import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.renderer.DefaultTableRenderer; +import org.nuiton.config.ConfigOptionDef; import org.nuiton.decorator.Decorator; import org.nuiton.decorator.MultiJXPathDecorator; @@ -219,8 +220,6 @@ public class ShowConfigAction extends AbstractAction { helper.addOption(ObserveSwingApplicationConfigOption.OBSTUNA_URL); helper.addOption(ObserveSwingApplicationConfigOption.OBSTUNA_LOGIN); helper.addOption(ObserveSwingApplicationConfigOption.OBSTUNA_USE_SSL_CERT); -// helper.addOption(ObserveSwingApplicationConfigOption.OBSTUNA_SSL_CERTIFICAT_FILE); - helper.addOption(ObserveSwingApplicationConfigOption.OBSTUNA_CAN_MIGRATE, ObserveUICallback.db); } @@ -328,7 +327,6 @@ public class ShowConfigAction extends AbstractAction { helper.addOption(ObserveSwingApplicationConfigOption.AUTO_POPUP_NUMBER_EDITOR, ObserveUICallback.ui); helper.addOption(ObserveSwingApplicationConfigOption.SHOW_DATE_TIME_EDITOR_SLIDER, ObserveUICallback.ui); helper.addOption(ObserveSwingApplicationConfigOption.LOAD_LOCAL_STORAGE, ObserveUICallback.application); -// helper.addOption(ObserveSwingApplicationConfigOption.FULL_SCREEN, ObserveUICallback.ui); helper.addOption(ObserveSwingApplicationConfigOption.LOCALE, ObserveUICallback.ui); helper.addOption(ObserveSwingApplicationConfigOption.DB_LOCALE, ObserveUICallback.ui); @@ -354,11 +352,16 @@ public class ShowConfigAction extends AbstractAction { protected ObserveConfigUIBuilder(ObserveSwingApplicationConfig config, SpeciesListTableCellEditor speciesListTableCellEditor, SpeciesListsTableCellRenderer speciesListsTableCellRenderer) { - super(config, config.getApplicationConfig()); + super(config, config.get(), config.get().getUserConfigFile()); this.speciesListTableCellEditor = speciesListTableCellEditor; this.speciesListsTableCellRenderer = speciesListsTableCellRenderer; } + @Override + public ConfigUIModelBuilder addOption(ConfigOptionDef def) throws IllegalStateException, NullPointerException { + return super.addOption(def).setOptionShortLabel(def.getDescription()); + } + public ConfigUIModelBuilder addOption(ObserveSwingApplicationConfigOption option, ObserveUICallback callBack) { addOption(option); @@ -381,11 +384,9 @@ public class ShowConfigAction extends AbstractAction { protected ConfigUIModelBuilder addSpeciesListOption(ObserveSwingApplicationConfigOption option) { - addOption(option).setOptionEditor(speciesListTableCellEditor) + return addOption(option).setOptionEditor(speciesListTableCellEditor) .setOptionRenderer(speciesListsTableCellRenderer); - return modelBuilder; - } } diff --git a/application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfiguration.java b/application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfiguration.java index 9d68915..99bd83f 100644 --- a/application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfiguration.java +++ b/application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfiguration.java @@ -65,7 +65,7 @@ public class ObserveWebApplicationConfiguration extends GeneratedObserveWebAppli } public ObserveWebApplicationConfiguration(String confFileName) { - ApplicationConfig delegate = getApplicationConfig(); + ApplicationConfig delegate = get(); delegate.setEncoding(StandardCharsets.UTF_8.name()); delegate.setConfigFileName(confFileName); } @@ -77,7 +77,7 @@ public class ObserveWebApplicationConfiguration extends GeneratedObserveWebAppli } try { - getApplicationConfig().parse(args); + get().parse(args); } catch (ArgumentsParserException e) { throw new ObserveWebApplicationConfigurationInitException("could not parse configuration", e); } @@ -106,7 +106,7 @@ public class ObserveWebApplicationConfiguration extends GeneratedObserveWebAppli if (log.isInfoEnabled()) { log.info("Dev mode detected, use temporary basedir: " + applicationBaseDirectory); } - getApplicationConfig().setOption(ObserveWebApplicationConfigurationOption.BASE_DIRECTORY.getKey(), applicationBaseDirectory.getAbsolutePath()); + get().setOption(ObserveWebApplicationConfigurationOption.BASE_DIRECTORY.getKey(), applicationBaseDirectory.getAbsolutePath()); } if (log.isInfoEnabled()) { @@ -191,7 +191,7 @@ public class ObserveWebApplicationConfiguration extends GeneratedObserveWebAppli StringBuilder builder = new StringBuilder(); builder.append("\n====================================================================================================================="); builder.append("\n=== Observe Web configuration ======================================================================================="); - ApplicationConfig delegate = getApplicationConfig(); + ApplicationConfig delegate = get(); builder.append(String.format("\n=== %1$-40s = %2$s", "Filename", delegate.getConfigFileName())); for (ObserveWebApplicationConfigurationOption option : ObserveWebApplicationConfigurationOption.orderedByKeys()) { builder.append(String.format("\n=== %1$-40s = %2$s", option.getKey(), delegate.getOption(option))); @@ -224,7 +224,7 @@ public class ObserveWebApplicationConfiguration extends GeneratedObserveWebAppli Properties logConfigurationProperties = new Properties(); logConfigurationProperties.load(inputStream); - finalLogConfigurationProperties = ObserveUtil.loadProperties(logConfigurationProperties, getApplicationConfig()); + finalLogConfigurationProperties = ObserveUtil.loadProperties(logConfigurationProperties, get()); } catch (Exception e) { throw new ObserveWebApplicationConfigurationInitException("Impossible de charger le fichier de configuration des logs", e); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.