March 2008 - Simexplorer-si-commits - mailman.cloud.codelutin.com

r1353 - branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/actions
by tchemit＠users.labs.libre-entreprise.org 15 Mar '08

15 Mar '08

Author: tchemit Date: 2008-03-15 21:01:59 +0000 (Sat, 15 Mar 2008) New Revision: 1353 Modified: branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/actions/SimExplorerCommonActions.java Log: ajout annotation pour marquer les options d'action ?\195?\160 enregistrer 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-15 20:59:39 UTC (rev 1352) +++ branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/actions/SimExplorerCommonActions.java 2008-03-15 21:01:59 UTC (rev 1353) @@ -20,10 +20,10 @@ package fr.cemagref.simexplorer.is.ui.swing.commandline.actions; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; +import fr.cemagref.simexplorer.is.ui.swing.commandline.SimExplorerAbstractContext; import fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerConfigMain; 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.SimExplorerAbstractContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import static org.codelutin.i18n.I18n._; @@ -37,6 +37,7 @@ * * @author chemit */ + at org.codelutin.option.OptionActionAnnotation public class SimExplorerCommonActions { private static final Log log = LogFactory.getLog(SimExplorerCommonActions.class);

1 0

r1352 - branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline
by tchemit＠users.labs.libre-entreprise.org 15 Mar '08

15 Mar '08

Author: tchemit Date: 2008-03-15 20:59:39 +0000 (Sat, 15 Mar 2008) New Revision: 1352 Modified: branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/pom.xml Log: add a clean ant run task to delete generated java sources + format 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-15 20:53:27 UTC (rev 1351) +++ branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/pom.xml 2008-03-15 20:59:39 UTC (rev 1352) @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> <artifactId>simexplorer-is-swing-commandline</artifactId> - <name>Swing</name> + <name>Swing-commandline</name> <version>0.1-SNAPSHOT</version> - <description>Java Swing commandline SimExplorer-is application</description> + <description>Java Swing commandline module</description> <packaging>jar</packaging> <parent> @@ -18,20 +18,38 @@ <version>0.1-SNAPSHOT</version> </parent> - <profiles> - <profile> - <id>project</id> + <profiles> + <profile> + <id>project</id> <activation> - <activeByDefault>true</activeByDefault> - </activation> + <activeByDefault>true</activeByDefault> + </activation> <properties> - <maven.verbose>false</maven.verbose> - </properties> - </profile> - </profiles> - + <maven.verbose>true</maven.verbose> + </properties> + </profile> + </profiles> + <build> <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>clean</phase> + <configuration> + <tasks> + <delete includeemptydirs="true"> + <fileset dir="${maven.src.dir}/java" includes="**/*"/> + </delete> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin>  +  <plugin> <groupId>lutinplugin</groupId> <artifactId>maven-commandline-plugin</artifactId> @@ -54,10 +73,11 @@ <parserPackageName>fr.cemagref.simexplorer.is.ui.swing.commandline</parserPackageName> <abstractConfigOptionKey>CONFIG_OPTION_KEY</abstractConfigOptionKey> <abstractConfigFileOptionKey>CONFIG_FILE_OPTION_KEY</abstractConfigFileOptionKey> - <abstractConfigFilenameConfigKey>fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerConfigMain.CONFIG_FILE_NAME_PROPERTY_KEY</abstractConfigFilenameConfigKey> + <abstractConfigFilenameConfigKey> + fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerConfigMain.CONFIG_FILE_NAME_PROPERTY_KEY + </abstractConfigFilenameConfigKey> <concreteConfig>true</concreteConfig> <actionImplementations> -  </actionImplementations> <configImplementations> <value>fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerConfigMain</value> @@ -70,9 +90,8 @@ <goals> <goal>genJava</goal> </goals> - </execution> + </execution> </executions> - </plugin>  <plugin> @@ -84,64 +103,16 @@ <param>fr_FR</param> <param>en_GB</param> </bundles> - <configuration> - <entries> - <entry> -  - <basedir>${maven.src.dir}/java/fr/cemagref/simexplorer/is/ui/swing/commandline</basedir> -  - </entry> - </entries> - </configuration> </configuration> <executions> <execution> - <phase>compile</phase> -  <goals> <goal>parserJava</goal> <goal>gen</goal> </goals> - </execution> </executions> </plugin> -  -  </plugins> </build>

1 0

r1351 - branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-jaxx
by tchemit＠users.labs.libre-entreprise.org 15 Mar '08

15 Mar '08

Author: tchemit Date: 2008-03-15 20:53:27 +0000 (Sat, 15 Mar 2008) New Revision: 1351 Modified: branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-jaxx/pom.xml Log: add a clean ant run task to delete generated java sources + format Modified: branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-jaxx/pom.xml =================================================================== --- branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-jaxx/pom.xml 2008-03-15 03:01:04 UTC (rev 1350) +++ branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-jaxx/pom.xml 2008-03-15 20:53:27 UTC (rev 1351) @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> <artifactId>simexplorer-is-swing-jaxx</artifactId> @@ -18,37 +18,58 @@ <version>0.1-SNAPSHOT</version> </parent> - <profiles> - <profile> - <id>project</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <properties> - <maven.verbose>false</maven.verbose> - </properties> - </profile> - </profiles> - + <profiles> + <profile> + <id>project</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <properties> + <maven.verbose>false</maven.verbose> + <maven.java.src.dir>${maven.src.dir}/java</maven.java.src.dir> + </properties> + </profile> + </profiles> + <build> <plugins> + <plugin> +  + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>clean</phase> + <configuration> + <tasks> + <delete includeemptydirs="true"> + <fileset dir="${maven.java.src.dir}" includes="**/*"/> + </delete> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> +  + We use now a fully compiliance maven process:) + --> <plugin> <groupId>lutinplugin</groupId> <artifactId>maven-jaxx-plugin</artifactId> <version>0.2-SNAPSHOT</version> - <configuration> - <out>${maven.src.dir}/java</out> - </configuration> + <configuration> + <out>${maven.java.src.dir}</out> + </configuration> <executions> <execution> <goals> @@ -73,19 +94,17 @@ <bundles> <param>fr_FR</param> <param>en_GB</param> - </bundles> + </bundles> </configuration> - <executions> + <executions> <execution> - <phase>compile</phase> -  <goals> - <goal>parserJaxx</goal> + <goal>parserJaxx</goal> <goal>gen</goal> - </goals> + </goals> </execution> </executions> - </plugin> + </plugin> </plugins> </build> @@ -103,6 +122,6 @@ <artifactId>jaxx</artifactId> <version>1.0.4-SNAPSHOT</version> <scope>compile</scope> - </dependency> + </dependency> </dependencies> </project>

1 0

r1350 - branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline
by tchemit＠users.labs.libre-entreprise.org 15 Mar '08

15 Mar '08

Author: tchemit Date: 2008-03-15 03:01:04 +0000 (Sat, 15 Mar 2008) New Revision: 1350 Modified: branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/ Log: svn ignore ide files + target Property changes on: branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline ___________________________________________________________________ Name: svn:ignore + *.iml .project .classpath target

1 0

r1349 - branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/src/java
by tchemit＠users.labs.libre-entreprise.org 15 Mar '08

15 Mar '08

Author: tchemit Date: 2008-03-15 02:58:51 +0000 (Sat, 15 Mar 2008) New Revision: 1349 Modified: branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/src/java/ Log: full generated module : src must NOT de on vcs Property changes on: branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/src/java ___________________________________________________________________ Name: svn:ignore + *

1 0

r1348 - in branches/20080315_before_commandline_split/simexplorer-is: . simexplorer-is-swing-commandline simexplorer-is-swing-commandline/src simexplorer-is-swing-commandline/src/resources simexplorer-is-swing-commandline/src/resources/i18n
by tchemit＠users.labs.libre-entreprise.org 15 Mar '08

15 Mar '08

Author: tchemit Date: 2008-03-15 02:57:11 +0000 (Sat, 15 Mar 2008) New Revision: 1348 Added: branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/ 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/ branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/src/java/ branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/src/resources/ 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/ 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-commandline/src/resources/log4j.properties branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/src/site/ branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/src/test/ Log: split module swing en swing-commandline et swing Added: 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 (rev 0) +++ branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/pom.xml 2008-03-15 02:57:11 UTC (rev 1348) @@ -0,0 +1,157 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <artifactId>simexplorer-is-swing-commandline</artifactId> + <name>Swing</name> + + <version>0.1-SNAPSHOT</version> + <description>Java Swing commandline SimExplorer-is application</description> + <packaging>jar</packaging> + + <parent> + <groupId>simexplorer-is</groupId> + <artifactId>simexplorer-is</artifactId> + <version>0.1-SNAPSHOT</version> + </parent> + + <profiles> + <profile> + <id>project</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <properties> + <maven.verbose>false</maven.verbose> + </properties> + </profile> + </profiles> + + <build> + <plugins> +  + <plugin> + <groupId>lutinplugin</groupId> + <artifactId>maven-commandline-plugin</artifactId> + <version>0.3</version> + <configuration> + <prefix>SimExplorer</prefix> + <i18nPrefix>simexplorer</i18nPrefix> + <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> + <abstractConfigFilenameConfigKey>fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerConfigMain.CONFIG_FILE_NAME_PROPERTY_KEY</abstractConfigFilenameConfigKey> + <concreteConfig>true</concreteConfig> + <actionImplementations> +  + </actionImplementations> + <configImplementations> + <value>fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerConfigMain</value> + <value>fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerConfigLocal</value> + <value>fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerConfigRemote</value> + </configImplementations> + </configuration> + <executions> + <execution> + <goals> + <goal>genJava</goal> + </goals> + </execution> + </executions> + + </plugin> +  + <plugin> + <groupId>lutinplugin</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <version>0.2-SNAPSHOT</version> + <configuration> + <bundles> + <param>fr_FR</param> + <param>en_GB</param> + </bundles> + <configuration> + <entries> + <entry> +  + <basedir>${maven.src.dir}/java/fr/cemagref/simexplorer/is/ui/swing/commandline</basedir> +  + </entry> + </entries> + </configuration> + </configuration> + <executions> + <execution> + <phase>compile</phase> +  + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + + </execution> + </executions> + </plugin> +  +  + </plugins> + </build> + + <dependencies> +  + <dependency> + <groupId>lutinlib</groupId> + <artifactId>lutincommandline</artifactId> + <version>0.1-SNAPSHOT</version> + <scope>compile</scope> + </dependency> + </dependencies> +</project> Added: 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 (rev 0) +++ branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/src/resources/commandline.properties 2008-03-15 02:57:11 UTC (rev 1348) @@ -0,0 +1,112 @@ +############################################################################### +### Option definitions ######################################################## +############################################################################### + +### +### common options (TODO should be in commandline project) +### +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> +help.option.definition=--help|-h +resetConfig.option.definition=--resetConfig +ui.option.definition=--ui <value:Boolean> + +### +### others options TODO +### + +############################################################################### +### 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 ############################################# +############################################################################### + +### +### Application global properties +### +main.config.definition.configFileName=java.io.File:.simexplorer-si-1 +main.config.modifiers.configFileName=final,mandatory,transient + +main.config.definition.debugMode=java.lang.Boolean:false +main.config.modifiers.debugMode=mandatory + +main.config.definition.version=org.codelutin.util.VersionNumber:0.0.1 +main.config.modifiers.version=final,static,mandatory + +main.config.definition.siteURL=java.net.URL:http://simexplorer-si.labs.libre-entreprise.org +main.config.modifiers.siteURL=final,static,mandatory + +#main.config.definition.smtpServer=java.lang.String:smtp +#main.config.modifiers.smtpServer=mandatory + +### +### Application preferences +### +main.config.definition.localSizor=jaxx.util.SimplePaginationEnum:_5 +main.config.modifiers.localSizor= + +main.config.definition.remoteSizor=jaxx.util.SimplePaginationEnum:_20 +main.config.modifiers.remoteSizor= + +main.config.definition.showLocalTab=java.lang.Boolean:True +main.config.modifiers.showLocalTab= + +main.config.definition.showRemoteTab=java.lang.Boolean:False +main.config.modifiers.showRemoteTab= + +main.config.definition.autoConnect=java.lang.Boolean:False +main.config.modifiers.autoConnect= + +### +### user properties +### + +main.config.definition.userFirstName=java.lang.String +main.config.modifiers.userFirstName=mandatory + +main.config.definition.userLocale=org.codelutin.i18n.LocaleEnum:fr +main.config.modifiers.userLocale=mandatory + +main.config.definition.userLastName=java.lang.String +main.config.modifiers.userLastName=mandatory + +main.config.definition.userMail=java.lang.String +main.config.modifiers.userMail=mandatory Added: 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 (rev 0) +++ branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/src/resources/i18n/simexplorer-is-swing-commandline-en_GB.properties 2008-03-15 02:57:11 UTC (rev 1348) @@ -0,0 +1,33 @@ +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.configFileName.description=The path of the configuration file +simexplorer.config.main.debugMode.description=Debug mode +simexplorer.config.main.description=Configuration de l'application SimExplorer SI +simexplorer.config.main.localSizor.description=number of result to display by page in local list +simexplorer.config.main.remoteSizor.description=number of result to display by page in remote list +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 +simexplorer.config.main.userFirstName.description=User first name +simexplorer.config.main.userLastName.description=User last name +simexplorer.config.main.userLocale.description=User locale +simexplorer.config.main.userMail.description=User email adress +simexplorer.config.main.version.description=Version of application +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.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.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) Added: 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 (rev 0) +++ branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/src/resources/i18n/simexplorer-is-swing-commandline-fr_FR.properties 2008-03-15 02:57:11 UTC (rev 1348) @@ -0,0 +1,33 @@ +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.configFileName.description=Le chemin du fichier de configuration +simexplorer.config.main.debugMode.description=Mode debug +simexplorer.config.main.description=La configuration de l'application +simexplorer.config.main.localSizor.description=Nombre de r\u00E9sultats par page dans la liste locale +simexplorer.config.main.remoteSizor.description=Nombre de r\u00E9sultats par page dans la liste distante +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 +simexplorer.config.main.userFirstName.description=Le pr\u00E9nom de l'utilisateur +simexplorer.config.main.userLastName.description=Le nom de l'utilisateur +simexplorer.config.main.userLocale.description=La langue de l'utilisateur +simexplorer.config.main.userMail.description=Le courriel de l'utilisateur +simexplorer.config.main.version.description=La version du logiciel +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.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.editConfig=pour lancer l'UI d'\u00E9dition de la configuration +simexplorer.option.description.help=Show this help +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) Added: branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/src/resources/log4j.properties =================================================================== --- branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/src/resources/log4j.properties (rev 0) +++ branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/src/resources/log4j.properties 2008-03-15 02:57:11 UTC (rev 1348) @@ -0,0 +1,12 @@ +# Global logging configuration +log4j.rootLogger=ERROR, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n + +# package level +log4j.logger.fr.cemagref.simexplorer.is=INFO +log4j.logger.org.codelutin=INFO + +

1 0

r1347 - branches/20080315_before_commandline_split/simexplorer-is
by tchemit＠users.labs.libre-entreprise.org 15 Mar '08

15 Mar '08

Author: tchemit Date: 2008-03-15 02:56:09 +0000 (Sat, 15 Mar 2008) New Revision: 1347 Modified: branches/20080315_before_commandline_split/simexplorer-is/pom.xml Log: split module swing en swing-commandline et swing Modified: branches/20080315_before_commandline_split/simexplorer-is/pom.xml =================================================================== --- branches/20080315_before_commandline_split/simexplorer-is/pom.xml 2008-03-15 02:55:33 UTC (rev 1346) +++ branches/20080315_before_commandline_split/simexplorer-is/pom.xml 2008-03-15 02:56:09 UTC (rev 1347) @@ -245,6 +245,7 @@ <module>simexplorer-is-service</module> <module>simexplorer-is-web</module> <module>simexplorer-is-swing-jaxx</module> + <module>simexplorer-is-swing-commandline</module> <module>simexplorer-is-swing</module> <module>simexplorer-is-ear</module> </modules>

1 0

r1346 - in branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing: . src/resources src/resources/i18n
by tchemit＠users.labs.libre-entreprise.org 15 Mar '08

15 Mar '08

Author: tchemit Date: 2008-03-15 02:55:33 +0000 (Sat, 15 Mar 2008) New Revision: 1346 Removed: branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/resources/commandline.properties Modified: branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/pom.xml branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties Log: split module swing en swing-commandline et swing Modified: branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/pom.xml =================================================================== --- branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/pom.xml 2008-03-15 02:01:09 UTC (rev 1345) +++ branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/pom.xml 2008-03-15 02:55:33 UTC (rev 1346) @@ -27,11 +27,11 @@ <properties> <maven.verbose>false</maven.verbose>  - <maven.vcs.src.dir>${basedir}/src</maven.vcs.src.dir> +   - <maven.src.dir>${basedir}/target/src-build</maven.src.dir> +   - <maven.gen.dir>${basedir}/target/gen</maven.gen.dir> +   <maven.jar.main.class>fr.cemagref.simexplorer.is.ui.swing.SimExplorer</maven.jar.main.class> </properties> @@ -41,10 +41,10 @@ <build> <plugins>  - <plugin> +  + <tasks> <copy todir="${maven.src.dir}/java" verbose="${maven.verbose}" overwrite="true"> <fileset dir="${maven.gen.dir}/java"/> @@ -62,8 +62,8 @@ </goals> </execution> </executions> - </plugin> - <plugin> + </plugin--> +   <plugin> <groupId>lutinplugin</groupId> @@ -116,7 +116,7 @@ <treateDefaultEntry>false</treateDefaultEntry> <entries> <entry> - <basedir>${maven.vcs.src.dir}/java/fr/cemagref/simexplorer/is/ui/swing/actions</basedir> + <basedir>${maven.src.dir}/java/fr/cemagref/simexplorer/is/ui/swing/actions</basedir> <includes> <param>**\/*Action.java</param> </includes> @@ -125,7 +125,7 @@ </excludes> </entry> <entry> - <basedir>${maven.vcs.src.dir}/java/fr/cemagref/simexplorer/is/ui/swing/ui</basedir> + <basedir>${maven.src.dir}/java/fr/cemagref/simexplorer/is/ui/swing/ui</basedir> <includes> <param>SimExplorerTab.java</param> </includes> @@ -140,7 +140,7 @@ <goal>parserJava</goal> <goal>gen</goal> </goals> - <configuration> +  </execution> </executions> </plugin> @@ -202,14 +202,19 @@ <groupId>simexplorer-is</groupId> <artifactId>simexplorer-is-swing-jaxx</artifactId> <version>0.1-SNAPSHOT</version> - </dependency> + </dependency> + <dependency> + <groupId>simexplorer-is</groupId> + <artifactId>simexplorer-is-swing-commandline</artifactId> + <version>0.1-SNAPSHOT</version> + </dependency>  - <dependency> +   <dependency> <groupId>jboss</groupId> Deleted: branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/resources/commandline.properties =================================================================== --- branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/resources/commandline.properties 2008-03-15 02:01:09 UTC (rev 1345) +++ branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/resources/commandline.properties 2008-03-15 02:55:33 UTC (rev 1346) @@ -1,112 +0,0 @@ -############################################################################### -### Option definitions ######################################################## -############################################################################### - -### -### common options (TODO should be in commandline project) -### -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> -help.option.definition=--help|-h -resetConfig.option.definition=--resetConfig -ui.option.definition=--ui <value:Boolean> - -### -### others options TODO -### - -############################################################################### -### 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 ############################################# -############################################################################### - -### -### Application global properties -### -main.config.definition.configFileName=java.io.File:.simexplorer-si-1 -main.config.modifiers.configFileName=final,mandatory,transient - -main.config.definition.debugMode=java.lang.Boolean:false -main.config.modifiers.debugMode=mandatory - -main.config.definition.version=org.codelutin.util.VersionNumber:0.0.1 -main.config.modifiers.version=final,static,mandatory - -main.config.definition.siteURL=java.net.URL:http://simexplorer-si.labs.libre-entreprise.org -main.config.modifiers.siteURL=final,static,mandatory - -#main.config.definition.smtpServer=java.lang.String:smtp -#main.config.modifiers.smtpServer=mandatory - -### -### Application preferences -### -main.config.definition.localSizor=jaxx.util.SimplePaginationEnum:_5 -main.config.modifiers.localSizor= - -main.config.definition.remoteSizor=jaxx.util.SimplePaginationEnum:_20 -main.config.modifiers.remoteSizor= - -main.config.definition.showLocalTab=java.lang.Boolean:True -main.config.modifiers.showLocalTab= - -main.config.definition.showRemoteTab=java.lang.Boolean:False -main.config.modifiers.showRemoteTab= - -main.config.definition.autoConnect=java.lang.Boolean:False -main.config.modifiers.autoConnect= - -### -### user properties -### - -main.config.definition.userFirstName=java.lang.String -main.config.modifiers.userFirstName=mandatory - -main.config.definition.userLocale=org.codelutin.i18n.LocaleEnum:fr -main.config.modifiers.userLocale=mandatory - -main.config.definition.userLastName=java.lang.String -main.config.modifiers.userLastName=mandatory - -main.config.definition.userMail=java.lang.String -main.config.modifiers.userMail=mandatory Modified: branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties =================================================================== --- branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-03-15 02:01:09 UTC (rev 1345) +++ branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-03-15 02:55:33 UTC (rev 1346) @@ -136,32 +136,6 @@ simexplorer.common.name=name simexplorer.common.value=value simexplorer.common.version=version -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.configFileName.description=The path of the configuration file -simexplorer.config.main.debugMode.description=Debug mode -simexplorer.config.main.description=Configuration de l'application SimExplorer SI -simexplorer.config.main.localSizor.description=number of result to display by page in local list -simexplorer.config.main.remoteSizor.description=number of result to display by page in remote list -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 -simexplorer.config.main.userFirstName.description=User first name -simexplorer.config.main.userLastName.description=User last name -simexplorer.config.main.userLocale.description=User locale -simexplorer.config.main.userMail.description=User email adress -simexplorer.config.main.version.description=Version of application -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.changeLanguage=Changing to language ''{0}'' will reset the ui and the history simexplorer.confirm.delete=Confirm delete of ''{0}'' simexplorer.error.login.failed=Remote authentication failed... @@ -171,13 +145,6 @@ simexplorer.node.descriptors=Descriptor(s) ({0}) simexplorer.node.noattachments=No attachment simexplorer.node.nodetail=No detail -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.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.tab.detail=Detail simexplorer.tab.detail.tooltip=Screen of details of an element simexplorer.tab.local=Local elements Modified: branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties =================================================================== --- branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-03-15 02:01:09 UTC (rev 1345) +++ branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-03-15 02:55:33 UTC (rev 1346) @@ -136,32 +136,6 @@ simexplorer.common.name=nom simexplorer.common.value=valeur simexplorer.common.version=version -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.configFileName.description=Le chemin du fichier de configuration -simexplorer.config.main.debugMode.description=Mode debug -simexplorer.config.main.description=La configuration de l'application -simexplorer.config.main.localSizor.description=Nombre de r\u00E9sultats par page dans la liste locale -simexplorer.config.main.remoteSizor.description=Nombre de r\u00E9sultats par page dans la liste distante -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 -simexplorer.config.main.userFirstName.description=Le pr\u00E9nom de l'utilisateur -simexplorer.config.main.userLastName.description=Le nom de l'utilisateur -simexplorer.config.main.userLocale.description=La langue de l'utilisateur -simexplorer.config.main.userMail.description=Le courriel de l'utilisateur -simexplorer.config.main.version.description=La version du logiciel -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.changeLanguage=Changer vers la langue ''{0}'' va r\u00E9initialiser les interfaces et l''historique simexplorer.confirm.delete=Confirmer la suppression de ''{0}'' simexplorer.error.login.failed=L'authentification a \u00E9chou\u00E9e... @@ -171,13 +145,6 @@ simexplorer.node.descriptors=Descripteur(s) ({0}) simexplorer.node.noattachments=Pas de fichier attach\u00E9 simexplorer.node.nodetail=Pas de d\u00E9tail -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.editConfig=pour lancer l'UI d'\u00E9dition de la configuration -simexplorer.option.description.help=Show this help -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.tab.detail=D\u00E9tail simexplorer.tab.detail.tooltip=L'\u00E9cran affichant les d\u00E9tails d'un \u00E9l\u00E9ment simexplorer.tab.local=Liste locale

1 0

r1345 - branches
by tchemit＠users.labs.libre-entreprise.org 15 Mar '08

15 Mar '08

Author: tchemit Date: 2008-03-15 02:01:09 +0000 (Sat, 15 Mar 2008) New Revision: 1345 Added: branches/20080315_before_commandline_split/ Log: create branche to work on swing-cxommandline split Copied: branches/20080315_before_commandline_split (from rev 1344, trunk)

1 0

r1344 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/actions
by tchemit＠users.labs.libre-entreprise.org 15 Mar '08

15 Mar '08

Author: tchemit Date: 2008-03-15 01:40:52 +0000 (Sat, 15 Mar 2008) New Revision: 1344 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/actions/SimExplorerCommonActions.java Log: passage en maven-commandline-plugin:0.3 prochaine ?\195?\169tape : split du module 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-03-15 01:40:46 UTC (rev 1343) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/actions/SimExplorerCommonActions.java 2008-03-15 01:40:52 UTC (rev 1344) @@ -19,10 +19,11 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.commandline.actions; -import fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerAbstractConfigMain; +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; +import fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerConfigMain; 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.SimExplorerActionManager; +import fr.cemagref.simexplorer.is.ui.swing.commandline.SimExplorerAbstractContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import static org.codelutin.i18n.I18n._; @@ -47,34 +48,36 @@ public static class HelpAction extends SimExplorerAbstractOptionActionHelp { - protected void run() throws Exception { + + protected void run(SimExplorerAbstractContext context) throws Exception { log.info("required help action"); StringWriter writer = new StringWriter(); - getParser().printUsage(writer, "SimExplorer SI v " + getContext().getConfig().getVersion()); - printConfig(writer, getParser().getMainConfig()); + context.getParser().printUsage(writer, "SimExplorer SI v " + context.getConfig().getVersion()); + printConfig(writer, context.getConfig()); writer.append('\n'); log.info(writer); - getContext().setQuit(true); + context.setQuit(true); } + } public static class ConfigAction extends SimExplorerAbstractOptionActionConfig { - protected void run() throws Exception { + protected void run(SimExplorerAbstractContext context) throws Exception { // Do nothing, this action is treated while init of config files } } public static class ShowConfigAction extends SimExplorerAbstractOptionActionShowConfig { @Override - protected void beforeAll(SimExplorerOptionShowConfig... options) { - super.beforeAll(options); + protected void beforeAll(SimExplorerAbstractContext context, SimExplorerOptionShowConfig... options) { + super.beforeAll(context, options); // check we have not twice config } - public void run() throws Exception { - SimExplorerAbstractConfigMain conf; - conf = getParser().getMainConfig(); + public void run(SimExplorerAbstractContext context) throws Exception { + SimExplorerConfigMain conf; + conf = context.getConfig(); String category = option.getConstantArgumentValue(0); if (conf == null) { @@ -84,29 +87,29 @@ StringWriter writer = new StringWriter(); printConfig(writer, conf); log.info(writer); - getContext().setQuit(true); + context.setQuit(true); } } public static class EditConfigAction extends SimExplorerAbstractOptionActionEditConfig { @Override - protected void beforeAll(SimExplorerOptionEditConfig... options) { - super.beforeAll(options); + protected void beforeAll(SimExplorerAbstractContext context, SimExplorerOptionEditConfig... options) { + super.beforeAll(context, options); // check we have not twice config } - public void run() throws Exception { - log.info("required editConfig action"); - SimExplorerActionManager.fireAction("config",this); + public void run(SimExplorerAbstractContext context) throws Exception { + log.info("required editConfig action"); + SimExplorerActionManager.fireAction("config", this); } } public static class ResetConfigAction extends SimExplorerAbstractOptionActionResetConfig { - public void run() throws Exception { - getContext().getConfig().getConfigFileName().delete(); + public void run(SimExplorerAbstractContext context) throws Exception { + context.getConfig().getConfigFileName().delete(); log.info(_("simexplorer.message.reset.user.configuration")); - getContext().setFirstLaunch(true); + context.setFirstLaunch(true); } } @@ -114,13 +117,13 @@ public static class UiAction extends SimExplorerAbstractOptionActionUi { protected boolean init = false; - public void run() throws Exception { + public void run(SimExplorerAbstractContext context) throws Exception { Boolean bool = isValue(); boolean launchUI = bool != null && bool; log.info(option.getUsedAlias() + ", value:" + bool); - getContext().setLaunchUI(launchUI); + context.setLaunchUI(launchUI); if (init) { - getContext().setQuit(true); + context.setQuit(true); } init = true; }

1 0