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

r108 - in trunk: jmexico-editor/src/main/resources/icons jmexico-model jmexico-model/src/main/java/fr/reseaumexico/model jmexico-model/src/main/xmi
by tchemit＠users.forge.codelutin.com 13 Nov '12

13 Nov '12

Author: tchemit Date: 2012-11-13 14:32:27 +0100 (Tue, 13 Nov 2012) New Revision: 108 Url: http://forge.codelutin.com/repositories/revision/jmexico/108 Log: use a common bean super class Added: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/AbstractMexicoBean.java Modified: trunk/jmexico-editor/src/main/resources/icons/action-help.png trunk/jmexico-model/pom.xml trunk/jmexico-model/src/main/xmi/mexico.properties Property changes on: trunk/jmexico-editor/src/main/resources/icons/action-help.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/jmexico-model/pom.xml =================================================================== --- trunk/jmexico-model/pom.xml 2012-11-13 13:31:26 UTC (rev 107) +++ trunk/jmexico-model/pom.xml 2012-11-13 13:32:27 UTC (rev 108) @@ -37,6 +37,11 @@ <artifactId>nuiton-utils</artifactId> </dependency> + <dependency> + <groupId>org.swinglabs.swingx</groupId> + <artifactId>swingx-common</artifactId> + </dependency> +  <dependency> <groupId>xpp3</groupId> Added: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/AbstractMexicoBean.java =================================================================== --- trunk/jmexico-model/src/main/java/fr/reseaumexico/model/AbstractMexicoBean.java (rev 0) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/AbstractMexicoBean.java 2012-11-13 13:32:27 UTC (rev 108) @@ -0,0 +1,50 @@ +package fr.reseaumexico.model; + +/* + * #%L + * JMexico :: Model + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 Réseau Mexico, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +import org.jdesktop.beans.AbstractSerializableBean; +import org.nuiton.util.CollectionUtil; + +import java.util.Collection; +import java.util.List; + +/** + * Abstract bean class. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.8 + */ +public abstract class AbstractMexicoBean extends AbstractSerializableBean { + + private static final long serialVersionUID = 1L; + + protected <T> T getChild(Collection<T> list, int index) { + return CollectionUtil.getOrNull(list, index); + } + + protected <T> T getChild(List<T> list, int index) { + return CollectionUtil.getOrNull(list, index); + } +} Property changes on: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/AbstractMexicoBean.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jmexico-model/src/main/xmi/mexico.properties =================================================================== --- trunk/jmexico-model/src/main/xmi/mexico.properties 2012-11-13 13:31:26 UTC (rev 107) +++ trunk/jmexico-model/src/main/xmi/mexico.properties 2012-11-13 13:32:27 UTC (rev 108) @@ -24,5 +24,6 @@ ### model.tagValue.constantPrefix=PROPERTY_ -model.tagValue.version=0.1 +model.tagValue.version=0.8 model.tagValue.doNotGenerateBooleanGetMethods=true +model.tagvalue.beanSuperClass=fr.reseaumexico.model.AbstractMexicoBean

1 0

r107 - trunk
by tchemit＠users.forge.codelutin.com 13 Nov '12

13 Nov '12

Author: tchemit Date: 2012-11-13 14:31:26 +0100 (Tue, 13 Nov 2012) New Revision: 107 Url: http://forge.codelutin.com/repositories/revision/jmexico/107 Log: refs #1627: Updates Eugene to 2.5.6 refs #1686: Updates mavenpom to 3.4.4 fix scm url Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-30 07:46:27 UTC (rev 106) +++ trunk/pom.xml 2012-11-13 13:31:26 UTC (rev 107) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.3</version> + <version>3.4.4-SNAPSHOT</version> </parent> <groupId>fr.reseaumexico</groupId> @@ -24,7 +24,7 @@  <nuitonI18nVersion>2.5</nuitonI18nVersion> <nuitonUtilsVersion>2.6.4-SNAPSHOT</nuitonUtilsVersion> - <eugenePluginVersion>2.5.5.1-SNAPSHOT</eugenePluginVersion> + <eugenePluginVersion>2.5.6-SNAPSHOT</eugenePluginVersion> <jaxxVersion>2.5.6</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> @@ -72,7 +72,7 @@ <developerConnection> scm:svn:http://svn.forge.codelutin.com/svn/jmexico/trunk </developerConnection> - <url>http://forge.codelutin.com/repositories/browse/jmexico/trunk</url> + <url>http://forge.codelutin.com/projects/jmexico/repository/trunk</url> </scm> <modules>

1 0

r106 - trunk
by tchemit＠users.forge.codelutin.com 30 Oct '12

30 Oct '12

Author: tchemit Date: 2012-10-30 08:46:27 +0100 (Tue, 30 Oct 2012) New Revision: 106 Url: http://forge.codelutin.com/repositories/revision/jmexico/106 Log: Update mavenpom4redmine to 3.4.3. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-28 12:34:12 UTC (rev 105) +++ trunk/pom.xml 2012-10-30 07:46:27 UTC (rev 106) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.2</version> + <version>3.4.3</version> </parent> <groupId>fr.reseaumexico</groupId>

1 0

r105 - in trunk: . jmexico-model
by tchemit＠users.forge.codelutin.com 28 Oct '12

28 Oct '12

Author: tchemit Date: 2012-10-28 13:34:12 +0100 (Sun, 28 Oct 2012) New Revision: 105 Url: http://forge.codelutin.com/repositories/revision/jmexico/105 Log: refs #1628: Updates nuiton-utils to 2.6.4 Modified: trunk/jmexico-model/pom.xml trunk/pom.xml Modified: trunk/jmexico-model/pom.xml =================================================================== --- trunk/jmexico-model/pom.xml 2012-10-28 09:07:09 UTC (rev 104) +++ trunk/jmexico-model/pom.xml 2012-10-28 12:34:12 UTC (rev 105) @@ -32,6 +32,11 @@ <artifactId>guava</artifactId> </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> +  <dependency> <groupId>xpp3</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-28 09:07:09 UTC (rev 104) +++ trunk/pom.xml 2012-10-28 12:34:12 UTC (rev 105) @@ -23,7 +23,7 @@  <nuitonI18nVersion>2.5</nuitonI18nVersion> - <nuitonUtilsVersion>2.6.3</nuitonUtilsVersion> + <nuitonUtilsVersion>2.6.4-SNAPSHOT</nuitonUtilsVersion> <eugenePluginVersion>2.5.5.1-SNAPSHOT</eugenePluginVersion> <jaxxVersion>2.5.6</jaxxVersion> <swingXVersion>1.6.4</swingXVersion>

1 0

r104 - trunk
by tchemit＠users.forge.codelutin.com 28 Oct '12

28 Oct '12

Author: tchemit Date: 2012-10-28 10:07:09 +0100 (Sun, 28 Oct 2012) New Revision: 104 Url: http://forge.codelutin.com/repositories/revision/jmexico/104 Log: refs #1627: Updates Eugene to 2.5.5.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-26 11:50:23 UTC (rev 103) +++ trunk/pom.xml 2012-10-28 09:07:09 UTC (rev 104) @@ -24,7 +24,7 @@  <nuitonI18nVersion>2.5</nuitonI18nVersion> <nuitonUtilsVersion>2.6.3</nuitonUtilsVersion> - <eugenePluginVersion>2.5</eugenePluginVersion> + <eugenePluginVersion>2.5.5.1-SNAPSHOT</eugenePluginVersion> <jaxxVersion>2.5.6</jaxxVersion> <swingXVersion>1.6.4</swingXVersion>

1 0

r103 - in trunk: . jmexico-editor jmexico-editor-demo jmexico-model
by maven-release＠users.forge.codelutin.com 26 Oct '12

26 Oct '12

Author: maven-release Date: 2012-10-26 13:50:23 +0200 (Fri, 26 Oct 2012) New Revision: 103 Url: http://forge.codelutin.com/repositories/revision/jmexico/103 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-26 11:50:16 UTC (rev 102) +++ trunk/jmexico-editor/pom.xml 2012-10-26 11:50:23 UTC (rev 103) @@ -5,7 +5,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.8</version> + <version>0.9-SNAPSHOT</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/jmexico-editor-demo/pom.xml =================================================================== --- trunk/jmexico-editor-demo/pom.xml 2012-10-26 11:50:16 UTC (rev 102) +++ trunk/jmexico-editor-demo/pom.xml 2012-10-26 11:50:23 UTC (rev 103) @@ -5,7 +5,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.8</version> + <version>0.9-SNAPSHOT</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/jmexico-model/pom.xml =================================================================== --- trunk/jmexico-model/pom.xml 2012-10-26 11:50:16 UTC (rev 102) +++ trunk/jmexico-model/pom.xml 2012-10-26 11:50:23 UTC (rev 103) @@ -5,7 +5,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.8</version> + <version>0.9-SNAPSHOT</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-26 11:50:16 UTC (rev 102) +++ trunk/pom.xml 2012-10-26 11:50:23 UTC (rev 103) @@ -11,7 +11,7 @@ <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.8</version> + <version>0.9-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.8 + scm:svn:http://svn.forge.codelutin.com/svn/jmexico/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/jmexico/tags/jmexico-0.8 + scm:svn:http://svn.forge.codelutin.com/svn/jmexico/trunk </developerConnection> - <url>http://forge.codelutin.com/repositories/browse/jmexico/tags/jmexico-0.8</url> + <url>http://forge.codelutin.com/repositories/browse/jmexico/trunk</url> </scm> <modules>

1 0

r102 - tags
by maven-release＠users.forge.codelutin.com 26 Oct '12

26 Oct '12

Author: maven-release Date: 2012-10-26 13:50:16 +0200 (Fri, 26 Oct 2012) New Revision: 102 Url: http://forge.codelutin.com/repositories/revision/jmexico/102 Log: [maven-release-plugin] copy for tag jmexico-0.8 Added: tags/jmexico-0.8/

1 0

r101 - in trunk: . jmexico-editor jmexico-editor-demo jmexico-model
by maven-release＠users.forge.codelutin.com 26 Oct '12

26 Oct '12

Author: maven-release Date: 2012-10-26 13:50:06 +0200 (Fri, 26 Oct 2012) New Revision: 101 Url: http://forge.codelutin.com/repositories/revision/jmexico/101 Log: [maven-release-plugin] prepare release jmexico-0.8 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-26 11:45:58 UTC (rev 100) +++ trunk/jmexico-editor/pom.xml 2012-10-26 11:50:06 UTC (rev 101) @@ -5,7 +5,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.8-SNAPSHOT</version> + <version>0.8</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/jmexico-editor-demo/pom.xml =================================================================== --- trunk/jmexico-editor-demo/pom.xml 2012-10-26 11:45:58 UTC (rev 100) +++ trunk/jmexico-editor-demo/pom.xml 2012-10-26 11:50:06 UTC (rev 101) @@ -5,7 +5,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.8-SNAPSHOT</version> + <version>0.8</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/jmexico-model/pom.xml =================================================================== --- trunk/jmexico-model/pom.xml 2012-10-26 11:45:58 UTC (rev 100) +++ trunk/jmexico-model/pom.xml 2012-10-26 11:50:06 UTC (rev 101) @@ -5,7 +5,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.8-SNAPSHOT</version> + <version>0.8</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-26 11:45:58 UTC (rev 100) +++ trunk/pom.xml 2012-10-26 11:50:06 UTC (rev 101) @@ -11,7 +11,7 @@ <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.8-SNAPSHOT</version> + <version>0.8</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.8 </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/jmexico/trunk + scm:svn:http://svn.forge.codelutin.com/svn/jmexico/tags/jmexico-0.8 </developerConnection> - <url>http://forge.codelutin.com/repositories/browse/jmexico/trunk</url> + <url>http://forge.codelutin.com/repositories/browse/jmexico/tags/jmexico-0.8</url> </scm> <modules>

1 0

r100 - trunk
by tchemit＠users.forge.codelutin.com 26 Oct '12

26 Oct '12

Author: tchemit Date: 2012-10-26 13:45:58 +0200 (Fri, 26 Oct 2012) New Revision: 100 Url: http://forge.codelutin.com/repositories/revision/jmexico/100 Log: Update mavenpom4redmine to 3.4.2. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-26 08:23:08 UTC (rev 99) +++ trunk/pom.xml 2012-10-26 11:45:58 UTC (rev 100) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4</version> + <version>3.4.2</version> </parent> <groupId>fr.reseaumexico</groupId>

1 0

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

26 Oct '12

Author: tchemit Date: 2012-10-26 10:23:08 +0200 (Fri, 26 Oct 2012) New Revision: 99 Url: http://forge.codelutin.com/repositories/revision/jmexico/99 Log: fixes #1624: Can import a partial scenario fixes #1625: Improve scenario import/export 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/pom.xml trunk/jmexico-model/src/main/java/fr/reseaumexico/model/MexicoUtil.java trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ScenarioXmlParser.java trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/InputDesignXmlWriter.java trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/ScenarioXmlWriter.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-25 17:12:35 UTC (rev 98) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorHandler.java 2012-10-26 08:23:08 UTC (rev 99) @@ -234,10 +234,15 @@ inputDesign.addScenario(scenario); List<String> unknownFactors = parser.getUnknownFactors(); - if(CollectionUtils.isNotEmpty(unknownFactors)) { + if (CollectionUtils.isNotEmpty(unknownFactors)) { + StringBuilder sb = new StringBuilder(); + for (String unknownFactor : unknownFactors) { + sb.append("\n'").append(unknownFactor).append('\''); + } JOptionPane.showMessageDialog( ui, - _("jmexico.warning.factor.not.imported", unknownFactors), + _("jmexico.warning.factor.not.imported", + unknownFactors.size(), sb.toString()), _("jmexico.title.importScenario"), JOptionPane.WARNING_MESSAGE); } 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-25 17:12:35 UTC (rev 98) +++ trunk/jmexico-editor/src/main/resources/i18n/jmexico-editor_en_GB.properties 2012-10-26 08:23:08 UTC (rev 99) @@ -29,4 +29,4 @@ 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. +jmexico.warning.factor.not.imported=There is %s factor which do not exist in model, their values can not be imported\: %s 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-25 17:12:35 UTC (rev 98) +++ trunk/jmexico-editor/src/main/resources/i18n/jmexico-editor_fr_FR.properties 2012-10-26 08:23:08 UTC (rev 99) @@ -29,4 +29,4 @@ 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. +jmexico.warning.factor.not.imported=Il existe %s facteurs qui n'existent pas dans le modèle, leurs valeurs ne sont pas importées \: %s. Modified: trunk/jmexico-model/pom.xml =================================================================== --- trunk/jmexico-model/pom.xml 2012-10-25 17:12:35 UTC (rev 98) +++ trunk/jmexico-model/pom.xml 2012-10-26 08:23:08 UTC (rev 99) @@ -23,6 +23,11 @@ </dependency> <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/MexicoUtil.java =================================================================== --- trunk/jmexico-model/src/main/java/fr/reseaumexico/model/MexicoUtil.java 2012-10-25 17:12:35 UTC (rev 98) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/MexicoUtil.java 2012-10-26 08:23:08 UTC (rev 99) @@ -24,6 +24,7 @@ */ package fr.reseaumexico.model; +import com.google.common.base.Function; import org.apache.commons.lang3.StringUtils; /** @@ -31,6 +32,13 @@ */ public class MexicoUtil { + public static final Function<Factor,String> GET_FACTOR_NAME = new Function<Factor, String>() { + @Override + public String apply(Factor input) { + return input.getName(); + } + }; + public static Object getTypedValue(ValueType type, String value) { Object result; if (StringUtils.isEmpty(value)) { 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-25 17:12:35 UTC (rev 98) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ScenarioXmlParser.java 2012-10-26 08:23:08 UTC (rev 99) @@ -24,23 +24,30 @@ * #L% */ +import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import com.google.common.collect.Multimap; +import com.google.common.collect.Multimaps; import com.google.common.collect.Sets; import fr.reseaumexico.model.Factor; +import fr.reseaumexico.model.MexicoUtil; import fr.reseaumexico.model.Scenario; import fr.reseaumexico.model.ScenarioImpl; import fr.reseaumexico.model.ValueType; +import org.apache.commons.collections.CollectionUtils; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; import java.io.IOException; import java.text.ParseException; +import java.util.Collection; 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.FACTOR_ID; +import static fr.reseaumexico.model.MexicoXmlConstant.FACTOR_NAME; import static fr.reseaumexico.model.MexicoXmlConstant.SCENARIO; import static fr.reseaumexico.model.MexicoXmlConstant.SCENARIO_FACTOR_VALUES; import static fr.reseaumexico.model.MexicoXmlConstant.SCENARIO_NAME; @@ -62,6 +69,12 @@ protected final Map<String, Factor> factors; /** + * Factors by their name (only used in {@code standalone} mode to find + * out a factor back if his id is not correct. + */ + protected final Multimap<String, Factor> factorByName; + + /** * Flag to know if parser is used standalone (says to import a scenario) or * as part of input designer parser. * @@ -79,6 +92,13 @@ this.factors = factors; this.standalone = standalone; this.unknownFactors = Lists.newArrayList(); + this.factorByName = ArrayListMultimap.create(); + if (standalone) { + + // populate the factorByName + factorByName.putAll(Multimaps.index(factors.values(), + MexicoUtil.GET_FACTOR_NAME)); + } } @Override @@ -109,16 +129,38 @@ Map<Factor, Object> factorValues = Maps.newLinkedHashMap(); while (!(testCurrentEndTag(parser, SCENARIO))) { - // get factor - String factorId = parser.getAttributeValue(null, FACTOR); + // get factor by his id + String factorId = parser.getAttributeValue(null, FACTOR_ID); + Factor factor = factors.get(factorId); if (factor == null) { if (standalone) { - // keep factor id - unknownFactors.add(factorId); - continue; + // fallback by name + String factorName = + parser.getAttributeValue(null, FACTOR_NAME); + + Collection<Factor> possibleFactors = + factorByName.get(factorName); + if (CollectionUtils.isNotEmpty(possibleFactors)) { + + // ok use the first one :( + factor = possibleFactors.iterator().next(); + } else { + + // really not found + // keep factor name + unknownFactors.add(factorName); + + // read factor value + parser.nextText(); + + // read next tag + parser.nextTag(); + continue; + } + } else { // do not accept this @@ -154,9 +196,9 @@ allFactors.removeAll(usedFactors); - for (Factor factorToAdd : allFactors) { - scenario.setFactorValue(factorToAdd, 0.d); - } +// for (Factor factorToAdd : allFactors) { +// scenario.setFactorValue(factorToAdd, 0.d); +// } } return scenario; Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/InputDesignXmlWriter.java =================================================================== --- trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/InputDesignXmlWriter.java 2012-10-25 17:12:35 UTC (rev 98) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/InputDesignXmlWriter.java 2012-10-26 08:23:08 UTC (rev 99) @@ -72,7 +72,7 @@ if (scenarios != null) { for (Scenario scenario : scenarios) { - ScenarioXmlWriter scenarioXmlWriter = new ScenarioXmlWriter(scenario); + ScenarioXmlWriter scenarioXmlWriter = new ScenarioXmlWriter(scenario, false); XmlNode scenariosXmlNode = scenarioXmlWriter.getRootElement(); rootXmlNode.add(scenariosXmlNode); Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/ScenarioXmlWriter.java =================================================================== --- trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/ScenarioXmlWriter.java 2012-10-25 17:12:35 UTC (rev 98) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/ScenarioXmlWriter.java 2012-10-26 08:23:08 UTC (rev 99) @@ -40,12 +40,21 @@ public class ScenarioXmlWriter extends MexicoXmlWriter<Scenario> { public static void write(Scenario model, File exportFile) throws IOException { - ScenarioXmlWriter writer = new ScenarioXmlWriter(model); + ScenarioXmlWriter writer = new ScenarioXmlWriter(model, true); writer.write(exportFile); } - public ScenarioXmlWriter(Scenario model) { + /** + * A flag to qualify when the writer is used only to write a single + * scenario (scenario export). + * + * @since 0.8 + */ + private final boolean standalone; + + public ScenarioXmlWriter(Scenario model, boolean standalone) { super(model); + this.standalone = standalone; } @Override @@ -60,7 +69,16 @@ Object value = entry.getValue(); XmlNode factorValueXmlNode = XmlNode.createElement( rootXmlNode, Scenario.PROPERTY_FACTOR_VALUES, String.valueOf(value)); - factorValueXmlNode.addAttribute(FACTOR, entry.getKey().getId()); + + Factor factor = entry.getKey(); + + factorValueXmlNode.addAttribute(FACTOR_ID, factor.getId()); + if (standalone) { + + // add also the name of factor (used to manage error when + // reading back file) + factorValueXmlNode.addAttribute(FACTOR_NAME, factor.getName()); + } } // features

1 0