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

r1365 - trunk/simexplorer-is/simexplorer-is-swing-commandline
by tchemit＠users.labs.libre-entreprise.org 16 Mar '08

16 Mar '08

Author: tchemit Date: 2008-03-16 12:23:07 +0000 (Sun, 16 Mar 2008) New Revision: 1365 Modified: trunk/simexplorer-is/simexplorer-is-swing-commandline/ Log: ... Property changes on: trunk/simexplorer-is/simexplorer-is-swing-commandline ___________________________________________________________________ Name: svn:ignore - *.iml .project .classpath target + *.iml .project .classpath target/*

1 0

r1364 - in trunk/simexplorer-is: . simexplorer-is-swing simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/tab simexplorer-is-swing/src/resources simexplorer-is-swing/src/resources/i18n simexplorer-is-swing-commandline simexplorer-is-swing-commandline/src/java simexplorer-is-swing-jaxx simexplorer-is-swing-jaxx/src/uimodel/f
by tchemit＠users.labs.libre-entreprise.org 16 Mar '08

16 Mar '08

Author: tchemit Date: 2008-03-16 11:44:47 +0000 (Sun, 16 Mar 2008) New Revision: 1364 Added: trunk/simexplorer-is/simexplorer-is-swing-commandline/ Removed: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/ trunk/simexplorer-is/simexplorer-is-swing/src/resources/commandline.properties Modified: trunk/simexplorer-is/pom.xml trunk/simexplorer-is/simexplorer-is-swing-commandline/src/java/ trunk/simexplorer-is/simexplorer-is-swing-jaxx/pom.xml trunk/simexplorer-is/simexplorer-is-swing-jaxx/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/JListTab.jaxx trunk/simexplorer-is/simexplorer-is-swing/dev.sh trunk/simexplorer-is/simexplorer-is-swing/pom.xml 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/actions/ChangeSizorAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/tab/ListTabModel.java 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 Log: merge branche with trunk : split du module swing-commandline Modified: trunk/simexplorer-is/pom.xml =================================================================== --- trunk/simexplorer-is/pom.xml 2008-03-16 11:18:42 UTC (rev 1363) +++ trunk/simexplorer-is/pom.xml 2008-03-16 11:44:47 UTC (rev 1364) @@ -95,14 +95,14 @@ http://lutinbuilder.labs.libre-entreprise.org/maven2 </url> </pluginRepository> - <pluginRepository> +  </pluginRepositories>  @@ -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> Modified: trunk/simexplorer-is/simexplorer-is-swing/dev.sh =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/dev.sh 2008-03-16 11:18:42 UTC (rev 1363) +++ trunk/simexplorer-is/simexplorer-is-swing/dev.sh 2008-03-16 11:44:47 UTC (rev 1364) @@ -79,20 +79,21 @@ ############################################################################### MVN_ACTION= if [ "$CLEAN" = "clean" ]; then - MVN_ACTION="clean dependency:copy-dependencies compile" + MVN_ACTION="clean compile" if [ "$DEV" = "jar" ]; then - MVN_ACTION="$MVN_ACTION jar:jar" + MVN_ACTION="$MVN_ACTION package" fi else - if [ ! -d $rep/target/dependency ]; then - MVN_ACTION="$MVN_ACTION dependency:copy-dependencies" - fi + #if [ ! -d $rep/target/dependency ]; then + # MVN_ACTION="$MVN_ACTION dependency:copy-dependencies" + #fi if [ ! -d $rep/target/classes -o "$COMPILE" = "compile" ]; then - MVN_ACTION="$MVN_ACTION compile" + MVN_ACTION="$MVN_ACTION compile " + else + if [ "$DEV" = "jar" -a ! -f $rep/target/$RELEASE.jar ]; then + MVN_ACTION="$MVN_ACTION package" + fi fi - if [ "$DEV" = "jar" -a ! -f $rep/target/$RELEASE.jar ]; then - MVN_ACTION="$MVN_ACTION jar:jar" - fi fi ############################################################################### Modified: trunk/simexplorer-is/simexplorer-is-swing/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/pom.xml 2008-03-16 11:18:42 UTC (rev 1363) +++ trunk/simexplorer-is/simexplorer-is-swing/pom.xml 2008-03-16 11:44:47 UTC (rev 1364) @@ -26,12 +26,6 @@ </activation> <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> @@ -40,60 +34,6 @@ <build> <plugins> -  - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <configuration> -  - <tasks> - <copy todir="${maven.src.dir}/java" verbose="${maven.verbose}" overwrite="true"> - <fileset dir="${maven.gen.dir}/java"/> - </copy> - <copy todir="${maven.src.dir}/java" verbose="${maven.verbose}" overwrite="true"> - <fileset dir="${maven.vcs.src.dir}/java"/> - </copy> - </tasks> - </configuration> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>lutinplugin</groupId> - <artifactId>maven-commandline-plugin</artifactId> - <version>0.3</version> - <configuration> - <prefix>SimExplorer</prefix> - <i18nPrefix>simexplorer</i18nPrefix> - <source>${maven.vcs.src.dir}/resources/commandline.properties</source> - <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> - <value>fr.cemagref.simexplorer.is.ui.swing.commandline.actions.SimExplorerCommonActions</value> - </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> @@ -116,7 +56,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 +65,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,18 +80,6 @@ <goal>parserJava</goal> <goal>gen</goal> </goals> - <configuration> - <entries> - <entry> - <specificGoal>parserJava</specificGoal> - <basedir>${maven.gen.dir}/java/fr/cemagref/simexplorer/is/ui/swing/commandline</basedir> - <includes> - <param>**\/*Option*.java</param> - <param>**\/*Config*.java</param> - </includes> - </entry> - </entries> - </configuration> </execution> </executions> </plugin> @@ -202,12 +130,17 @@ <groupId>simexplorer-is</groupId> <artifactId>simexplorer-is-swing-jaxx</artifactId> <version>0.1-SNAPSHOT</version> - </dependency> -  + </dependency> <dependency> - <groupId>lutinlib</groupId> - <artifactId>lutincommandline</artifactId> + <groupId>simexplorer-is</groupId> + <artifactId>simexplorer-is-swing-commandline</artifactId> <version>0.1-SNAPSHOT</version> + </dependency> +  + <dependency> + <groupId>lutinlib</groupId> + <artifactId>lutincommandline-ui</artifactId> + <version>0.2</version> <scope>compile</scope> </dependency>  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-03-16 11:18:42 UTC (rev 1363) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java 2008-03-16 11:44:47 UTC (rev 1364) @@ -24,9 +24,13 @@ 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 org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.codelutin.i18n.I18n; +import org.codelutin.option.ParserFailedException; import java.awt.event.ActionEvent; +import java.io.IOException; /** * L'application principale @@ -35,6 +39,8 @@ */ public class SimExplorer { + private static final Log log = LogFactory.getLog(SimExplorer.class); + /** le context principal de l'application */ protected static SimExplorerContext context; @@ -50,13 +56,27 @@ * chargement du context * * @param args les arguments passés à l'application - * @throws java.io.IOException si pb pendant l'init */ - public static void init(String... args) throws Exception { + public static void init(String... args) { - // init context, parser and configs - context = new SimExplorerContext(args); + try { + // init context, parser and configs + context = new SimExplorerContext(args); + } catch (IOException e) { + log.error("io error : " + e.getMessage()); + e.printStackTrace(); + System.exit(1); + } catch (ParserFailedException e) { + log.error("parser error : " + e.getMessage()); + e.printStackTrace(); + System.exit(1); + } catch (Exception e) { + log.error("fatal error : " + e.getMessage()); + e.printStackTrace(); + System.exit(1); + } + } /** Lancement de l'ui après init de l'application. */ 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-03-16 11:18:42 UTC (rev 1363) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java 2008-03-16 11:44:47 UTC (rev 1364) @@ -33,7 +33,7 @@ import fr.cemagref.simexplorer.is.storage.SortColumn; import fr.cemagref.simexplorer.is.ui.swing.commandline.SimExplorerAbstractContext; import org.codelutin.i18n.I18n; -import org.codelutin.option.ParserException; +import org.codelutin.option.ParserFailedException; import java.io.IOException; @@ -181,11 +181,10 @@ * restricted access constructor * * @param args argumentsfor parser - * @throws java.io.IOException if pb while saing configuration - * @throws org.codelutin.option.ParserException - * if pb while parsing arguments + * @throws java.io.IOException if pb while saing configuration + * @throws ParserFailedException if pb while parsing arguments */ - SimExplorerContext(String... args) throws IOException, ParserException { + SimExplorerContext(String... args) throws IOException, ParserFailedException { super(args); Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangeSizorAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangeSizorAction.java 2008-03-16 11:18:42 UTC (rev 1363) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangeSizorAction.java 2008-03-16 11:44:47 UTC (rev 1364) @@ -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: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/tab/ListTabModel.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/tab/ListTabModel.java 2008-03-16 11:18:42 UTC (rev 1363) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/tab/ListTabModel.java 2008-03-16 11:44:47 UTC (rev 1364) @@ -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; Deleted: trunk/simexplorer-is/simexplorer-is-swing/src/resources/commandline.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/resources/commandline.properties 2008-03-16 11:18:42 UTC (rev 1363) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/commandline.properties 2008-03-16 11:44:47 UTC (rev 1364) @@ -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: 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-03-16 11:18:42 UTC (rev 1363) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-03-16 11:44:47 UTC (rev 1364) @@ -136,48 +136,14 @@ 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... simexplorer.error.service.failed=Remote server is not reachable... simexplorer.login.retry=Do you want to retry ? -simexplorer.message.reset.user.configuration= 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: 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-03-16 11:18:42 UTC (rev 1363) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-03-16 11:44:47 UTC (rev 1364) @@ -136,48 +136,14 @@ 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... simexplorer.error.service.failed=Le serveur central n'est pas joignable simexplorer.login.retry=Voulez-vous ressayer de vous connecter ? -simexplorer.message.reset.user.configuration= 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 Copied: trunk/simexplorer-is/simexplorer-is-swing-commandline (from rev 1363, branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline) Property changes on: trunk/simexplorer-is/simexplorer-is-swing-commandline ___________________________________________________________________ Name: svn:ignore + *.iml .project .classpath target Modified: trunk/simexplorer-is/simexplorer-is-swing-jaxx/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing-jaxx/pom.xml 2008-03-16 11:18:42 UTC (rev 1363) +++ trunk/simexplorer-is/simexplorer-is-swing-jaxx/pom.xml 2008-03-16 11:44:47 UTC (rev 1364) @@ -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> Modified: trunk/simexplorer-is/simexplorer-is-swing-jaxx/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/JListTab.jaxx =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing-jaxx/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/JListTab.jaxx 2008-03-16 11:18:42 UTC (rev 1363) +++ trunk/simexplorer-is/simexplorer-is-swing-jaxx/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/JListTab.jaxx 2008-03-16 11:44:47 UTC (rev 1364) @@ -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>

1 0

r1363 - in branches/20080315_before_commandline_split/simexplorer-is: . simexplorer-is-swing simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing simexplorer-is-swing/src/resources/i18n
by tchemit＠users.labs.libre-entreprise.org 16 Mar '08

16 Mar '08

Author: tchemit Date: 2008-03-16 11:18:42 +0000 (Sun, 16 Mar 2008) New Revision: 1363 Modified: branches/20080315_before_commandline_split/simexplorer-is/pom.xml branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/dev.sh branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java 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: improve exception handling in commandline Modified: branches/20080315_before_commandline_split/simexplorer-is/pom.xml =================================================================== --- branches/20080315_before_commandline_split/simexplorer-is/pom.xml 2008-03-16 06:36:35 UTC (rev 1362) +++ branches/20080315_before_commandline_split/simexplorer-is/pom.xml 2008-03-16 11:18:42 UTC (rev 1363) @@ -95,14 +95,14 @@ http://lutinbuilder.labs.libre-entreprise.org/maven2 </url> </pluginRepository> - <pluginRepository> +  </pluginRepositories>  Modified: branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/dev.sh =================================================================== --- branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/dev.sh 2008-03-16 06:36:35 UTC (rev 1362) +++ branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/dev.sh 2008-03-16 11:18:42 UTC (rev 1363) @@ -79,20 +79,21 @@ ############################################################################### MVN_ACTION= if [ "$CLEAN" = "clean" ]; then - MVN_ACTION="clean dependency:copy-dependencies compile" + MVN_ACTION="clean compile" if [ "$DEV" = "jar" ]; then - MVN_ACTION="$MVN_ACTION jar:jar" + MVN_ACTION="$MVN_ACTION package" fi else - if [ ! -d $rep/target/dependency ]; then - MVN_ACTION="$MVN_ACTION dependency:copy-dependencies" - fi + #if [ ! -d $rep/target/dependency ]; then + # MVN_ACTION="$MVN_ACTION dependency:copy-dependencies" + #fi if [ ! -d $rep/target/classes -o "$COMPILE" = "compile" ]; then - MVN_ACTION="$MVN_ACTION compile" + MVN_ACTION="$MVN_ACTION compile " + else + if [ "$DEV" = "jar" -a ! -f $rep/target/$RELEASE.jar ]; then + MVN_ACTION="$MVN_ACTION package" + fi fi - if [ "$DEV" = "jar" -a ! -f $rep/target/$RELEASE.jar ]; then - MVN_ACTION="$MVN_ACTION jar:jar" - fi fi ############################################################################### Modified: branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java =================================================================== --- branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java 2008-03-16 06:36:35 UTC (rev 1362) +++ branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java 2008-03-16 11:18:42 UTC (rev 1363) @@ -24,9 +24,13 @@ 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 org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.codelutin.i18n.I18n; +import org.codelutin.option.ParserFailedException; import java.awt.event.ActionEvent; +import java.io.IOException; /** * L'application principale @@ -35,6 +39,8 @@ */ public class SimExplorer { + private static final Log log = LogFactory.getLog(SimExplorer.class); + /** le context principal de l'application */ protected static SimExplorerContext context; @@ -50,13 +56,27 @@ * chargement du context * * @param args les arguments passés à l'application - * @throws java.io.IOException si pb pendant l'init */ - public static void init(String... args) throws Exception { + public static void init(String... args) { - // init context, parser and configs - context = new SimExplorerContext(args); + try { + // init context, parser and configs + context = new SimExplorerContext(args); + } catch (IOException e) { + log.error("io error : " + e.getMessage()); + e.printStackTrace(); + System.exit(1); + } catch (ParserFailedException e) { + log.error("parser error : " + e.getMessage()); + e.printStackTrace(); + System.exit(1); + } catch (Exception e) { + log.error("fatal error : " + e.getMessage()); + e.printStackTrace(); + System.exit(1); + } + } /** Lancement de l'ui après init de l'application. */ Modified: branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java =================================================================== --- branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java 2008-03-16 06:36:35 UTC (rev 1362) +++ branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java 2008-03-16 11:18:42 UTC (rev 1363) @@ -33,7 +33,7 @@ import fr.cemagref.simexplorer.is.storage.SortColumn; import fr.cemagref.simexplorer.is.ui.swing.commandline.SimExplorerAbstractContext; import org.codelutin.i18n.I18n; -import org.codelutin.option.ParserException; +import org.codelutin.option.ParserFailedException; import java.io.IOException; @@ -181,11 +181,10 @@ * restricted access constructor * * @param args argumentsfor parser - * @throws java.io.IOException if pb while saing configuration - * @throws org.codelutin.option.ParserException - * if pb while parsing arguments + * @throws java.io.IOException if pb while saing configuration + * @throws ParserFailedException if pb while parsing arguments */ - SimExplorerContext(String... args) throws IOException, ParserException { + SimExplorerContext(String... args) throws IOException, ParserFailedException { super(args); 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-16 06:36:35 UTC (rev 1362) +++ branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-03-16 11:18:42 UTC (rev 1363) @@ -141,7 +141,6 @@ simexplorer.error.login.failed=Remote authentication failed... simexplorer.error.service.failed=Remote server is not reachable... simexplorer.login.retry=Do you want to retry ? -simexplorer.message.reset.user.configuration= simexplorer.node.descriptors=Descriptor(s) ({0}) simexplorer.node.noattachments=No attachment simexplorer.node.nodetail=No detail 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-16 06:36:35 UTC (rev 1362) +++ branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-03-16 11:18:42 UTC (rev 1363) @@ -141,7 +141,6 @@ simexplorer.error.login.failed=L'authentification a \u00E9chou\u00E9e... simexplorer.error.service.failed=Le serveur central n'est pas joignable simexplorer.login.retry=Voulez-vous ressayer de vous connecter ? -simexplorer.message.reset.user.configuration= simexplorer.node.descriptors=Descripteur(s) ({0}) simexplorer.node.noattachments=Pas de fichier attach\u00E9 simexplorer.node.nodetail=Pas de d\u00E9tail

1 0

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

16 Mar '08

Author: tchemit Date: 2008-03-16 06:36:35 +0000 (Sun, 16 Mar 2008) New Revision: 1362 Removed: branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/ Log: delte common actions from project : generated by maven-commandline-plugin :)

1 0

r1361 - 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 16 Mar '08

16 Mar '08

Author: tchemit Date: 2008-03-16 06:34:45 +0000 (Sun, 16 Mar 2008) New Revision: 1361 Removed: branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/actions/SimExplorerCommonActions.java Log: delte common actions from project : generated by maven-commandline-plugin :) Deleted: 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 03:45:57 UTC (rev 1360) +++ 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 06:34:45 UTC (rev 1361) @@ -1,132 +0,0 @@ -/* -* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Code Lutin, -* Benjamin Poussin, Tony Chemit -* -* -* 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.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 org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import static org.codelutin.i18n.I18n._; -import org.codelutin.option.Config; - -import java.io.IOException; -import java.io.StringWriter; - -/** - * The class to define all common actions that IsisFish can launch at init time. - * - * @author chemit - */ - at org.codelutin.option.OptionActionAnnotation -public class SimExplorerCommonActions { - - private static final Log log = LogFactory.getLog(SimExplorerCommonActions.class); - - static void printConfig(StringWriter writer, Config config) throws IOException { - writer.append('\n').append(config.toString()); - writer.flush(); - } - - public static class HelpAction extends SimExplorerAbstractOptionActionHelp { - - - protected void run(SimExplorerAbstractContext context) throws Exception { - log.info("required help action"); - StringWriter writer = new StringWriter(); - context.getParser().printUsage(writer, "SimExplorer SI v " + context.getConfig().getVersion()); - printConfig(writer, context.getConfig()); - writer.append('\n'); - log.info(writer); - context.setQuit(true); - } - - } - - public static class ConfigAction extends SimExplorerAbstractOptionActionChangeConfig { - - 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(SimExplorerAbstractContext context, SimExplorerOptionShowConfig... options) { - super.beforeAll(context, options); - // check we have not twice config - } - - public void run(SimExplorerAbstractContext context) throws Exception { - SimExplorerConfigMain conf; - conf = context.getConfig(); - - String category = option.getConstantArgumentValue(0); - if (conf == null) { - throw new IllegalArgumentException("could not found a configuration with category " + category); - } - log.info("required showConfig pour category [" + category + "]"); - StringWriter writer = new StringWriter(); - printConfig(writer, conf); - log.info(writer); - context.setQuit(true); - } - } - - public static class EditConfigAction extends SimExplorerAbstractOptionActionEditConfig { - @Override - protected void beforeAll(SimExplorerAbstractContext context, SimExplorerOptionEditConfig... options) { - super.beforeAll(context, options); - // check we have not twice config - } - - 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(SimExplorerAbstractContext context) throws Exception { - context.getConfig().getConfigFileName().delete(); - log.info(_("simexplorer.message.reset.user.configuration")); - context.setFirstLaunch(true); - } - - } - - public static class UiAction extends SimExplorerAbstractOptionActionUi { - protected boolean init = false; - - public void run(SimExplorerAbstractContext context) throws Exception { - Boolean bool = isFlag(); - boolean launchUI = bool != null && bool; - log.info(option.getUsedAlias() + ", value:" + bool); - context.setLaunchUI(launchUI); - if (init) { - context.setQuit(true); - } - init = true; - } - } -}

1 0

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

16 Mar '08

Author: tchemit Date: 2008-03-16 03:45:57 +0000 (Sun, 16 Mar 2008) New Revision: 1360 Modified: branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/src/resources/i18n/simexplorer-is-swing-commandline-fr_FR.properties Log: ... 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 03:40:11 UTC (rev 1359) +++ 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:45:57 UTC (rev 1360) @@ -25,7 +25,7 @@ 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.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.changeFileConfig=sp\u00E9cifer le fichier de configuration utilis\u00E9 simexplorer.option.description.editConfig=pour lancer l'UI d'\u00E9dition de la configuration simexplorer.option.description.help=Voir cette aide simexplorer.option.description.resetConfig=R\u00E9initialisation de la configuration.

1 0

r1359 - in branches/20080315_before_commandline_split/simexplorer-is: simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/actions simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/tab simexplorer-is-swing-commandline simexplorer-is-swing-commandline/src/resources simexplorer-is-swing-commandline/src/resources/i18n simexplorer-is-swing-jaxx/src/uimodel/fr/cemagref
by tchemit＠users.labs.libre-entreprise.org 16 Mar '08

16 Mar '08

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>

1 0

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

16 Mar '08

Author: tchemit Date: 2008-03-16 00:24:47 +0000 (Sun, 16 Mar 2008) New Revision: 1358 Modified: branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/pom.xml Log: passage en lutincommandline 0.2 (sans la partie ui) et lutincommandline-ui 0.2 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-16 00:24:04 UTC (rev 1357) +++ branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/pom.xml 2008-03-16 00:24:47 UTC (rev 1358) @@ -136,6 +136,13 @@ <artifactId>simexplorer-is-swing-commandline</artifactId> <version>0.1-SNAPSHOT</version> </dependency> +  + <dependency> + <groupId>lutinlib</groupId> + <artifactId>lutincommandline-ui</artifactId> + <version>0.2</version> + <scope>compile</scope> + </dependency>  <dependency> <groupId>jboss</groupId>

1 0

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

16 Mar '08

Author: tchemit Date: 2008-03-16 00:24:04 +0000 (Sun, 16 Mar 2008) New Revision: 1357 Modified: branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/pom.xml Log: passage en lutincommandline 0.2 (sans la partie ui) 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:05:57 UTC (rev 1356) +++ branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/pom.xml 2008-03-16 00:24:04 UTC (rev 1357) @@ -121,7 +121,7 @@ <dependency> <groupId>lutinlib</groupId> <artifactId>lutincommandline</artifactId> - <version>0.1-SNAPSHOT</version> + <version>0.2</version> <scope>compile</scope> </dependency> </dependencies>

1 0

r1356 - branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/src/resources
by tchemit＠users.labs.libre-entreprise.org 16 Mar '08

16 Mar '08

Author: tchemit Date: 2008-03-16 00:05:57 +0000 (Sun, 16 Mar 2008) New Revision: 1356 Modified: branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/src/resources/commandline.properties Log: transfert enum from jaxx to lutinutil to avoid jaxx dependency in this module just for that 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-15 21:10:49 UTC (rev 1355) +++ branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/src/resources/commandline.properties 2008-03-16 00:05:57 UTC (rev 1356) @@ -80,10 +80,10 @@ ### ### Application preferences ### -main.config.definition.localSizor=jaxx.util.SimplePaginationEnum:_5 +main.config.definition.localSizor=org.codelutin.util.SimplePaginationEnum:_5 main.config.modifiers.localSizor= -main.config.definition.remoteSizor=jaxx.util.SimplePaginationEnum:_20 +main.config.definition.remoteSizor=org.codelutin.util.SimplePaginationEnum:_20 main.config.modifiers.remoteSizor= main.config.definition.showLocalTab=java.lang.Boolean:True

1 0