- Jmexico-commits - mailman.cloud.codelutin.com

r98 - in trunk: jmexico-editor/src/main/java/fr/reseaumexico/editor jmexico-editor/src/main/resources/i18n jmexico-model/src/main/java/fr/reseaumexico/model/parser
by tchemit＠users.forge.codelutin.com 25 Oct '12

25 Oct '12

Author: tchemit Date: 2012-10-25 19:12:35 +0200 (Thu, 25 Oct 2012) New Revision: 98 Url: http://forge.codelutin.com/repositories/revision/jmexico/98 Log: fixes #1624: Can import a partial scenario Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorHandler.java trunk/jmexico-editor/src/main/resources/i18n/jmexico-editor_en_GB.properties trunk/jmexico-editor/src/main/resources/i18n/jmexico-editor_fr_FR.properties trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ScenarioXmlParser.java Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorHandler.java =================================================================== --- trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorHandler.java 2012-10-21 13:01:07 UTC (rev 97) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorHandler.java 2012-10-25 17:12:35 UTC (rev 98) @@ -233,6 +233,15 @@ scenario.setOrderNumber(getMaxOrder()); inputDesign.addScenario(scenario); + List<String> unknownFactors = parser.getUnknownFactors(); + if(CollectionUtils.isNotEmpty(unknownFactors)) { + JOptionPane.showMessageDialog( + ui, + _("jmexico.warning.factor.not.imported", unknownFactors), + _("jmexico.title.importScenario"), + JOptionPane.WARNING_MESSAGE); + } + } catch (Exception e) { if (log.isErrorEnabled()) { log.error("Could not import scenario", e); Modified: trunk/jmexico-editor/src/main/resources/i18n/jmexico-editor_en_GB.properties =================================================================== --- trunk/jmexico-editor/src/main/resources/i18n/jmexico-editor_en_GB.properties 2012-10-21 13:01:07 UTC (rev 97) +++ trunk/jmexico-editor/src/main/resources/i18n/jmexico-editor_en_GB.properties 2012-10-25 17:12:35 UTC (rev 98) @@ -23,8 +23,10 @@ jmexico.label.scenario.import.name=Name of new scenario jmexico.label.scenario.remove.selected=Scenario to delete jmexico.title.error=Error +jmexico.title.importScenario=Import a scenario jmexico.title.scenario.add=Add a scenario jmexico.title.scenario.clone=Clone a scenario jmexico.title.scenario.export=Import a scenario jmexico.title.scenario.import=Export a scenario jmexico.title.scenario.remove=Remove a scenario +jmexico.warning.factor.not.imported=Following factors %s does not exist in scenario, their values can not be imported. Modified: trunk/jmexico-editor/src/main/resources/i18n/jmexico-editor_fr_FR.properties =================================================================== --- trunk/jmexico-editor/src/main/resources/i18n/jmexico-editor_fr_FR.properties 2012-10-21 13:01:07 UTC (rev 97) +++ trunk/jmexico-editor/src/main/resources/i18n/jmexico-editor_fr_FR.properties 2012-10-25 17:12:35 UTC (rev 98) @@ -23,8 +23,10 @@ jmexico.label.scenario.import.name=Nom du scénario à importer jmexico.label.scenario.remove.selected=Scénario à supprimer jmexico.title.error=Erreur +jmexico.title.importScenario=Import de scénario jmexico.title.scenario.add=Ajouter un scénario jmexico.title.scenario.clone=Dupliquer un scénario jmexico.title.scenario.export=Exporter un scénario jmexico.title.scenario.import=Importer un scénario jmexico.title.scenario.remove=Supprimer un scénario +jmexico.warning.factor.not.imported=Les facteurs suivants %s n'existent pas dans le scénario, leurs valeurs ne sont pas importées. Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ScenarioXmlParser.java =================================================================== --- trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ScenarioXmlParser.java 2012-10-21 13:01:07 UTC (rev 97) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ScenarioXmlParser.java 2012-10-25 17:12:35 UTC (rev 98) @@ -24,7 +24,9 @@ * #L% */ +import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import com.google.common.collect.Sets; import fr.reseaumexico.model.Factor; import fr.reseaumexico.model.Scenario; import fr.reseaumexico.model.ScenarioImpl; @@ -34,7 +36,9 @@ import java.io.IOException; import java.text.ParseException; +import java.util.List; import java.util.Map; +import java.util.Set; import static fr.reseaumexico.model.MexicoXmlConstant.FACTOR; import static fr.reseaumexico.model.MexicoXmlConstant.SCENARIO; @@ -65,6 +69,8 @@ */ protected final boolean standalone; + protected final List<String> unknownFactors; + public ScenarioXmlParser(Map<String, Factor> factors) { this(factors, true); } @@ -72,11 +78,14 @@ public ScenarioXmlParser(Map<String, Factor> factors, boolean standalone) { this.factors = factors; this.standalone = standalone; + this.unknownFactors = Lists.newArrayList(); } @Override protected Scenario parseModel(XmlPullParser parser) throws IOException, XmlPullParserException, ParseException { + unknownFactors.clear(); + if (standalone) { // file must start with input design tag checkStartFile( @@ -105,9 +114,18 @@ Factor factor = factors.get(factorId); if (factor == null) { - throw new IOException( - "Could not find factor named '" + - factorId + "' at line " + parser.getLineNumber()); + if (standalone) { + + // keep factor id + unknownFactors.add(factorId); + continue; + } else { + + // do not accept this + throw new IOException( + "Could not find factor named '" + + factorId + "' at line " + parser.getLineNumber()); + } } ValueType valueType = factor.getDomain().getValueType(); @@ -128,6 +146,23 @@ parser.nextTag(); } + if (standalone) { + + // make sure all factors are loaded + Set<Factor> usedFactors = scenario.getFactorValues().keySet(); + Set<Factor> allFactors = Sets.newHashSet(factors.values()); + + allFactors.removeAll(usedFactors); + + for (Factor factorToAdd : allFactors) { + scenario.setFactorValue(factorToAdd, 0.d); + } + } + return scenario; } + + public List<String> getUnknownFactors() { + return Lists.newArrayList(unknownFactors); + } }

1 0

r97 - in trunk: . jmexico-editor jmexico-editor-demo jmexico-model
by tchemit＠users.forge.codelutin.com 21 Oct '12

21 Oct '12

Author: tchemit Date: 2012-10-21 15:01:07 +0200 (Sun, 21 Oct 2012) New Revision: 97 Url: http://forge.codelutin.com/repositories/revision/jmexico/97 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/jmexico-editor-demo/pom.xml trunk/jmexico-editor/pom.xml trunk/jmexico-model/pom.xml trunk/pom.xml Modified: trunk/jmexico-editor/pom.xml =================================================================== --- trunk/jmexico-editor/pom.xml 2012-10-21 13:01:00 UTC (rev 96) +++ trunk/jmexico-editor/pom.xml 2012-10-21 13:01:07 UTC (rev 97) @@ -5,7 +5,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.7</version> + <version>0.8-SNAPSHOT</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/jmexico-editor-demo/pom.xml =================================================================== --- trunk/jmexico-editor-demo/pom.xml 2012-10-21 13:01:00 UTC (rev 96) +++ trunk/jmexico-editor-demo/pom.xml 2012-10-21 13:01:07 UTC (rev 97) @@ -5,7 +5,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.7</version> + <version>0.8-SNAPSHOT</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/jmexico-model/pom.xml =================================================================== --- trunk/jmexico-model/pom.xml 2012-10-21 13:01:00 UTC (rev 96) +++ trunk/jmexico-model/pom.xml 2012-10-21 13:01:07 UTC (rev 97) @@ -5,7 +5,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.7</version> + <version>0.8-SNAPSHOT</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-21 13:01:00 UTC (rev 96) +++ trunk/pom.xml 2012-10-21 13:01:07 UTC (rev 97) @@ -11,7 +11,7 @@ <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.7</version> + <version>0.8-SNAPSHOT</version> <name>JMexico</name> <packaging>pom</packaging> @@ -67,12 +67,12 @@ <scm> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/jmexico/tags/jmexico-0.7 + scm:svn:http://svn.forge.codelutin.com/svn/jmexico/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/jmexico/tags/jmexico-0.7 + scm:svn:http://svn.forge.codelutin.com/svn/jmexico/trunk </developerConnection> - <url>http://forge.codelutin.com/repositories/browse/jmexico/tags/jmexico-0.7</url> + <url>http://forge.codelutin.com/repositories/browse/jmexico/trunk</url> </scm> <modules>

1 0

r96 - tags
by tchemit＠users.forge.codelutin.com 21 Oct '12

21 Oct '12

Author: tchemit Date: 2012-10-21 15:01:00 +0200 (Sun, 21 Oct 2012) New Revision: 96 Url: http://forge.codelutin.com/repositories/revision/jmexico/96 Log: [maven-release-plugin] copy for tag jmexico-0.7 Added: tags/jmexico-0.7/

1 0

r95 - in trunk: . jmexico-editor jmexico-editor-demo jmexico-model
by tchemit＠users.forge.codelutin.com 21 Oct '12

21 Oct '12

Author: tchemit Date: 2012-10-21 15:00:52 +0200 (Sun, 21 Oct 2012) New Revision: 95 Url: http://forge.codelutin.com/repositories/revision/jmexico/95 Log: [maven-release-plugin] prepare release jmexico-0.7 Modified: trunk/jmexico-editor-demo/pom.xml trunk/jmexico-editor/pom.xml trunk/jmexico-model/pom.xml trunk/pom.xml Modified: trunk/jmexico-editor/pom.xml =================================================================== --- trunk/jmexico-editor/pom.xml 2012-10-21 12:53:49 UTC (rev 94) +++ trunk/jmexico-editor/pom.xml 2012-10-21 13:00:52 UTC (rev 95) @@ -5,7 +5,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.7-SNAPSHOT</version> + <version>0.7</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/jmexico-editor-demo/pom.xml =================================================================== --- trunk/jmexico-editor-demo/pom.xml 2012-10-21 12:53:49 UTC (rev 94) +++ trunk/jmexico-editor-demo/pom.xml 2012-10-21 13:00:52 UTC (rev 95) @@ -5,7 +5,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.7-SNAPSHOT</version> + <version>0.7</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/jmexico-model/pom.xml =================================================================== --- trunk/jmexico-model/pom.xml 2012-10-21 12:53:49 UTC (rev 94) +++ trunk/jmexico-model/pom.xml 2012-10-21 13:00:52 UTC (rev 95) @@ -5,7 +5,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.7-SNAPSHOT</version> + <version>0.7</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-21 12:53:49 UTC (rev 94) +++ trunk/pom.xml 2012-10-21 13:00:52 UTC (rev 95) @@ -11,7 +11,7 @@ <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.7-SNAPSHOT</version> + <version>0.7</version> <name>JMexico</name> <packaging>pom</packaging> @@ -67,12 +67,12 @@ <scm> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/jmexico/trunk + scm:svn:http://svn.forge.codelutin.com/svn/jmexico/tags/jmexico-0.7 </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/jmexico/trunk + scm:svn:http://svn.forge.codelutin.com/svn/jmexico/tags/jmexico-0.7 </developerConnection> - <url>http://forge.codelutin.com/repositories/browse/jmexico/trunk</url> + <url>http://forge.codelutin.com/repositories/browse/jmexico/tags/jmexico-0.7</url> </scm> <modules>

1 0

r94 - trunk/src
by tchemit＠users.forge.codelutin.com 21 Oct '12

21 Oct '12

Author: tchemit Date: 2012-10-21 14:53:49 +0200 (Sun, 21 Oct 2012) New Revision: 94 Url: http://forge.codelutin.com/repositories/revision/jmexico/94 Log: remove obsolte dir Removed: trunk/src/announcement/

1 0

r93 - in trunk: . jmexico-editor jmexico-editor-demo jmexico-model
by tchemit＠users.forge.codelutin.com 21 Oct '12

21 Oct '12

Author: tchemit Date: 2012-10-21 14:51:16 +0200 (Sun, 21 Oct 2012) New Revision: 93 Url: http://forge.codelutin.com/repositories/revision/jmexico/93 Log: clean poms before release Modified: trunk/jmexico-editor-demo/pom.xml trunk/jmexico-editor/pom.xml trunk/jmexico-model/pom.xml trunk/pom.xml Modified: trunk/jmexico-editor/pom.xml =================================================================== --- trunk/jmexico-editor/pom.xml 2012-10-15 10:10:41 UTC (rev 92) +++ trunk/jmexico-editor/pom.xml 2012-10-21 12:51:16 UTC (rev 93) @@ -2,11 +2,6 @@ <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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - -  -  -  - <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> @@ -16,6 +11,18 @@ <groupId>fr.reseaumexico</groupId> <artifactId>jmexico-editor</artifactId> + <name>JMexico :: Swing Editor</name> + <description>JMexico - Editor module</description> + + <properties> + +  + <jaxx.addProjectClassPath>true</jaxx.addProjectClassPath> + <jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath> + <jaxx.autoImportCss>true</jaxx.autoImportCss> + <jaxx.autoRecurseInCss>false</jaxx.autoRecurseInCss> + </properties> + <dependencies> <dependency> @@ -31,6 +38,11 @@ </dependency> <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + + <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> </dependency> @@ -80,26 +92,6 @@ </dependencies> -  -  -  - - <name>JMexico :: Swing Editor</name> - <description>JMexico - Editor module</description> - - <properties> - -  - <jaxx.addProjectClassPath>true</jaxx.addProjectClassPath> - <jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath> - <jaxx.autoImportCss>true</jaxx.autoImportCss> - <jaxx.autoRecurseInCss>false</jaxx.autoRecurseInCss> - </properties> - -  -  -  - <build> @@ -142,5 +134,4 @@ </build> - </project> \ No newline at end of file Modified: trunk/jmexico-editor-demo/pom.xml =================================================================== --- trunk/jmexico-editor-demo/pom.xml 2012-10-15 10:10:41 UTC (rev 92) +++ trunk/jmexico-editor-demo/pom.xml 2012-10-21 12:51:16 UTC (rev 93) @@ -2,11 +2,6 @@ <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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - -  -  -  - <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> @@ -16,6 +11,28 @@ <groupId>fr.reseaumexico</groupId> <artifactId>jmexico-editor-demo</artifactId> + <name>JMexico :: Swing Editor Demo</name> + <description>JMexico - Swing Editor Demo module</description> + + <properties> + + <maven.jar.main.class> + fr.reseaumexico.editor.demo.RunMexicoEditorDemo + </maven.jar.main.class> + +  + <jaxx.addProjectClassPath>true</jaxx.addProjectClassPath> + <jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath> + <jaxx.autoImportCss>true</jaxx.autoImportCss> + <jaxx.autoRecurseInCss>false</jaxx.autoRecurseInCss> + + <i18n.bundleOutputName>jmexico-editor-demo-i18n</i18n.bundleOutputName> + +  + <license.generateBundle>true</license.generateBundle> + + </properties> + <dependencies> <dependency> @@ -65,34 +82,6 @@ </dependencies> -  -  -  - - <name>JMexico :: Swing Editor Demo</name> - <description>JMexico - Swing Editor Demo module</description> - - <properties> - - <maven.jar.main.class>fr.reseaumexico.editor.demo.RunMexicoEditorDemo</maven.jar.main.class> - -  - <jaxx.addProjectClassPath>true</jaxx.addProjectClassPath> - <jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath> - <jaxx.autoImportCss>true</jaxx.autoImportCss> - <jaxx.autoRecurseInCss>false</jaxx.autoRecurseInCss> - - <i18n.bundleOutputName>jmexico-editor-demo-i18n</i18n.bundleOutputName> - -  - <license.generateBundle>true</license.generateBundle> - - </properties> - -  -  -  - <build> <pluginManagement> Modified: trunk/jmexico-model/pom.xml =================================================================== --- trunk/jmexico-model/pom.xml 2012-10-15 10:10:41 UTC (rev 92) +++ trunk/jmexico-model/pom.xml 2012-10-21 12:51:16 UTC (rev 93) @@ -2,11 +2,6 @@ <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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - -  -  -  - <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> @@ -16,10 +11,6 @@ <groupId>fr.reseaumexico</groupId> <artifactId>jmexico-model</artifactId> -  -  -  - <name>JMexico :: Model</name> <description>JMexico - Model module</description> @@ -63,12 +54,6 @@ </dependencies> -  -  -  - - <packaging>jar</packaging> - <build> <plugins> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-15 10:10:41 UTC (rev 92) +++ trunk/pom.xml 2012-10-21 12:51:16 UTC (rev 93) @@ -3,11 +3,6 @@ <modelVersion>4.0.0</modelVersion> - -  -  -  - <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> @@ -17,20 +12,25 @@ <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> <version>0.7-SNAPSHOT</version> + <name>JMexico</name> - <modules> - <module>jmexico-model</module> - <module>jmexico-editor</module> - <module>jmexico-editor-demo</module> - </modules> + <packaging>pom</packaging> + <properties> -  -  -  + <platform>forge.codelutin.com</platform> + <projectId>jmexico</projectId> - <name>JMexico</name> +  + <nuitonI18nVersion>2.5</nuitonI18nVersion> + <nuitonUtilsVersion>2.6.3</nuitonUtilsVersion> + <eugenePluginVersion>2.5</eugenePluginVersion> + <jaxxVersion>2.5.6</jaxxVersion> + <swingXVersion>1.6.4</swingXVersion> + <license.organizationName>Réseau Mexico, Codelutin</license.organizationName> + </properties> + <description> Implantation de la norme Mexico en Java (http://reseau-mexico.fr/) </description> @@ -65,27 +65,22 @@ </developer> </developers> + <scm> + <connection> + scm:svn:http://svn.forge.codelutin.com/svn/jmexico/trunk + </connection> + <developerConnection> + scm:svn:http://svn.forge.codelutin.com/svn/jmexico/trunk + </developerConnection> + <url>http://forge.codelutin.com/repositories/browse/jmexico/trunk</url> + </scm> -  -  -  - <packaging>pom</packaging> + <modules> + <module>jmexico-model</module> + <module>jmexico-editor</module> + <module>jmexico-editor-demo</module> + </modules> - <properties> - - <platform>forge.codelutin.com</platform> - <projectId>jmexico</projectId> - -  - <nuitonI18nVersion>2.5</nuitonI18nVersion> - <nuitonUtilsVersion>2.6.3</nuitonUtilsVersion> - <eugenePluginVersion>2.5</eugenePluginVersion> - <jaxxVersion>2.5.6</jaxxVersion> - <swingXVersion>1.6.4</swingXVersion> - - <license.organizationName>Réseau Mexico, Codelutin</license.organizationName> - </properties> - <dependencyManagement> <dependencies> @@ -188,21 +183,6 @@ </build> -  -  -  - -  - <scm> - <connection> - scm:svn:http://svn.forge.codelutin.com/svn/jmexico/trunk - </connection> - <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/jmexico/trunk - </developerConnection> - <url>http://forge.codelutin.com/repositories/browse/jmexico/trunk</url> - </scm> - <distributionManagement> <site> <id>${platform}</id>

1 0

r92 - in trunk: . jmexico-editor/src/main/java/fr/reseaumexico/editor
by tchemit＠users.forge.codelutin.com 15 Oct '12

15 Oct '12

Author: tchemit Date: 2012-10-15 12:10:41 +0200 (Mon, 15 Oct 2012) New Revision: 92 Url: http://forge.codelutin.com/repositories/revision/jmexico/92 Log: #1572: Upgrade some librairies and plugins (pass to last jaxx stable version) Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorHandler.java trunk/pom.xml Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorHandler.java =================================================================== --- trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorHandler.java 2012-10-11 02:55:22 UTC (rev 91) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorHandler.java 2012-10-15 10:10:41 UTC (rev 92) @@ -280,6 +280,10 @@ } } + public static String getScenarioExtension() { + return _("jmexico.config.scenario.extension"); + } + protected boolean showCloneScenarioUI(CloneScenarioModel model) { // show ui @@ -423,10 +427,6 @@ return doIt; } - public static String getScenarioExtension() { - return _("jmexico.config.scenario.extension"); - } - protected boolean showImportScenarioUI(ImportScenarioModel model) { // show ui Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-11 02:55:22 UTC (rev 91) +++ trunk/pom.xml 2012-10-15 10:10:41 UTC (rev 92) @@ -80,7 +80,7 @@ <nuitonI18nVersion>2.5</nuitonI18nVersion> <nuitonUtilsVersion>2.6.3</nuitonUtilsVersion> <eugenePluginVersion>2.5</eugenePluginVersion> - <jaxxVersion>2.5.6-SNAPSHOT</jaxxVersion> + <jaxxVersion>2.5.6</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> <license.organizationName>Réseau Mexico, Codelutin</license.organizationName>

1 0

r91 - trunk
by tchemit＠users.forge.codelutin.com 11 Oct '12

11 Oct '12

Author: tchemit Date: 2012-10-11 04:55:22 +0200 (Thu, 11 Oct 2012) New Revision: 91 Url: http://forge.codelutin.com/repositories/revision/jmexico/91 Log: Update mavenpom4redmine to 3.4. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-07 19:01:48 UTC (rev 90) +++ trunk/pom.xml 2012-10-11 02:55:22 UTC (rev 91) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.3.8</version> + <version>3.4</version> </parent> <groupId>fr.reseaumexico</groupId>

1 0

r90 - in trunk/jmexico-editor/src/main: java/fr/reseaumexico/editor resources/i18n
by tchemit＠users.forge.codelutin.com 07 Oct '12

07 Oct '12

Author: tchemit Date: 2012-10-07 21:01:48 +0200 (Sun, 07 Oct 2012) New Revision: 90 Url: http://forge.codelutin.com/repositories/revision/jmexico/90 Log: fix i18n key Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ExportScenarioPanel.css trunk/jmexico-editor/src/main/resources/i18n/jmexico-editor_en_GB.properties trunk/jmexico-editor/src/main/resources/i18n/jmexico-editor_fr_FR.properties Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ExportScenarioPanel.css =================================================================== --- trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ExportScenarioPanel.css 2012-10-07 17:41:29 UTC (rev 89) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ExportScenarioPanel.css 2012-10-07 19:01:48 UTC (rev 90) @@ -47,5 +47,5 @@ #exportFilenameLabelInfo { actionIcon:"help"; - text:{_("jmexico.label.scenario.export.filename.info", InputDesignEditorHandler.getScenarioExtension())}; + text:{_("jmexico.info.scenario.export.filename", InputDesignEditorHandler.getScenarioExtension())}; } Modified: trunk/jmexico-editor/src/main/resources/i18n/jmexico-editor_en_GB.properties =================================================================== --- trunk/jmexico-editor/src/main/resources/i18n/jmexico-editor_en_GB.properties 2012-10-07 17:41:29 UTC (rev 89) +++ trunk/jmexico-editor/src/main/resources/i18n/jmexico-editor_en_GB.properties 2012-10-07 19:01:48 UTC (rev 90) @@ -12,12 +12,12 @@ jmexico.error.scenario.name.used=Error\: Name of scenario '%1$s' is already used. jmexico.error.scenario.not.selected=Error\: No scenario selected. jmexico.factor.name=Factor +jmexico.info.scenario.export.filename=Scenario extension (.%s) will be added to the filename jmexico.label.scenario.add.name=Name of scenario to add jmexico.label.scenario.clone.name=Name of new scenario jmexico.label.scenario.clone.selected=Scenario to clone jmexico.label.scenario.export.directory=Export directory jmexico.label.scenario.export.filename=Export filename -jmexico.label.scenario.export.filename.info=Scenario extension (.%s) will be added to the filename jmexico.label.scenario.export.selected=Scenario to export jmexico.label.scenario.import.file=Import file jmexico.label.scenario.import.name=Name of new scenario Modified: trunk/jmexico-editor/src/main/resources/i18n/jmexico-editor_fr_FR.properties =================================================================== --- trunk/jmexico-editor/src/main/resources/i18n/jmexico-editor_fr_FR.properties 2012-10-07 17:41:29 UTC (rev 89) +++ trunk/jmexico-editor/src/main/resources/i18n/jmexico-editor_fr_FR.properties 2012-10-07 19:01:48 UTC (rev 90) @@ -12,12 +12,12 @@ jmexico.error.scenario.name.used=Erreur \: le scenario '%1$s' est déjà utilisé. jmexico.error.scenario.not.selected=Erreur \: scénario à cloner non sélectionné. jmexico.factor.name=Facteur +jmexico.info.scenario.export.filename=L'extension de scénario (.%s) sera rajoutée au nom du fichier saisi jmexico.label.scenario.add.name=Nom du scénario jmexico.label.scenario.clone.name=Nom du nouveau scénario jmexico.label.scenario.clone.selected=Scénario à dupliquer jmexico.label.scenario.export.directory=Répertoire d'export jmexico.label.scenario.export.filename=Nom du fichier d'export -jmexico.label.scenario.export.filename.info=L'extension de scénario (.%s) sera rajoutée au nom du fichier saisi jmexico.label.scenario.export.selected=Scénario à exporter jmexico.label.scenario.import.file=Fichier d'import jmexico.label.scenario.import.name=Nom du scénario à importer

1 0

r89 - in trunk/jmexico-editor/src/main: java/fr/reseaumexico/editor resources resources/i18n resources/icons
by tchemit＠users.forge.codelutin.com 07 Oct '12

07 Oct '12

Author: tchemit Date: 2012-10-07 19:41:29 +0200 (Sun, 07 Oct 2012) New Revision: 89 Url: http://forge.codelutin.com/repositories/revision/jmexico/89 Log: fixes #1577: Add export scenario operation (improve config) Added: trunk/jmexico-editor/src/main/resources/icons/ trunk/jmexico-editor/src/main/resources/icons/action-help.png Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ExportScenarioModel.java trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ExportScenarioPanel.css trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ExportScenarioPanel.jaxx trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ImportScenarioPanel.jaxx trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorHandler.java trunk/jmexico-editor/src/main/resources/i18n/jmexico-editor_en_GB.properties trunk/jmexico-editor/src/main/resources/i18n/jmexico-editor_fr_FR.properties Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ExportScenarioModel.java =================================================================== --- trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ExportScenarioModel.java 2012-10-07 16:24:50 UTC (rev 88) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ExportScenarioModel.java 2012-10-07 17:41:29 UTC (rev 89) @@ -36,22 +36,40 @@ private static final long serialVersionUID = 1L; - protected File exportFile; + protected String exportFilename; - public File getExportFile() { - return exportFile; + protected File exportDirectory; + + public String getExportFilename() { + return exportFilename; } - public void setExportFile(File exportFile) { - Object oldValue = this.exportFile; - this.exportFile = exportFile; - firePropertyChange("exportFile", oldValue, exportFile); + public void setExportFilename(String exportFilename) { + Object oldValue = this.exportFilename; + this.exportFilename = exportFilename; + firePropertyChange("exportFilename", oldValue, exportFilename); } + public File getExportDirectory() { + return exportDirectory; + } + public void setExportDirectory(File exportDirectory) { + Object oldValue = this.exportDirectory; + this.exportDirectory = exportDirectory; + firePropertyChange("exportDirectory", oldValue, exportDirectory); + + } + + public File getExportFile(String extension) { + return new File(getExportDirectory(), + getExportFilename() + "." + extension); + } + @Override public void copyTo(ExportScenarioModel model) { super.copyTo(model); - model.setExportFile(getExportFile()); + model.setExportDirectory(getExportDirectory()); + model.setExportFilename(getExportFilename()); } } \ No newline at end of file Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ExportScenarioPanel.css =================================================================== --- trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ExportScenarioPanel.css 2012-10-07 16:24:50 UTC (rev 88) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ExportScenarioPanel.css 2012-10-07 17:41:29 UTC (rev 89) @@ -21,14 +21,22 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -#exportFileLabel { - text:"jmexico.label.scenario.export.file"; +#exportFilenameLabel { + text:"jmexico.label.scenario.export.filename"; } -#exportFileEditor { - selectedFile:{model.getExportFile()}; +#exportFilenameEditor { + text:{model.getExportFilename()}; } +#exportDirectoryLabel { + text:"jmexico.label.scenario.export.directory"; +} + +#exportDirectoryEditor { + selectedFile:{model.getExportDirectory()}; +} + #selectedScenarioLabel { text:"jmexico.label.scenario.export.selected"; } @@ -36,3 +44,8 @@ #selectedScenarioEditor { selectedItem:{model.getSelectedScenario()}; } + +#exportFilenameLabelInfo { + actionIcon:"help"; + text:{_("jmexico.label.scenario.export.filename.info", InputDesignEditorHandler.getScenarioExtension())}; +} Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ExportScenarioPanel.jaxx =================================================================== --- trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ExportScenarioPanel.jaxx 2012-10-07 16:24:50 UTC (rev 88) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ExportScenarioPanel.jaxx 2012-10-07 17:41:29 UTC (rev 89) @@ -38,7 +38,7 @@ SwingUtil.fillComboBox(selectedScenarioEditor, model.getScenarios(), model.getSelectedScenario()); - } +} ]]> </script> @@ -53,11 +53,25 @@ </row> <row fill='both'> <cell> - <JLabel id='exportFileLabel'/> + <JLabel id='exportDirectoryLabel'/> </cell> <cell> - <FileEditor id='exportFileEditor' - onActionPerformed='model.setExportFile(((FileEditor) event.getSource()).getSelectedFile())'/> + <FileEditor id='exportDirectoryEditor' + onActionPerformed='model.setExportDirectory(((FileEditor) event.getSource()).getSelectedFile())'/> </cell> + </row> + <row fill='both'> + <cell> + <JLabel id='exportFilenameLabel'/> + </cell> + <cell> + <JTextField id='exportFilenameEditor' + onKeyReleased='model.setExportFilename(((JTextField)event.getSource()).getText())'/> + </cell> + </row> + <row fill='both'> + <cell columns='2'> + <JLabel id='exportFilenameLabelInfo'/> + </cell> </row> </Table> Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ImportScenarioPanel.jaxx =================================================================== --- trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ImportScenarioPanel.jaxx 2012-10-07 16:24:50 UTC (rev 88) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ImportScenarioPanel.jaxx 2012-10-07 17:41:29 UTC (rev 89) @@ -38,20 +38,20 @@ </script> <row fill='both'> <cell> - <JLabel id='scenarioNameLabel'/> + <JLabel id='importFileLabel'/> </cell> <cell> - <JTextField id='scenarioNameEditor' - onKeyReleased='model.setScenarioName(((JTextField)event.getSource()).getText())'/> + <FileEditor id='importFileEditor' + onActionPerformed='model.setImportFile(((FileEditor) event.getSource()).getSelectedFile())'/> </cell> </row> <row fill='both'> <cell> - <JLabel id='importFileLabel'/> + <JLabel id='scenarioNameLabel'/> </cell> <cell> - <FileEditor id='importFileEditor' - onActionPerformed='model.setImportFile(((FileEditor) event.getSource()).getSelectedFile())'/> + <JTextField id='scenarioNameEditor' + onKeyReleased='model.setScenarioName(((JTextField)event.getSource()).getText())'/> </cell> - </row> + </row> </Table> Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorHandler.java =================================================================== --- trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorHandler.java 2012-10-07 16:24:50 UTC (rev 88) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorHandler.java 2012-10-07 17:41:29 UTC (rev 89) @@ -254,7 +254,7 @@ // export scenario - File exportFile = model.getExportFile(); + File exportFile = model.getExportFile(getScenarioExtension()); Scenario scenario = model.getSelectedScenario(); if (log.isInfoEnabled()) { @@ -351,13 +351,10 @@ ExportScenarioPanel panel = new ExportScenarioPanel(); panel.init(model); - FileEditor fileEditor = panel.getExportFileEditor(); + FileEditor fileEditor = panel.getExportDirectoryEditor(); + fileEditor.setDirectoryEnabled(true); + fileEditor.setFileEnabled(false); - fileEditor.setAcceptAllFileFilterUsed(false); - fileEditor.setExts(_("jmexico.config.scenario.extension")); - fileEditor.setExtsDescription( - _("jmexico.config.scenario.extension.description")); - int response = JOptionPane.showConfirmDialog( ui, panel, @@ -392,24 +389,44 @@ if (valid) { - // check export file is filled - File exportFile = model.getExportFile(); + //check export directory is filled + File exportDirectory = model.getExportDirectory(); + if (exportDirectory == null) { + valid = false; + JOptionPane.showMessageDialog( + ui, + _("jmexico.error.scenario.exportDirectory.required"), + _("jmexico.title.error"), + JOptionPane.ERROR_MESSAGE); - if (exportFile == null) { + } + } + + if (valid) { + + // check export filename is filled + String exportFilename = model.getExportFilename(); + + if (StringUtils.isBlank(exportFilename)) { valid = false; JOptionPane.showMessageDialog( ui, - _("jmexico.error.scenario.exportFile.required"), + _("jmexico.error.scenario.exportFilename.required"), _("jmexico.title.error"), JOptionPane.ERROR_MESSAGE); } } + doIt = valid || showExportScenarioUI(model); } return doIt; } + public static String getScenarioExtension() { + return _("jmexico.config.scenario.extension"); + } + protected boolean showImportScenarioUI(ImportScenarioModel model) { // show ui @@ -420,7 +437,7 @@ FileEditor fileEditor = panel.getImportFileEditor(); fileEditor.setAcceptAllFileFilterUsed(false); - fileEditor.setExts(_("jmexico.config.scenario.extension")); + fileEditor.setExts(getScenarioExtension()); fileEditor.setExtsDescription( _("jmexico.config.scenario.extension.description")); Modified: trunk/jmexico-editor/src/main/resources/i18n/jmexico-editor_en_GB.properties =================================================================== --- trunk/jmexico-editor/src/main/resources/i18n/jmexico-editor_en_GB.properties 2012-10-07 16:24:50 UTC (rev 88) +++ trunk/jmexico-editor/src/main/resources/i18n/jmexico-editor_en_GB.properties 2012-10-07 17:41:29 UTC (rev 89) @@ -5,7 +5,8 @@ jmexico.action.remove.scenario=Remove scenario jmexico.config.scenario.extension=scenario jmexico.config.scenario.extension.description=JMexico scenario file (*.scenario) -jmexico.error.scenario.exportFile.required=Error\: Export file is mandatory. +jmexico.error.scenario.exportDirectory.required=Error\: Export directory is mandatory. +jmexico.error.scenario.exportFilename.required=Error\: Export filename is mandatory. jmexico.error.scenario.importFile.required=Error\: Import file is mandatory. jmexico.error.scenario.name.required=Error\: Name of scenario is mandatory. jmexico.error.scenario.name.used=Error\: Name of scenario '%1$s' is already used. @@ -14,7 +15,9 @@ jmexico.label.scenario.add.name=Name of scenario to add jmexico.label.scenario.clone.name=Name of new scenario jmexico.label.scenario.clone.selected=Scenario to clone -jmexico.label.scenario.export.file=Export file +jmexico.label.scenario.export.directory=Export directory +jmexico.label.scenario.export.filename=Export filename +jmexico.label.scenario.export.filename.info=Scenario extension (.%s) will be added to the filename jmexico.label.scenario.export.selected=Scenario to export jmexico.label.scenario.import.file=Import file jmexico.label.scenario.import.name=Name of new scenario Modified: trunk/jmexico-editor/src/main/resources/i18n/jmexico-editor_fr_FR.properties =================================================================== --- trunk/jmexico-editor/src/main/resources/i18n/jmexico-editor_fr_FR.properties 2012-10-07 16:24:50 UTC (rev 88) +++ trunk/jmexico-editor/src/main/resources/i18n/jmexico-editor_fr_FR.properties 2012-10-07 17:41:29 UTC (rev 89) @@ -5,8 +5,9 @@ jmexico.action.remove.scenario=Supprimer un scénario jmexico.config.scenario.extension=scenario jmexico.config.scenario.extension.description=Scénario jmexico (*.scenario) -jmexico.error.scenario.exportFile.required=Erreur \: pas de fichier d'export choisi -jmexico.error.scenario.importFile.required= +jmexico.error.scenario.exportDirectory.required=Erreur \: Le répertoire d'export est obligatoire. +jmexico.error.scenario.exportFilename.required=Erreur \: Le nom du fichier d'export est obligatoire. +jmexico.error.scenario.importFile.required=Erreur \: Le fichier d'import est obligatoire. jmexico.error.scenario.name.required=Erreur \: le nom du scénario est obligatoire jmexico.error.scenario.name.used=Erreur \: le scenario '%1$s' est déjà utilisé. jmexico.error.scenario.not.selected=Erreur \: scénario à cloner non sélectionné. @@ -14,11 +15,13 @@ jmexico.label.scenario.add.name=Nom du scénario jmexico.label.scenario.clone.name=Nom du nouveau scénario jmexico.label.scenario.clone.selected=Scénario à dupliquer -jmexico.label.scenario.export.file=Fichier d'export -jmexico.label.scenario.export.selected=Sélection du scénarion à exporter +jmexico.label.scenario.export.directory=Répertoire d'export +jmexico.label.scenario.export.filename=Nom du fichier d'export +jmexico.label.scenario.export.filename.info=L'extension de scénario (.%s) sera rajoutée au nom du fichier saisi +jmexico.label.scenario.export.selected=Scénario à exporter jmexico.label.scenario.import.file=Fichier d'import jmexico.label.scenario.import.name=Nom du scénario à importer -jmexico.label.scenario.remove.selected=Sélection du scénario à supprimer +jmexico.label.scenario.remove.selected=Scénario à supprimer jmexico.title.error=Erreur jmexico.title.scenario.add=Ajouter un scénario jmexico.title.scenario.clone=Dupliquer un scénario Added: trunk/jmexico-editor/src/main/resources/icons/action-help.png =================================================================== (Binary files differ) Property changes on: trunk/jmexico-editor/src/main/resources/icons/action-help.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + image/png

1 0