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

r58 - in trunk: . jmexico-editor jmexico-editor-demo jmexico-model
by sletellier＠users.forge.codelutin.com 29 Mar '12

29 Mar '12

Author: sletellier Date: 2012-03-29 17:37:19 +0200 (Thu, 29 Mar 2012) New Revision: 58 Url: http://forge.codelutin.com/repositories/revision/jmexico/58 Log: [maven-release-plugin] rollback the release of jmexico-0.4 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-03-29 15:28:39 UTC (rev 57) +++ trunk/jmexico-editor/pom.xml 2012-03-29 15:37:19 UTC (rev 58) @@ -10,7 +10,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.4-SNAPSHOT</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/jmexico-editor-demo/pom.xml =================================================================== --- trunk/jmexico-editor-demo/pom.xml 2012-03-29 15:28:39 UTC (rev 57) +++ trunk/jmexico-editor-demo/pom.xml 2012-03-29 15:37:19 UTC (rev 58) @@ -10,7 +10,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.4-SNAPSHOT</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/jmexico-model/pom.xml =================================================================== --- trunk/jmexico-model/pom.xml 2012-03-29 15:28:39 UTC (rev 57) +++ trunk/jmexico-model/pom.xml 2012-03-29 15:37:19 UTC (rev 58) @@ -10,7 +10,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.4-SNAPSHOT</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-29 15:28:39 UTC (rev 57) +++ trunk/pom.xml 2012-03-29 15:37:19 UTC (rev 58) @@ -16,7 +16,7 @@ <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.4-SNAPSHOT</version> <modules> <module>jmexico-model</module>

1 0

r57 - in trunk: . jmexico-editor jmexico-editor-demo jmexico-model
by sletellier＠users.forge.codelutin.com 29 Mar '12

29 Mar '12

Author: sletellier Date: 2012-03-29 17:28:39 +0200 (Thu, 29 Mar 2012) New Revision: 57 Url: http://forge.codelutin.com/repositories/revision/jmexico/57 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-03-29 15:28:31 UTC (rev 56) +++ trunk/jmexico-editor/pom.xml 2012-03-29 15:28:39 UTC (rev 57) @@ -10,7 +10,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.4</version> + <version>0.5-SNAPSHOT</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/jmexico-editor-demo/pom.xml =================================================================== --- trunk/jmexico-editor-demo/pom.xml 2012-03-29 15:28:31 UTC (rev 56) +++ trunk/jmexico-editor-demo/pom.xml 2012-03-29 15:28:39 UTC (rev 57) @@ -10,7 +10,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.4</version> + <version>0.5-SNAPSHOT</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/jmexico-model/pom.xml =================================================================== --- trunk/jmexico-model/pom.xml 2012-03-29 15:28:31 UTC (rev 56) +++ trunk/jmexico-model/pom.xml 2012-03-29 15:28:39 UTC (rev 57) @@ -10,7 +10,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.4</version> + <version>0.5-SNAPSHOT</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-29 15:28:31 UTC (rev 56) +++ trunk/pom.xml 2012-03-29 15:28:39 UTC (rev 57) @@ -16,7 +16,7 @@ <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.4</version> + <version>0.5-SNAPSHOT</version> <modules> <module>jmexico-model</module> @@ -181,11 +181,11 @@  <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/jmexico/tags/jmexico-0.4</connection> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/jmexico/trunk</connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/jmexico/tags/jmexico-0.4 + scm:svn:http://svn.forge.codelutin.com/svn/jmexico/trunk </developerConnection> - <url>http://forge.codelutin.com/repositories/browse/jmexico/tags/jmexico-0.4</url> + <url>http://forge.codelutin.com/repositories/browse/jmexico/trunk</url> </scm> <distributionManagement>

1 0

r56 - tags
by sletellier＠users.forge.codelutin.com 29 Mar '12

29 Mar '12

Author: sletellier Date: 2012-03-29 17:28:31 +0200 (Thu, 29 Mar 2012) New Revision: 56 Url: http://forge.codelutin.com/repositories/revision/jmexico/56 Log: [maven-release-plugin] copy for tag jmexico-0.4 Added: tags/jmexico-0.4/

1 0

r55 - in trunk: . jmexico-editor jmexico-editor-demo jmexico-model
by sletellier＠users.forge.codelutin.com 29 Mar '12

29 Mar '12

Author: sletellier Date: 2012-03-29 17:28:22 +0200 (Thu, 29 Mar 2012) New Revision: 55 Url: http://forge.codelutin.com/repositories/revision/jmexico/55 Log: [maven-release-plugin] prepare release jmexico-0.4 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-03-29 09:28:57 UTC (rev 54) +++ trunk/jmexico-editor/pom.xml 2012-03-29 15:28:22 UTC (rev 55) @@ -10,7 +10,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.4-SNAPSHOT</version> + <version>0.4</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/jmexico-editor-demo/pom.xml =================================================================== --- trunk/jmexico-editor-demo/pom.xml 2012-03-29 09:28:57 UTC (rev 54) +++ trunk/jmexico-editor-demo/pom.xml 2012-03-29 15:28:22 UTC (rev 55) @@ -10,7 +10,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.4-SNAPSHOT</version> + <version>0.4</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/jmexico-model/pom.xml =================================================================== --- trunk/jmexico-model/pom.xml 2012-03-29 09:28:57 UTC (rev 54) +++ trunk/jmexico-model/pom.xml 2012-03-29 15:28:22 UTC (rev 55) @@ -10,7 +10,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.4-SNAPSHOT</version> + <version>0.4</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-29 09:28:57 UTC (rev 54) +++ trunk/pom.xml 2012-03-29 15:28:22 UTC (rev 55) @@ -16,7 +16,7 @@ <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.4-SNAPSHOT</version> + <version>0.4</version> <modules> <module>jmexico-model</module> @@ -181,11 +181,11 @@  <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/jmexico/trunk</connection> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/jmexico/tags/jmexico-0.4</connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/jmexico/trunk + scm:svn:http://svn.forge.codelutin.com/svn/jmexico/tags/jmexico-0.4 </developerConnection> - <url>http://forge.codelutin.com/repositories/browse/jmexico/trunk</url> + <url>http://forge.codelutin.com/repositories/browse/jmexico/tags/jmexico-0.4</url> </scm> <distributionManagement>

1 0

r54 - in trunk: jmexico-editor/src/main/java/fr/reseaumexico/editor jmexico-model/src/main/java/fr/reseaumexico/model/writer
by sletellier＠users.forge.codelutin.com 29 Mar '12

29 Mar '12

Author: sletellier Date: 2012-03-29 11:28:57 +0200 (Thu, 29 Mar 2012) New Revision: 54 Url: http://forge.codelutin.com/repositories/revision/jmexico/54 Log: - fixes #1043 : Enlarge rows in table - fixes #1042 : NPE when no scenario are in model Removed: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ui/ Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditor.jaxx trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/InputDesignXmlWriter.java Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditor.jaxx =================================================================== --- trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditor.jaxx 2012-03-23 10:45:29 UTC (rev 53) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditor.jaxx 2012-03-29 09:28:57 UTC (rev 54) @@ -68,7 +68,7 @@ </script> <JScrollPane constraints='BorderLayout.CENTER'> - <JTable id='inputDesignTable' model='{getModel()}'/> + <JTable id='inputDesignTable' model='{getModel()}' rowHeight='20'/> </JScrollPane> <JPanel id='factorActionPanel' constraints='BorderLayout.SOUTH'> 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-03-23 10:45:29 UTC (rev 53) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/InputDesignXmlWriter.java 2012-03-29 09:28:57 UTC (rev 54) @@ -30,6 +30,7 @@ import java.io.File; import java.io.IOException; +import java.util.Collection; import java.util.Date; import java.util.Map; @@ -70,21 +71,24 @@ protected void composeScenarios(XmlNode rootXmlNode) { // scenarios - for (Scenario scenario : model.getScenario()) { - XmlNode scenariosXmlNode = XmlNode.createElement(rootXmlNode, SCENARIO); - addParameter(scenariosXmlNode, SCENARIO_NAME, scenario.getName()); - addParameter(scenariosXmlNode, SCENARIO_ORDER_NUMBER, scenario.getOrderNumber()); + Collection<Scenario> scenarios = model.getScenario(); + if (scenarios != null) { + for (Scenario scenario : scenarios) { + XmlNode scenariosXmlNode = XmlNode.createElement(rootXmlNode, SCENARIO); + addParameter(scenariosXmlNode, SCENARIO_NAME, scenario.getName()); + addParameter(scenariosXmlNode, SCENARIO_ORDER_NUMBER, scenario.getOrderNumber()); - // factor values - Map<Factor, Object> factorValues = scenario.getFactorValues(); - for (Map.Entry<Factor, Object> entry : factorValues.entrySet()) { - Object value = entry.getValue(); - XmlNode factorValueXmlNode = XmlNode.createElement(scenariosXmlNode, SCENARIO_FACTOR_VALUES, String.valueOf(value)); - factorValueXmlNode.addAttribute(FACTOR, entry.getKey().getId()); + // factor values + Map<Factor, Object> factorValues = scenario.getFactorValues(); + for (Map.Entry<Factor, Object> entry : factorValues.entrySet()) { + Object value = entry.getValue(); + XmlNode factorValueXmlNode = XmlNode.createElement(scenariosXmlNode, SCENARIO_FACTOR_VALUES, String.valueOf(value)); + factorValueXmlNode.addAttribute(FACTOR, entry.getKey().getId()); + } + + // features + addAllFeature(scenariosXmlNode, scenario.getFeature()); } - - // features - addAllFeature(scenariosXmlNode, scenario.getFeature()); } } }

1 0

r53 - in trunk: . jmexico-editor-demo
by sletellier＠users.forge.codelutin.com 23 Mar '12

23 Mar '12

Author: sletellier Date: 2012-03-23 11:45:29 +0100 (Fri, 23 Mar 2012) New Revision: 53 Url: http://forge.codelutin.com/repositories/revision/jmexico/53 Log: Clean poms Modified: trunk/jmexico-editor-demo/pom.xml trunk/pom.xml Modified: trunk/jmexico-editor-demo/pom.xml =================================================================== --- trunk/jmexico-editor-demo/pom.xml 2012-03-23 10:36:59 UTC (rev 52) +++ trunk/jmexico-editor-demo/pom.xml 2012-03-23 10:45:29 UTC (rev 53) @@ -215,6 +215,7 @@ <plugin> <groupId>org.nuiton</groupId> <artifactId>maven-helper-plugin</artifactId> + <version>1.3</version> <executions> <execution> <id>get-keystore</id> @@ -235,7 +236,7 @@  <plugin> - <groupId>org.codehaus.mojo.webstart</groupId> + <groupId>org.codehaus.mojo</groupId> <artifactId>webstart-maven-plugin</artifactId> <executions> <execution> @@ -307,4 +308,4 @@ </profile> </profiles> -</project> \ No newline at end of file +</project> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-23 10:36:59 UTC (rev 52) +++ trunk/pom.xml 2012-03-23 10:45:29 UTC (rev 53) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.1.1</version> + <version>3.2</version> </parent> <groupId>fr.reseaumexico</groupId> @@ -114,12 +114,6 @@ <version>${jaxxVersion}</version> </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>11.0.1</version> - </dependency> -  <dependency> <groupId>xpp3</groupId> @@ -135,17 +129,6 @@ <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - <version>3.1</version> - </dependency> - - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1.1</version> - </dependency> </dependencies> </dependencyManagement>

1 0

r52 - trunk/jmexico-model/src/main/xmi
by sletellier＠users.forge.codelutin.com 23 Mar '12

23 Mar '12

Author: sletellier Date: 2012-03-23 11:36:59 +0100 (Fri, 23 Mar 2012) New Revision: 52 Url: http://forge.codelutin.com/repositories/revision/jmexico/52 Log: Add OTHER feature type Modified: trunk/jmexico-model/src/main/xmi/mexico.zargo Modified: trunk/jmexico-model/src/main/xmi/mexico.zargo =================================================================== (Binary files differ)

1 0

r51 - trunk
by tchemit＠users.forge.codelutin.com 29 Feb '12

29 Feb '12

Author: tchemit Date: 2012-02-29 13:37:12 +0100 (Wed, 29 Feb 2012) New Revision: 51 Url: http://forge.codelutin.com/repositories/revision/jmexico/51 Log: updates to mavenpom 3.1.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-02-10 16:53:47 UTC (rev 50) +++ trunk/pom.xml 2012-02-29 12:37:12 UTC (rev 51) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.1</version> + <version>3.1.1</version> </parent> <groupId>fr.reseaumexico</groupId>

1 0

r50 - in trunk: . jmexico-editor jmexico-editor-demo jmexico-model
by sletellier＠users.forge.codelutin.com 10 Feb '12

10 Feb '12

Author: sletellier Date: 2012-02-10 17:53:47 +0100 (Fri, 10 Feb 2012) New Revision: 50 Url: http://forge.codelutin.com/repositories/revision/jmexico/50 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-02-10 16:53:45 UTC (rev 49) +++ trunk/jmexico-editor/pom.xml 2012-02-10 16:53:47 UTC (rev 50) @@ -10,7 +10,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.3</version> + <version>0.4-SNAPSHOT</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/jmexico-editor-demo/pom.xml =================================================================== --- trunk/jmexico-editor-demo/pom.xml 2012-02-10 16:53:45 UTC (rev 49) +++ trunk/jmexico-editor-demo/pom.xml 2012-02-10 16:53:47 UTC (rev 50) @@ -10,7 +10,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.3</version> + <version>0.4-SNAPSHOT</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/jmexico-model/pom.xml =================================================================== --- trunk/jmexico-model/pom.xml 2012-02-10 16:53:45 UTC (rev 49) +++ trunk/jmexico-model/pom.xml 2012-02-10 16:53:47 UTC (rev 50) @@ -10,7 +10,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.3</version> + <version>0.4-SNAPSHOT</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-02-10 16:53:45 UTC (rev 49) +++ trunk/pom.xml 2012-02-10 16:53:47 UTC (rev 50) @@ -16,7 +16,7 @@ <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.3</version> + <version>0.4-SNAPSHOT</version> <modules> <module>jmexico-model</module> @@ -198,11 +198,11 @@  <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/jmexico/tags/jmexico-0.3</connection> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/jmexico/trunk</connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/jmexico/tags/jmexico-0.3 + scm:svn:http://svn.forge.codelutin.com/svn/jmexico/trunk </developerConnection> - <url>http://forge.codelutin.com/repositories/browse/jmexico/tags/jmexico-0.3</url> + <url>http://forge.codelutin.com/repositories/browse/jmexico/trunk</url> </scm> <distributionManagement>

1 0

r49 - tags
by sletellier＠users.forge.codelutin.com 10 Feb '12

10 Feb '12

Author: sletellier Date: 2012-02-10 17:53:45 +0100 (Fri, 10 Feb 2012) New Revision: 49 Url: http://forge.codelutin.com/repositories/revision/jmexico/49 Log: [maven-release-plugin] copy for tag jmexico-0.3 Added: tags/jmexico-0.3/

1 0