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

r128 - tags
by echatellier＠users.forge.codelutin.com 26 Jul '13

26 Jul '13

Author: echatellier Date: 2013-07-26 16:51:13 +0200 (Fri, 26 Jul 2013) New Revision: 128 Url: http://forge.codelutin.com/projects/jmexico/repository/revisions/128 Log: Redo release Removed: tags/jmexico-0.10/

1 0

r127 - in trunk: . jmexico-editor jmexico-editor-demo jmexico-model
by echatellier＠users.forge.codelutin.com 26 Jul '13

26 Jul '13

Author: echatellier Date: 2013-07-26 16:50:35 +0200 (Fri, 26 Jul 2013) New Revision: 127 Url: http://forge.codelutin.com/projects/jmexico/repository/revisions/127 Log: Use latest mavenpom Removed: trunk/changelog.txt trunk/jmexico-editor-demo/changelog.txt trunk/jmexico-editor/changelog.txt trunk/jmexico-model/changelog.txt Modified: trunk/pom.xml Deleted: trunk/changelog.txt =================================================================== Deleted: trunk/jmexico-editor/changelog.txt =================================================================== Deleted: trunk/jmexico-editor-demo/changelog.txt =================================================================== Deleted: trunk/jmexico-model/changelog.txt =================================================================== Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-26 14:48:54 UTC (rev 126) +++ trunk/pom.xml 2013-07-26 14:50:35 UTC (rev 127) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.10</version> + <version>3.4.13</version> </parent> <groupId>fr.reseaumexico</groupId>

1 0

r126 - in trunk: . jmexico-editor jmexico-editor-demo jmexico-model
by maven-release＠users.forge.codelutin.com 26 Jul '13

26 Jul '13

Author: maven-release Date: 2013-07-26 16:48:54 +0200 (Fri, 26 Jul 2013) New Revision: 126 Url: http://forge.codelutin.com/projects/jmexico/repository/revisions/126 Log: [maven-release-plugin] rollback the release of jmexico-0.10 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 2013-07-26 14:43:31 UTC (rev 125) +++ trunk/jmexico-editor/pom.xml 2013-07-26 14:48:54 UTC (rev 126) @@ -5,7 +5,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.11-SNAPSHOT</version> + <version>0.10-SNAPSHOT</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/jmexico-editor-demo/pom.xml =================================================================== --- trunk/jmexico-editor-demo/pom.xml 2013-07-26 14:43:31 UTC (rev 125) +++ trunk/jmexico-editor-demo/pom.xml 2013-07-26 14:48:54 UTC (rev 126) @@ -5,7 +5,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.11-SNAPSHOT</version> + <version>0.10-SNAPSHOT</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/jmexico-model/pom.xml =================================================================== --- trunk/jmexico-model/pom.xml 2013-07-26 14:43:31 UTC (rev 125) +++ trunk/jmexico-model/pom.xml 2013-07-26 14:48:54 UTC (rev 126) @@ -5,7 +5,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.11-SNAPSHOT</version> + <version>0.10-SNAPSHOT</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-26 14:43:31 UTC (rev 125) +++ trunk/pom.xml 2013-07-26 14:48:54 UTC (rev 126) @@ -11,7 +11,7 @@ <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.11-SNAPSHOT</version> + <version>0.10-SNAPSHOT</version> <name>JMexico</name> <packaging>pom</packaging>

1 0

r125 - in trunk: . jmexico-editor jmexico-editor-demo jmexico-model
by maven-release＠users.forge.codelutin.com 26 Jul '13

26 Jul '13

Author: maven-release Date: 2013-07-26 16:43:31 +0200 (Fri, 26 Jul 2013) New Revision: 125 Url: http://forge.codelutin.com/projects/jmexico/repository/revisions/125 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 2013-07-26 14:43:23 UTC (rev 124) +++ trunk/jmexico-editor/pom.xml 2013-07-26 14:43:31 UTC (rev 125) @@ -5,7 +5,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.10</version> + <version>0.11-SNAPSHOT</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/jmexico-editor-demo/pom.xml =================================================================== --- trunk/jmexico-editor-demo/pom.xml 2013-07-26 14:43:23 UTC (rev 124) +++ trunk/jmexico-editor-demo/pom.xml 2013-07-26 14:43:31 UTC (rev 125) @@ -5,7 +5,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.10</version> + <version>0.11-SNAPSHOT</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/jmexico-model/pom.xml =================================================================== --- trunk/jmexico-model/pom.xml 2013-07-26 14:43:23 UTC (rev 124) +++ trunk/jmexico-model/pom.xml 2013-07-26 14:43:31 UTC (rev 125) @@ -5,7 +5,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.10</version> + <version>0.11-SNAPSHOT</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-26 14:43:23 UTC (rev 124) +++ trunk/pom.xml 2013-07-26 14:43:31 UTC (rev 125) @@ -11,7 +11,7 @@ <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.10</version> + <version>0.11-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.10 + scm:svn:http://svn.forge.codelutin.com/svn/jmexico/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/jmexico/tags/jmexico-0.10 + scm:svn:http://svn.forge.codelutin.com/svn/jmexico/trunk </developerConnection> - <url>http://forge.codelutin.com/projects/jmexico/repository/tags/jmexico-0.10</url> + <url>http://forge.codelutin.com/projects/jmexico/repository/trunk</url> </scm> <modules>

1 0

r124 - tags
by maven-release＠users.forge.codelutin.com 26 Jul '13

26 Jul '13

Author: maven-release Date: 2013-07-26 16:43:23 +0200 (Fri, 26 Jul 2013) New Revision: 124 Url: http://forge.codelutin.com/projects/jmexico/repository/revisions/124 Log: [maven-release-plugin] copy for tag jmexico-0.10 Added: tags/jmexico-0.10/

1 0

r123 - in trunk: . jmexico-editor jmexico-editor-demo jmexico-model
by maven-release＠users.forge.codelutin.com 26 Jul '13

26 Jul '13

Author: maven-release Date: 2013-07-26 16:43:15 +0200 (Fri, 26 Jul 2013) New Revision: 123 Url: http://forge.codelutin.com/projects/jmexico/repository/revisions/123 Log: [maven-release-plugin] prepare release jmexico-0.10 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 2013-05-31 10:01:56 UTC (rev 122) +++ trunk/jmexico-editor/pom.xml 2013-07-26 14:43:15 UTC (rev 123) @@ -5,7 +5,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.10-SNAPSHOT</version> + <version>0.10</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/jmexico-editor-demo/pom.xml =================================================================== --- trunk/jmexico-editor-demo/pom.xml 2013-05-31 10:01:56 UTC (rev 122) +++ trunk/jmexico-editor-demo/pom.xml 2013-07-26 14:43:15 UTC (rev 123) @@ -5,7 +5,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.10-SNAPSHOT</version> + <version>0.10</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/jmexico-model/pom.xml =================================================================== --- trunk/jmexico-model/pom.xml 2013-05-31 10:01:56 UTC (rev 122) +++ trunk/jmexico-model/pom.xml 2013-07-26 14:43:15 UTC (rev 123) @@ -5,7 +5,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.10-SNAPSHOT</version> + <version>0.10</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-05-31 10:01:56 UTC (rev 122) +++ trunk/pom.xml 2013-07-26 14:43:15 UTC (rev 123) @@ -11,7 +11,7 @@ <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.10-SNAPSHOT</version> + <version>0.10</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.10 </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/jmexico/trunk + scm:svn:http://svn.forge.codelutin.com/svn/jmexico/tags/jmexico-0.10 </developerConnection> - <url>http://forge.codelutin.com/projects/jmexico/repository/trunk</url> + <url>http://forge.codelutin.com/projects/jmexico/repository/tags/jmexico-0.10</url> </scm> <modules>

1 0

r122 - in trunk: . jmexico-editor jmexico-editor-demo jmexico-model
by echatellier＠users.forge.codelutin.com 31 May '13

31 May '13

Author: echatellier Date: 2013-05-31 12:01:56 +0200 (Fri, 31 May 2013) New Revision: 122 Url: http://forge.codelutin.com/projects/jmexico/repository/revisions/122 Log: svn:ignore Modified: trunk/ trunk/jmexico-editor-demo/ trunk/jmexico-editor/ trunk/jmexico-model/ Property changes on: trunk ___________________________________________________________________ Modified: svn:ignore - target *.ipr *.iws *.iml *.log + target *.ipr *.iws *.iml *.log .settings .project Property changes on: trunk/jmexico-editor ___________________________________________________________________ Modified: svn:ignore - target *.ipr *.iws *.iml *.log + target *.ipr *.iws *.iml *.log .classpath .project .settings Property changes on: trunk/jmexico-editor-demo ___________________________________________________________________ Modified: svn:ignore - target *.ipr *.iws *.iml *.log + target *.ipr *.iws *.iml *.log .classpath .project .settings Property changes on: trunk/jmexico-model ___________________________________________________________________ Modified: svn:ignore - target *.ipr *.iws *.iml *.log + target *.ipr *.iws *.iml *.log .classpath .project .settings

1 0

r121 - trunk/jmexico-editor/src/main/resources/i18n
by echatellier＠users.forge.codelutin.com 29 May '13

29 May '13

Author: echatellier Date: 2013-05-29 16:30:21 +0200 (Wed, 29 May 2013) New Revision: 121 Url: http://forge.codelutin.com/projects/jmexico/repository/revisions/121 Log: Fix i18n files Modified: 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/resources/i18n/jmexico-editor_en_GB.properties =================================================================== --- trunk/jmexico-editor/src/main/resources/i18n/jmexico-editor_en_GB.properties 2013-05-29 14:28:43 UTC (rev 120) +++ trunk/jmexico-editor/src/main/resources/i18n/jmexico-editor_en_GB.properties 2013-05-29 14:30:21 UTC (rev 121) @@ -5,8 +5,8 @@ jmexico.action.remove.scenario=Remove scenario jmexico.config.scenario.extension=scenario jmexico.config.scenario.extension.csv=csv +jmexico.config.scenario.extension.csv.description=JMexico scenario file (*.csv) jmexico.config.scenario.extension.description=JMexico scenario file (*.scenario) -jmexico.config.scenario.extension.csv.description=JMexico scenario file (*.csv) 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. 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 2013-05-29 14:28:43 UTC (rev 120) +++ trunk/jmexico-editor/src/main/resources/i18n/jmexico-editor_fr_FR.properties 2013-05-29 14:30:21 UTC (rev 121) @@ -5,8 +5,8 @@ jmexico.action.remove.scenario=Supprimer un scénario jmexico.config.scenario.extension=scenario jmexico.config.scenario.extension.csv=csv +jmexico.config.scenario.extension.csv.description=Scénario jmexico (*.csv) jmexico.config.scenario.extension.description=Scénario jmexico (*.scenario) -jmexico.config.scenario.extension.csv.description=Scénario jmexico (*.csv) 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.

1 0

r120 - trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor
by echatellier＠users.forge.codelutin.com 29 May '13

29 May '13

Author: echatellier Date: 2013-05-29 16:28:43 +0200 (Wed, 29 May 2013) New Revision: 120 Url: http://forge.codelutin.com/projects/jmexico/repository/revisions/120 Log: fixes #2519 : Add listener to be able to add behaviour before and after scenarios import Added: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ImportScenarioListener.java Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorHandler.java Added: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ImportScenarioListener.java =================================================================== --- trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ImportScenarioListener.java (rev 0) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ImportScenarioListener.java 2013-05-29 14:28:43 UTC (rev 120) @@ -0,0 +1,43 @@ +/* + * #%L + * JMexico :: Swing Editor + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2013 Réseau Mexico, Codelutin, Chatellier Eric + * %% + * 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% + */ + +package fr.reseaumexico.editor; + +/** + * Import scenario listener. + * + * @author echatellier + */ +public interface ImportScenarioListener { + + /** + * Called before scenario import. + */ + void beforeImportScenario(); + + /** + * Called after scenario import. + */ + void afterImportScenario(); +} Property changes on: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ImportScenarioListener.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorHandler.java =================================================================== --- trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorHandler.java 2013-05-15 12:29:06 UTC (rev 119) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorHandler.java 2013-05-29 14:28:43 UTC (rev 120) @@ -32,6 +32,7 @@ import java.io.File; import java.io.IOException; import java.util.Collection; +import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -73,6 +74,8 @@ private final InputDesignEditor ui; + protected Collection<ImportScenarioListener> importScenarioListeners = new LinkedList<ImportScenarioListener>(); + public InputDesignEditorHandler(InputDesignEditor ui) { this.ui = ui; } @@ -204,8 +207,20 @@ } } + public void addScenarioImportListener(ImportScenarioListener l) { + importScenarioListeners.add(l); + } + + public void removeScenarioImportListener(ImportScenarioListener l) { + importScenarioListeners.remove(l); + } + public void importScenario() { + for (ImportScenarioListener l : importScenarioListeners) { + l.beforeImportScenario(); + } + InputDesign inputDesign = ui.getInputDesign(); ImportScenarioModel model = new ImportScenarioModel(); @@ -234,6 +249,10 @@ importXMLScenario(factors, importFile, scenarioName); } } + + for (ImportScenarioListener l : importScenarioListeners) { + l.afterImportScenario(); + } } protected void importCSVScenario(List<Factor> factors, File importFile, String scenarioName) {

1 0

r119 - trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser
by echatellier＠users.forge.codelutin.com 15 May '13

15 May '13

Author: echatellier Date: 2013-05-15 14:29:06 +0200 (Wed, 15 May 2013) New Revision: 119 Url: http://forge.codelutin.com/projects/jmexico/repository/revisions/119 Log: refs #2426: Add option to import scenario files using xml or csv depending on file extension Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ScenarioCSVParser.java Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ScenarioCSVParser.java =================================================================== --- trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ScenarioCSVParser.java 2013-05-15 12:16:35 UTC (rev 118) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ScenarioCSVParser.java 2013-05-15 12:29:06 UTC (rev 119) @@ -84,13 +84,16 @@ CsvReader csvReader = null; try { + + // csv file doesn't contains headers, so it's not a real + // csv file csvReader = new CsvReader(Files.newReader(file, Charsets.UTF_8), ','); - csvReader.readHeaders(); Map<Factor, Object> factorValues = Maps.newLinkedHashMap(); while (csvReader.readRecord()) { - String factorName = csvReader.get("factorname"); + // factor name + String factorName = csvReader.get(0); Factor factor = factors.get(factorName); @@ -112,7 +115,7 @@ ValueType valueType = factor.getDomain().getValueType(); // factor value - String value = csvReader.get("factorvalue"); + String value = csvReader.get(1); factorValues.put(factor, MexicoUtil.getTypedValue(valueType, value)); }

1 0