[Simexplorer-si-commits] r1205 - in trunk/simexplorer-is/simexplorer-is-swing/src: java/fr/cemagref/simexplorer/is/ui/swing java/fr/cemagref/simexplorer/is/ui/swing/commandline/actions java/fr/cemagref/simexplorer/is/ui/swing/commandline/configs java/fr/cemagref/simexplorer/is/ui/swing/ui resources resources/i18n resources/icons/action resources/jaxx

Author: tchemit Date: 2008-02-22 21:25:25 +0000 (Fri, 22 Feb 2008) New Revision: 1205 Added: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/configs/SimExplorerConfig.java trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/export-element-to-local.png trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/export-element-to-remote.png Removed: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/configs/SimExplorerConfig.java trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/export-to-local.png trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/export-to-remote.png Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/actions/SimExplorerCommonActions.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/ListTabRefreshHelper.java trunk/simexplorer-is/simexplorer-is-swing/src/resources/commandline.properties trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties trunk/simexplorer-is/simexplorer-is-swing/src/resources/jaxx/simexplorer-is-swing-actions.properties Log: multi-config refactor Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java 2008-02-22 19:43:28 UTC (rev 1204) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java 2008-02-22 21:25:25 UTC (rev 1205) @@ -23,10 +23,8 @@ import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerMainUI; import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerTab; import fr.cemagref.simexplorer.is.ui.swing.ui.util.ErrorDialog; -import fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerConfig; +import fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerAbstractConfigMain; import org.codelutin.i18n.I18n; -import org.codelutin.option.ui.ConfigTableModel; -import org.codelutin.option.ui.ConfigUI; import java.awt.event.ActionEvent; import java.io.IOException; @@ -58,7 +56,7 @@ // init context context = new SimExplorerContext(); - // init i18n + // init i18n with default locale I18n.initISO88591(); // init parser @@ -67,9 +65,13 @@ // init config context.initConfig(); - // save config + // init i18n with user locale + context.initI18n(); + + context.setFirstLaunch(!context.getConfig().getSource().exists()); try { - context.save(); + // save config + context.getConfig().save(); } catch (IOException e) { throw new RuntimeException(e); } @@ -81,7 +83,7 @@ // init ui SimExplorerMainUI mainUI = SimExplorerMainUI.getUI(); - SimExplorerConfig conf = getContext().getConfig(); + SimExplorerAbstractConfigMain conf = getContext().getConfig(); if (conf.isShowLocalTab()) { // show local tab @@ -114,7 +116,6 @@ SimExplorerTab.dispose(); SimExplorerActionManager.dispose(); - ConfigUI.reloadUI(); ErrorDialog.disposeUI(); SimExplorerMainUI.getUI().disposeUI(); if (reload) { @@ -131,8 +132,8 @@ context.getParser().doAllActions(); // show edit config if first launch - if (SimExplorer.context.isFirstLaunch()) { - ConfigUI.showUI(context.getConfig(), ConfigTableModel.TypeModel.all); + if (context.isFirstLaunch()) { + SimExplorerActionManager.fireAction("config",context); } // launch ui only if required @@ -148,6 +149,9 @@ } } + public void initI18n() { + I18n.initISO88591(getContext().getConfig().getUserLocale()); + } protected SimExplorer() { // protected restricted access } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java 2008-02-22 19:43:28 UTC (rev 1204) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java 2008-02-22 21:25:25 UTC (rev 1205) @@ -21,13 +21,12 @@ import fr.cemagref.simexplorer.is.exceptions.SimExplorerRuntimeException; import fr.cemagref.simexplorer.is.ui.swing.commandline.actions.SimExplorerCommonActions; import fr.cemagref.simexplorer.is.ui.swing.commandline.SimExplorerOptionParser; -import fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerConfig; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerAbstractConfigRemote; +import fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerAbstractConfigLocal; +import fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerAbstractConfigMain; import org.codelutin.option.ParserException; +import org.codelutin.i18n.I18n; -import java.io.BufferedOutputStream; -import java.io.FileOutputStream; import java.io.IOException; /** @@ -39,9 +38,6 @@ */ public class SimExplorerContext { - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(SimExplorerContext.class); - /** * le parseur utilisé au démarrage pour récupérer les options passées * par l'utilisateur. @@ -74,16 +70,28 @@ // enregistrement des actions concretes parser.registerActions(SimExplorerCommonActions.class); // enregistrement des configs concretes - parser.registerConfig(SimExplorerConfig.class); + parser.registerConfig(SimExplorerAbstractConfigMain.class); + parser.registerConfig(SimExplorerAbstractConfigLocal.class); + parser.registerConfig(SimExplorerAbstractConfigRemote.class); } return parser; } /** @return la configuration de l'application */ - public SimExplorerConfig getConfig() { - return (SimExplorerConfig) getParser().getMainConfig(); + public SimExplorerAbstractConfigMain getConfig() { + return getParser().getMainConfig(); } + /** @return la configuration de l'application */ + public SimExplorerAbstractConfigRemote getRemoteConfig() { + return getParser().getRemoteConfig(); + } + + /** @return la configuration de l'application */ + public SimExplorerAbstractConfigLocal getLocalConfig() { + return getParser().getLocalConfig(); + } + /** * @return <code>true</code> si l'utilisateur est connecté, * <code>false</code> sinon. @@ -93,36 +101,6 @@ } /** - * Sauvegarde la configuration courante de l'utilisateur. - * - * @throws IOException si problème lors de l'écriture du fichier de configuration - */ - public void save() throws IOException { - if (getConfig().getSource() == null) { - return; - } - BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream(getConfig().getSource())); - try { - getConfig().save(out); - } finally { - out.flush(); - out.close(); - } - } - - /** - * Sauvegarde la configuration de l'utilisateur sans soulever d'exception - * si un problème est survenu lors de l'opération. - */ - public void saveSafely() { - try { - save(); - } catch (Exception e) { - log.warn("simexplorer.error.unsafe.save.config" + e.getMessage(), e); - } - } - - /** * @return <code>true</code> si on doit quitter l'application (uniquement utilisé * lors du démarrage de l'application lors de l'exécution des options * utilisateurs) @@ -194,6 +172,12 @@ /** Initialisation de la configuration utilisateur */ void initConfig() { - getConfig().initI18n(); + getConfig(); + getLocalConfig(); + getRemoteConfig(); } + + public void initI18n() { + I18n.initISO88591(getConfig().getUserLocale()); + } } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/actions/SimExplorerCommonActions.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/actions/SimExplorerCommonActions.java 2008-02-22 19:43:28 UTC (rev 1204) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/actions/SimExplorerCommonActions.java 2008-02-22 21:25:25 UTC (rev 1205) @@ -22,18 +22,11 @@ import fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerAbstractConfigMain; import fr.cemagref.simexplorer.is.ui.swing.commandline.options.SimExplorerOptionEditConfig; import fr.cemagref.simexplorer.is.ui.swing.commandline.options.SimExplorerOptionShowConfig; -import fr.cemagref.simexplorer.is.ui.swing.commandline.actions.SimExplorerAbstractOptionActionConfig; -import fr.cemagref.simexplorer.is.ui.swing.commandline.actions.SimExplorerAbstractOptionActionEditConfig; -import fr.cemagref.simexplorer.is.ui.swing.commandline.actions.SimExplorerAbstractOptionActionHelp; -import fr.cemagref.simexplorer.is.ui.swing.commandline.actions.SimExplorerAbstractOptionActionResetConfig; -import fr.cemagref.simexplorer.is.ui.swing.commandline.actions.SimExplorerAbstractOptionActionShowConfig; -import fr.cemagref.simexplorer.is.ui.swing.commandline.actions.SimExplorerAbstractOptionActionUi; +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import static org.codelutin.i18n.I18n._; import org.codelutin.option.Config; -import org.codelutin.option.ui.ConfigTableModel; -import org.codelutin.option.ui.ConfigUI; import java.io.IOException; import java.io.StringWriter; @@ -103,27 +96,14 @@ } public void run() throws Exception { - SimExplorerAbstractConfigMain conf; - conf = getParser().getMainConfig(); - if (isAll()) { - ConfigUI.showUI(conf, ConfigTableModel.TypeModel.all); - } else if (isTec()) { - ConfigUI.showTechnicalUI(conf); - } else { - ConfigUI.showUI(conf); - } - - StringWriter writer = new StringWriter(); - printConfig(writer, conf); - log.info("required editConfig pour category [" + conf.getCategory() + "]" + writer); + log.info("required editConfig action"); + SimExplorerActionManager.fireAction("config",this); } } public static class ResetConfigAction extends SimExplorerAbstractOptionActionResetConfig { public void run() throws Exception { - //IsisFish.firstLaunch = true; - //IsisFish.resetConfig = true; getContext().getConfig().getConfigFileName().delete(); log.info(_("simexplorer.message.reset.user.configuration")); getContext().setFirstLaunch(true); Deleted: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/configs/SimExplorerConfig.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/configs/SimExplorerConfig.java 2008-02-22 19:43:28 UTC (rev 1204) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/configs/SimExplorerConfig.java 2008-02-22 21:25:25 UTC (rev 1205) @@ -1,136 +0,0 @@ -/* -* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Code Lutin, -* Tony Chemit, Gabriel Landais -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* ##% */ -package fr.cemagref.simexplorer.is.ui.swing.commandline.configs; - -import fr.cemagref.simexplorer.is.exceptions.SimExplorerRuntimeException; -import fr.cemagref.simexplorer.is.ui.swing.commandline.options.SimExplorerOptionConfig; -import fr.cemagref.simexplorer.is.ui.swing.commandline.options.SimExplorerOptionConfigFile; -import fr.cemagref.simexplorer.is.ui.swing.commandline.SimExplorerOptionParser; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorer; -import org.codelutin.i18n.I18n; -import static org.codelutin.i18n.I18n._; -import org.codelutin.i18n.LocaleEnum; -import org.codelutin.option.ConfigPropertyKey; -import org.codelutin.option.OptionParser; - -import java.io.File; -import java.io.IOException; - -/** - * L'implantation concrete de la config principale - * - * @author chemit - */ -public class SimExplorerConfig extends SimExplorerAbstractConfigMain { - - public SimExplorerConfig() { - super(); - String home = System.getProperty("user.home"); - if (home == null) { - // this is a serious fatal error - throw new SimExplorerRuntimeException("simexplorer.error.user.home"); - } - doInit(); - } - - public void init() throws IOException { - log.info("start for category [" + category + "] -------------------------"); - - SimExplorerOptionParser parser = SimExplorer.getContext().getParser(); - initConfigFile(parser); - log.info("config file : " + getSource()); - // chargement des valeurs par défaut - loadFromDefaultValue(); - // après le chargement des valeurs par défaut - // la configuration n'est pas modifiée - clearModified(); - // surcharge à partir du fichier de configuration de l'utilisateur - loadFromSource(); - // surcharge à partir des propriétés système - loadFromSystem(); - // surcharge à partir des propriétés de la jvm - loadFromJvm(); - // surcharge à partir de l'option config de la ligne de commande - loadFromOptions(parser); - clearModified(); - for (String s : this.toString().split("\n")) { - log.debug(s); - } - log.info("end for category [" + category + "] ---------------------------"); - } - - protected void initConfigFile(OptionParser parser) { - File file; - if (parser.isOptionEnabled(SimExplorerOptionParser.CONFIG_FILE_OPTION_KEY)) { - // surcharge config file - SimExplorerOptionConfigFile option = SimExplorerOptionParser.CONFIG_FILE_OPTION_KEY.getOptions().get(0); - - file = option.getConfigFile(); - } else { - String home = System.getProperty("user.home", ""); - File root = new File(home); - file = new File(root, SimExplorerConfig.CONFIG_FILE_NAME_PROPERTY_KEY.getDefaultValue().getName()); - if (!file.exists()) { - SimExplorer.getContext().setFirstLaunch(true); - try { - file.createNewFile(); - } catch (IOException e) { - throw new SimExplorerRuntimeException(e); - } - } - } - if (containsKey(SimExplorerConfig.CONFIG_FILE_NAME_PROPERTY_KEY)) { - setProperty(SimExplorerConfig.CONFIG_FILE_NAME_PROPERTY_KEY, file); - } - setSource(file); - } - - public void initI18n() { - I18n.initISO88591(getUserLocale()); - } - - protected void loadFromOptions(SimExplorerOptionParser parser) { - if (!parser.isOptionEnabled(SimExplorerOptionParser.CONFIG_OPTION_KEY)) { - return; - } - // surcharge config file - for (SimExplorerOptionConfig option : SimExplorerOptionParser.CONFIG_OPTION_KEY.getOptions()) { - if (getCategory().equals(SimExplorerOptionParser.MAIN_CONFIG_KEY.getCategory())) { - ConfigPropertyKey<?> propKey = getPropertyKey(option.getKey()); - if (propKey == null) { - // fatal error , could not found a matching configuration property - throw new SimExplorerRuntimeException(_("simexplorer.error.unfound.config.property", category, option.getKey())); - } - Object oldVal = propKey.getCurrentValue(); - setProperty(propKey, option.getValue()); - Object newVal = propKey.getCurrentValue(); - log.info(_("simexplorer.change.config.property", category, propKey, oldVal, newVal)); - } - } - } - - /*public void setI18n(LanguageEnum language, CountryEnum country) { - setUserLanguage(language); - setUserCountry(country); - }*/ - - public void setI18n(LocaleEnum locale) { - setUserLocale(locale); - } -} \ No newline at end of file Added: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/configs/SimExplorerConfig.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/configs/SimExplorerConfig.java (rev 0) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/configs/SimExplorerConfig.java 2008-02-22 21:25:25 UTC (rev 1205) @@ -0,0 +1,63 @@ +/* +* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Code Lutin, +* Tony Chemit, Gabriel Landais +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package fr.cemagref.simexplorer.is.ui.swing.commandline.configs; + +import fr.cemagref.simexplorer.is.ui.swing.SimExplorer; +import fr.cemagref.simexplorer.is.ui.swing.commandline.SimExplorerOptionKey; +import fr.cemagref.simexplorer.is.ui.swing.commandline.SimExplorerOptionParser; +import org.codelutin.option.ConfigPropertyKey; +import org.codelutin.option.SimpleConfigImpl; + +import java.io.File; +import java.io.IOException; + +/** + * L'implantation de base des configuration de l'application. + * + * @author chemit + */ +public class SimExplorerConfig extends SimpleConfigImpl<SimExplorerOptionParser, SimExplorerOptionKey<?, ?>> { + + public SimExplorerConfig(String category, String description) { + super(category, description); + } + + protected SimExplorerOptionParser getParser() { + return SimExplorer.getContext().getParser(); + } + + protected SimExplorerOptionKey<?, ?> getConfigOptionKey() { + return SimExplorerOptionParser.CONFIG_OPTION_KEY; + } + + protected SimExplorerOptionKey<?, ?> getConfigFileOptionKey() { + return SimExplorerOptionParser.CONFIG_FILE_OPTION_KEY; + } + + protected ConfigPropertyKey<File> getFileNameConfigKey() { + return SimExplorerAbstractConfigMain.CONFIG_FILE_NAME_PROPERTY_KEY; + } + + @Override + protected void loadFromSource() throws IOException { + super.loadFromSource(); + // we do not deal with inter config properties + clearUnsafeData(); + } +} \ No newline at end of file Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/ListTabRefreshHelper.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/ListTabRefreshHelper.java 2008-02-22 19:43:28 UTC (rev 1204) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/ListTabRefreshHelper.java 2008-02-22 21:25:25 UTC (rev 1205) @@ -88,7 +88,7 @@ DataEntityModel item = model.getSelectedItem(); ui.getTablePopupMenu().setEnabled(item != null); int index = model.getSelectedIndex(); - if (item == null || index == -1) { + if (item == null || index == -1 || model.isEmpty()) { return; } MetaData data = model.get(index); Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/commandline.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/resources/commandline.properties 2008-02-22 19:43:28 UTC (rev 1204) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/commandline.properties 2008-02-22 21:25:25 UTC (rev 1205) @@ -5,10 +5,10 @@ ### ### common options (TODO should be in commandline project) ### -showConfig.option.definition=--show-config {0,1} [all|tec] -editConfig.option.definition=--edit-config {0,1} [all|tec] +showConfig.option.definition=--show-config {0,1} <main|local|remote> [all|tec] +editConfig.option.definition=--edit-config configFile.option.definition=--config-file <configFile:File> -config.option.definition=--config * <key:String> <value:String> +config.option.definition=--config * [main|local|remote] <key:String> <value:String> help.option.definition=--help|-h resetConfig.option.definition=--resetConfig ui.option.definition=--ui <value:Boolean> @@ -18,6 +18,44 @@ ### ############################################################################### +### Local configuration definition ############################################ +############################################################################### + +local.config.definition.db=java.io.File:/var/local/simexplorer/local-db +local.config.modifiers.db=mandatory + +local.config.definition.optimizePeriod=java.lang.Integer:3600 +local.config.modifiers.optimizePeriod=mandatory + +local.config.definition.data=java.io.File:/var/local/simexplorer/local-data +local.config.modifiers.data=mandatory + +############################################################################### +### Remote configuration definition ########################################### +############################################################################### + +remote.config.definition.login=java.lang.String +remote.config.modifiers.login=mandatory + +remote.config.definition.password=java.lang.String +remote.config.modifiers.password= + +remote.config.definition.URI=java.net.URI:jnp://localhost:1099 +remote.config.modifiers.URI=static,mandatory + +remote.config.definition.useProxy=java.lang.Boolean:False +remote.config.modifiers.useProxy= + +remote.config.definition.useAuthenticationProxy=java.lang.Boolean:False +remote.config.modifiers.useAuthenticationProxy= + +remote.config.definition.proxyLogin=java.lang.String +remote.config.modifiers.proxyLogin= + +remote.config.definition.proxyPassword=java.lang.String +remote.config.modifiers.proxyPassword= + +############################################################################### ### Main configuration definition ############################################# ############################################################################### @@ -27,12 +65,6 @@ main.config.definition.configFileName=java.io.File:.simexplorer-si-1 main.config.modifiers.configFileName=final,mandatory,transient -main.config.definition.baseDirectory=java.io.File:simexplorer-si -main.config.modifiers.baseDirectory=final,mandatory - -main.config.definition.backupDirectory=java.io.File:simexplorer-si-backup -main.config.modifiers.backupDirectory=final,mandatory - main.config.definition.version=org.codelutin.util.VersionNumber:0.0.1 main.config.modifiers.version=final,static,mandatory @@ -61,30 +93,6 @@ main.config.modifiers.autoConnect= ### -### Remote service configuration -### -main.config.definition.remoteLogin=java.lang.String -main.config.modifiers.remoteLogin=mandatory - -main.config.definition.remotePassword=java.lang.String -main.config.modifiers.remotePassword= - -main.config.definition.remoteURI=java.net.URI:jnp://localhost:1099 -main.config.modifiers.remoteURI=static,mandatory - -### -### Local service configuration -### -main.config.definition.localDb=java.io.File:/var/local/simexplorer/local-db -main.config.modifiers.localDb=mandatory - -main.config.definition.localOptimizePeriod=java.lang.Integer:3600 -main.config.modifiers.localOptimizePeriod=mandatory - -main.config.definition.localData=java.io.File:/var/local/simexplorer/local-data -main.config.modifiers.localData=mandatory - -### ### user properties ### Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-02-22 19:43:28 UTC (rev 1204) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-02-22 21:25:25 UTC (rev 1205) @@ -125,7 +125,6 @@ simexplorer.action.unconnect=Unconnect simexplorer.action.unconnect.help= simexplorer.action.unconnect.tooltip=Disconnect from remote server -simexplorer.change.config.property= simexplorer.choose.applicationexploration=Choose a application's exploration (*.zip) simexplorer.choose.dir=Choose this directory simexplorer.choose.import.label=Import type @@ -144,19 +143,15 @@ simexplorer.common.value=value simexplorer.common.version=version simexplorer.config.i18n.menu=Language +simexplorer.config.local.data.description=Local database data directory +simexplorer.config.local.db.description=Local database directory +simexplorer.config.local.description=Local server configuration +simexplorer.config.local.optimizePeriod.description=Optimize period (Lucene) simexplorer.config.main.autoConnect.description=Flag to auto connect to remote server at init time -simexplorer.config.main.backupDirectory.description=Directory to put all SimExplorer backup files -simexplorer.config.main.baseDirectory.description=Directory of the local databse of SimExplorer simexplorer.config.main.configFileName.description=The path of the configuration file simexplorer.config.main.description=Configuration de l'application SimExplorer SI -simexplorer.config.main.localData.description=Local database data directory -simexplorer.config.main.localDb.description=Local database directory -simexplorer.config.main.localOptimizePeriod.description=Optimize period (Lucene) simexplorer.config.main.localSizor.description=number of result to display by page in local list -simexplorer.config.main.remoteLogin.description=User login to remote server -simexplorer.config.main.remotePassword.description=User password to connect remote server simexplorer.config.main.remoteSizor.description=number of result to display by page in remote list -simexplorer.config.main.remoteURI.description=URI of the remote storage service simexplorer.config.main.showLocalTab.description=Show at launch time, the local tab simexplorer.config.main.showRemoteTab.description=Show at launch time, the remote tab simexplorer.config.main.siteURL.description=Simexplorer-is site URL @@ -166,6 +161,14 @@ simexplorer.config.main.userMail.description=User email adress simexplorer.config.main.version.description=Version of application simexplorer.config.menu=Configuration +simexplorer.config.remote.URI.description=URI of the remote storage service +simexplorer.config.remote.description=Remote server configuration +simexplorer.config.remote.login.description=User login to remote server +simexplorer.config.remote.password.description=User password to connect remote server +simexplorer.config.remote.proxyLogin.description=login to proxy host +simexplorer.config.remote.proxyPassword.description=password to proxy host +simexplorer.config.remote.useAuthenticationProxy.description=use an anthenticated proxy +simexplorer.config.remote.useProxy.description=use a proxy host toreach remote server simexplorer.confirm.delete=Confirm delete of ''{0}'' simexplorer.entities.applicationExploration=Exploration Application simexplorer.entities.library=Library @@ -173,7 +176,6 @@ simexplorer.error.dialog.title=Error detected\! simexplorer.error.login.failed=Remote authentication failed... simexplorer.error.service.failed=Remote server is not reachable... -simexplorer.error.unfound.config.property= simexplorer.help.menu=Help simexplorer.login.retry=Do you want to retry ? simexplorer.login.title=Authentication to remote server Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-02-22 19:43:28 UTC (rev 1204) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-02-22 21:25:25 UTC (rev 1205) @@ -125,7 +125,6 @@ simexplorer.action.unconnect=D\u00E9connexion simexplorer.action.unconnect.help= simexplorer.action.unconnect.tooltip=Se d\u00E9connecter du serveur distant -simexplorer.change.config.property= simexplorer.choose.applicationexploration=Choisir une exploration d'application (*.zip) simexplorer.choose.dir=Choisir ce r\u00E9pertoire simexplorer.choose.import.label=Type d'\u00E9l\u00E9ment \u00E0 importer @@ -144,19 +143,15 @@ simexplorer.common.value=valeur simexplorer.common.version=version simexplorer.config.i18n.menu=Langue +simexplorer.config.local.data.description=R\u00E9pertoire des donn\u00E9es de la base locale +simexplorer.config.local.db.description=R\u00E9pertoire de la base locale +simexplorer.config.local.description=Configuration du serveur local +simexplorer.config.local.optimizePeriod.description=La p\u00E9riode optimale (Lucene) simexplorer.config.main.autoConnect.description=Se connecter automatiquement au d\u00E9marrage -simexplorer.config.main.backupDirectory.description=le r\u00E9pertoire des sauvegardes -simexplorer.config.main.baseDirectory.description=le r\u00E9pertoire de la base locale simexplorer.config.main.configFileName.description=Le chemin du fichier de configuration simexplorer.config.main.description=La configuration de l'application -simexplorer.config.main.localData.description=R\u00E9pertoire des donn\u00E9es de la base locale -simexplorer.config.main.localDb.description=R\u00E9pertoire de la base locale -simexplorer.config.main.localOptimizePeriod.description=La p\u00E9riode optimale (Lucene) simexplorer.config.main.localSizor.description=Nombre de r\u00E9sultats par page dans la liste locale -simexplorer.config.main.remoteLogin.description=Le login de l'utilisateur au service distant -simexplorer.config.main.remotePassword.description=Le mot de passe utilisateur (non visible) au serveur distant simexplorer.config.main.remoteSizor.description=Nombre de r\u00E9sultats par page dans la liste distante -simexplorer.config.main.remoteURI.description=l'url du service distant simexplorer.config.main.showLocalTab.description=Voir au d\u00E9marrage l'onglet Local simexplorer.config.main.showRemoteTab.description=Voir au d\u00E9mrrage l'onglet Distant simexplorer.config.main.siteURL.description=L'URL du site de Simexplorer-is @@ -166,6 +161,14 @@ simexplorer.config.main.userMail.description=Le courriel de l'utilisateur simexplorer.config.main.version.description=La version du logiciel simexplorer.config.menu=Configuration +simexplorer.config.remote.URI.description=l'uri du service distant +simexplorer.config.remote.description=Configuration du serveur distant +simexplorer.config.remote.login.description=Le login de l'utilisateur au service distant +simexplorer.config.remote.password.description=Le mot de passe utilisateur (non visible) au serveur distant +simexplorer.config.remote.proxyLogin.description=Login proxy +simexplorer.config.remote.proxyPassword.description=Mot de passe proxy +simexplorer.config.remote.useAuthenticationProxy.description=utilise une authentification sur le proxy +simexplorer.config.remote.useProxy.description=utilise un proxy pour atteindre le serveur distant simexplorer.confirm.delete=Confirmer la suppression de ''{0}'' simexplorer.entities.applicationExploration=Exploration d'application simexplorer.entities.library=Librairie @@ -173,7 +176,6 @@ simexplorer.error.dialog.title=Erreur detect\u00E9e simexplorer.error.login.failed=L'authentification a \u00E9chou\u00E9e... simexplorer.error.service.failed=Le serveur central n'est pas joignable -simexplorer.error.unfound.config.property= simexplorer.help.menu=Aide simexplorer.login.retry=Voulez-vous ressayer de vous connecter ? simexplorer.login.title=Connexion au serveur central Copied: trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/export-element-to-local.png (from rev 1190, trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/export-to-local.png) =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/export-element-to-local.png (rev 0) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/export-element-to-local.png 2008-02-22 21:25:25 UTC (rev 1205) @@ -0,0 +1 @@ +link go-previous.png \ No newline at end of file Property changes on: trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/export-element-to-local.png ___________________________________________________________________ Name: svn:special + * Copied: trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/export-element-to-remote.png (from rev 1190, trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/export-to-remote.png) =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/export-element-to-remote.png (rev 0) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/export-element-to-remote.png 2008-02-22 21:25:25 UTC (rev 1205) @@ -0,0 +1 @@ +link go-next.png \ No newline at end of file Property changes on: trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/export-element-to-remote.png ___________________________________________________________________ Name: svn:special + * Deleted: trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/export-to-local.png =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/export-to-local.png 2008-02-22 19:43:28 UTC (rev 1204) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/export-to-local.png 2008-02-22 21:25:25 UTC (rev 1205) @@ -1 +0,0 @@ -link go-previous.png \ No newline at end of file Deleted: trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/export-to-remote.png =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/export-to-remote.png 2008-02-22 19:43:28 UTC (rev 1204) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/export-to-remote.png 2008-02-22 21:25:25 UTC (rev 1205) @@ -1 +0,0 @@ -link go-next.png \ No newline at end of file Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/jaxx/simexplorer-is-swing-actions.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/resources/jaxx/simexplorer-is-swing-actions.properties 2008-02-22 19:43:28 UTC (rev 1204) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/jaxx/simexplorer-is-swing-actions.properties 2008-02-22 21:25:25 UTC (rev 1205) @@ -71,10 +71,12 @@ action.historyNext=fr.cemagref.simexplorer.is.ui.swing.actions.history.HistoryNextAction action.historyPrevious=fr.cemagref.simexplorer.is.ui.swing.actions.history.HistoryPreviousAction -# import- export actions +# export actions action.exportElement=fr.cemagref.simexplorer.is.ui.swing.actions.ExportElementAction -action.exportElementToLocal=fr.cemagref.simexplorer.is.ui.swing.actions.ExportElementToLocalAction -action.exportElementToRemote=fr.cemagref.simexplorer.is.ui.swing.actions.ExportElementToRemoteAction +action.exportElementToLocal=fr.cemagref.simexplorer.is.ui.swing.actions.ExportElementAction +action.exportElementToRemote=fr.cemagref.simexplorer.is.ui.swing.actions.ExportElementAction + +# import actions action.importElement=fr.cemagref.simexplorer.is.ui.swing.actions.ImportElementAction # help actions