Author: tchemit Date: 2008-03-16 03:40:11 +0000 (Sun, 16 Mar 2008) New Revision: 1359 Modified: branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/pom.xml branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/src/resources/commandline.properties branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/src/resources/i18n/simexplorer-is-swing-commandline-en_GB.properties branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/src/resources/i18n/simexplorer-is-swing-commandline-fr_FR.properties branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-jaxx/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/JListTab.jaxx branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangeSizorAction.java branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/actions/SimExplorerCommonActions.java branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/tab/ListTabModel.java Log: normalisation nom options de config + transfertSimplePageEnum depuis jaxx ver lutinutil Modified: branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangeSizorAction.java =================================================================== --- branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangeSizorAction.java 2008-03-16 00:24:47 UTC (rev 1358) +++ branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangeSizorAction.java 2008-03-16 03:40:11 UTC (rev 1359) @@ -20,7 +20,7 @@ import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction; import fr.cemagref.simexplorer.is.ui.swing.model.tab.ListTabModel; -import jaxx.util.SimplePaginationEnum; +import org.codelutin.util.SimplePaginationEnum; import javax.swing.Action; import javax.swing.JComboBox; Modified: branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/actions/SimExplorerCommonActions.java =================================================================== --- branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/actions/SimExplorerCommonActions.java 2008-03-16 00:24:47 UTC (rev 1358) +++ branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/actions/SimExplorerCommonActions.java 2008-03-16 03:40:11 UTC (rev 1359) @@ -62,7 +62,7 @@ } - public static class ConfigAction extends SimExplorerAbstractOptionActionConfig { + public static class ConfigAction extends SimExplorerAbstractOptionActionChangeConfig { protected void run(SimExplorerAbstractContext context) throws Exception { // Do nothing, this action is treated while init of config files @@ -119,7 +119,7 @@ protected boolean init = false; public void run(SimExplorerAbstractContext context) throws Exception { - Boolean bool = isValue(); + Boolean bool = isFlag(); boolean launchUI = bool != null && bool; log.info(option.getUsedAlias() + ", value:" + bool); context.setLaunchUI(launchUI); Modified: branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/tab/ListTabModel.java =================================================================== --- branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/tab/ListTabModel.java 2008-03-16 00:24:47 UTC (rev 1358) +++ branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/tab/ListTabModel.java 2008-03-16 03:40:11 UTC (rev 1359) @@ -21,7 +21,7 @@ import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.storage.SortColumn; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerContext; -import jaxx.util.SimplePaginationEnum; +import org.codelutin.util.SimplePaginationEnum; import java.io.Serializable; Modified: branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/pom.xml =================================================================== --- branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/pom.xml 2008-03-16 00:24:47 UTC (rev 1358) +++ branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/pom.xml 2008-03-16 03:40:11 UTC (rev 1359) @@ -71,8 +71,8 @@ <source>${maven.src.dir}/resources/commandline.properties</source> <out>${maven.src.dir}/java</out> <parserPackageName>fr.cemagref.simexplorer.is.ui.swing.commandline</parserPackageName> - <abstractConfigOptionKey>CONFIG_OPTION_KEY</abstractConfigOptionKey> - <abstractConfigFileOptionKey>CONFIG_FILE_OPTION_KEY</abstractConfigFileOptionKey> + <abstractConfigOptionKey>CHANGE_CONFIG_OPTION_KEY</abstractConfigOptionKey> + <abstractConfigFileOptionKey>CHANGE_FILE_CONFIG_OPTION_KEY</abstractConfigFileOptionKey> <abstractConfigFilenameConfigKey> fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerConfigMain.CONFIG_FILE_NAME_PROPERTY_KEY </abstractConfigFilenameConfigKey> Modified: branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/src/resources/commandline.properties =================================================================== --- branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/src/resources/commandline.properties 2008-03-16 00:24:47 UTC (rev 1358) +++ branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/src/resources/commandline.properties 2008-03-16 03:40:11 UTC (rev 1359) @@ -7,10 +7,10 @@ ### 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 * [main|local|remote] <key:String> <value:String> +changeFileConfig.option.definition=--config-file <configFile:File> +changeConfig.option.definition=--config * [main|local|remote] <key:String> <value:String> +resetConfig.option.definition=--resetConfig help.option.definition=--help|-h -resetConfig.option.definition=--resetConfig ui.option.definition=--ui <value:Boolean> ### Modified: branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/src/resources/i18n/simexplorer-is-swing-commandline-en_GB.properties =================================================================== --- branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/src/resources/i18n/simexplorer-is-swing-commandline-en_GB.properties 2008-03-16 00:24:47 UTC (rev 1358) +++ branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/src/resources/i18n/simexplorer-is-swing-commandline-en_GB.properties 2008-03-16 03:40:11 UTC (rev 1359) @@ -24,10 +24,10 @@ 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.option.description.config=change value of configuration property (with **key**) by value **value**. -simexplorer.option.description.configFile=configuration's file -simexplorer.option.description.editConfig=to launch UI of configuration modifier +simexplorer.option.description.changeConfig=change value of configuration property (with **key**) by value **value**. +simexplorer.option.description.changeFileConfig=specify the configuration's file to load +simexplorer.option.description.editConfig=to launch UI of configuration editor simexplorer.option.description.help=Show this help simexplorer.option.description.resetConfig=Reset user configuration. simexplorer.option.description.showConfig=See configuration details -simexplorer.option.description.ui=launch or not user interface (value) +simexplorer.option.description.ui=launch or not user interface (**flag**) Modified: branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/src/resources/i18n/simexplorer-is-swing-commandline-fr_FR.properties =================================================================== --- branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/src/resources/i18n/simexplorer-is-swing-commandline-fr_FR.properties 2008-03-16 00:24:47 UTC (rev 1358) +++ branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/src/resources/i18n/simexplorer-is-swing-commandline-fr_FR.properties 2008-03-16 03:40:11 UTC (rev 1359) @@ -24,10 +24,10 @@ 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.option.description.config=remplace la valeur d'une propri\u00E9t\u00E9 de clef **key** de la configuration par la valeur **value**. -simexplorer.option.description.configFile=le fichier de configuration utilis\u00E9 +simexplorer.option.description.changeConfig=remplace la valeur d'une propri\u00E9t\u00E9 de clef **key** de la configuration par la valeur **value**. +simexplorer.option.description.changeFileConfig=sp\u009cifer le fichier de configuration utilis\u00E9 simexplorer.option.description.editConfig=pour lancer l'UI d'\u00E9dition de la configuration -simexplorer.option.description.help=Show this help +simexplorer.option.description.help=Voir cette aide simexplorer.option.description.resetConfig=R\u00E9initialisation de la configuration. simexplorer.option.description.showConfig=Voir les d\u00E9tails d'une configuration -simexplorer.option.description.ui=launch or not user interface (value) +simexplorer.option.description.ui=Lancer ou non l'interface ui Modified: branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-jaxx/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/JListTab.jaxx =================================================================== --- branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-jaxx/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/JListTab.jaxx 2008-03-16 00:24:47 UTC (rev 1358) +++ branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-jaxx/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/JListTab.jaxx 2008-03-16 03:40:11 UTC (rev 1359) @@ -27,7 +27,7 @@ <JTextField id='searchText' toolTipText='simexplorer.action.searchText.tooltip'/> <JButton id='search'/> <JButton id='advancedSearch'/> - <org.codelutin.util.EnumEditor id='changeSizor' font-size='9' constructorParams="jaxx.util.SimplePaginationEnum.class" enabled='false' opaque='false' preferredSize='{new Dimension(50,5)}'/> + <org.codelutin.util.EnumEditor id='changeSizor' font-size='9' constructorParams="org.codelutin.util.SimplePaginationEnum.class" enabled='false' opaque='false' preferredSize='{new Dimension(50,5)}'/> </JToolBar> </cell> </row>