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

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

10 Feb '12

Author: sletellier Date: 2012-02-10 17:53:43 +0100 (Fri, 10 Feb 2012) New Revision: 48 Url: http://forge.codelutin.com/repositories/revision/jmexico/48 Log: [maven-release-plugin] prepare release jmexico-0.3 Modified: trunk/jmexico-editor-demo/pom.xml trunk/jmexico-editor/pom.xml trunk/jmexico-model/pom.xml trunk/pom.xml Modified: trunk/jmexico-editor/pom.xml =================================================================== --- trunk/jmexico-editor/pom.xml 2012-02-10 16:49:00 UTC (rev 47) +++ trunk/jmexico-editor/pom.xml 2012-02-10 16:53:43 UTC (rev 48) @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<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"> +<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> @@ -11,7 +10,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.3-SNAPSHOT</version> + <version>0.3</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/jmexico-editor-demo/pom.xml =================================================================== --- trunk/jmexico-editor-demo/pom.xml 2012-02-10 16:49:00 UTC (rev 47) +++ trunk/jmexico-editor-demo/pom.xml 2012-02-10 16:53:43 UTC (rev 48) @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<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"> +<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> @@ -11,7 +10,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.3-SNAPSHOT</version> + <version>0.3</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/jmexico-model/pom.xml =================================================================== --- trunk/jmexico-model/pom.xml 2012-02-10 16:49:00 UTC (rev 47) +++ trunk/jmexico-model/pom.xml 2012-02-10 16:53:43 UTC (rev 48) @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<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"> +<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> @@ -11,7 +10,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.3-SNAPSHOT</version> + <version>0.3</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-02-10 16:49:00 UTC (rev 47) +++ trunk/pom.xml 2012-02-10 16:53:43 UTC (rev 48) @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<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/maven-v4_0_0.xsd"> +<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/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -17,7 +16,7 @@ <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.3-SNAPSHOT</version> + <version>0.3</version> <modules> <module>jmexico-model</module> @@ -199,11 +198,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.3</connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/jmexico/trunk + scm:svn:http://svn.forge.codelutin.com/svn/jmexico/tags/jmexico-0.3 </developerConnection> - <url>http://forge.codelutin.com/repositories/browse/jmexico/trunk</url> + <url>http://forge.codelutin.com/repositories/browse/jmexico/tags/jmexico-0.3</url> </scm> <distributionManagement>

1 0

r47 - trunk
by sletellier＠users.forge.codelutin.com 10 Feb '12

10 Feb '12

Author: sletellier Date: 2012-02-10 17:49:00 +0100 (Fri, 10 Feb 2012) New Revision: 47 Url: http://forge.codelutin.com/repositories/revision/jmexico/47 Log: Up to mavenpom 3.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-02-10 16:18:08 UTC (rev 46) +++ trunk/pom.xml 2012-02-10 16:49:00 UTC (rev 47) @@ -12,7 +12,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.0.7</version> + <version>3.1</version> </parent> <groupId>fr.reseaumexico</groupId>

1 0

r46 - trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue
by sletellier＠users.forge.codelutin.com 10 Feb '12

10 Feb '12

Author: sletellier Date: 2012-02-10 17:18:08 +0100 (Fri, 10 Feb 2012) New Revision: 46 Url: http://forge.codelutin.com/repositories/revision/jmexico/46 Log: Reove unused imports Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueCellEditor.java 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-02-07 14:47:08 UTC (rev 45) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueCellEditor.java 2012-02-10 16:18:08 UTC (rev 46) @@ -30,8 +30,6 @@ import org.apache.commons.logging.LogFactory; import javax.swing.*; -import javax.swing.event.CellEditorListener; -import javax.swing.event.ChangeEvent; import javax.swing.table.TableCellEditor; import java.awt.*; import java.awt.event.ActionEvent;

1 0

r45 - in trunk/jmexico-editor/src/main: java/fr/reseaumexico/editor java/fr/reseaumexico/editor/factorValue resources
by sletellier＠users.forge.codelutin.com 07 Feb '12

07 Feb '12

Author: sletellier Date: 2012-02-07 15:47:08 +0100 (Tue, 07 Feb 2012) New Revision: 45 Url: http://forge.codelutin.com/repositories/revision/jmexico/45 Log: [#1561] [Option] Plus la possibilit?\195?\169 d'?\195?\169diter des options Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignTableModel.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/resources/log4j.properties Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignTableModel.java =================================================================== --- trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignTableModel.java 2012-02-07 14:25:32 UTC (rev 44) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignTableModel.java 2012-02-07 14:47:08 UTC (rev 45) @@ -39,8 +39,6 @@ import javax.swing.table.DefaultTableModel; import javax.swing.table.TableModel; import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; import java.util.LinkedList; import java.util.List; import java.util.Map; 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-02-07 14:25:32 UTC (rev 44) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueCellEditor.java 2012-02-07 14:47:08 UTC (rev 45) @@ -26,8 +26,12 @@ 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.event.CellEditorListener; +import javax.swing.event.ChangeEvent; import javax.swing.table.TableCellEditor; import java.awt.*; import java.awt.event.ActionEvent; @@ -47,6 +51,11 @@ private static final long serialVersionUID = 1L; + /** + * Logger + */ + private static Log log = LogFactory.getLog(FactorValueCellEditor.class); + protected JTable table; protected Factor factor; protected Object currentValue; @@ -73,6 +82,7 @@ if (isEditing) { currentValue = defaultInlineEditor.getText(); isEditing = false; + fireEditingStopped(); } if (specificEditor != null) { currentValue = specificEditor.getValue(); @@ -103,19 +113,6 @@ }); } - component.addFocusListener(new FocusListener() { - - @Override - public void focusGained(FocusEvent e) { - // do nothing - } - - @Override - public void focusLost(FocusEvent e) { - fireEditingStopped(); - } - }); - return component; } defaultInlineEditor.setText(currentValue == null ? "" : String.valueOf(currentValue)); 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-02-07 14:25:32 UTC (rev 44) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueCellRenderer.java 2012-02-07 14:47:08 UTC (rev 45) @@ -51,7 +51,6 @@ } delegate = new DefaultTableCellRenderer(); - } @Override Modified: trunk/jmexico-editor/src/main/resources/log4j.properties =================================================================== --- trunk/jmexico-editor/src/main/resources/log4j.properties 2012-02-07 14:25:32 UTC (rev 44) +++ trunk/jmexico-editor/src/main/resources/log4j.properties 2012-02-07 14:47:08 UTC (rev 45) @@ -30,5 +30,5 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%d [%t] %-5p %c - %m%n -# mexicos +# mexico log4j.logger.fr.reseaumexico.editor=INFO

1 0

r44 - in trunk: . jmexico-editor jmexico-editor/src/main/java/fr/reseaumexico/editor jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue jmexico-editor/src/site jmexico-editor-demo jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo jmexico-editor-demo/src/site jmexico-model jmexico-model/src/main/java/fr/reseaumexico/model jmexico-model/src/main/java/fr/reseaumexico/model/parser jmexico-model/src/main/java/fr/reseaumexico/model/writer jmexico-model/src/site src/site/
by sletellier＠users.forge.codelutin.com 07 Feb '12

07 Feb '12

Author: sletellier Date: 2012-02-07 15:25:32 +0100 (Tue, 07 Feb 2012) New Revision: 44 Url: http://forge.codelutin.com/repositories/revision/jmexico/44 Log: - Reformat code - Fix NPE - [#1540] [Mod?\195?\168le] Trier par ordre d'apparition. 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-demo/src/main/java/fr/reseaumexico/editor/demo/RunMexicoEditorDemo.java trunk/jmexico-editor-demo/src/site/site_fr.xml 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/FactorValueCellRenderer.java trunk/jmexico-editor/src/site/site_fr.xml trunk/jmexico-model/pom.xml trunk/jmexico-model/src/main/java/fr/reseaumexico/model/MexicoUtil.java trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ExperimentDesignParser.java trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/XmlNode.java trunk/jmexico-model/src/site/site_fr.xml trunk/pom.xml trunk/src/site/resources/examples/inputDesign.xml Modified: trunk/jmexico-editor/pom.xml =================================================================== --- trunk/jmexico-editor/pom.xml 2012-01-26 16:54:30 UTC (rev 43) +++ trunk/jmexico-editor/pom.xml 2012-02-07 14:25:32 UTC (rev 44) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<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"> +<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> @@ -101,7 +102,7 @@ </execution> </executions> </plugin> - + <plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>maven-i18n-plugin</artifactId> Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorHandler.java =================================================================== --- trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorHandler.java 2012-01-26 16:54:30 UTC (rev 43) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorHandler.java 2012-02-07 14:25:32 UTC (rev 44) @@ -47,9 +47,9 @@ InputDesign inputDesign = editor.getInputDesign(); String selectedName = JOptionPane.showInputDialog(editor, - _("jmexico.scenario.inputName"), - _("jmexico.scenario.inputName.title"), - JOptionPane.QUESTION_MESSAGE); + _("jmexico.scenario.inputName"), + _("jmexico.scenario.inputName.title"), + JOptionPane.QUESTION_MESSAGE); // if user enter name if (StringUtils.isNotBlank(selectedName)) { @@ -58,20 +58,23 @@ Collection<Scenario> scenarios = inputDesign.getScenario(); int maxOrder = 0; - for (Scenario scenario : scenarios) { - if (selectedName.equalsIgnoreCase(scenario.getName())) { - JOptionPane.showMessageDialog(editor, - _("jmexico.error.title"), - _("jmexico.error.scenario.name.used"), - JOptionPane.ERROR_MESSAGE); + if (scenarios != null) { + for (Scenario scenario : scenarios) { + if (selectedName.equalsIgnoreCase(scenario.getName())) { - return; + JOptionPane.showMessageDialog(editor, + _("jmexico.error.title"), + _("jmexico.error.scenario.name.used"), + JOptionPane.ERROR_MESSAGE); + + return; + } + int orderNumber = scenario.getOrderNumber(); + if (maxOrder < orderNumber) { + maxOrder = orderNumber; + } } - int orderNumber = scenario.getOrderNumber(); - if (maxOrder < orderNumber) { - maxOrder = orderNumber; - } } // create new scenario Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignTableModel.java =================================================================== --- trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignTableModel.java 2012-01-26 16:54:30 UTC (rev 43) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignTableModel.java 2012-02-07 14:25:32 UTC (rev 44) @@ -78,14 +78,14 @@ factors = new LinkedList<Factor>(inputDesign.getExperimentDesign().getFactor()); // sort on id - Collections.sort(factors, new Comparator<Factor>() { +// Collections.sort(factors, new Comparator<Factor>() { +// +// @Override +// public int compare(Factor o1, Factor o2) { +// return o1.getName().compareTo(o2.getName()); +// } +// }); - @Override - public int compare(Factor o1, Factor o2) { - return o1.getName().compareTo(o2.getName()); - } - }); - factory.clearCache(); fireTableStructureChanged(); Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/MexicoDecoratorProvider.java =================================================================== --- trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/MexicoDecoratorProvider.java 2012-01-26 16:54:30 UTC (rev 43) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/MexicoDecoratorProvider.java 2012-02-07 14:25:32 UTC (rev 44) @@ -27,7 +27,9 @@ import fr.reseaumexico.model.Factor; import jaxx.runtime.decorator.DecoratorProvider; -/** @author sletellier <letellier(a)codelutin.com> */ +/** + * @author sletellier <letellier(a)codelutin.com> + */ public class MexicoDecoratorProvider extends DecoratorProvider { @Override 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-01-26 16:54:30 UTC (rev 43) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueCellRenderer.java 2012-02-07 14:25:32 UTC (rev 44) @@ -32,7 +32,9 @@ import javax.swing.table.TableCellRenderer; import java.awt.*; -/** @author sletellier <letellier(a)codelutin.com> */ +/** + * @author sletellier <letellier(a)codelutin.com> + */ public class FactorValueCellRenderer implements TableCellRenderer { protected FactorValueEditorFactory factory; Modified: trunk/jmexico-editor/src/site/site_fr.xml =================================================================== --- trunk/jmexico-editor/src/site/site_fr.xml 2012-01-26 16:54:30 UTC (rev 43) +++ trunk/jmexico-editor/src/site/site_fr.xml 2012-02-07 14:25:32 UTC (rev 44) @@ -25,7 +25,6 @@ --> - <project name="${project.name}"> <body> Modified: trunk/jmexico-editor-demo/pom.xml =================================================================== --- trunk/jmexico-editor-demo/pom.xml 2012-01-26 16:54:30 UTC (rev 43) +++ trunk/jmexico-editor-demo/pom.xml 2012-02-07 14:25:32 UTC (rev 44) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<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"> +<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> 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-01-26 16:54:30 UTC (rev 43) +++ trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUIHandler.java 2012-02-07 14:25:32 UTC (rev 44) @@ -50,7 +50,9 @@ */ public class MexicoEditorDemoUIHandler { - /** Logger */ + /** + * Logger + */ private static Log log = LogFactory.getLog(MexicoEditorDemoUIHandler.class); public void closeApplication(MexicoEditorDemoUI ui) { 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-01-26 16:54:30 UTC (rev 43) +++ trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUIModel.java 2012-02-07 14:25:32 UTC (rev 44) @@ -30,7 +30,9 @@ import java.beans.PropertyChangeSupport; import java.io.File; -/** @author sletellier <letellier(a)codelutin.com> */ +/** + * @author sletellier <letellier(a)codelutin.com> + */ public class MexicoEditorDemoUIModel { protected final PropertyChangeSupport pcs = new PropertyChangeSupport(this); Modified: trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/RunMexicoEditorDemo.java =================================================================== --- trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/RunMexicoEditorDemo.java 2012-01-26 16:54:30 UTC (rev 43) +++ trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/RunMexicoEditorDemo.java 2012-02-07 14:25:32 UTC (rev 44) @@ -37,7 +37,9 @@ */ public class RunMexicoEditorDemo { - /** Logger */ + /** + * Logger + */ private static Log log = LogFactory.getLog(RunMexicoEditorDemo.class); public static void main(String[] args) { Modified: trunk/jmexico-editor-demo/src/site/site_fr.xml =================================================================== --- trunk/jmexico-editor-demo/src/site/site_fr.xml 2012-01-26 16:54:30 UTC (rev 43) +++ trunk/jmexico-editor-demo/src/site/site_fr.xml 2012-02-07 14:25:32 UTC (rev 44) @@ -25,7 +25,6 @@ --> - <project name="${project.name}"> <body> Modified: trunk/jmexico-model/pom.xml =================================================================== --- trunk/jmexico-model/pom.xml 2012-01-26 16:54:30 UTC (rev 43) +++ trunk/jmexico-model/pom.xml 2012-02-07 14:25:32 UTC (rev 44) @@ -1,105 +1,106 @@ <?xml version="1.0" encoding="UTF-8"?> -<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> +<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> - <version>0.3-SNAPSHOT</version> - </parent> - + <parent> <groupId>fr.reseaumexico</groupId> - <artifactId>jmexico-model</artifactId> + <artifactId>jmexico</artifactId> + <version>0.3-SNAPSHOT</version> + </parent> -  -  -  + <groupId>fr.reseaumexico</groupId> + <artifactId>jmexico-model</artifactId> - <name>JMexico :: Model</name> - <description>JMexico - Model module</description> +  +  +  - <dependencies> + <name>JMexico :: Model</name> + <description>JMexico - Model module</description> -  - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> + <dependencies> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> +  + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> -  - <dependency> - <groupId>xpp3</groupId> - <artifactId>xpp3</artifactId> - </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> -  - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> +  + <dependency> + <groupId>xpp3</groupId> + <artifactId>xpp3</artifactId> + </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>test</scope> - </dependency> +  + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> - <dependency> - <groupId>xmlunit</groupId> - <artifactId>xmlunit</artifactId> - <scope>test</scope> - </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>test</scope> + </dependency> - </dependencies> + <dependency> + <groupId>xmlunit</groupId> + <artifactId>xmlunit</artifactId> + <scope>test</scope> + </dependency> -  -  -  + </dependencies> - <packaging>jar</packaging> +  +  +  - <build> + <packaging>jar</packaging> - <plugins> + <build> - <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> - <configuration> - <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver> - <templates> - org.nuiton.eugene.java.JavaInterfaceTransformer, - org.nuiton.eugene.java.JavaBeanTransformer, - org.nuiton.eugene.java.JavaEnumerationTransformer - </templates> - </configuration> - <executions> - <execution> - <phase>generate-sources</phase> - <configuration> - <defaultPackage>fr.reseaumexico.model</defaultPackage> - <fullPackagePath>fr.reseaumexico.model</fullPackagePath> - <inputs>src/main/xmi:mexico.zargo</inputs> - </configuration> - <goals> - <goal>smart-generate</goal> - </goals> - </execution> - </executions> - </plugin> + <plugins> - </plugins> - </build> + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <configuration> + <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver> + <templates> + org.nuiton.eugene.java.JavaInterfaceTransformer, + org.nuiton.eugene.java.JavaBeanTransformer, + org.nuiton.eugene.java.JavaEnumerationTransformer + </templates> + </configuration> + <executions> + <execution> + <phase>generate-sources</phase> + <configuration> + <defaultPackage>fr.reseaumexico.model</defaultPackage> + <fullPackagePath>fr.reseaumexico.model</fullPackagePath> + <inputs>src/main/xmi:mexico.zargo</inputs> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </project> \ No newline at end of file Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/MexicoUtil.java =================================================================== --- trunk/jmexico-model/src/main/java/fr/reseaumexico/model/MexicoUtil.java 2012-01-26 16:54:30 UTC (rev 43) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/MexicoUtil.java 2012-02-07 14:25:32 UTC (rev 44) @@ -26,7 +26,9 @@ import org.apache.commons.lang3.StringUtils; -/** @author sletellier <letellier(a)codelutin.com> */ +/** + * @author sletellier <letellier(a)codelutin.com> + */ public class MexicoUtil { public static Object getTypedValue(ValueType type, String value) { 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-01-26 16:54:30 UTC (rev 43) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ExperimentDesignParser.java 2012-02-07 14:25:32 UTC (rev 44) @@ -63,7 +63,7 @@ public ExperimentDesignParser(File file) throws FileNotFoundException { super(file); - factors = Maps.newHashMap(); + factors = Maps.newLinkedHashMap(); } @Override 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-01-26 16:54:30 UTC (rev 43) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/XmlNode.java 2012-02-07 14:25:32 UTC (rev 44) @@ -26,11 +26,12 @@ 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/jmexico-model/src/site/site_fr.xml =================================================================== --- trunk/jmexico-model/src/site/site_fr.xml 2012-01-26 16:54:30 UTC (rev 43) +++ trunk/jmexico-model/src/site/site_fr.xml 2012-02-07 14:25:32 UTC (rev 44) @@ -25,7 +25,6 @@ --> - <project name="${project.name}"> <body> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-26 16:54:30 UTC (rev 43) +++ trunk/pom.xml 2012-02-07 14:25:32 UTC (rev 44) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<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/maven-v4_0_0.xsd"> +<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/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -37,7 +38,7 @@ <inceptionYear>2011</inceptionYear> <url>http://maven-site.forge.codelutin.com/jmexico</url> - + <organization> <name>Code Lutin</name> </organization> @@ -90,15 +91,15 @@   -  -  -  +  +  +   <dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - <version>${nuitonI18nVersion}</version> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + <version>${nuitonI18nVersion}</version> </dependency>  Modified: trunk/src/site/resources/examples/inputDesign.xml =================================================================== --- trunk/src/site/resources/examples/inputDesign.xml 2012-01-26 16:54:30 UTC (rev 43) +++ trunk/src/site/resources/examples/inputDesign.xml 2012-02-07 14:25:32 UTC (rev 44) @@ -31,7 +31,7 @@ </description> <factors> <factor id="Consommation en energie"> - <description>CEN Consommation brute en energie fossile associee a la conduite du SDC</description> + <description>CEN Consommation brute en energie fossile associee a la conduite du SDC</description> <domain valueType="INTEGER"/> <feature name="ScaleValue_name" value="elevee" valueType="STRING"/> <feature name="ScaleValue_name" value="moyenne" valueType="STRING"/> @@ -63,7 +63,7 @@ <feature name="ScaleValue_name" value="nulle" valueType="STRING"/> </factor> <factor id="Contribution a l emergence de filieres"> - <description>CENF Contribution a l emergence de nouvelles filieres</description> + <description>CENF Contribution a l emergence de nouvelles filieres</description> <domain valueType="INTEGER"/> <feature name="ScaleValue_name" value="nulle" valueType="STRING"/> <feature name="ScaleValue_name" value="Moyenne" valueType="STRING"/> @@ -79,7 +79,7 @@ <feature name="ScaleValue_name" value="tres elevee" valueType="STRING"/> </factor> <factor id="Maitrise du statut organique"> - <description>MSO Maitrise de la teneur en matiere organique du sol</description> + <description>MSO Maitrise de la teneur en matiere organique du sol</description> <domain valueType="INTEGER"/> <feature name="ScaleValue_name" value="tres faible" valueType="STRING"/> <feature name="ScaleValue_name" value="faible a moyenne" valueType="STRING"/> @@ -95,7 +95,7 @@ <feature name="ScaleValue_name" value="tres elevee" valueType="STRING"/> </factor> <factor id="Maitrise de l erosion"> - <description>MERO Maitrise du risque d erosion du sol</description> + <description>MERO Maitrise du risque d erosion du sol</description> <domain valueType="INTEGER"/> <feature name="ScaleValue_name" value="tres faible" valueType="STRING"/> <feature name="ScaleValue_name" value="faible a moyenne" valueType="STRING"/> @@ -111,7 +111,8 @@ <feature name="ScaleValue_name" value="tres faible" valueType="STRING"/> </factor> <factor id="Efficience economique"> - <description>EFF Efficience economique vis-a-vis des intrants comptabilises dans la marge semi-nette</description> + <description>EFF Efficience economique vis-a-vis des intrants comptabilises dans la marge semi-nette + </description> <domain valueType="INTEGER"/> <feature name="ScaleValue_name" value="tres faible" valueType="STRING"/> <feature name="ScaleValue_name" value="faible a moyenne" valueType="STRING"/> @@ -135,7 +136,7 @@ <feature name="ScaleValue_name" value="tres elevee" valueType="STRING"/> </factor> <factor id="Maitrise des emissions de N2O"> - <description>MN2O Risque de pertes de protoxyde d azote dans l air</description> + <description>MN2O Risque de pertes de protoxyde d azote dans l air</description> <domain valueType="INTEGER"/> <feature name="ScaleValue_name" value="tres faible" valueType="STRING"/> <feature name="ScaleValue_name" value="faible a moyenne" valueType="STRING"/> @@ -150,14 +151,14 @@ <feature name="ScaleValue_name" value="eleve" valueType="STRING"/> </factor> <factor id="Qualite technonologique et esthetique des produits"> - <description>QTEP Risque de non atteinte du niveau de qualite technologique/esthetique exige</description> + <description>QTEP Risque de non atteinte du niveau de qualite technologique/esthetique exige</description> <domain valueType="INTEGER"/> <feature name="ScaleValue_name" value="faible" valueType="STRING"/> <feature name="ScaleValue_name" value="moyenne" valueType="STRING"/> <feature name="ScaleValue_name" value="elevee" valueType="STRING"/> </factor> <factor id="Pression Phosphore"> - <description>PSPH Pression exerce par leSDC sur les ressources biogeochimiques en phosphore</description> + <description>PSPH Pression exerce par leSDC sur les ressources biogeochimiques en phosphore</description> <domain valueType="INTEGER"/> <feature name="ScaleValue_name" value="tres elevee" valueType="STRING"/> <feature name="ScaleValue_name" value="moyenne a elevee" valueType="STRING"/> @@ -165,14 +166,14 @@ <feature name="ScaleValue_name" value="tres faible" valueType="STRING"/> </factor> <factor id="Surcharge de travail"> - <description>SDT Contribution du SDC a la surcharge de travail en periode de pointe</description> + <description>SDT Contribution du SDC a la surcharge de travail en periode de pointe</description> <domain valueType="INTEGER"/> <feature name="ScaleValue_name" value="elevee" valueType="STRING"/> <feature name="ScaleValue_name" value="moyenne" valueType="STRING"/> <feature name="ScaleValue_name" value="faible" valueType="STRING"/> </factor> <factor id="Maitrise des emissions de NH3"> - <description>MNH3 Risque de pertes d ammoniac par volatilisation </description> + <description>MNH3 Risque de pertes d ammoniac par volatilisation</description> <domain valueType="INTEGER"/> <feature name="ScaleValue_name" value="tres faible" valueType="STRING"/> <feature name="ScaleValue_name" value="faible a moyenne" valueType="STRING"/> @@ -180,7 +181,7 @@ <feature name="ScaleValue_name" value="tres elevee" valueType="STRING"/> </factor> <factor id="Qualite sanitaire"> - <description>QS Risque de non atteinte de niveau de qualite sanitaire exige par les filieres</description> + <description>QS Risque de non atteinte de niveau de qualite sanitaire exige par les filieres</description> <domain valueType="INTEGER"/> <feature name="ScaleValue_name" value="faible" valueType="STRING"/> <feature name="ScaleValue_name" value="moyenne" valueType="STRING"/> @@ -239,14 +240,15 @@ <feature name="ScaleValue_name" value="tres elevee" valueType="STRING"/> </factor> <factor id="Conso. en eau d irrigation en periode critique"> - <description>IRRC Consommation d eau d irrigation en periodes critiques (secheresse/etiage)</description> + <description>IRRC Consommation d eau d irrigation en periodes critiques (secheresse/etiage)</description> <domain valueType="INTEGER"/> <feature name="ScaleValue_name" value="elevee" valueType="STRING"/> <feature name="ScaleValue_name" value="moyenne" valueType="STRING"/> <feature name="ScaleValue_name" value="faible" valueType="STRING"/> </factor> <factor id="Contribution a l emploi"> - <description>EMP Contribution du SDC a l insertion sociale et au developpement local par les emplois </description> + <description>EMP Contribution du SDC a l insertion sociale et au developpement local par les emplois + </description> <domain valueType="INTEGER"/> <feature name="ScaleValue_name" value="tres faible" valueType="STRING"/> <feature name="ScaleValue_name" value="faible a moyenne" valueType="STRING"/> @@ -254,7 +256,7 @@ <feature name="ScaleValue_name" value="tres elevee" valueType="STRING"/> </factor> <factor id="Maitrise de l accumulation d elements toxiques"> - <description>MAET Maitrise a long terme de l accumulation d elements toxiques dans le sol</description> + <description>MAET Maitrise a long terme de l accumulation d elements toxiques dans le sol</description> <domain valueType="INTEGER"/> <feature name="ScaleValue_name" value="tres faible" valueType="STRING"/> <feature name="ScaleValue_name" value="faible a moyenne" valueType="STRING"/> @@ -290,7 +292,7 @@ <feature name="ScaleValue_name" value="eleve" valueType="STRING"/> </factor> <factor id="Efficience energetique"> - <description>EEN Rapport d efficience entre lenergie produite et energie consommee par le SDC</description> + <description>EEN Rapport d efficience entre lenergie produite et energie consommee par le SDC</description> <domain valueType="INTEGER"/> <feature name="ScaleValue_name" value="faible" valueType="STRING"/> <feature name="ScaleValue_name" value="moyen" valueType="STRING"/> @@ -304,7 +306,7 @@ <feature name="ScaleValue_name" value="eleve" valueType="STRING"/> </factor> <factor id="Maitrise pertes dans les eaux superficielles"> - <description>MPES Risque de pollution des eaux superficielles par les pesticides</description> + <description>MPES Risque de pollution des eaux superficielles par les pesticides</description> <domain valueType="INTEGER"/> <feature name="ScaleValue_name" value="tres faible" valueType="STRING"/> <feature name="ScaleValue_name" value="faible a moyenne" valueType="STRING"/> @@ -319,14 +321,14 @@ <feature name="ScaleValue_name" value="eleve" valueType="STRING"/> </factor> <factor id="Surcout en materiel"> - <description>MAT Surcout en investissements lies au materiel supplementaire specifique au SDC</description> + <description>MAT Surcout en investissements lies au materiel supplementaire specifique au SDC</description> <domain valueType="INTEGER"/> <feature name="ScaleValue_name" value="eleve" valueType="STRING"/> <feature name="ScaleValue_name" value="moyen" valueType="STRING"/> <feature name="ScaleValue_name" value="faible" valueType="STRING"/> </factor> <factor id="Temps de veille technico-economique"> - <description>TVTE Difficulte de mise en oeuvre d un SDC compose de cultures differentes</description> + <description>TVTE Difficulte de mise en oeuvre d un SDC compose de cultures differentes</description> <domain valueType="INTEGER"/> <feature name="ScaleValue_name" value="eleve" valueType="STRING"/> <feature name="ScaleValue_name" value="moyen" valueType="STRING"/> @@ -341,7 +343,7 @@ <feature name="ScaleValue_name" value="tres faible" valueType="STRING"/> </factor> <factor id="Maitrise des emissions de pesticides Air"> - <description>MPA Risque de pollution atmospherique par les pesticides</description> + <description>MPA Risque de pollution atmospherique par les pesticides</description> <domain valueType="INTEGER"/> <feature name="ScaleValue_name" value="tres faible" valueType="STRING"/> <feature name="ScaleValue_name" value="faible a moyenne" valueType="STRING"/> @@ -363,7 +365,7 @@ <feature name="ScaleValue_name" value="faible" valueType="STRING"/> </factor> <factor id="Fourniture de matieres premieres"> - <description>FMP Contribution du SDC a satisfaire les besoins de la societe en produits agricoles</description> + <description>FMP Contribution du SDC a satisfaire les besoins de la societe en produits agricoles</description> <domain valueType="INTEGER"/> <feature name="ScaleValue_name" value="tres faible" valueType="STRING"/> <feature name="ScaleValue_name" value="faible a moyenne" valueType="STRING"/> @@ -371,14 +373,15 @@ <feature name="ScaleValue_name" value="tres elevee" valueType="STRING"/> </factor> <factor id="Difficulte physique"> - <description>DIFF Niveau de penibilite physique associe a la conduite des operations culturales du SDC</description> + <description>DIFF Niveau de penibilite physique associe a la conduite des operations culturales du SDC + </description> <domain valueType="INTEGER"/> <feature name="ScaleValue_name" value="elevee" valueType="STRING"/> <feature name="ScaleValue_name" value="moyenne" valueType="STRING"/> <feature name="ScaleValue_name" value="faible" valueType="STRING"/> </factor> <factor id="Complexite des itineraires techniques"> - <description>CIT Complexite des interventions culturales induites par le SDC </description> + <description>CIT Complexite des interventions culturales induites par le SDC</description> <domain valueType="INTEGER"/> <feature name="ScaleValue_name" value="tres elevee" valueType="STRING"/> <feature name="ScaleValue_name" value="moyenne a elevee" valueType="STRING"/> @@ -409,7 +412,7 @@ <feature name="ScaleValue_name" value="tres elevee" valueType="STRING"/> </factor> <factor id="Maitrise des pertes de NO3"> - <description>MPNO3 Risque de pollution des eaux induit par les nitrates</description> + <description>MPNO3 Risque de pollution des eaux induit par les nitrates</description> <domain valueType="INTEGER"/> <feature name="ScaleValue_name" value="tres faible" valueType="STRING"/> <feature name="ScaleValue_name" value="faible a moyenne" valueType="STRING"/> @@ -424,7 +427,7 @@ <feature name="ScaleValue_name" value="Nulle" valueType="STRING"/> </factor> <factor id="Maitrise pertes dans les eaux profondes"> - <description>MPEP Risque de pollution des eaux profondes par les pesticides</description> + <description>MPEP Risque de pollution des eaux profondes par les pesticides</description> <domain valueType="INTEGER"/> <feature name="ScaleValue_name" value="tres faible" valueType="STRING"/> <feature name="ScaleValue_name" value="faible a moyenne" valueType="STRING"/> @@ -446,7 +449,7 @@ <feature name="ScaleValue_name" value="faible" valueType="STRING"/> </factor> <factor id="Rentabilite"> - <description>MSN Rentabilite a court terme du SDC calculee avec la marge semi-nette</description> + <description>MSN Rentabilite a court terme du SDC calculee avec la marge semi-nette</description> <domain valueType="INTEGER"/> <feature name="ScaleValue_name" value="tres faible" valueType="STRING"/> <feature name="ScaleValue_name" value="faible a moyenne" valueType="STRING"/> @@ -462,7 +465,8 @@ <feature name="ScaleValue_name" value="tres faible" valueType="STRING"/> </factor> <factor id="Risque pour la sante de l applicateur"> - <description>TOX Risque d intoxication du travailleur lors de la manipulation des produits phytosanitaires</description> + <description>TOX Risque d intoxication du travailleur lors de la manipulation des produits phytosanitaires + </description> <domain valueType="INTEGER"/> <feature name="ScaleValue_name" value="eleve" valueType="STRING"/> <feature name="ScaleValue_name" value="moyen" valueType="STRING"/> @@ -507,7 +511,7 @@ <feature name="ScaleValue_name" value="faible" valueType="STRING"/> </factor> <factor id="Independance economique"> - <description>IND Independance economique vis-a-vis dess aides incluses dans la marge semi-nette</description> + <description>IND Independance economique vis-a-vis dess aides incluses dans la marge semi-nette</description> <domain valueType="INTEGER"/> <feature name="ScaleValue_name" value="tres faible" valueType="STRING"/> <feature name="ScaleValue_name" value="faible a moyenne" valueType="STRING"/> @@ -536,7 +540,7 @@ <feature name="ScaleValue_name" value="nul" valueType="STRING"/> </factor> <factor id="Maitrise des adventices"> - <description>MADV Evolution de la pression des adventices </description> + <description>MADV Evolution de la pression des adventices</description> <domain valueType="INTEGER"/> <feature name="ScaleValue_name" value="tres faible" valueType="STRING"/> <feature name="ScaleValue_name" value="faible a moyenne" valueType="STRING"/>

1 0

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

26 Jan '12

Author: maven-release Date: 2012-01-26 17:54:30 +0100 (Thu, 26 Jan 2012) New Revision: 43 Url: http://forge.codelutin.com/repositories/revision/jmexico/43 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-01-26 16:54:29 UTC (rev 42) +++ trunk/jmexico-editor/pom.xml 2012-01-26 16:54:30 UTC (rev 43) @@ -10,7 +10,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.2</version> + <version>0.3-SNAPSHOT</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/jmexico-editor-demo/pom.xml =================================================================== --- trunk/jmexico-editor-demo/pom.xml 2012-01-26 16:54:29 UTC (rev 42) +++ trunk/jmexico-editor-demo/pom.xml 2012-01-26 16:54:30 UTC (rev 43) @@ -10,7 +10,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.2</version> + <version>0.3-SNAPSHOT</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/jmexico-model/pom.xml =================================================================== --- trunk/jmexico-model/pom.xml 2012-01-26 16:54:29 UTC (rev 42) +++ trunk/jmexico-model/pom.xml 2012-01-26 16:54:30 UTC (rev 43) @@ -10,7 +10,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.2</version> + <version>0.3-SNAPSHOT</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-26 16:54:29 UTC (rev 42) +++ trunk/pom.xml 2012-01-26 16:54:30 UTC (rev 43) @@ -16,7 +16,7 @@ <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.2</version> + <version>0.3-SNAPSHOT</version> <modules> <module>jmexico-model</module> @@ -198,11 +198,11 @@  <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/jmexico/tags/jmexico-0.2</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.2 + scm:svn:http://svn.forge.codelutin.com/svn/jmexico/trunk </developerConnection> - <url>http://forge.codelutin.com/repositories/browse/jmexico/tags/jmexico-0.2</url> + <url>http://forge.codelutin.com/repositories/browse/jmexico/trunk</url> </scm> <distributionManagement>

1 0

r42 - tags
by maven-release＠users.forge.codelutin.com 26 Jan '12

26 Jan '12

Author: maven-release Date: 2012-01-26 17:54:29 +0100 (Thu, 26 Jan 2012) New Revision: 42 Url: http://forge.codelutin.com/repositories/revision/jmexico/42 Log: [maven-release-plugin] copy for tag jmexico-0.2 Added: tags/jmexico-0.2/

1 0

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

26 Jan '12

Author: maven-release Date: 2012-01-26 17:54:28 +0100 (Thu, 26 Jan 2012) New Revision: 41 Url: http://forge.codelutin.com/repositories/revision/jmexico/41 Log: [maven-release-plugin] prepare release jmexico-0.2 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-01-26 16:36:49 UTC (rev 40) +++ trunk/jmexico-editor/pom.xml 2012-01-26 16:54:28 UTC (rev 41) @@ -10,7 +10,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.2-SNAPSHOT</version> + <version>0.2</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/jmexico-editor-demo/pom.xml =================================================================== --- trunk/jmexico-editor-demo/pom.xml 2012-01-26 16:36:49 UTC (rev 40) +++ trunk/jmexico-editor-demo/pom.xml 2012-01-26 16:54:28 UTC (rev 41) @@ -10,7 +10,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.2-SNAPSHOT</version> + <version>0.2</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/jmexico-model/pom.xml =================================================================== --- trunk/jmexico-model/pom.xml 2012-01-26 16:36:49 UTC (rev 40) +++ trunk/jmexico-model/pom.xml 2012-01-26 16:54:28 UTC (rev 41) @@ -10,7 +10,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.2-SNAPSHOT</version> + <version>0.2</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-26 16:36:49 UTC (rev 40) +++ trunk/pom.xml 2012-01-26 16:54:28 UTC (rev 41) @@ -16,7 +16,7 @@ <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.2-SNAPSHOT</version> + <version>0.2</version> <modules> <module>jmexico-model</module> @@ -198,11 +198,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.2</connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/jmexico/trunk + scm:svn:http://svn.forge.codelutin.com/svn/jmexico/tags/jmexico-0.2 </developerConnection> - <url>http://forge.codelutin.com/repositories/browse/jmexico/trunk</url> + <url>http://forge.codelutin.com/repositories/browse/jmexico/tags/jmexico-0.2</url> </scm> <distributionManagement>

1 0

r40 - in trunk: jmexico-editor-demo jmexico-editor-demo/src/license jmexico-editor-demo/src/main/assembly jmexico-editor-demo/src/main/assembly/bin jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo jmexico-editor-demo/src/main/resources jmexico-editor-demo/src/main/resources/i18n jmexico-editor-demo/src/site jmexico-editor-demo/src/site/rst jmexico-model/src/main/xmi
by sletellier＠users.forge.codelutin.com 26 Jan '12

26 Jan '12

Author: sletellier Date: 2012-01-26 17:36:49 +0100 (Thu, 26 Jan 2012) New Revision: 40 Url: http://forge.codelutin.com/repositories/revision/jmexico/40 Log: Update headers and keywords Modified: trunk/jmexico-editor-demo/LICENSE.txt trunk/jmexico-editor-demo/README.txt trunk/jmexico-editor-demo/changelog.txt trunk/jmexico-editor-demo/pom.xml trunk/jmexico-editor-demo/src/license/THIRD-PARTY.properties trunk/jmexico-editor-demo/src/main/assembly/bin.xml trunk/jmexico-editor-demo/src/main/assembly/bin/README.txt trunk/jmexico-editor-demo/src/main/assembly/bin/go.bat trunk/jmexico-editor-demo/src/main/assembly/bin/go.sh trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUI.css trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUI.jaxx 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-demo/src/main/java/fr/reseaumexico/editor/demo/RunMexicoEditorDemo.java trunk/jmexico-editor-demo/src/main/resources/i18n/jmexico-editor-demo_en_GB.properties trunk/jmexico-editor-demo/src/main/resources/i18n/jmexico-editor-demo_fr_FR.properties trunk/jmexico-editor-demo/src/main/resources/log4j.properties trunk/jmexico-editor-demo/src/site/rst/index.rst trunk/jmexico-editor-demo/src/site/site_fr.xml trunk/jmexico-model/src/main/xmi/mexico.properties Property changes on: trunk/jmexico-editor-demo/LICENSE.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: trunk/jmexico-editor-demo/README.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: trunk/jmexico-editor-demo/changelog.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: trunk/jmexico-editor-demo/pom.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: trunk/jmexico-editor-demo/src/license/THIRD-PARTY.properties ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: trunk/jmexico-editor-demo/src/main/assembly/bin/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/jmexico-editor-demo/src/main/assembly/bin/go.bat ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jmexico-editor-demo/src/main/assembly/bin/go.sh =================================================================== --- trunk/jmexico-editor-demo/src/main/assembly/bin/go.sh 2012-01-26 16:27:47 UTC (rev 39) +++ trunk/jmexico-editor-demo/src/main/assembly/bin/go.sh 2012-01-26 16:36:49 UTC (rev 40) @@ -2,8 +2,8 @@ # #%L # ObServe :: Client # -# $Id: go.sh 1306 2011-02-15 21:15:22Z chemit $ -# $HeadURL: https://svn.mpl.ird.fr/osiris/observe/trunk/observe-cli/src/main/assembly/b… $ +# $Id$ +# $HeadURL$ # %% # Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit # %% Property changes on: trunk/jmexico-editor-demo/src/main/assembly/bin/go.sh ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/jmexico-editor-demo/src/main/assembly/bin.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUI.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUI.jaxx ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUIHandler.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUIModel.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/RunMexicoEditorDemo.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: trunk/jmexico-editor-demo/src/main/resources/i18n/jmexico-editor-demo_en_GB.properties ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: trunk/jmexico-editor-demo/src/main/resources/i18n/jmexico-editor-demo_fr_FR.properties ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: trunk/jmexico-editor-demo/src/main/resources/log4j.properties ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: trunk/jmexico-editor-demo/src/site/rst/index.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/jmexico-editor-demo/src/site/site_fr.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: trunk/jmexico-model/src/main/xmi/mexico.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r39 - in trunk: jmexico-editor/src/main/java/fr/reseaumexico/editor jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue jmexico-model/src/main/java/fr/reseaumexico/model/parser jmexico-model/src/main/java/fr/reseaumexico/model/writer
by sletellier＠users.forge.codelutin.com 26 Jan '12

26 Jan '12

Author: sletellier Date: 2012-01-26 17:27:47 +0100 (Thu, 26 Jan 2012) New Revision: 39 Url: http://forge.codelutin.com/repositories/revision/jmexico/39 Log: - Allow to clear cache if needed Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditor.jaxx trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignTableModel.java trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueEditorFactory.java trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ExperimentDesignParser.java trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/XmlNode.java Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditor.jaxx =================================================================== --- trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditor.jaxx 2012-01-26 14:40:44 UTC (rev 38) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditor.jaxx 2012-01-26 16:27:47 UTC (rev 39) @@ -36,7 +36,7 @@ <InputDesignEditorHandler id='handler'/> - <InputDesignTableModel id='model' javaBean="new InputDesignTableModel()"/> + <InputDesignTableModel id='model' constructorParams='this'/> <FactorValueCellEditor id='cellEditor' constructorParams='this'/> Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignTableModel.java =================================================================== --- trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignTableModel.java 2012-01-26 14:40:44 UTC (rev 38) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignTableModel.java 2012-01-26 16:27:47 UTC (rev 39) @@ -24,6 +24,7 @@ */ package fr.reseaumexico.editor; +import fr.reseaumexico.editor.factorValue.FactorValueEditorFactory; import fr.reseaumexico.model.Factor; import fr.reseaumexico.model.InputDesign; import fr.reseaumexico.model.MexicoUtil; @@ -31,6 +32,7 @@ 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; @@ -59,7 +61,12 @@ protected List<Factor> factors; - public InputDesignTableModel() { + protected FactorValueEditorFactory factory; + + public InputDesignTableModel(JAXXContext context) { + // search specific factory in context + factory = context.getContextValue(FactorValueEditorFactory.class); + delegate = new DefaultTableModel(); } @@ -79,6 +86,8 @@ } }); + factory.clearCache(); + fireTableStructureChanged(); } 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-01-26 14:40:44 UTC (rev 38) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueEditorFactory.java 2012-01-26 16:27:47 UTC (rev 39) @@ -128,6 +128,10 @@ return getCellEditor(factor, value); } + public void clearCache() { + factorValueEditorCache = Maps.newHashMap(); + } + protected interface FactorValueCellRenderer { Component getComponent(); 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-01-26 14:40:44 UTC (rev 38) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ExperimentDesignParser.java 2012-01-26 16:27:47 UTC (rev 39) @@ -164,7 +164,7 @@ if (parser.getEventType() == XmlPullParser.START_TAG && parserEqual(parser, FEATURE)) { - List<Feature> features = Lists.newLinkedList(); + List<Feature> features = Lists.newArrayList(); while (parserEqual(parser, FEATURE)) { 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-01-26 14:40:44 UTC (rev 38) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/XmlNode.java 2012-01-26 16:27:47 UTC (rev 39) @@ -26,13 +26,12 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import java.util.List; +import java.util.Map; +import java.util.Set; import org.apache.commons.lang3.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; -import java.util.LinkedList; -import java.util.Map; -import java.util.Set; - /** * Represent an XML node * @@ -46,7 +45,7 @@ public static final String START_TAG = "%s<%s%s>"; public static final String END_TAG = "%s</%s>\n"; - protected LinkedList<XmlNode> children; + protected List<XmlNode> children; protected Map<String, String> attributes; protected String tagName; protected String text; @@ -58,7 +57,7 @@ public XmlNode(String tagName, String text) { this.tagName = tagName; this.text = text; - children = Lists.newLinkedList(); + children = Lists.newArrayList(); attributes = Maps.newHashMap(); }

1 0