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

r1275 - branches/avec_module_swing_jaxx_20080301/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing
by tchemit＠users.labs.libre-entreprise.org 01 Mar '08

01 Mar '08

Author: tchemit Date: 2008-03-01 13:06:08 +0000 (Sat, 01 Mar 2008) New Revision: 1275 Modified: branches/avec_module_swing_jaxx_20080301/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java branches/avec_module_swing_jaxx_20080301/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java Log: refactor IsisContext... Modified: branches/avec_module_swing_jaxx_20080301/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java =================================================================== --- branches/avec_module_swing_jaxx_20080301/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java 2008-03-01 10:49:45 UTC (rev 1274) +++ branches/avec_module_swing_jaxx_20080301/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java 2008-03-01 13:06:08 UTC (rev 1275) @@ -56,22 +56,10 @@ // init context context = new SimExplorerContext(); + + // init context + context.initContext(args); - // init i18n with default locale - I18n.initISO88591(); - - // init parser - context.initParser(args); - - // init config - context.initConfig(); - - // init i18n with user locale - context.initI18n(); - - // mark if first launch - context.setFirstLaunch(!context.getConfig().getSource().exists()); - // save config context.getConfig().save(); Modified: branches/avec_module_swing_jaxx_20080301/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java =================================================================== --- branches/avec_module_swing_jaxx_20080301/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java 2008-03-01 10:49:45 UTC (rev 1274) +++ branches/avec_module_swing_jaxx_20080301/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java 2008-03-01 13:06:08 UTC (rev 1275) @@ -18,25 +18,23 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing; +import fr.cemagref.simexplorer.is.entities.EntityTypeEnum; +import fr.cemagref.simexplorer.is.entities.data.LoggableElement; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; +import fr.cemagref.simexplorer.is.entities.metadata.Version; +import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.exceptions.SimExplorerRuntimeException; import fr.cemagref.simexplorer.is.exceptions.UnreachableServiceException; -import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.service.MockStorageServiceImpl; import fr.cemagref.simexplorer.is.service.StorageService; import fr.cemagref.simexplorer.is.service.StorageServiceClient; import fr.cemagref.simexplorer.is.service.remote.RemoteService; import fr.cemagref.simexplorer.is.service.remote.RemoteStorageService; +import fr.cemagref.simexplorer.is.storage.SortColumn; import fr.cemagref.simexplorer.is.ui.swing.commandline.SimExplorerOptionParser; -import fr.cemagref.simexplorer.is.ui.swing.commandline.actions.SimExplorerCommonActions; import fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerAbstractConfigLocal; import fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerAbstractConfigMain; import fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerAbstractConfigRemote; -import fr.cemagref.simexplorer.is.ui.swing.LoggableElementCache; -import fr.cemagref.simexplorer.is.entities.metadata.Version; -import fr.cemagref.simexplorer.is.entities.metadata.MetaData; -import fr.cemagref.simexplorer.is.entities.data.LoggableElement; -import fr.cemagref.simexplorer.is.entities.EntityTypeEnum; -import fr.cemagref.simexplorer.is.storage.SortColumn; import org.codelutin.i18n.I18n; import org.codelutin.option.ParserException; @@ -46,7 +44,7 @@ * Le context de l'application, implanté en singleton. * <p/> * Contient la configuration de l'application, le parseur d'options, les services, ... - * + * <p/> * Contient aussi des méthodes qui appelent les services * * @author chemit @@ -96,12 +94,6 @@ if (parser == null) { // creation du parseur parser = new SimExplorerOptionParser(); - // enregistrement des actions concretes - parser.registerActions(SimExplorerCommonActions.class); - // enregistrement des configs concretes - parser.registerConfig(SimExplorerAbstractConfigMain.class); - parser.registerConfig(SimExplorerAbstractConfigLocal.class); - parser.registerConfig(SimExplorerAbstractConfigRemote.class); } return parser; } @@ -187,7 +179,7 @@ public void initServices() { // init local service getLocalStorageService(); - + if (getConfig().isAutoConnect()) { getRemoteStorageService(); } @@ -226,7 +218,7 @@ } } - public MetaData[] getData( boolean remote, boolean onlyLatest, String query, long newFirstIndex, int width, SortColumn column, boolean ascending) { + public MetaData[] getData(boolean remote, boolean onlyLatest, String query, long newFirstIndex, int width, SortColumn column, boolean ascending) { StorageService service = getStorageService(remote); String token = getToken(); try { @@ -254,7 +246,7 @@ throw new SimExplorerRuntimeException(e); } } - + public StorageService getStorageService(boolean remote) { StorageService service; service = remote ? getRemoteStorageService() : getLocalStorageService(); @@ -266,7 +258,7 @@ public LoggableElementCache getLoggableElementCache(boolean remote) { getStorageService(remote); LoggableElementCache cache; - cache = remote?remoteCache:localCache; + cache = remote ? remoteCache : localCache; return cache; } @@ -279,9 +271,20 @@ * * @param args les arguments passés au démarrage de l'application */ - void initParser(String... args) { + void initContext(String... args) { try { + // parse arguments getParser().doParse(args); + + // init configs + getParser().initConfigs(); + + // init i18n with user locale (or default one if not found) + initI18n(); + + // mark if first launch + setFirstLaunch(!getConfig().getSource().exists()); + } catch (ParserException e) { throw new SimExplorerRuntimeException(e); } catch (IOException e) { @@ -289,12 +292,6 @@ } } - /** Initialisation de la configuration utilisateur */ - void initConfig() { - getConfig(); - getLocalConfig(); - getRemoteConfig(); - } /** @return le service de storage locale */ protected StorageService getLocalStorageService() {

1 0

r1274 - in branches/avec_module_swing_jaxx_20080301/simexplorer-is: simexplorer-is-swing simexplorer-is-swing/src/resources/i18n simexplorer-is-swing-jaxx/src
by tchemit＠users.labs.libre-entreprise.org 01 Mar '08

01 Mar '08

Author: tchemit Date: 2008-03-01 10:49:45 +0000 (Sat, 01 Mar 2008) New Revision: 1274 Added: branches/avec_module_swing_jaxx_20080301/simexplorer-is/simexplorer-is-swing-jaxx/src/site/ Modified: branches/avec_module_swing_jaxx_20080301/simexplorer-is/simexplorer-is-swing/pom.xml branches/avec_module_swing_jaxx_20080301/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties branches/avec_module_swing_jaxx_20080301/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties Log: split module swing in tow modules swing-jaxx and swing (with no jaxx stuff) Modified: branches/avec_module_swing_jaxx_20080301/simexplorer-is/simexplorer-is-swing/pom.xml =================================================================== --- branches/avec_module_swing_jaxx_20080301/simexplorer-is/simexplorer-is-swing/pom.xml 2008-03-01 10:49:22 UTC (rev 1273) +++ branches/avec_module_swing_jaxx_20080301/simexplorer-is/simexplorer-is-swing/pom.xml 2008-03-01 10:49:45 UTC (rev 1274) @@ -42,26 +42,6 @@ <plugins>  <plugin> - <groupId>lutinplugin</groupId> - <artifactId>maven-jaxx-plugin</artifactId> - <version>0.2-SNAPSHOT</version> - <executions> - <execution> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>lutinlib</groupId> - <artifactId>lutinwidget</artifactId> - <version>0.10-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - </dependencies> - </plugin> - <plugin> <artifactId>maven-antrun-plugin</artifactId> <configuration>  @@ -148,7 +128,6 @@ <phase>compile</phase> <id>java</id> <goals> - <goal>parserJaxx</goal> <goal>parserJava</goal> <goal>gen</goal> </goals> @@ -211,18 +190,10 @@ <version>0.0.1-SNAPSHOT</version> </dependency> <dependency> - <groupId>lutinlib</groupId> - <artifactId>lutinwidget</artifactId> - <version>0.10-SNAPSHOT</version> - <scope>compile</scope> - </dependency> -  - <dependency> - <groupId>lutinlib</groupId> - <artifactId>jaxx</artifactId> - <version>1.0.4-SNAPSHOT</version> - <scope>compile</scope> - </dependency> + <groupId>simexplorer-is</groupId> + <artifactId>simexplorer-is-swing-jaxx</artifactId> + <version>0.0.1-SNAPSHOT</version> + </dependency>  <dependency> <groupId>lutinlib</groupId> Modified: branches/avec_module_swing_jaxx_20080301/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties =================================================================== --- branches/avec_module_swing_jaxx_20080301/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-03-01 10:49:22 UTC (rev 1273) +++ branches/avec_module_swing_jaxx_20080301/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-03-01 10:49:45 UTC (rev 1274) @@ -22,7 +22,6 @@ simexplorer.action.connect=Connect simexplorer.action.connect.help= simexplorer.action.connect.tooltip=Connect to remote server -simexplorer.action.currentPage=page simexplorer.action.deleteElement=Delete element simexplorer.action.deleteElement.help= simexplorer.action.deleteElement.tooltip=Delete element ''{0}'' @@ -109,7 +108,6 @@ simexplorer.action.search=search simexplorer.action.search.help= simexplorer.action.search.tooltip=Launch search -simexplorer.action.searchText.tooltip=Text to search in applications simexplorer.action.showTab_detail=Show details simexplorer.action.showTab_detail.help= simexplorer.action.showTab_detail.tooltip=show Detail of element ''{0}'' @@ -130,23 +128,14 @@ simexplorer.action.unconnect.tooltip=Disconnect from remote server simexplorer.choose.applicationexploration=Choose a application's exploration (*.zip) simexplorer.choose.dir=Choose this directory -simexplorer.choose.import.label=Import type simexplorer.choose.library=Choose a library file (*.?) -simexplorer.common.apply=Apply -simexplorer.common.cancel=Cancel -simexplorer.common.close=Close simexplorer.common.creationDate=create date simexplorer.common.description=description simexplorer.common.elementClass=type simexplorer.common.key=key -simexplorer.common.login=Login simexplorer.common.name=name -simexplorer.common.ok=Ok -simexplorer.common.passphrase=Password -simexplorer.common.type=type simexplorer.common.value=value simexplorer.common.version=version -simexplorer.config.i18n.menu=Language simexplorer.config.local.data.description=Local database data directory simexplorer.config.local.db.description=Local database directory simexplorer.config.local.description=Local server configuration @@ -165,7 +154,6 @@ 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.menu=Configuration simexplorer.config.remote.URI.description=URI of the remote storage service simexplorer.config.remote.description=Remote server configuration simexplorer.config.remote.login.description=User login to remote server @@ -176,22 +164,11 @@ 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.debug.menu=Debug -simexplorer.entities.applicationExploration=Exploration Application -simexplorer.entities.library=Library -simexplorer.error.dialog.message=An error was found -simexplorer.error.dialog.title=Error detected\! simexplorer.error.login.failed=Remote authentication failed... simexplorer.error.service.failed=Remote server is not reachable... -simexplorer.help.menu=Help simexplorer.login.retry=Do you want to retry ? -simexplorer.login.title=Authentication to remote server -simexplorer.main.menu=Main -simexplorer.main.ui.title=SimExplorer SI v 0.0.1 simexplorer.message.reset.user.configuration= simexplorer.node.descriptors=Descriptor(s) ({0}) -simexplorer.node.navigation.local=Local element -simexplorer.node.navigation.remote=Remote element simexplorer.node.noattachments=No attachment simexplorer.node.nodetail=No detail simexplorer.option.description.config=change value of configuration property (with **key**) by value **value**. Modified: branches/avec_module_swing_jaxx_20080301/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties =================================================================== --- branches/avec_module_swing_jaxx_20080301/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-03-01 10:49:22 UTC (rev 1273) +++ branches/avec_module_swing_jaxx_20080301/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-03-01 10:49:45 UTC (rev 1274) @@ -22,7 +22,6 @@ simexplorer.action.connect=Connexion simexplorer.action.connect.help= simexplorer.action.connect.tooltip=Se connecter au serveur distant -simexplorer.action.currentPage=page simexplorer.action.deleteElement=Supprimer simexplorer.action.deleteElement.help= simexplorer.action.deleteElement.tooltip=Supprimer l''\u00E9l\u00E9ment ''{0}'' @@ -109,7 +108,6 @@ simexplorer.action.search=chercher simexplorer.action.search.help= simexplorer.action.search.tooltip=Lancer la recherche -simexplorer.action.searchText.tooltip=Le texte de recherche simexplorer.action.showTab_detail=Voir les d\u00E9tails simexplorer.action.showTab_detail.help= simexplorer.action.showTab_detail.tooltip=Afficher les d\u00E9tails de l''\u00E9l\u00E9ment ''{0}'' @@ -130,23 +128,14 @@ simexplorer.action.unconnect.tooltip=Se d\u00E9connecter du serveur distant simexplorer.choose.applicationexploration=Choisir une exploration d'application (*.zip) simexplorer.choose.dir=Choisir ce r\u00E9pertoire -simexplorer.choose.import.label=Type d'\u00E9l\u00E9ment \u00E0 importer simexplorer.choose.library=Choisir une librairie (*.?) -simexplorer.common.apply=Appliquer -simexplorer.common.cancel=Annuler -simexplorer.common.close=Fermer simexplorer.common.creationDate=date de cr\u00E9ation simexplorer.common.description=description simexplorer.common.elementClass=type simexplorer.common.key=nom descriptor -simexplorer.common.login=Login utilisateur simexplorer.common.name=nom -simexplorer.common.ok=Ok -simexplorer.common.passphrase=Mot de passe -simexplorer.common.type=type simexplorer.common.value=valeur simexplorer.common.version=version -simexplorer.config.i18n.menu=Langue simexplorer.config.local.data.description=R\u00E9pertoire des donn\u00E9es de la base locale simexplorer.config.local.db.description=R\u00E9pertoire de la base locale simexplorer.config.local.description=Configuration du serveur local @@ -165,7 +154,6 @@ 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.menu=Configuration simexplorer.config.remote.URI.description=l'uri du service distant simexplorer.config.remote.description=Configuration du serveur distant simexplorer.config.remote.login.description=Le login de l'utilisateur au service distant @@ -176,22 +164,11 @@ 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.debug.menu=Debug -simexplorer.entities.applicationExploration=Exploration d'application -simexplorer.entities.library=Librairie -simexplorer.error.dialog.message=Une erreur est survenue\! -simexplorer.error.dialog.title=Erreur detect\u00E9e simexplorer.error.login.failed=L'authentification a \u00E9chou\u00E9e... simexplorer.error.service.failed=Le serveur central n'est pas joignable -simexplorer.help.menu=Aide simexplorer.login.retry=Voulez-vous ressayer de vous connecter ? -simexplorer.login.title=Connexion au serveur central -simexplorer.main.menu=Menu principal -simexplorer.main.ui.title=SimExplorer SI v 0.0.1 simexplorer.message.reset.user.configuration= simexplorer.node.descriptors=Descripteur(s) ({0}) -simexplorer.node.navigation.local=\u00E9l\u00E9ment local -simexplorer.node.navigation.remote=\u00E9l\u00E9ment distant 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**.

1 0

r1273 - branches/avec_module_swing_jaxx_20080301/simexplorer-is/simexplorer-is-swing-jaxx/src/java
by tchemit＠users.labs.libre-entreprise.org 01 Mar '08

01 Mar '08

Author: tchemit Date: 2008-03-01 10:49:22 +0000 (Sat, 01 Mar 2008) New Revision: 1273 Modified: branches/avec_module_swing_jaxx_20080301/simexplorer-is/simexplorer-is-swing-jaxx/src/java/ Log: this is a fully generated module, so no java source must be versionned Property changes on: branches/avec_module_swing_jaxx_20080301/simexplorer-is/simexplorer-is-swing-jaxx/src/java ___________________________________________________________________ Name: svn:ignore + *

1 0

r1272 - in branches/avec_module_swing_jaxx_20080301/simexplorer-is: . simexplorer-is-swing/src simexplorer-is-swing/src/resources simexplorer-is-swing-jaxx simexplorer-is-swing-jaxx/src simexplorer-is-swing-jaxx/src/resources simexplorer-is-swing-jaxx/src/resources/i18n
by tchemit＠users.labs.libre-entreprise.org 01 Mar '08

01 Mar '08

Author: tchemit Date: 2008-03-01 10:34:50 +0000 (Sat, 01 Mar 2008) New Revision: 1272 Added: branches/avec_module_swing_jaxx_20080301/simexplorer-is/simexplorer-is-swing-jaxx/ branches/avec_module_swing_jaxx_20080301/simexplorer-is/simexplorer-is-swing-jaxx/pom.xml branches/avec_module_swing_jaxx_20080301/simexplorer-is/simexplorer-is-swing-jaxx/src/ branches/avec_module_swing_jaxx_20080301/simexplorer-is/simexplorer-is-swing-jaxx/src/java/ branches/avec_module_swing_jaxx_20080301/simexplorer-is/simexplorer-is-swing-jaxx/src/resources/ branches/avec_module_swing_jaxx_20080301/simexplorer-is/simexplorer-is-swing-jaxx/src/resources/i18n/ branches/avec_module_swing_jaxx_20080301/simexplorer-is/simexplorer-is-swing-jaxx/src/resources/i18n/simexplorer-is-swing-jaxx-en_GB.properties branches/avec_module_swing_jaxx_20080301/simexplorer-is/simexplorer-is-swing-jaxx/src/resources/i18n/simexplorer-is-swing-jaxx-fr_FR.properties branches/avec_module_swing_jaxx_20080301/simexplorer-is/simexplorer-is-swing-jaxx/src/resources/icons/ branches/avec_module_swing_jaxx_20080301/simexplorer-is/simexplorer-is-swing-jaxx/src/uimodel/ Removed: branches/avec_module_swing_jaxx_20080301/simexplorer-is/simexplorer-is-swing/src/resources/icons/ branches/avec_module_swing_jaxx_20080301/simexplorer-is/simexplorer-is-swing/src/uimodel/ Modified: branches/avec_module_swing_jaxx_20080301/simexplorer-is/pom.xml Log: split module swing in tow modules swing-jaxx and swing (with no jaxx stuff) Modified: branches/avec_module_swing_jaxx_20080301/simexplorer-is/pom.xml =================================================================== --- branches/avec_module_swing_jaxx_20080301/simexplorer-is/pom.xml 2008-03-01 09:53:58 UTC (rev 1271) +++ branches/avec_module_swing_jaxx_20080301/simexplorer-is/pom.xml 2008-03-01 10:34:50 UTC (rev 1272) @@ -199,6 +199,7 @@ <module>simexplorer-is-storage</module> <module>simexplorer-is-service</module> <module>simexplorer-is-web</module> + <module>simexplorer-is-swing-jaxx</module> <module>simexplorer-is-swing</module> <module>simexplorer-is-ear</module> </modules> Added: branches/avec_module_swing_jaxx_20080301/simexplorer-is/simexplorer-is-swing-jaxx/pom.xml =================================================================== --- branches/avec_module_swing_jaxx_20080301/simexplorer-is/simexplorer-is-swing-jaxx/pom.xml (rev 0) +++ branches/avec_module_swing_jaxx_20080301/simexplorer-is/simexplorer-is-swing-jaxx/pom.xml 2008-03-01 10:34:50 UTC (rev 1272) @@ -0,0 +1,108 @@ +<?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-jaxx</artifactId> + <name>Swing-jaxx</name> + + <version>0.0.1-SNAPSHOT</version> + <description>Java Swing - jaxx UI for SimExplorer-is</description> + <packaging>jar</packaging> + + <parent> + <groupId>simexplorer-is</groupId> + <artifactId>simexplorer-is</artifactId> + <version>0.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-jaxx-plugin</artifactId> + <version>0.2-SNAPSHOT</version> + <configuration> + <out>${maven.src.dir}/java</out> + </configuration> + <executions> + <execution> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>lutinlib</groupId> + <artifactId>lutinwidget</artifactId> + <version>0.10-SNAPSHOT</version> + </dependency> + </dependencies> + </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> + <executions> + <execution> + <phase>compile</phase> +  + <goals> + <goal>parserJaxx</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <dependencies> +  + <dependency> + <groupId>lutinlib</groupId> + <artifactId>lutinwidget</artifactId> + <version>0.10-SNAPSHOT</version> + <scope>compile</scope> + </dependency> +  + <dependency> + <groupId>lutinlib</groupId> + <artifactId>jaxx</artifactId> + <version>1.0.4-SNAPSHOT</version> + <scope>compile</scope> + </dependency> + </dependencies> +</project> Added: branches/avec_module_swing_jaxx_20080301/simexplorer-is/simexplorer-is-swing-jaxx/src/resources/i18n/simexplorer-is-swing-jaxx-en_GB.properties =================================================================== --- branches/avec_module_swing_jaxx_20080301/simexplorer-is/simexplorer-is-swing-jaxx/src/resources/i18n/simexplorer-is-swing-jaxx-en_GB.properties (rev 0) +++ branches/avec_module_swing_jaxx_20080301/simexplorer-is/simexplorer-is-swing-jaxx/src/resources/i18n/simexplorer-is-swing-jaxx-en_GB.properties 2008-03-01 10:34:50 UTC (rev 1272) @@ -0,0 +1,26 @@ +simexplorer.action.currentPage=page +simexplorer.action.importElement=import +simexplorer.action.searchText.tooltip=Text to search in applications +simexplorer.choose.import.label=Import type +simexplorer.common.apply=Apply +simexplorer.common.cancel=Cancel +simexplorer.common.close=Close +simexplorer.common.creationDate=create date +simexplorer.common.description=description +simexplorer.common.login=Login +simexplorer.common.ok=Ok +simexplorer.common.passphrase=Password +simexplorer.common.type=type +simexplorer.config.i18n.menu=Language +simexplorer.config.menu=Configuration +simexplorer.debug.menu=Debug +simexplorer.entities.applicationExploration=Exploration Application +simexplorer.entities.library=Library +simexplorer.error.dialog.message=An error was found +simexplorer.error.dialog.title=Error detected\! +simexplorer.help.menu=Help +simexplorer.login.title=Authentication to remote server +simexplorer.main.menu=Main +simexplorer.main.ui.title=SimExplorer SI v 0.0.1 +simexplorer.node.navigation.local=Local element +simexplorer.node.navigation.remote=Remote element Added: branches/avec_module_swing_jaxx_20080301/simexplorer-is/simexplorer-is-swing-jaxx/src/resources/i18n/simexplorer-is-swing-jaxx-fr_FR.properties =================================================================== --- branches/avec_module_swing_jaxx_20080301/simexplorer-is/simexplorer-is-swing-jaxx/src/resources/i18n/simexplorer-is-swing-jaxx-fr_FR.properties (rev 0) +++ branches/avec_module_swing_jaxx_20080301/simexplorer-is/simexplorer-is-swing-jaxx/src/resources/i18n/simexplorer-is-swing-jaxx-fr_FR.properties 2008-03-01 10:34:50 UTC (rev 1272) @@ -0,0 +1,26 @@ +simexplorer.action.currentPage=page +simexplorer.action.importElement=importer +simexplorer.action.searchText.tooltip=Le texte de recherche +simexplorer.choose.import.label=Type d'\u00E9l\u00E9ment \u00E0 importer +simexplorer.common.apply=Appliquer +simexplorer.common.cancel=Annuler +simexplorer.common.close=Fermer +simexplorer.common.creationDate=date de cr\u00E9ation +simexplorer.common.description=description +simexplorer.common.login=Login utilisateur +simexplorer.common.ok=Ok +simexplorer.common.passphrase=Mot de passe +simexplorer.common.type=type +simexplorer.config.i18n.menu=Langue +simexplorer.config.menu=Configuration +simexplorer.debug.menu=Debug +simexplorer.entities.applicationExploration=Exploration d'application +simexplorer.entities.library=Librairie +simexplorer.error.dialog.message=Une erreur est survenue\! +simexplorer.error.dialog.title=Erreur detect\u00E9e +simexplorer.help.menu=Aide +simexplorer.login.title=Connexion au serveur central +simexplorer.main.menu=Menu principal +simexplorer.main.ui.title=SimExplorer SI v 0.0.1 +simexplorer.node.navigation.local=\u00E9l\u00E9ment local +simexplorer.node.navigation.remote=\u00E9l\u00E9ment distant Copied: branches/avec_module_swing_jaxx_20080301/simexplorer-is/simexplorer-is-swing-jaxx/src/resources/icons (from rev 1271, branches/avec_module_swing_jaxx_20080301/simexplorer-is/simexplorer-is-swing/src/resources/icons) Copied: branches/avec_module_swing_jaxx_20080301/simexplorer-is/simexplorer-is-swing-jaxx/src/uimodel (from rev 1271, branches/avec_module_swing_jaxx_20080301/simexplorer-is/simexplorer-is-swing/src/uimodel)

1 0

r1271 - branches
by tchemit＠users.labs.libre-entreprise.org 01 Mar '08

01 Mar '08

Author: tchemit Date: 2008-03-01 09:53:58 +0000 (Sat, 01 Mar 2008) New Revision: 1271 Added: branches/avec_module_swing_jaxx_20080301/ Log: test d'un module jaxx independant Copied: branches/avec_module_swing_jaxx_20080301 (from rev 1270, trunk)

1 0

r1270 - /
by tchemit＠users.labs.libre-entreprise.org 01 Mar '08

01 Mar '08

Author: tchemit Date: 2008-03-01 09:52:54 +0000 (Sat, 01 Mar 2008) New Revision: 1270 Added: branches/ Log: lesmod?\195?\168les jaxx sont d?\195?\169sormais ind?\195?\169pendant et peuvent ?\195?\170tre trait?\195?\169s dans un module ?\195?\160 part.

1 0

r1269 - tags
by tchemit＠users.labs.libre-entreprise.org 01 Mar '08

01 Mar '08

Author: tchemit Date: 2008-03-01 09:08:37 +0000 (Sat, 01 Mar 2008) New Revision: 1269 Added: tags/tchemit_20080301/ Log: tag avant module swing-jaxx Copied: tags/tchemit_20080301 (from rev 1268, trunk)

1 0

r1268 - tags
by tchemit＠users.labs.libre-entreprise.org 01 Mar '08

01 Mar '08

Author: tchemit Date: 2008-03-01 09:07:59 +0000 (Sat, 01 Mar 2008) New Revision: 1268 Removed: tags/tchemit_20080301/ Log: erreur paquetage...

1 0

r1267 - tags
by tchemit＠users.labs.libre-entreprise.org 01 Mar '08

01 Mar '08

Author: tchemit Date: 2008-03-01 09:07:30 +0000 (Sat, 01 Mar 2008) New Revision: 1267 Added: tags/tchemit_20080301/ Log: tag avant ajout module swing-jaxx Copied: tags/tchemit_20080301 (from rev 1266, trunk/simexplorer-is)

1 0

r1266 - in trunk/simexplorer-is/simexplorer-is-swing/src: java/fr/cemagref/simexplorer/is/ui/swing/actions java/fr/cemagref/simexplorer/is/ui/swing/actions/util uimodel/fr/cemagref/simexplorer/is/ui/swing/ui
by tchemit＠users.labs.libre-entreprise.org 01 Mar '08

01 Mar '08

Author: tchemit Date: 2008-03-01 09:03:10 +0000 (Sat, 01 Mar 2008) New Revision: 1266 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/JDetailTab.jaxx trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/JListTab.jaxx Log: lesmod?\195?\168les jaxx sont d?\195?\169sormais ind?\195?\169pendant et peuvent ?\195?\170tre trait?\195?\169s dans un module ?\195?\160 part. Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java 2008-02-29 18:06:48 UTC (rev 1265) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java 2008-03-01 09:03:10 UTC (rev 1266) @@ -25,6 +25,7 @@ import fr.cemagref.simexplorer.is.ui.swing.actions.util.ShowTabAbstractAction; import fr.cemagref.simexplorer.is.ui.swing.model.DataEntityModel; import fr.cemagref.simexplorer.is.ui.swing.model.EntityTreeNode; +import fr.cemagref.simexplorer.is.ui.swing.model.DetailTableModel; import fr.cemagref.simexplorer.is.ui.swing.model.tab.DetailTabModel; import fr.cemagref.simexplorer.is.ui.swing.ui.EntityTreeNodeHelper; import fr.cemagref.simexplorer.is.ui.swing.ui.JDetailTab; @@ -126,6 +127,10 @@ } protected void initFirstUsage(final JDetailTab ui, final DetailTabModel model) { + + // init table model + ui.getDetailTable().setModel(new DetailTableModel()); + // add a listener on navigation tree navigationSelectionListener = new NavigationSelectionListener(); ui.getNavigationTree().addTreeSelectionListener(navigationSelectionListener); Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java 2008-02-29 18:06:48 UTC (rev 1265) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java 2008-03-01 09:03:10 UTC (rev 1266) @@ -101,6 +101,9 @@ ui.initPopup(); + // set table model + ui.getTable().setModel(new ListTableModel()); + // init remote property on model model.synch(remote, (LoggableElement) null); Modified: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/JDetailTab.jaxx =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/JDetailTab.jaxx 2008-02-29 18:06:48 UTC (rev 1265) +++ trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/JDetailTab.jaxx 2008-03-01 09:03:10 UTC (rev 1266) @@ -96,7 +96,8 @@ <row> <cell fill='horizontal' columns="2" insets='0,0,0,0'> <JScrollPane id='scrollTable' border='{null}' horizontalScrollBarPolicy='horizontal_scrollbar_as_needed' verticalScrollBarPolicy='vertical_scrollbar_as_needed'> - <JTable id="detailTable" border='{null}' model='{new fr.cemagref.simexplorer.is.ui.swing.model.DetailTableModel()}' focusable='false' enabled='false' /> + <JTable id="detailTable" border='{null}' focusable='false' enabled='false' /> +  </JScrollPane> </cell> </row> Modified: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/JListTab.jaxx =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/JListTab.jaxx 2008-02-29 18:06:48 UTC (rev 1265) +++ trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/JListTab.jaxx 2008-03-01 09:03:10 UTC (rev 1266) @@ -34,8 +34,8 @@ <row fill='both' weightx='1' weighty='1'> <cell insets='0,0,0,0'> <JScrollPane> - <JTable id='table' model='{new fr.cemagref.simexplorer.is.ui.swing.model.ListTableModel()}' - selectionMode='{ListSelectionModel.SINGLE_SELECTION}'/> + <JTable id='table' selectionMode='{ListSelectionModel.SINGLE_SELECTION}'/> +  </JScrollPane> </cell> </row>

1 0