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

r96 - tags
by tchemit＠users.forge.codelutin.com Oct. 21, 2012

Oct. 21, 2012

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 Oct. 21, 2012

Oct. 21, 2012

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 Oct. 21, 2012

Oct. 21, 2012

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 Oct. 21, 2012

Oct. 21, 2012

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 Oct. 15, 2012

Oct. 15, 2012

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 Oct. 11, 2012

Oct. 11, 2012

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 Oct. 7, 2012

Oct. 7, 2012

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 Oct. 7, 2012

Oct. 7, 2012

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

r88 - in trunk: jmexico-editor/src/main/java/fr/reseaumexico/editor jmexico-editor/src/main/resources/i18n jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo
by tchemit＠users.forge.codelutin.com Oct. 7, 2012

Oct. 7, 2012

Author: tchemit Date: 2012-10-07 18:24:50 +0200 (Sun, 07 Oct 2012) New Revision: 88 Url: http://forge.codelutin.com/repositories/revision/jmexico/88 Log: fixes #1576: Add import scenario action (add UI) fixes #1577: Add export scenario operation (add UI) Added: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/AbstractScenarioModel.java 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/ImportScenarioModel.java trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ImportScenarioPanel.css trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ImportScenarioPanel.jaxx Modified: trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUIHandler.java trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/CloneScenarioModel.java trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditor.css trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditor.jaxx trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorHandler.java trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorModel.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 Added: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/AbstractScenarioModel.java =================================================================== --- trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/AbstractScenarioModel.java (rev 0) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/AbstractScenarioModel.java 2012-10-07 16:24:50 UTC (rev 88) @@ -0,0 +1,71 @@ +package fr.reseaumexico.editor; + +/* + * #%L + * JMexico :: Swing Editor + * $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 fr.reseaumexico.model.Scenario; +import org.jdesktop.beans.AbstractSerializableBean; + +import java.io.File; +import java.util.Collection; + +/** + * Model toimport a scenarion into a input design. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.7 + */ +public class AbstractScenarioModel<M extends AbstractScenarioModel> extends AbstractSerializableBean { + + private static final long serialVersionUID = 1L; + + protected Collection<Scenario> scenarios; + + protected Scenario selectedScenario; + + public Collection<Scenario> getScenarios() { + return scenarios; + } + + public Scenario getSelectedScenario() { + return selectedScenario; + } + + public void setSelectedScenario(Scenario selectedScenario) { + Object oldValue = this.selectedScenario; + this.selectedScenario = selectedScenario; + firePropertyChange("selectedScenario", oldValue, selectedScenario); + } + + + public void setScenarios(Collection<Scenario> scenarios) { + this.scenarios = scenarios; + firePropertyChange("scenarios", null, scenarios); + } + + public void copyTo(M model) { + model.setScenarios(getScenarios()); + model.setSelectedScenario(getSelectedScenario()); + } +} \ No newline at end of file Property changes on: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/AbstractScenarioModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/CloneScenarioModel.java =================================================================== --- trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/CloneScenarioModel.java 2012-10-07 16:24:03 UTC (rev 87) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/CloneScenarioModel.java 2012-10-07 16:24:50 UTC (rev 88) @@ -35,48 +35,25 @@ * @author tchemit <chemit(a)codelutin.com> * @since 0.7 */ -public class CloneScenarioModel extends AbstractSerializableBean { +public class CloneScenarioModel extends AbstractScenarioModel<CloneScenarioModel> { private static final long serialVersionUID = 1L; - protected Collection<Scenario> scenarios; - - protected Scenario selectedScenario; - protected String scenarioName; - public Collection<Scenario> getScenarios() { - return scenarios; - } - - public Scenario getSelectedScenario() { - return selectedScenario; - } - public String getScenarioName() { return scenarioName; } - public void setSelectedScenario(Scenario selectedScenario) { - Object oldValue = this.selectedScenario; - this.selectedScenario = selectedScenario; - firePropertyChange("selectedScenario", oldValue, selectedScenario); - } - public void setScenarioName(String scenarioName) { Object oldValue = this.scenarioName; this.scenarioName = scenarioName; firePropertyChange("scenarioName", oldValue, scenarioName); } - public void setScenarios(Collection<Scenario> scenarios) { - this.scenarios = scenarios; - firePropertyChange("scenarios", null, scenarios); - } - + @Override public void copyTo(CloneScenarioModel model) { + super.copyTo(model); model.setScenarioName(getScenarioName()); - model.setScenarios(getScenarios()); - model.setSelectedScenario(getSelectedScenario()); } } Added: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ExportScenarioModel.java =================================================================== --- trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ExportScenarioModel.java (rev 0) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ExportScenarioModel.java 2012-10-07 16:24:50 UTC (rev 88) @@ -0,0 +1,57 @@ +package fr.reseaumexico.editor; + +/* + * #%L + * JMexico :: Swing Editor + * $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 java.io.File; + +/** + * Model to export a scenario. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.7 + */ +public class ExportScenarioModel extends AbstractScenarioModel<ExportScenarioModel> { + + private static final long serialVersionUID = 1L; + + protected File exportFile; + + public File getExportFile() { + return exportFile; + } + + public void setExportFile(File exportFile) { + Object oldValue = this.exportFile; + this.exportFile = exportFile; + firePropertyChange("exportFile", oldValue, exportFile); + } + + + @Override + public void copyTo(ExportScenarioModel model) { + super.copyTo(model); + model.setExportFile(getExportFile()); + } +} \ No newline at end of file Property changes on: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ExportScenarioModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ExportScenarioPanel.css =================================================================== --- trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ExportScenarioPanel.css (rev 0) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ExportScenarioPanel.css 2012-10-07 16:24:50 UTC (rev 88) @@ -0,0 +1,38 @@ +/* + * #%L + * JMexico :: Swing Editor + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 Réseau Mexico, Codelutin, Tony Chemit + * %% + * 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% + */ +#exportFileLabel { + text:"jmexico.label.scenario.export.file"; +} + +#exportFileEditor { + selectedFile:{model.getExportFile()}; +} + +#selectedScenarioLabel { + text:"jmexico.label.scenario.export.selected"; +} + +#selectedScenarioEditor { + selectedItem:{model.getSelectedScenario()}; +} Property changes on: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ExportScenarioPanel.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ExportScenarioPanel.jaxx =================================================================== --- trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ExportScenarioPanel.jaxx (rev 0) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ExportScenarioPanel.jaxx 2012-10-07 16:24:50 UTC (rev 88) @@ -0,0 +1,63 @@ + +<Table id='panel' layout='{new BorderLayout()}'> + + <import> + jaxx.runtime.swing.editor.FileEditor + </import> + + <ExportScenarioModel id='model'/> + + <script> + <![CDATA[ +public void init(ExportScenarioModel model) { + model.copyTo(this.model); + + // init selected scenario + SwingUtil.fillComboBox(selectedScenarioEditor, + model.getScenarios(), + model.getSelectedScenario()); + } + ]]> + </script> + + <row fill='both'> + <cell> + <JLabel id='selectedScenarioLabel'/> + </cell> + <cell> + <JComboBox id='selectedScenarioEditor' + onItemStateChanged='InputDesignEditorHandler.onSelectedScenarioChanged(model, event)'/> + </cell> + </row> + <row fill='both'> + <cell> + <JLabel id='exportFileLabel'/> + </cell> + <cell> + <FileEditor id='exportFileEditor' + onActionPerformed='model.setExportFile(((FileEditor) event.getSource()).getSelectedFile())'/> + </cell> + </row> +</Table> Property changes on: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ExportScenarioPanel.jaxx ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ImportScenarioModel.java =================================================================== --- trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ImportScenarioModel.java (rev 0) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ImportScenarioModel.java 2012-10-07 16:24:50 UTC (rev 88) @@ -0,0 +1,69 @@ +package fr.reseaumexico.editor; + +/* + * #%L + * JMexico :: Swing Editor + * $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 java.io.File; + +/** + * Model toimport a scenarion into a input design. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.7 + */ +public class ImportScenarioModel extends AbstractScenarioModel<ImportScenarioModel> { + + private static final long serialVersionUID = 1L; + + protected File importFile; + + protected String scenarioName; + + public String getScenarioName() { + return scenarioName; + } + + public File getImportFile() { + return importFile; + } + + public void setScenarioName(String scenarioName) { + Object oldValue = this.scenarioName; + this.scenarioName = scenarioName; + firePropertyChange("scenarioName", oldValue, scenarioName); + } + + public void setImportFile(File importFile) { + Object oldValue = this.importFile; + this.importFile = importFile; + firePropertyChange("importFile", oldValue, importFile); + } + + @Override + public void copyTo(ImportScenarioModel model) { + super.copyTo(model); + model.setImportFile(getImportFile()); + model.setScenarioName(getScenarioName()); + } +} \ No newline at end of file Property changes on: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ImportScenarioModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ImportScenarioPanel.css =================================================================== --- trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ImportScenarioPanel.css (rev 0) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ImportScenarioPanel.css 2012-10-07 16:24:50 UTC (rev 88) @@ -0,0 +1,38 @@ +/* + * #%L + * JMexico :: Swing Editor + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 Réseau Mexico, Codelutin, Tony Chemit + * %% + * 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% + */ +#scenarioNameLabel { + text:"jmexico.label.scenario.import.name"; +} + +#scenarioNameEditor { + text:{model.getScenarioName()}; +} + +#importFileLabel { + text:"jmexico.label.scenario.import.file"; +} + +#importFileEditor { + selectedFile:{model.getImportFile()}; +} Property changes on: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ImportScenarioPanel.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ImportScenarioPanel.jaxx =================================================================== --- trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ImportScenarioPanel.jaxx (rev 0) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ImportScenarioPanel.jaxx 2012-10-07 16:24:50 UTC (rev 88) @@ -0,0 +1,57 @@ + +<Table id='panel' layout='{new BorderLayout()}'> + + <import> + jaxx.runtime.swing.editor.FileEditor + </import> + + <ImportScenarioModel id='model'/> + + <script> + <![CDATA[ +public void init(ImportScenarioModel model) { + model.copyTo(this.model); +} + ]]> + </script> + <row fill='both'> + <cell> + <JLabel id='scenarioNameLabel'/> + </cell> + <cell> + <JTextField id='scenarioNameEditor' + onKeyReleased='model.setScenarioName(((JTextField)event.getSource()).getText())'/> + </cell> + </row> + <row fill='both'> + <cell> + <JLabel id='importFileLabel'/> + </cell> + <cell> + <FileEditor id='importFileEditor' + onActionPerformed='model.setImportFile(((FileEditor) event.getSource()).getSelectedFile())'/> + </cell> + </row> +</Table> Property changes on: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ImportScenarioPanel.jaxx ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditor.css =================================================================== --- trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditor.css 2012-10-07 16:24:03 UTC (rev 87) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditor.css 2012-10-07 16:24:50 UTC (rev 88) @@ -42,6 +42,16 @@ enabled:{model.isScenarioExists()}; } +#importScenarioButton { + text:"jmexico.action.import.scenario"; + enabled:{model.getInputDesign() != null}; +} + +#exportScenarioButton { + text:"jmexico.action.export.scenario"; + enabled:{model.isScenarioExists()}; +} + #selectedScenarioEditor { selectedItem:{model.getSelectedScenario()}; } \ No newline at end of file Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditor.jaxx =================================================================== --- trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditor.jaxx 2012-10-07 16:24:03 UTC (rev 87) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditor.jaxx 2012-10-07 16:24:50 UTC (rev 88) @@ -61,6 +61,10 @@ onActionPerformed='getHandler().removeScenario()'/> <JButton id='cloneScenarioButton' constraints='BorderLayout.EAST' onActionPerformed='getHandler().cloneScenario()'/> + <JButton id='importScenarioButton' constraints='BorderLayout.EAST' + onActionPerformed='getHandler().importScenario()'/> + <JButton id='exportScenarioButton' constraints='BorderLayout.EAST' + onActionPerformed='getHandler().exportScenario()'/> </JPanel> </JPanel> 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:03 UTC (rev 87) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorHandler.java 2012-10-07 16:24:50 UTC (rev 88) @@ -24,6 +24,7 @@ */ package fr.reseaumexico.editor; +import com.google.common.base.Function; import com.google.common.collect.Maps; import fr.reseaumexico.editor.factorValue.FactorValueCellEditor; import fr.reseaumexico.editor.factorValue.FactorValueCellRenderer; @@ -32,15 +33,24 @@ import fr.reseaumexico.model.InputDesign; import fr.reseaumexico.model.Scenario; import fr.reseaumexico.model.ScenarioImpl; +import fr.reseaumexico.model.parser.ScenarioXmlParser; +import fr.reseaumexico.model.writer.ScenarioXmlWriter; +import jaxx.runtime.swing.editor.FileEditor; import jaxx.runtime.swing.renderer.DecoratorProviderTableCellRenderer; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jdesktop.swingx.JXTable; import javax.swing.JOptionPane; import java.awt.event.ItemEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; +import java.io.File; +import java.io.IOException; import java.util.Collection; +import java.util.List; import java.util.Map; import static org.nuiton.i18n.I18n._; @@ -52,6 +62,10 @@ */ public class InputDesignEditorHandler { + /** Logger. */ + private static final Log log = + LogFactory.getLog(InputDesignEditorHandler.class); + private final InputDesignEditor ui; public InputDesignEditorHandler(InputDesignEditor ui) { @@ -70,14 +84,18 @@ } } }); + + JXTable table = ui.getInputDesignTable(); + // table renderer - // TODO sletellier 20111221 : do on time for all, put in context ? - MexicoDecoratorProvider mexicoDecoratorProvider = new MexicoDecoratorProvider(); - ui.inputDesignTable.setDefaultRenderer(Factor.class, new DecoratorProviderTableCellRenderer(mexicoDecoratorProvider)); - ui.inputDesignTable.setDefaultRenderer(Object.class, new FactorValueCellRenderer(ui)); + table.setDefaultRenderer( + Factor.class, + new DecoratorProviderTableCellRenderer( + new MexicoDecoratorProvider())); + table.setDefaultRenderer(Object.class, new FactorValueCellRenderer(ui)); // cell editor - ui.inputDesignTable.setDefaultEditor(Object.class, new FactorValueCellEditor(ui)); + table.setDefaultEditor(Object.class, new FactorValueCellEditor(ui)); } public void addScenario() { @@ -181,7 +199,79 @@ } } - public static void onSelectedScenarioChanged(CloneScenarioModel model, + public void importScenario() { + + InputDesign inputDesign = ui.getInputDesign(); + + ImportScenarioModel model = new ImportScenarioModel(); + model.setScenarios(inputDesign.getScenario()); + + boolean accept = showImportScenarioUI(model); + + if (accept) { + + // import scenario + + File importFile = model.getImportFile(); + + String scenarioName = model.getScenarioName(); + + if (log.isInfoEnabled()) { + log.info("Import scenario '" + scenarioName + "' from " + importFile); + } + List<Factor> factors = ui.getModel().getFactors(); + ScenarioXmlParser parser = new ScenarioXmlParser(Maps.uniqueIndex(factors, new Function<Factor, String>() { + @Override + public String apply(Factor input) { + return input.getId(); + } + })); + try { + Scenario scenario = parser.getModel(importFile); + + scenario.setName(scenarioName); + scenario.setOrderNumber(getMaxOrder()); + inputDesign.addScenario(scenario); + + } catch (Exception e) { + if (log.isErrorEnabled()) { + log.error("Could not import scenario", e); + } + } + } + } + + public void exportScenario() { + + InputDesign inputDesign = ui.getInputDesign(); + + ExportScenarioModel model = new ExportScenarioModel(); + model.setScenarios(inputDesign.getScenario()); + + boolean accept = showExportScenarioUI(model); + + if (accept) { + + // export scenario + + File exportFile = model.getExportFile(); + Scenario scenario = model.getSelectedScenario(); + + if (log.isInfoEnabled()) { + log.info("Export scenario '" + scenario.getName() + + "' to file " + exportFile); + } + try { + ScenarioXmlWriter.write(scenario, exportFile); + } catch (IOException e) { + if (log.isErrorEnabled()) { + log.error("Could not export scenario to " + exportFile, e); + } + } + } + } + + public static void onSelectedScenarioChanged(AbstractScenarioModel<?> model, ItemEvent event) { if (event.getStateChange() == ItemEvent.SELECTED) { @@ -246,7 +336,6 @@ } else { valid = isScenarioNameAvailable(selectedName); } - } doIt = valid || showCloneScenarioUI(model); @@ -255,6 +344,142 @@ return doIt; } + protected boolean showExportScenarioUI(ExportScenarioModel model) { + + // show ui + + ExportScenarioPanel panel = new ExportScenarioPanel(); + panel.init(model); + + FileEditor fileEditor = panel.getExportFileEditor(); + + fileEditor.setAcceptAllFileFilterUsed(false); + fileEditor.setExts(_("jmexico.config.scenario.extension")); + fileEditor.setExtsDescription( + _("jmexico.config.scenario.extension.description")); + + int response = JOptionPane.showConfirmDialog( + ui, + panel, + _("jmexico.title.scenario.export"), + JOptionPane.OK_CANCEL_OPTION, + JOptionPane.QUESTION_MESSAGE); + + boolean doIt = response == JOptionPane.OK_OPTION; + + if (doIt) { + + // user ask to perform operation + + //copy back model + panel.getModel().copyTo(model); + + // validate model + boolean valid = true; + + Scenario selectedScenario = model.getSelectedScenario(); + if (selectedScenario == null) { + + // no scenario selected + JOptionPane.showMessageDialog( + ui, + _("jmexico.error.scenario.not.selected"), + _("jmexico.title.error"), + JOptionPane.ERROR_MESSAGE); + + valid = false; + } + + if (valid) { + + // check export file is filled + File exportFile = model.getExportFile(); + + if (exportFile == null) { + valid = false; + JOptionPane.showMessageDialog( + ui, + _("jmexico.error.scenario.exportFile.required"), + _("jmexico.title.error"), + JOptionPane.ERROR_MESSAGE); + + } + } + doIt = valid || showExportScenarioUI(model); + } + return doIt; + } + + protected boolean showImportScenarioUI(ImportScenarioModel model) { + + // show ui + + ImportScenarioPanel panel = new ImportScenarioPanel(); + panel.init(model); + + FileEditor fileEditor = panel.getImportFileEditor(); + + fileEditor.setAcceptAllFileFilterUsed(false); + fileEditor.setExts(_("jmexico.config.scenario.extension")); + fileEditor.setExtsDescription( + _("jmexico.config.scenario.extension.description")); + + + int response = JOptionPane.showConfirmDialog( + ui, + panel, + _("jmexico.title.scenario.import"), + JOptionPane.OK_CANCEL_OPTION, + JOptionPane.QUESTION_MESSAGE); + + boolean doIt = response == JOptionPane.OK_OPTION; + + if (doIt) { + + // user ask to perform operation + + //copy back model + panel.getModel().copyTo(model); + + // validate model + boolean valid = true; + + + // check import file filled + File importFile = model.getImportFile(); + + if (importFile == null) { + valid = false; + JOptionPane.showMessageDialog( + ui, + _("jmexico.error.scenario.importFile.required"), + _("jmexico.title.error"), + JOptionPane.ERROR_MESSAGE); + } + + if (valid) { + + // check scenario name is not used + String selectedName = model.getScenarioName(); + + if (StringUtils.isBlank(selectedName)) { + + valid = false; + JOptionPane.showMessageDialog( + ui, + _("jmexico.error.scenario.name.required"), + _("jmexico.title.error"), + JOptionPane.ERROR_MESSAGE); + + } else { + valid = isScenarioNameAvailable(selectedName); + } + } + doIt = valid || showImportScenarioUI(model); + } + return doIt; + } + protected int getMaxOrder() { int maxOrder = 0; Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorModel.java =================================================================== --- trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorModel.java 2012-10-07 16:24:03 UTC (rev 87) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorModel.java 2012-10-07 16:24:50 UTC (rev 88) @@ -81,6 +81,10 @@ return tableModel; } + public List<Factor> getFactors() { + return factors; + } + public void setInputDesign(InputDesign inputDesign) { InputDesign oldValue = this.inputDesign; 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:03 UTC (rev 87) +++ trunk/jmexico-editor/src/main/resources/i18n/jmexico-editor_en_GB.properties 2012-10-07 16:24:50 UTC (rev 88) @@ -1,15 +1,27 @@ jmexico.action.add.scenario=Add scenario jmexico.action.clone.scenario=Clone scenario +jmexico.action.export.scenario=Export scenario +jmexico.action.import.scenario=Import scenario jmexico.action.remove.scenario=Remove scenario -jmexico.error.scenario.name.required=Error\: Name of scenario is mandatory +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.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. jmexico.error.scenario.not.selected=Error\: No scenario selected. jmexico.factor.name=Factor -jmexico.label.scenario.add.name=Name of scenario to add \: +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.selected=Scenario to export +jmexico.label.scenario.import.file=Import file +jmexico.label.scenario.import.name=Name of new scenario jmexico.label.scenario.remove.selected=Scenario to delete jmexico.title.error=Error 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 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:03 UTC (rev 87) +++ trunk/jmexico-editor/src/main/resources/i18n/jmexico-editor_fr_FR.properties 2012-10-07 16:24:50 UTC (rev 88) @@ -1,6 +1,12 @@ jmexico.action.add.scenario=Ajouter un scénario jmexico.action.clone.scenario=Dupliquer un scénario +jmexico.action.export.scenario=Exporter un scénario +jmexico.action.import.scenario=Importer un scénario 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.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é. @@ -8,8 +14,14 @@ 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.remove.selected=Selection du scénario à supprimer +jmexico.label.scenario.export.file=Fichier d'export +jmexico.label.scenario.export.selected=Sélection du scénarion à 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.title.error=Erreur 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 Modified: trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUIHandler.java =================================================================== --- trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUIHandler.java 2012-10-07 16:24:03 UTC (rev 87) +++ trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUIHandler.java 2012-10-07 16:24:50 UTC (rev 88) @@ -125,11 +125,10 @@ // save modified model try { - InputDesignXmlWriter writer = new InputDesignXmlWriter(selectedFile, ui.getInputDesign()); + InputDesignXmlWriter writer = new InputDesignXmlWriter(ui.getInputDesign()); try { - writer.write(); + writer.write(selectedFile); } finally { - writer.close(); ui.getModel().setOptionChanged(false); } } catch (IOException eee) { @@ -139,21 +138,16 @@ } protected InputDesign readInputDesignFile(File selectedFile) { - InputDesign inputDesignModel = null; + InputDesign result = null; try { - // parse inputDesign - InputDesignParser inputDesignParser = new InputDesignParser(selectedFile); - try { - inputDesignModel = inputDesignParser.getModel(); - } finally { - inputDesignParser.close(); - } + InputDesignParser parser = new InputDesignParser(); + result = parser.getModel(selectedFile); } catch (Exception eee) { log.error("Failed to read inputDesign file '" + selectedFile.getName() + "'", eee); ErrorDialogUI.showError(eee); } - return inputDesignModel; + return result; } }

1 0

r87 - trunk
by tchemit＠users.forge.codelutin.com Oct. 7, 2012

Oct. 7, 2012

Author: tchemit Date: 2012-10-07 18:24:03 +0200 (Sun, 07 Oct 2012) New Revision: 87 Url: http://forge.codelutin.com/repositories/revision/jmexico/87 Log: refs #1572: Upgrade some librairies and plugins (jaxx ast snapshot) Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-07 16:22:58 UTC (rev 86) +++ trunk/pom.xml 2012-10-07 16:24:03 UTC (rev 87) @@ -80,7 +80,7 @@ <nuitonI18nVersion>2.5</nuitonI18nVersion> <nuitonUtilsVersion>2.6.3</nuitonUtilsVersion> <eugenePluginVersion>2.5</eugenePluginVersion> - <jaxxVersion>2.5.5</jaxxVersion> + <jaxxVersion>2.5.6-SNAPSHOT</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> <license.organizationName>Réseau Mexico, Codelutin</license.organizationName>

1 0