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

r78 - trunk
by tchemit＠users.forge.codelutin.com 30 Aug '12

30 Aug '12

Author: tchemit Date: 2012-08-30 16:46:50 +0200 (Thu, 30 Aug 2012) New Revision: 78 Url: http://forge.codelutin.com/repositories/revision/jmexico/78 Log: Update mavenpom4redmine to 3.3.7. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-07-09 15:42:05 UTC (rev 77) +++ trunk/pom.xml 2012-08-30 14:46:50 UTC (rev 78) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.3.4</version> + <version>3.3.7</version> </parent> <groupId>fr.reseaumexico</groupId>

1 0

r77 - in trunk: . jmexico-editor jmexico-editor-demo jmexico-model
by maven-release＠users.forge.codelutin.com 09 Jul '12

09 Jul '12

Author: maven-release Date: 2012-07-09 17:42:05 +0200 (Mon, 09 Jul 2012) New Revision: 77 Url: http://forge.codelutin.com/repositories/revision/jmexico/77 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-07-09 15:41:58 UTC (rev 76) +++ trunk/jmexico-editor/pom.xml 2012-07-09 15:42:05 UTC (rev 77) @@ -10,7 +10,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.6</version> + <version>0.7-SNAPSHOT</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/jmexico-editor-demo/pom.xml =================================================================== --- trunk/jmexico-editor-demo/pom.xml 2012-07-09 15:41:58 UTC (rev 76) +++ trunk/jmexico-editor-demo/pom.xml 2012-07-09 15:42:05 UTC (rev 77) @@ -10,7 +10,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.6</version> + <version>0.7-SNAPSHOT</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/jmexico-model/pom.xml =================================================================== --- trunk/jmexico-model/pom.xml 2012-07-09 15:41:58 UTC (rev 76) +++ trunk/jmexico-model/pom.xml 2012-07-09 15:42:05 UTC (rev 77) @@ -10,7 +10,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.6</version> + <version>0.7-SNAPSHOT</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-07-09 15:41:58 UTC (rev 76) +++ trunk/pom.xml 2012-07-09 15:42:05 UTC (rev 77) @@ -16,7 +16,7 @@ <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.6</version> + <version>0.7-SNAPSHOT</version> <modules> <module>jmexico-model</module> @@ -187,11 +187,11 @@  <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/jmexico/tags/jmexico-0.6</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.6 + scm:svn:http://svn.forge.codelutin.com/svn/jmexico/trunk </developerConnection> - <url>http://forge.codelutin.com/repositories/browse/jmexico/tags/jmexico-0.6</url> + <url>http://forge.codelutin.com/repositories/browse/jmexico/trunk</url> </scm> <distributionManagement>

1 0

r76 - tags
by maven-release＠users.forge.codelutin.com 09 Jul '12

09 Jul '12

Author: maven-release Date: 2012-07-09 17:41:58 +0200 (Mon, 09 Jul 2012) New Revision: 76 Url: http://forge.codelutin.com/repositories/revision/jmexico/76 Log: [maven-release-plugin] copy for tag jmexico-0.6 Added: tags/jmexico-0.6/

1 0

r75 - in trunk: . jmexico-editor jmexico-editor-demo jmexico-model
by maven-release＠users.forge.codelutin.com 09 Jul '12

09 Jul '12

Author: maven-release Date: 2012-07-09 17:41:46 +0200 (Mon, 09 Jul 2012) New Revision: 75 Url: http://forge.codelutin.com/repositories/revision/jmexico/75 Log: [maven-release-plugin] prepare release jmexico-0.6 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-07-09 10:11:39 UTC (rev 74) +++ trunk/jmexico-editor/pom.xml 2012-07-09 15:41:46 UTC (rev 75) @@ -10,7 +10,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.6</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/jmexico-editor-demo/pom.xml =================================================================== --- trunk/jmexico-editor-demo/pom.xml 2012-07-09 10:11:39 UTC (rev 74) +++ trunk/jmexico-editor-demo/pom.xml 2012-07-09 15:41:46 UTC (rev 75) @@ -10,7 +10,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.6</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/jmexico-model/pom.xml =================================================================== --- trunk/jmexico-model/pom.xml 2012-07-09 10:11:39 UTC (rev 74) +++ trunk/jmexico-model/pom.xml 2012-07-09 15:41:46 UTC (rev 75) @@ -10,7 +10,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.6</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-07-09 10:11:39 UTC (rev 74) +++ trunk/pom.xml 2012-07-09 15:41:46 UTC (rev 75) @@ -16,7 +16,7 @@ <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.6</version> <modules> <module>jmexico-model</module> @@ -187,11 +187,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.6</connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/jmexico/trunk + scm:svn:http://svn.forge.codelutin.com/svn/jmexico/tags/jmexico-0.6 </developerConnection> - <url>http://forge.codelutin.com/repositories/browse/jmexico/trunk</url> + <url>http://forge.codelutin.com/repositories/browse/jmexico/tags/jmexico-0.6</url> </scm> <distributionManagement>

1 0

r74 - trunk
by tchemit＠users.forge.codelutin.com 09 Jul '12

09 Jul '12

Author: tchemit Date: 2012-07-09 12:11:39 +0200 (Mon, 09 Jul 2012) New Revision: 74 Url: http://forge.codelutin.com/repositories/revision/jmexico/74 Log: updates to mavenpom 3.3.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-07-05 12:48:16 UTC (rev 73) +++ trunk/pom.xml 2012-07-09 10:11:39 UTC (rev 74) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.3.3</version> + <version>3.3.4</version> </parent> <groupId>fr.reseaumexico</groupId>

1 0

r73 - in trunk: . jmexico-editor
by sletellier＠users.forge.codelutin.com 05 Jul '12

05 Jul '12

Author: sletellier Date: 2012-07-05 14:48:16 +0200 (Thu, 05 Jul 2012) New Revision: 73 Url: http://forge.codelutin.com/repositories/revision/jmexico/73 Log: - fixes #1299 : Update to latest release version of Jaxx and Mavenpom - fixes missing dependencies Modified: trunk/jmexico-editor/pom.xml trunk/pom.xml Modified: trunk/jmexico-editor/pom.xml =================================================================== --- trunk/jmexico-editor/pom.xml 2012-06-27 15:19:38 UTC (rev 72) +++ trunk/jmexico-editor/pom.xml 2012-07-05 12:48:16 UTC (rev 73) @@ -63,6 +63,16 @@ <scope>runtime</scope> </dependency> + <dependency> + <groupId>org.swinglabs</groupId> + <artifactId>swingx-core</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + </dependencies>  Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-06-27 15:19:38 UTC (rev 72) +++ trunk/pom.xml 2012-07-05 12:48:16 UTC (rev 73) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.2</version> + <version>3.3.3</version> </parent> <groupId>fr.reseaumexico</groupId> @@ -78,9 +78,9 @@  <nuitonI18nVersion>2.4.1</nuitonI18nVersion> -  + <nuitonUtilsVersion>2.5</nuitonUtilsVersion> <eugenePluginVersion>2.4.2</eugenePluginVersion> - <jaxxVersion>2.5-SNAPSHOT</jaxxVersion> + <jaxxVersion>2.5</jaxxVersion> <license.organizationName>Réseau Mexico, Codelutin</license.organizationName> </properties> @@ -89,11 +89,11 @@ <dependencies>  -  -  -  -  -  + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>${nuitonUtilsVersion}</version> + </dependency> <dependency> <groupId>org.nuiton.i18n</groupId> @@ -114,6 +114,12 @@ <version>${jaxxVersion}</version> </dependency> + <dependency> + <groupId>org.swinglabs</groupId> + <artifactId>swingx-core</artifactId> + <version>1.6.2-2</version> + </dependency> +  <dependency> <groupId>xpp3</groupId>

1 0

r72 - in trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor: . factorValue
by sletellier＠users.forge.codelutin.com 27 Jun '12

27 Jun '12

Author: sletellier Date: 2012-06-27 17:19:38 +0200 (Wed, 27 Jun 2012) New Revision: 72 Url: http://forge.codelutin.com/repositories/revision/jmexico/72 Log: Use JXTable and set columnControlVisible Removed: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignColumnModel.java Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditor.jaxx trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueCellRenderer.java Deleted: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignColumnModel.java =================================================================== --- trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignColumnModel.java 2012-06-27 14:44:36 UTC (rev 71) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignColumnModel.java 2012-06-27 15:19:38 UTC (rev 72) @@ -1,47 +0,0 @@ -/* - * #%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% - */ -package fr.reseaumexico.editor; - -import javax.swing.table.DefaultTableColumnModel; -import javax.swing.table.TableColumn; - -/** - * @author sletellier <letellier(a)codelutin.com> - */ -public class InputDesignColumnModel extends DefaultTableColumnModel { - - public static final int FIRST_COLUMN_MIN_WIDTH = 400; - public static final int NEXT_COLUMNS_MIN_WIDTH = 150; - - @Override - public TableColumn getColumn(int columnIndex) { - TableColumn column = super.getColumn(columnIndex); - switch (columnIndex) { - case 0 : column.setMinWidth(FIRST_COLUMN_MIN_WIDTH);break; - default: column.setMinWidth(NEXT_COLUMNS_MIN_WIDTH);break; - } - return column; - } -} Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditor.jaxx =================================================================== --- trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditor.jaxx 2012-06-27 14:44:36 UTC (rev 71) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditor.jaxx 2012-06-27 15:19:38 UTC (rev 72) @@ -32,6 +32,8 @@ fr.reseaumexico.editor.factorValue.FactorValueCellRenderer fr.reseaumexico.editor.MexicoDecoratorProvider jaxx.runtime.swing.renderer.DecoratorProviderTableCellRenderer + org.jdesktop.swingx.JXTable + javax.swing.JTable </import> <InputDesignEditorHandler id='handler'/> @@ -68,11 +70,10 @@ </script> <JScrollPane constraints='BorderLayout.CENTER'> - <JTable id='inputDesignTable' - model='{getModel()}' - autoResizeMode='{JTable.AUTO_RESIZE_OFF}' - columnModel='{new InputDesignColumnModel()}' - rowHeight='20'/> + <JXTable id='inputDesignTable' + model='{getModel()}' + columnControlVisible='true' + rowHeight='20'/> </JScrollPane> <JPanel id='factorActionPanel' constraints='BorderLayout.SOUTH'> Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueCellRenderer.java =================================================================== --- trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueCellRenderer.java 2012-06-27 14:44:36 UTC (rev 71) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueCellRenderer.java 2012-06-27 15:19:38 UTC (rev 72) @@ -54,7 +54,7 @@ @Override public Component getTableCellRendererComponent(final JTable table, final Object value, final boolean isSelected, final boolean hasFocus, final int row, final int column) { - Factor factor = (Factor) table.getValueAt(row, 0); + Factor factor = (Factor) table.getModel().getValueAt(row, 0); FactorValueEditorFactory.FactorValueCellRenderer specificRenderer = factory.getRenderedComponent(factor, value);

1 0

r71 - trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor
by sletellier＠users.forge.codelutin.com 27 Jun '12

27 Jun '12

Author: sletellier Date: 2012-06-27 16:44:36 +0200 (Wed, 27 Jun 2012) New Revision: 71 Url: http://forge.codelutin.com/repositories/revision/jmexico/71 Log: Use column model to fix column size Added: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignColumnModel.java Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditor.jaxx Added: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignColumnModel.java =================================================================== --- trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignColumnModel.java (rev 0) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignColumnModel.java 2012-06-27 14:44:36 UTC (rev 71) @@ -0,0 +1,47 @@ +/* + * #%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% + */ +package fr.reseaumexico.editor; + +import javax.swing.table.DefaultTableColumnModel; +import javax.swing.table.TableColumn; + +/** + * @author sletellier <letellier(a)codelutin.com> + */ +public class InputDesignColumnModel extends DefaultTableColumnModel { + + public static final int FIRST_COLUMN_MIN_WIDTH = 400; + public static final int NEXT_COLUMNS_MIN_WIDTH = 150; + + @Override + public TableColumn getColumn(int columnIndex) { + TableColumn column = super.getColumn(columnIndex); + switch (columnIndex) { + case 0 : column.setMinWidth(FIRST_COLUMN_MIN_WIDTH);break; + default: column.setMinWidth(NEXT_COLUMNS_MIN_WIDTH);break; + } + return column; + } +} Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditor.jaxx =================================================================== --- trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditor.jaxx 2012-06-25 12:36:31 UTC (rev 70) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditor.jaxx 2012-06-27 14:44:36 UTC (rev 71) @@ -68,7 +68,11 @@ </script> <JScrollPane constraints='BorderLayout.CENTER'> - <JTable id='inputDesignTable' model='{getModel()}' rowHeight='20'/> + <JTable id='inputDesignTable' + model='{getModel()}' + autoResizeMode='{JTable.AUTO_RESIZE_OFF}' + columnModel='{new InputDesignColumnModel()}' + rowHeight='20'/> </JScrollPane> <JPanel id='factorActionPanel' constraints='BorderLayout.SOUTH'>

1 0

r70 - in trunk: . jmexico-editor jmexico-editor/src/main/java/fr/reseaumexico/editor jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue jmexico-editor-demo jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo jmexico-model/src/main/java/fr/reseaumexico/model jmexico-model/src/main/java/fr/reseaumexico/model/event jmexico-model/src/main/java/fr/reseaumexico/model/parser jmexico-model/src/main/java/fr/reseaumexico/model/writer
by sletellier＠users.forge.codelutin.com 25 Jun '12

25 Jun '12

Author: sletellier Date: 2012-06-25 14:36:31 +0200 (Mon, 25 Jun 2012) New Revision: 70 Url: http://forge.codelutin.com/repositories/revision/jmexico/70 Log: - Optimize imports - Up to jaxx snapshot version - Up to nuiton-utils snapshot version Modified: trunk/jmexico-editor-demo/pom.xml trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUIHandler.java trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUIModel.java trunk/jmexico-editor/pom.xml trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorHandler.java trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignTableModel.java trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/MexicoDecoratorProvider.java trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueCellEditor.java trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueCellRenderer.java trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueEditorFactory.java trunk/jmexico-model/src/main/java/fr/reseaumexico/model/InputDesignImpl.java trunk/jmexico-model/src/main/java/fr/reseaumexico/model/ScenarioImpl.java trunk/jmexico-model/src/main/java/fr/reseaumexico/model/event/InputDesignScenarioEvent.java trunk/jmexico-model/src/main/java/fr/reseaumexico/model/event/ScenarioFactorValueEvent.java trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ExperimentDesignParser.java trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/InputDesignParser.java trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/MexicoXmlParser.java trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/ExperimentDesignXmlWriter.java trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/InputDesignXmlWriter.java trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/MexicoXmlWriter.java trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/XmlNode.java trunk/pom.xml Modified: trunk/jmexico-editor/pom.xml =================================================================== --- trunk/jmexico-editor/pom.xml 2012-05-22 13:33:36 UTC (rev 69) +++ trunk/jmexico-editor/pom.xml 2012-06-25 12:36:31 UTC (rev 70) @@ -92,7 +92,7 @@ <plugin> <groupId>org.nuiton.jaxx</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <executions> <execution> <goals> Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorHandler.java =================================================================== --- trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorHandler.java 2012-05-22 13:33:36 UTC (rev 69) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorHandler.java 2012-06-25 12:36:31 UTC (rev 70) @@ -29,11 +29,10 @@ import fr.reseaumexico.model.InputDesign; import fr.reseaumexico.model.Scenario; import fr.reseaumexico.model.ScenarioImpl; -import org.apache.commons.lang3.StringUtils; - -import javax.swing.*; import java.util.Collection; import java.util.Map; +import javax.swing.JOptionPane; +import org.apache.commons.lang3.StringUtils; import static org.nuiton.i18n.I18n._; Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignTableModel.java =================================================================== --- trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignTableModel.java 2012-05-22 13:33:36 UTC (rev 69) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignTableModel.java 2012-06-25 12:36:31 UTC (rev 70) @@ -32,16 +32,15 @@ import fr.reseaumexico.model.ValueType; import fr.reseaumexico.model.event.InputDesignScenarioEvent; import fr.reseaumexico.model.event.InputDesignScenarioListener; -import jaxx.runtime.JAXXContext; -import org.apache.commons.lang3.ObjectUtils; - -import javax.swing.table.AbstractTableModel; -import javax.swing.table.DefaultTableModel; -import javax.swing.table.TableModel; import java.util.Collection; import java.util.LinkedList; import java.util.List; import java.util.Map; +import javax.swing.table.AbstractTableModel; +import javax.swing.table.DefaultTableModel; +import javax.swing.table.TableModel; +import jaxx.runtime.JAXXContext; +import org.apache.commons.lang3.ObjectUtils; import static org.nuiton.i18n.I18n._; Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/MexicoDecoratorProvider.java =================================================================== --- trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/MexicoDecoratorProvider.java 2012-05-22 13:33:36 UTC (rev 69) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/MexicoDecoratorProvider.java 2012-06-25 12:36:31 UTC (rev 70) @@ -25,7 +25,7 @@ package fr.reseaumexico.editor; import fr.reseaumexico.model.Factor; -import jaxx.runtime.decorator.DecoratorProvider; +import org.nuiton.util.decorator.DecoratorProvider; /** * @author sletellier <letellier(a)codelutin.com> Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueCellEditor.java =================================================================== --- trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueCellEditor.java 2012-05-22 13:33:36 UTC (rev 69) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueCellEditor.java 2012-06-25 12:36:31 UTC (rev 70) @@ -25,17 +25,19 @@ package fr.reseaumexico.editor.factorValue; import fr.reseaumexico.model.Factor; -import jaxx.runtime.JAXXContext; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import javax.swing.*; -import javax.swing.table.TableCellEditor; -import java.awt.*; +import java.awt.Component; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.FocusEvent; import java.awt.event.FocusListener; +import javax.swing.AbstractCellEditor; +import javax.swing.JComboBox; +import javax.swing.JTable; +import javax.swing.JTextField; +import javax.swing.table.TableCellEditor; +import jaxx.runtime.JAXXContext; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** * Cell editor for factor values Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueCellRenderer.java =================================================================== --- trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueCellRenderer.java 2012-05-22 13:33:36 UTC (rev 69) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueCellRenderer.java 2012-06-25 12:36:31 UTC (rev 70) @@ -25,12 +25,11 @@ package fr.reseaumexico.editor.factorValue; import fr.reseaumexico.model.Factor; -import jaxx.runtime.JAXXContext; - -import javax.swing.*; +import java.awt.Component; +import javax.swing.JTable; import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellRenderer; -import java.awt.*; +import jaxx.runtime.JAXXContext; /** * @author sletellier <letellier(a)codelutin.com> Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueEditorFactory.java =================================================================== --- trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueEditorFactory.java 2012-05-22 13:33:36 UTC (rev 69) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueEditorFactory.java 2012-06-25 12:36:31 UTC (rev 70) @@ -28,13 +28,14 @@ import fr.reseaumexico.model.Domain; import fr.reseaumexico.model.Factor; import fr.reseaumexico.model.ValueType; +import java.awt.Component; +import java.util.Map; +import javax.swing.JCheckBox; +import javax.swing.JDialog; +import javax.swing.JTextField; import jaxx.runtime.swing.editor.NumberEditor; import org.apache.commons.lang3.StringUtils; -import javax.swing.*; -import java.awt.*; -import java.util.Map; - /** * Factory used to open specific editor to input factor value * Modified: trunk/jmexico-editor-demo/pom.xml =================================================================== --- trunk/jmexico-editor-demo/pom.xml 2012-05-22 13:33:36 UTC (rev 69) +++ trunk/jmexico-editor-demo/pom.xml 2012-06-25 12:36:31 UTC (rev 70) @@ -114,7 +114,7 @@ <plugin> <groupId>org.nuiton.jaxx</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <executions> <execution> <goals> 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-05-22 13:33:36 UTC (rev 69) +++ trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUIHandler.java 2012-06-25 12:36:31 UTC (rev 70) @@ -31,15 +31,14 @@ import fr.reseaumexico.model.event.InputDesignScenarioListener; import fr.reseaumexico.model.parser.InputDesignParser; import fr.reseaumexico.model.writer.InputDesignXmlWriter; +import java.io.File; +import java.io.IOException; +import javax.swing.JFileChooser; import jaxx.runtime.context.JAXXInitialContext; import jaxx.runtime.swing.ErrorDialogUI; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.*; -import java.io.File; -import java.io.IOException; - import static org.nuiton.i18n.I18n._; /** Modified: trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUIModel.java =================================================================== --- trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUIModel.java 2012-05-22 13:33:36 UTC (rev 69) +++ trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUIModel.java 2012-06-25 12:36:31 UTC (rev 70) @@ -25,7 +25,6 @@ package fr.reseaumexico.editor.demo; import fr.reseaumexico.model.InputDesign; - import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; import java.io.File; Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/InputDesignImpl.java =================================================================== --- trunk/jmexico-model/src/main/java/fr/reseaumexico/model/InputDesignImpl.java 2012-05-22 13:33:36 UTC (rev 69) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/InputDesignImpl.java 2012-06-25 12:36:31 UTC (rev 70) @@ -32,12 +32,11 @@ import fr.reseaumexico.model.event.InputDesignScenarioListener; import fr.reseaumexico.model.event.ScenarioFactorValueEvent; import fr.reseaumexico.model.event.ScenarioFactorValueListener; - -import javax.swing.event.EventListenerList; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.Collection; import java.util.Map; +import javax.swing.event.EventListenerList; /** * Implementation of {@link InputDesign} to provide listener API Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/ScenarioImpl.java =================================================================== --- trunk/jmexico-model/src/main/java/fr/reseaumexico/model/ScenarioImpl.java 2012-05-22 13:33:36 UTC (rev 69) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/ScenarioImpl.java 2012-06-25 12:36:31 UTC (rev 70) @@ -27,9 +27,8 @@ import com.google.common.collect.Maps; import fr.reseaumexico.model.event.ScenarioFactorValueEvent; import fr.reseaumexico.model.event.ScenarioFactorValueListener; - -import javax.swing.event.EventListenerList; import java.util.Map; +import javax.swing.event.EventListenerList; /** * Implementation of {@link Scenario} to provide listener API Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/event/InputDesignScenarioEvent.java =================================================================== --- trunk/jmexico-model/src/main/java/fr/reseaumexico/model/event/InputDesignScenarioEvent.java 2012-05-22 13:33:36 UTC (rev 69) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/event/InputDesignScenarioEvent.java 2012-06-25 12:36:31 UTC (rev 70) @@ -26,7 +26,6 @@ import fr.reseaumexico.model.InputDesign; import fr.reseaumexico.model.Scenario; - import java.util.EventObject; /** Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/event/ScenarioFactorValueEvent.java =================================================================== --- trunk/jmexico-model/src/main/java/fr/reseaumexico/model/event/ScenarioFactorValueEvent.java 2012-05-22 13:33:36 UTC (rev 69) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/event/ScenarioFactorValueEvent.java 2012-06-25 12:36:31 UTC (rev 70) @@ -26,7 +26,6 @@ import fr.reseaumexico.model.Factor; import fr.reseaumexico.model.Scenario; - import java.util.EventObject; /** Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ExperimentDesignParser.java =================================================================== --- trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ExperimentDesignParser.java 2012-05-22 13:33:36 UTC (rev 69) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ExperimentDesignParser.java 2012-06-25 12:36:31 UTC (rev 70) @@ -41,16 +41,15 @@ import fr.reseaumexico.model.MexicoTechnicalException; import fr.reseaumexico.model.MexicoXmlConstant; import fr.reseaumexico.model.ValueType; -import java.io.UnsupportedEncodingException; -import org.xmlpull.v1.XmlPullParser; -import org.xmlpull.v1.XmlPullParserException; - import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; +import java.io.UnsupportedEncodingException; import java.text.ParseException; import java.util.List; import java.util.Map; +import org.xmlpull.v1.XmlPullParser; +import org.xmlpull.v1.XmlPullParserException; /** * Parser for experiment design xml files, build a {@link ExperimentDesign} model. Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/InputDesignParser.java =================================================================== --- trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/InputDesignParser.java 2012-05-22 13:33:36 UTC (rev 69) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/InputDesignParser.java 2012-06-25 12:36:31 UTC (rev 70) @@ -34,16 +34,15 @@ import fr.reseaumexico.model.Scenario; import fr.reseaumexico.model.ScenarioImpl; import fr.reseaumexico.model.ValueType; -import java.io.UnsupportedEncodingException; -import org.xmlpull.v1.XmlPullParser; -import org.xmlpull.v1.XmlPullParserException; - import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; +import java.io.UnsupportedEncodingException; import java.text.ParseException; import java.util.List; import java.util.Map; +import org.xmlpull.v1.XmlPullParser; +import org.xmlpull.v1.XmlPullParserException; import static fr.reseaumexico.model.MexicoXmlConstant.FACTOR; import static fr.reseaumexico.model.MexicoXmlConstant.INPUT_DESIGN; Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/MexicoXmlParser.java =================================================================== --- trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/MexicoXmlParser.java 2012-05-22 13:33:36 UTC (rev 69) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/MexicoXmlParser.java 2012-06-25 12:36:31 UTC (rev 70) @@ -27,7 +27,6 @@ import fr.reseaumexico.model.DateFormatFactory; import fr.reseaumexico.model.MexicoUtil; import fr.reseaumexico.model.ValueType; - import java.io.File; import java.io.FileNotFoundException; import java.io.UnsupportedEncodingException; Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/ExperimentDesignXmlWriter.java =================================================================== --- trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/ExperimentDesignXmlWriter.java 2012-05-22 13:33:36 UTC (rev 69) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/ExperimentDesignXmlWriter.java 2012-06-25 12:36:31 UTC (rev 70) @@ -29,12 +29,11 @@ import fr.reseaumexico.model.ExperimentDesign; import fr.reseaumexico.model.Factor; import fr.reseaumexico.model.Level; -import org.apache.commons.lang3.StringUtils; - import java.io.File; import java.io.IOException; import java.util.Collection; import java.util.Date; +import org.apache.commons.lang3.StringUtils; /** * Writer to create experiment design file with {@link ExperimentDesign} model 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-05-22 13:33:36 UTC (rev 69) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/InputDesignXmlWriter.java 2012-06-25 12:36:31 UTC (rev 70) @@ -27,7 +27,6 @@ import fr.reseaumexico.model.Factor; import fr.reseaumexico.model.InputDesign; import fr.reseaumexico.model.Scenario; - import java.io.File; import java.io.IOException; import java.util.Collection; Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/MexicoXmlWriter.java =================================================================== --- trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/MexicoXmlWriter.java 2012-05-22 13:33:36 UTC (rev 69) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/MexicoXmlWriter.java 2012-06-25 12:36:31 UTC (rev 70) @@ -27,7 +27,6 @@ import fr.reseaumexico.model.DateFormatFactory; import fr.reseaumexico.model.Feature; import fr.reseaumexico.model.MexicoXmlConstant; - import java.io.File; import java.io.IOException; import java.util.Collection; Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/XmlNode.java =================================================================== --- trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/XmlNode.java 2012-05-22 13:33:36 UTC (rev 69) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/XmlNode.java 2012-06-25 12:36:31 UTC (rev 70) @@ -26,12 +26,11 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import org.apache.commons.lang3.StringEscapeUtils; -import org.apache.commons.lang3.StringUtils; - import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.commons.lang3.StringEscapeUtils; +import org.apache.commons.lang3.StringUtils; /** * Represent an XML node Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-05-22 13:33:36 UTC (rev 69) +++ trunk/pom.xml 2012-06-25 12:36:31 UTC (rev 70) @@ -80,7 +80,7 @@ <nuitonI18nVersion>2.4.1</nuitonI18nVersion>  <eugenePluginVersion>2.4.2</eugenePluginVersion> - <jaxxVersion>2.4.2</jaxxVersion> + <jaxxVersion>2.5-SNAPSHOT</jaxxVersion> <license.organizationName>Réseau Mexico, Codelutin</license.organizationName> </properties> @@ -160,7 +160,7 @@ <plugin> <groupId>org.nuiton.jaxx</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <version>${jaxxVersion}</version> </plugin>

1 0

r69 - in trunk/jmexico-model/src/main/java/fr/reseaumexico/model: parser writer
by sletellier＠users.forge.codelutin.com 22 May '12

22 May '12

Author: sletellier Date: 2012-05-22 15:33:36 +0200 (Tue, 22 May 2012) New Revision: 69 Url: http://forge.codelutin.com/repositories/revision/jmexico/69 Log: fixes #1241 : Force using UTF-8 encoding Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ExperimentDesignParser.java trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/InputDesignParser.java trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/MexicoXmlParser.java trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/XmlParser.java trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/XmlWriter.java Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ExperimentDesignParser.java =================================================================== --- trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ExperimentDesignParser.java 2012-05-02 09:29:30 UTC (rev 68) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ExperimentDesignParser.java 2012-05-22 13:33:36 UTC (rev 69) @@ -41,6 +41,7 @@ import fr.reseaumexico.model.MexicoTechnicalException; import fr.reseaumexico.model.MexicoXmlConstant; import fr.reseaumexico.model.ValueType; +import java.io.UnsupportedEncodingException; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; @@ -61,7 +62,7 @@ protected Map<String, Factor> factors; - public ExperimentDesignParser(File file) throws FileNotFoundException { + public ExperimentDesignParser(File file) throws FileNotFoundException, UnsupportedEncodingException { super(file); factors = Maps.newLinkedHashMap(); } Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/InputDesignParser.java =================================================================== --- trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/InputDesignParser.java 2012-05-02 09:29:30 UTC (rev 68) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/InputDesignParser.java 2012-05-22 13:33:36 UTC (rev 69) @@ -34,6 +34,7 @@ import fr.reseaumexico.model.Scenario; import fr.reseaumexico.model.ScenarioImpl; import fr.reseaumexico.model.ValueType; +import java.io.UnsupportedEncodingException; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; @@ -62,7 +63,7 @@ protected ExperimentDesignParser experimentDesignParser; - public InputDesignParser(File file) throws FileNotFoundException { + public InputDesignParser(File file) throws FileNotFoundException, UnsupportedEncodingException { super(file); experimentDesignParser = new ExperimentDesignParser(file); } Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/MexicoXmlParser.java =================================================================== --- trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/MexicoXmlParser.java 2012-05-02 09:29:30 UTC (rev 68) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/MexicoXmlParser.java 2012-05-22 13:33:36 UTC (rev 69) @@ -30,6 +30,7 @@ import java.io.File; import java.io.FileNotFoundException; +import java.io.UnsupportedEncodingException; import java.text.ParseException; import java.util.Date; @@ -41,7 +42,7 @@ */ public abstract class MexicoXmlParser<M> extends XmlParser<M> { - public MexicoXmlParser(File file) throws FileNotFoundException { + public MexicoXmlParser(File file) throws FileNotFoundException, UnsupportedEncodingException { super(file); } Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/XmlParser.java =================================================================== --- trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/XmlParser.java 2012-05-02 09:29:30 UTC (rev 68) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/XmlParser.java 2012-05-22 13:33:36 UTC (rev 69) @@ -24,15 +24,16 @@ */ package fr.reseaumexico.model.parser; -import org.xmlpull.v1.XmlPullParser; -import org.xmlpull.v1.XmlPullParserException; -import org.xmlpull.v1.XmlPullParserFactory; - import java.io.File; +import java.io.FileInputStream; import java.io.FileNotFoundException; -import java.io.FileReader; import java.io.IOException; +import java.io.InputStreamReader; +import java.io.UnsupportedEncodingException; import java.text.ParseException; +import org.xmlpull.v1.XmlPullParser; +import org.xmlpull.v1.XmlPullParserException; +import org.xmlpull.v1.XmlPullParserFactory; /** * Abstract parser to get model from xml file using XPP3 @@ -41,10 +42,10 @@ * @see XmlPullParser * @since 0.1 */ -public abstract class XmlParser<M> extends FileReader { +public abstract class XmlParser<M> extends InputStreamReader { - public XmlParser(File file) throws FileNotFoundException { - super(file); + public XmlParser(File file) throws FileNotFoundException, UnsupportedEncodingException { + super(new FileInputStream(file), "UTF-8"); } public M getModel() throws XmlPullParserException, IOException, ParseException { Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/XmlWriter.java =================================================================== --- trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/XmlWriter.java 2012-05-02 09:29:30 UTC (rev 68) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/XmlWriter.java 2012-05-22 13:33:36 UTC (rev 69) @@ -25,8 +25,9 @@ package fr.reseaumexico.model.writer; import java.io.File; -import java.io.FileWriter; +import java.io.FileOutputStream; import java.io.IOException; +import java.io.OutputStreamWriter; /** * Abstract writer to create xml files using {@link XmlNode} @@ -34,14 +35,14 @@ * @author sletellier <letellier(a)codelutin.com> * @since 0.1 */ -public abstract class XmlWriter<M> extends FileWriter { +public abstract class XmlWriter<M> extends OutputStreamWriter { public static final int INDENT = 2; protected M model; public XmlWriter(File file, M model) throws IOException { - super(file); + super(new FileOutputStream(file), "UTF-8"); this.model = model; }

1 0