[Jmexico-commits] r32 - in trunk: jmexico-editor jmexico-editor/src/main/java/fr/reseaumexico/editor jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue jmexico-editor/src/main/java/fr/reseaumexico/editor/ui jmexico-editor/src/main/resources/i18n jmexico-editor-demo jmexico-editor-demo/src/main/assembly 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/s

Author: tchemit Date: 2012-01-18 17:58:27 +0100 (Wed, 18 Jan 2012) New Revision: 32 Url: http://forge.codelutin.com/repositories/revision/jmexico/32 Log: update headers fix event method names Removed: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ui/decorator/ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ui/editor/ Modified: trunk/jmexico-editor-demo/pom.xml trunk/jmexico-editor-demo/src/main/assembly/bin.xml 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-editor/pom.xml trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditor.jaxx trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorHandler.java trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/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/FactorValueEditor.jaxx trunk/jmexico-editor/src/main/resources/i18n/jmexico-editor_en_GB.properties trunk/jmexico-editor/src/main/resources/i18n/jmexico-editor_fr_FR.properties trunk/jmexico-model/src/main/java/fr/reseaumexico/model/DateFormatFactory.java trunk/jmexico-model/src/main/java/fr/reseaumexico/model/InputDesignImpl.java trunk/jmexico-model/src/main/java/fr/reseaumexico/model/MexicoTechnicalException.java trunk/jmexico-model/src/main/java/fr/reseaumexico/model/MexicoUtil.java trunk/jmexico-model/src/main/java/fr/reseaumexico/model/MexicoXmlConstant.java trunk/jmexico-model/src/main/java/fr/reseaumexico/model/ScenarioImpl.java trunk/jmexico-model/src/main/java/fr/reseaumexico/model/event/InputDesignFactorEvent.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/parser/XmlParser.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/jmexico-model/src/main/java/fr/reseaumexico/model/writer/XmlWriter.java trunk/jmexico-model/src/main/xmi/mexico.properties trunk/jmexico-model/src/main/xmi/mexico.zargo trunk/jmexico-model/src/site/site_fr.xml trunk/src/site/resources/examples/experimentDesign.xml trunk/src/site/rst/index.rst Modified: trunk/jmexico-editor/pom.xml =================================================================== --- trunk/jmexico-editor/pom.xml 2012-01-18 16:16:00 UTC (rev 31) +++ trunk/jmexico-editor/pom.xml 2012-01-18 16:58:27 UTC (rev 32) @@ -112,13 +112,13 @@ <goal>parserJava</goal> <goal>gen</goal> </goals> - <!--<configuration>--> - <!--<entries>--> - <!--<entry>--> - <!--<basedir>${maven.gen.dir}/java/</basedir>--> - <!--</entry>--> - <!--</entries>--> - <!--</configuration>--> + <configuration> + <entries> + <entry> + <basedir>${maven.gen.dir}/java/</basedir> + </entry> + </entries> + </configuration> </execution> </executions> </plugin> 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-18 16:16:00 UTC (rev 31) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditor.jaxx 2012-01-18 16:58:27 UTC (rev 32) @@ -66,7 +66,7 @@ } ]]> </script> - + <JScrollPane constraints='BorderLayout.CENTER'> <JTable id='inputDesignTable' model='{getModel()}'/> </JScrollPane> 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-18 16:16:00 UTC (rev 31) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorHandler.java 2012-01-18 16:58:27 UTC (rev 32) @@ -29,10 +29,11 @@ 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._; @@ -100,7 +101,7 @@ // show scenario select dialog Collection<Scenario> scenarios = inputDesign.getScenario(); - Scenario scenario = (Scenario)JOptionPane.showInputDialog( + Scenario scenario = (Scenario) JOptionPane.showInputDialog( editor, _("jmexico.scenario.selectRemove"), _("jmexico.scenario.selectRemove.title"), 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-18 16:16:00 UTC (rev 31) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignTableModel.java 2012-01-18 16:58:27 UTC (rev 32) @@ -31,16 +31,17 @@ import fr.reseaumexico.model.ValueType; import fr.reseaumexico.model.event.InputDesignScenarioEvent; import fr.reseaumexico.model.event.InputDesignScenarioListener; +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.Collections; import java.util.Comparator; 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 org.apache.commons.lang3.ObjectUtils; import static org.nuiton.i18n.I18n._; @@ -68,7 +69,7 @@ // extract factors factors = new LinkedList<Factor>(inputDesign.getExperimentDesign().getFactor()); - + // sort on id Collections.sort(factors, new Comparator<Factor>() { @@ -82,12 +83,12 @@ } @Override - public void onScenarioAdded(InputDesignScenarioEvent event) { + public void scenarioAdded(InputDesignScenarioEvent event) { fireTableStructureChanged(); } @Override - public void onScenarioRemoved(InputDesignScenarioEvent event) { + public void scenarioRemoved(InputDesignScenarioEvent event) { fireTableStructureChanged(); } @@ -178,7 +179,7 @@ if (scenario == null) { return null; } - Map<Factor,Object> factorValues = scenario.getFactorValues(); + Map<Factor, Object> factorValues = scenario.getFactorValues(); Object result = factorValues.get(factor); return result; @@ -191,7 +192,7 @@ return; } if (columnIndex == 0) { - + // must never append return; } 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-18 16:16:00 UTC (rev 31) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/MexicoDecoratorProvider.java 2012-01-18 16:58:27 UTC (rev 32) @@ -27,9 +27,7 @@ import fr.reseaumexico.model.Factor; import jaxx.runtime.decorator.DecoratorProvider; -/** - * @author sletellier <letellier@codelutin.com> - */ +/** @author sletellier <letellier@codelutin.com> */ public class MexicoDecoratorProvider extends DecoratorProvider { @Override 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-01-18 16:16:00 UTC (rev 31) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueCellEditor.java 2012-01-18 16:58:27 UTC (rev 32) @@ -25,24 +25,22 @@ package fr.reseaumexico.editor.factorValue; import fr.reseaumexico.model.Factor; -import java.awt.Component; +import jaxx.runtime.JAXXContext; + +import javax.swing.*; +import javax.swing.table.TableCellEditor; +import java.awt.*; 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; /** * Cell editor for factor values * * @author sletellier <letellier@codelutin.com> - * @since 0.1 * @see TableCellEditor + * @since 0.1 */ public class FactorValueCellEditor extends AbstractCellEditor implements TableCellEditor, FocusListener { @@ -96,7 +94,7 @@ // stop editing on select for combos if (component instanceof JComboBox) { - ((JComboBox)component).addActionListener(new ActionListener() { + ((JComboBox) component).addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { 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-18 16:16:00 UTC (rev 31) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueCellRenderer.java 2012-01-18 16:58:27 UTC (rev 32) @@ -25,17 +25,16 @@ package fr.reseaumexico.editor.factorValue; import fr.reseaumexico.model.Factor; -import java.awt.Component; -import javax.swing.JTable; +import jaxx.runtime.JAXXContext; + +import javax.swing.*; import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellRenderer; -import jaxx.runtime.JAXXContext; +import java.awt.*; -/** - * @author sletellier <letellier@codelutin.com> - */ +/** @author sletellier <letellier@codelutin.com> */ public class FactorValueCellRenderer implements TableCellRenderer { - + protected FactorValueEditorFactory factory; protected TableCellRenderer delegate; Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueEditor.jaxx =================================================================== --- trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueEditor.jaxx 2012-01-18 16:16:00 UTC (rev 31) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueEditor.jaxx 2012-01-18 16:58:27 UTC (rev 32) @@ -28,8 +28,8 @@ layout='{new BorderLayout()}'> <import> -java.awt.BorderLayout -fr.reseaumexico.model.Factor + java.awt.BorderLayout + fr.reseaumexico.model.Factor </import> <Factor id='factor' initializer='getContextValue(Factor.class)'/> @@ -42,4 +42,4 @@ ]]> </script> -</JDialog> \ No newline at end of file +</JDialog> Modified: trunk/jmexico-editor/src/main/resources/i18n/jmexico-editor_en_GB.properties =================================================================== --- trunk/jmexico-editor/src/main/resources/i18n/jmexico-editor_en_GB.properties 2012-01-18 16:16:00 UTC (rev 31) +++ trunk/jmexico-editor/src/main/resources/i18n/jmexico-editor_en_GB.properties 2012-01-18 16:58:27 UTC (rev 32) @@ -1,6 +1,8 @@ +jmexico.add.scenario=Add scenario jmexico.error.scenario.name.used=Error \: scenario name '%1$s' is already used. jmexico.error.title=Error jmexico.factor.name=Factor +jmexico.remove.scenario=Delete scenario jmexico.scenario.inputName=Name of scenario to add \: jmexico.scenario.inputName.title=Input a name for scenario to add jmexico.scenario.selectRemove=Select scenario to delete Modified: trunk/jmexico-editor/src/main/resources/i18n/jmexico-editor_fr_FR.properties =================================================================== --- trunk/jmexico-editor/src/main/resources/i18n/jmexico-editor_fr_FR.properties 2012-01-18 16:16:00 UTC (rev 31) +++ trunk/jmexico-editor/src/main/resources/i18n/jmexico-editor_fr_FR.properties 2012-01-18 16:58:27 UTC (rev 32) @@ -1,6 +1,8 @@ +jmexico.add.scenario=Ajouter un scénario jmexico.error.scenario.name.used=Erreur \: le scenario '%1$s' est déjà utilisé. jmexico.error.title=Erreur jmexico.factor.name=Facteur +jmexico.remove.scenario=Supprimer un scénario jmexico.scenario.inputName=Nom du scénario à ajouter \: jmexico.scenario.inputName.title=Enter un nom pour le scenario à ajouter jmexico.scenario.selectRemove=Selection du scénario à supprimer Modified: trunk/jmexico-editor-demo/pom.xml =================================================================== --- trunk/jmexico-editor-demo/pom.xml 2012-01-18 16:16:00 UTC (rev 31) +++ trunk/jmexico-editor-demo/pom.xml 2012-01-18 16:58:27 UTC (rev 32) @@ -153,13 +153,13 @@ <goal>parserJava</goal> <goal>gen</goal> </goals> - <!--<configuration>--> - <!--<entries>--> - <!--<entry>--> - <!--<basedir>${maven.gen.dir}/java/</basedir>--> - <!--</entry>--> - <!--</entries>--> - <!--</configuration>--> + <configuration> + <entries> + <entry> + <basedir>${maven.gen.dir}/java/</basedir> + </entry> + </entries> + </configuration> </execution> <execution> <id>make-bundle</id> Modified: trunk/jmexico-editor-demo/src/main/assembly/bin.xml =================================================================== --- trunk/jmexico-editor-demo/src/main/assembly/bin.xml 2012-01-18 16:16:00 UTC (rev 31) +++ trunk/jmexico-editor-demo/src/main/assembly/bin.xml 2012-01-18 16:58:27 UTC (rev 32) @@ -1,9 +1,9 @@ <!-- #%L - ObServe :: Client + JMexico :: Swing Editor Demo - $Id: bin.xml 1391 2011-04-15 11:53:14Z chemit $ - $HeadURL: https://svn.mpl.ird.fr/osiris/observe/trunk/observe-cli/src/main/assembly/bi... $ + $Id$ + $HeadURL$ %% Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit %% Modified: 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.css 2012-01-18 16:16:00 UTC (rev 31) +++ trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUI.css 2012-01-18 16:58:27 UTC (rev 32) @@ -1,9 +1,9 @@ /* * #%L - * JMexico :: Swing Editor + * JMexico :: Swing Editor Demo * - * $Id: MexicoMainUI.css 24 2012-01-18 09:54:16Z sletellier $ - * $HeadURL: http://svn.forge.codelutin.com/svn/jmexico/trunk/jmexico-swing-editor/src/ma... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 Réseau Mexico, Codelutin * %% @@ -23,17 +23,20 @@ * #L% */ #menuFile { - text:"jmexico.menu.file"; - mnemonic:F; + text: "jmexico.menu.file"; + mnemonic: F; } + #menuFileOpen { - text:"jmexico.menu.file.open"; - mnemonic:O; + text: "jmexico.menu.file.open"; + mnemonic: O; } + #menuFileSave { - text:"jmexico.menu.file.save"; - mnemonic:S; + text: "jmexico.menu.file.save"; + mnemonic: S; } + #exit { - text:"jmexico.menu.exit"; -} \ No newline at end of file + text: "jmexico.menu.exit"; +} Modified: trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUI.jaxx =================================================================== --- trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUI.jaxx 2012-01-18 16:16:00 UTC (rev 31) +++ trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUI.jaxx 2012-01-18 16:58:27 UTC (rev 32) @@ -1,9 +1,9 @@ <!-- #%L - JMexico :: Swing Editor + JMexico :: Swing Editor Demo - $Id: MexicoMainUI.jaxx 26 2012-01-18 10:25:02Z sletellier $ - $HeadURL: http://svn.forge.codelutin.com/svn/jmexico/trunk/jmexico-swing-editor/src/ma... $ + $Id$ + $HeadURL$ %% Copyright (C) 2011 Réseau Mexico, Codelutin %% @@ -33,7 +33,7 @@ </import> <MexicoEditorDemoUIHandler id="handler" - initializer='getContextValue(MexicoEditorDemoUIHandler.class)'/> + initializer='getContextValue(MexicoEditorDemoUIHandler.class)'/> <MexicoEditorDemoUIModel id="model"/> 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-18 16:16:00 UTC (rev 31) +++ trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUIHandler.java 2012-01-18 16:58:27 UTC (rev 32) @@ -1,9 +1,9 @@ /* * #%L - * JMexico :: Swing Editor + * JMexico :: Swing Editor Demo * - * $Id: MexicoMainUIHandler.java 26 2012-01-18 10:25:02Z sletellier $ - * $HeadURL: http://svn.forge.codelutin.com/svn/jmexico/trunk/jmexico-swing-editor/src/ma... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 Réseau Mexico, Codelutin * %% @@ -86,7 +86,7 @@ inputDesign.addInputDesignFactorListener(new InputDesignFactorListener() { @Override - public void onFactorValueChange(InputDesignFactorEvent event) { + public void factorValueChanged(InputDesignFactorEvent event) { ui.setInputDesign(event.getSource()); } }); @@ -94,12 +94,12 @@ inputDesign.addInputDesignScenarioListener(new InputDesignScenarioListener() { @Override - public void onScenarioAdded(InputDesignScenarioEvent event) { + public void scenarioAdded(InputDesignScenarioEvent event) { ui.setInputDesign(event.getSource()); } @Override - public void onScenarioRemoved(InputDesignScenarioEvent event) { + public void scenarioRemoved(InputDesignScenarioEvent event) { ui.setInputDesign(event.getSource()); } }); 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-18 16:16:00 UTC (rev 31) +++ trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUIModel.java 2012-01-18 16:58:27 UTC (rev 32) @@ -1,9 +1,9 @@ /* * #%L - * JMexico :: Swing Editor + * JMexico :: Swing Editor Demo * * $Id$ - * $HeadURL: http://svn.forge.codelutin.com/svn/jmexico/trunk/jmexico-swing-editor/src/ma... $ + * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Réseau Mexico, Codelutin * %% 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-18 16:16:00 UTC (rev 31) +++ trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/RunMexicoEditorDemo.java 2012-01-18 16:58:27 UTC (rev 32) @@ -1,9 +1,9 @@ /* * #%L - * JMexico :: Swing Editor + * JMexico :: Swing Editor Demo * * $Id$ - * $HeadURL: http://svn.forge.codelutin.com/svn/jmexico/trunk/jmexico-swing-editor/src/ma... $ + * $HeadURL$ * %% * Copyright (C) 2011 Réseau Mexico, Codelutin * %% Modified: 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_en_GB.properties 2012-01-18 16:16:00 UTC (rev 31) +++ trunk/jmexico-editor-demo/src/main/resources/i18n/jmexico-editor-demo_en_GB.properties 2012-01-18 16:58:27 UTC (rev 32) @@ -1 +1,5 @@ jmexico.file.open.dialog=Open an InputDesign file. +jmexico.menu.exit=Quit +jmexico.menu.file=File +jmexico.menu.file.open=Open +jmexico.menu.file.save=Save Modified: trunk/jmexico-editor-demo/src/main/resources/i18n/jmexico-editor-demo_fr_FR.properties =================================================================== --- trunk/jmexico-editor-demo/src/main/resources/i18n/jmexico-editor-demo_fr_FR.properties 2012-01-18 16:16:00 UTC (rev 31) +++ trunk/jmexico-editor-demo/src/main/resources/i18n/jmexico-editor-demo_fr_FR.properties 2012-01-18 16:58:27 UTC (rev 32) @@ -1 +1,5 @@ jmexico.file.open.dialog=Ouvrir un fichier InputDesign +jmexico.menu.exit=Quitter +jmexico.menu.file=Fichier +jmexico.menu.file.open=Ouvrir +jmexico.menu.file.save=Sauver Modified: trunk/jmexico-editor-demo/src/main/resources/log4j.properties =================================================================== --- trunk/jmexico-editor-demo/src/main/resources/log4j.properties 2012-01-18 16:16:00 UTC (rev 31) +++ trunk/jmexico-editor-demo/src/main/resources/log4j.properties 2012-01-18 16:58:27 UTC (rev 32) @@ -1,9 +1,9 @@ ### # #%L -# JMexico :: Swing Editor +# JMexico :: Swing Editor Demo # # $Id$ -# $HeadURL: http://svn.forge.codelutin.com/svn/jmexico/trunk/jmexico-swing-editor/src/ma... $ +# $HeadURL$ # %% # Copyright (C) 2011 Réseau Mexico, Codelutin # %% Modified: trunk/jmexico-editor-demo/src/site/rst/index.rst =================================================================== --- trunk/jmexico-editor-demo/src/site/rst/index.rst 2012-01-18 16:16:00 UTC (rev 31) +++ trunk/jmexico-editor-demo/src/site/rst/index.rst 2012-01-18 16:58:27 UTC (rev 32) @@ -1,9 +1,9 @@ .. - .. * #%L -.. * JMexico :: Swing Editor +.. * JMexico :: Swing Editor Demo .. * -.. * $Id: index.rst 28 2012-01-18 11:35:09Z tchemit $ -.. * $HeadURL: http://svn.forge.codelutin.com/svn/jmexico/trunk/jmexico-swing-editor/src/si... $ +.. * $Id$ +.. * $HeadURL$ .. * %% .. * Copyright (C) 2011 - 2012 Réseau Mexico, Codelutin .. * %% Modified: trunk/jmexico-editor-demo/src/site/site_fr.xml =================================================================== --- trunk/jmexico-editor-demo/src/site/site_fr.xml 2012-01-18 16:16:00 UTC (rev 31) +++ trunk/jmexico-editor-demo/src/site/site_fr.xml 2012-01-18 16:58:27 UTC (rev 32) @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- #%L - JMexico :: Swing Editor + JMexico :: Swing Editor Demo $Id$ - $HeadURL: http://svn.forge.codelutin.com/svn/jmexico/trunk/jmexico-swing-editor/src/si... $ + $HeadURL$ %% Copyright (C) 2011 - 2012 Réseau Mexico, Codelutin %% Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/DateFormatFactory.java =================================================================== --- trunk/jmexico-model/src/main/java/fr/reseaumexico/model/DateFormatFactory.java 2012-01-18 16:16:00 UTC (rev 31) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/DateFormatFactory.java 2012-01-18 16:58:27 UTC (rev 32) @@ -29,10 +29,10 @@ /** * Factory for format all jmexico dates using {@link SimpleDateFormat} - * + * * @author sletellier <letellier@codelutin.com> + * @see SimpleDateFormat * @since 0.1 - * @see SimpleDateFormat */ public class DateFormatFactory { Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/InputDesignImpl.java =================================================================== --- trunk/jmexico-model/src/main/java/fr/reseaumexico/model/InputDesignImpl.java 2012-01-18 16:16:00 UTC (rev 31) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/InputDesignImpl.java 2012-01-18 16:58:27 UTC (rev 32) @@ -32,11 +32,12 @@ 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 @@ -49,12 +50,12 @@ private static final long serialVersionUID = 1L; protected final EventListenerList listenerList; - + protected final Map<Scenario, ScenarioFactorValueListener> scenarioFactorValueListenerMap; public InputDesignImpl() { - this.scenarioFactorValueListenerMap = Maps.newHashMap(); - this.listenerList = new EventListenerList(); + scenarioFactorValueListenerMap = Maps.newHashMap(); + listenerList = new EventListenerList(); addPropertyChangeListener(PROPERTY_SCENARIO, new PropertyChangeListener() { @Override @@ -76,15 +77,15 @@ @Override public void addScenario(final Scenario scenarios) { - if (this.scenario == null) { - this.scenario = Lists.newArrayList(); + if (scenario == null) { + scenario = Lists.newArrayList(); } super.addScenario(scenarios); ScenarioFactorValueListener scenarioFactorValueListener = new ScenarioFactorValueListener() { @Override - public void onFactorValueChange(ScenarioFactorValueEvent event) { + public void factorValueChanged(ScenarioFactorValueEvent event) { fireFactorChanged(scenarios, event.getFactorId(), event.getFactorOldValue(), event.getFactorNewValue()); } }; @@ -149,7 +150,7 @@ InputDesignScenarioEvent event = new InputDesignScenarioEvent(this, scenario); InputDesignScenarioListener[] listeners = listenerList.getListeners(InputDesignScenarioListener.class); for (InputDesignScenarioListener listener : listeners) { - listener.onScenarioAdded(event); + listener.scenarioAdded(event); } } @@ -157,7 +158,7 @@ InputDesignScenarioEvent event = new InputDesignScenarioEvent(this, scenario); InputDesignScenarioListener[] listeners = listenerList.getListeners(InputDesignScenarioListener.class); for (InputDesignScenarioListener listener : listeners) { - listener.onScenarioRemoved(event); + listener.scenarioRemoved(event); } } @@ -165,7 +166,7 @@ InputDesignFactorEvent event = new InputDesignFactorEvent(this, scenario, factorId, oldValue, newValue); InputDesignFactorListener[] listeners = listenerList.getListeners(InputDesignFactorListener.class); for (InputDesignFactorListener listener : listeners) { - listener.onFactorValueChange(event); + listener.factorValueChanged(event); } } } Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/MexicoTechnicalException.java =================================================================== --- trunk/jmexico-model/src/main/java/fr/reseaumexico/model/MexicoTechnicalException.java 2012-01-18 16:16:00 UTC (rev 31) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/MexicoTechnicalException.java 2012-01-18 16:58:27 UTC (rev 32) @@ -28,7 +28,7 @@ * Mexico technical exception * * @author sletellier <letellier@codelutin.com> - * @since 0.1 + * @since 0.1 */ public class MexicoTechnicalException extends RuntimeException { 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-18 16:16:00 UTC (rev 31) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/MexicoUtil.java 2012-01-18 16:58:27 UTC (rev 32) @@ -26,9 +26,7 @@ import org.apache.commons.lang3.StringUtils; -/** - * @author sletellier <letellier@codelutin.com> - */ +/** @author sletellier <letellier@codelutin.com> */ public class MexicoUtil { public static Object getTypedValue(ValueType type, String value) { @@ -37,10 +35,18 @@ return null; } switch (type) { - case INTEGER: result = Integer.parseInt(value); break; - case BOOLEAN: result = Boolean.parseBoolean(value); break; - case DECIMAL: result = Double.parseDouble(value); break; - default: result = value; break; + case INTEGER: + result = Integer.parseInt(value); + break; + case BOOLEAN: + result = Boolean.parseBoolean(value); + break; + case DECIMAL: + result = Double.parseDouble(value); + break; + default: + result = value; + break; // TODO sletelier : convert string to matrice // case MATRICE: } Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/MexicoXmlConstant.java =================================================================== --- trunk/jmexico-model/src/main/java/fr/reseaumexico/model/MexicoXmlConstant.java 2012-01-18 16:16:00 UTC (rev 31) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/MexicoXmlConstant.java 2012-01-18 16:58:27 UTC (rev 32) @@ -32,40 +32,40 @@ * @author sletellier <letellier@codelutin.com> * @since 0.1 */ -public class MexicoXmlConstant { +public interface MexicoXmlConstant { - public static final String EXPERIMENT_DESIGN = Introspector.decapitalize(ExperimentDesign.class.getSimpleName()); - public static final String EXPERIMENT_DESIGN_DATE = ExperimentDesign.PROPERTY_DATE; - public static final String EXPERIMENT_DESIGN_ID = ExperimentDesign.PROPERTY_ID; - public static final String EXPERIMENT_DESIGN_AUTHOR = ExperimentDesign.PROPERTY_AUTHOR; - public static final String EXPERIMENT_DESIGN_LICENCE = ExperimentDesign.PROPERTY_LICENCE; - public static final String EXPERIMENT_DESIGN_DESCRIPTION = ExperimentDesign.PROPERTY_DESCRIPTION; - public static final String FACTORS = "factors"; - public static final String FACTOR = Introspector.decapitalize(Factor.class.getSimpleName()); - public static final String FACTOR_ID = Factor.PROPERTY_ID; - public static final String FACTOR_NAME = Factor.PROPERTY_NAME; - public static final String FACTOR_UNIT = Factor.PROPERTY_UNIT; - public static final String FACTOR_DESCRIPTION = Factor.PROPERTY_DESCRIPTION; - public static final String DOMAIN = Factor.PROPERTY_DOMAIN; - public static final String DOMAIN_NAME = Domain.PROPERTY_NAME; - public static final String DOMAIN_DISTRIBUTION_NAME = Domain.PROPERTY_DISTRIBUTION_NAME; - public static final String DOMAIN_DISTRIBUTION_PARAMETER = Introspector.decapitalize(DistributionParameter.class.getSimpleName()); - public static final String DISTRIBUTION_PARAMETER_NAME = DistributionParameter.PROPERTY_NAME; - public static final String DISTRIBUTION_PARAMETER_VALUE = DistributionParameter.PROPERTY_VALUE; - public static final String DISTRIBUTION_PARAMETER_VALUE_TYPE = DistributionParameter.PROPERTY_VALUE_TYPE; - public static final String DOMAIN_LEVEL = Introspector.decapitalize(Level.class.getSimpleName()); - public static final String LEVEL_VALUE = Level.PROPERTY_VALUE; - public static final String LEVEL_WEIGHT = Level.PROPERTY_WEIGHT; - public static final String DOMAIN_VALUE_TYPE = Domain.PROPERTY_VALUE_TYPE; - public static final String DOMAIN_NOMINAL_VALUE = Domain.PROPERTY_NOMINAL_VALUE; - public static final String FEATURE = Introspector.decapitalize(Feature.class.getSimpleName()); - public static final String FEATURE_NAME = Feature.PROPERTY_NAME; - public static final String FEATURE_VALUE = Feature.PROPERTY_VALUE; - public static final String FEATURE_VALUE_TYPE = Feature.PROPERTY_VALUE_TYPE; - public static final String INPUT_DESIGN = Introspector.decapitalize(InputDesign.class.getSimpleName()); - public static final String INPUT_DESIGN_DATE = InputDesign.PROPERTY_DATE; - public static final String SCENARIO = Introspector.decapitalize(Scenario.class.getSimpleName()); - public static final String SCENARIO_NAME = Scenario.PROPERTY_NAME; - public static final String SCENARIO_ORDER_NUMBER = Scenario.PROPERTY_ORDER_NUMBER; - public static final String SCENARIO_FACTOR_VALUES = Scenario.PROPERTY_FACTOR_VALUES; + String EXPERIMENT_DESIGN = Introspector.decapitalize(ExperimentDesign.class.getSimpleName()); + String EXPERIMENT_DESIGN_DATE = ExperimentDesign.PROPERTY_DATE; + String EXPERIMENT_DESIGN_ID = ExperimentDesign.PROPERTY_ID; + String EXPERIMENT_DESIGN_AUTHOR = ExperimentDesign.PROPERTY_AUTHOR; + String EXPERIMENT_DESIGN_LICENCE = ExperimentDesign.PROPERTY_LICENCE; + String EXPERIMENT_DESIGN_DESCRIPTION = ExperimentDesign.PROPERTY_DESCRIPTION; + String FACTORS = "factors"; + String FACTOR = Introspector.decapitalize(Factor.class.getSimpleName()); + String FACTOR_ID = Factor.PROPERTY_ID; + String FACTOR_NAME = Factor.PROPERTY_NAME; + String FACTOR_UNIT = Factor.PROPERTY_UNIT; + String FACTOR_DESCRIPTION = Factor.PROPERTY_DESCRIPTION; + String DOMAIN = Factor.PROPERTY_DOMAIN; + String DOMAIN_NAME = Domain.PROPERTY_NAME; + String DOMAIN_DISTRIBUTION_NAME = Domain.PROPERTY_DISTRIBUTION_NAME; + String DOMAIN_DISTRIBUTION_PARAMETER = Introspector.decapitalize(DistributionParameter.class.getSimpleName()); + String DISTRIBUTION_PARAMETER_NAME = DistributionParameter.PROPERTY_NAME; + String DISTRIBUTION_PARAMETER_VALUE = DistributionParameter.PROPERTY_VALUE; + String DISTRIBUTION_PARAMETER_VALUE_TYPE = DistributionParameter.PROPERTY_VALUE_TYPE; + String DOMAIN_LEVEL = Introspector.decapitalize(Level.class.getSimpleName()); + String LEVEL_VALUE = Level.PROPERTY_VALUE; + String LEVEL_WEIGHT = Level.PROPERTY_WEIGHT; + String DOMAIN_VALUE_TYPE = Domain.PROPERTY_VALUE_TYPE; + String DOMAIN_NOMINAL_VALUE = Domain.PROPERTY_NOMINAL_VALUE; + String FEATURE = Introspector.decapitalize(Feature.class.getSimpleName()); + String FEATURE_NAME = Feature.PROPERTY_NAME; + String FEATURE_VALUE = Feature.PROPERTY_VALUE; + String FEATURE_VALUE_TYPE = Feature.PROPERTY_VALUE_TYPE; + String INPUT_DESIGN = Introspector.decapitalize(InputDesign.class.getSimpleName()); + String INPUT_DESIGN_DATE = InputDesign.PROPERTY_DATE; + String SCENARIO = Introspector.decapitalize(Scenario.class.getSimpleName()); + String SCENARIO_NAME = Scenario.PROPERTY_NAME; + String SCENARIO_ORDER_NUMBER = Scenario.PROPERTY_ORDER_NUMBER; + String SCENARIO_FACTOR_VALUES = Scenario.PROPERTY_FACTOR_VALUES; } Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/ScenarioImpl.java =================================================================== --- trunk/jmexico-model/src/main/java/fr/reseaumexico/model/ScenarioImpl.java 2012-01-18 16:16:00 UTC (rev 31) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/ScenarioImpl.java 2012-01-18 16:58:27 UTC (rev 32) @@ -27,8 +27,9 @@ 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 @@ -43,7 +44,7 @@ protected final EventListenerList factorListenerList; public ScenarioImpl() { - this.factorListenerList = new EventListenerList(); + factorListenerList = new EventListenerList(); } @Override @@ -82,7 +83,7 @@ ScenarioFactorValueEvent event = new ScenarioFactorValueEvent(this, factorId, oldValue, newValue); ScenarioFactorValueListener[] listeners = factorListenerList.getListeners(ScenarioFactorValueListener.class); for (ScenarioFactorValueListener listener : listeners) { - listener.onFactorValueChange(event); + listener.factorValueChanged(event); } } Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/event/InputDesignFactorEvent.java =================================================================== --- trunk/jmexico-model/src/main/java/fr/reseaumexico/model/event/InputDesignFactorEvent.java 2012-01-18 16:16:00 UTC (rev 31) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/event/InputDesignFactorEvent.java 2012-01-18 16:58:27 UTC (rev 32) @@ -24,11 +24,12 @@ */ package fr.reseaumexico.model.event; +import fr.reseaumexico.model.Factor; import fr.reseaumexico.model.InputDesign; import fr.reseaumexico.model.Scenario; /** - * Event fired when {@link fr.reseaumexico.model.Factor} change on {@link InputDesign} + * Event fired when {@link Factor} change on {@link InputDesign} * * @author sletellier <letellier@codelutin.com> * @since 0.1 @@ -38,7 +39,9 @@ private static final long serialVersionUID = 1L; protected String factorId; + protected Object factorOldValue; + protected Object factorNewValue; public InputDesignFactorEvent(InputDesign inputDesign, @@ -48,8 +51,8 @@ Object newValue) { super(inputDesign, scenario); this.factorId = factorId; - this.factorOldValue = oldValue; - this.factorNewValue = newValue; + factorOldValue = oldValue; + factorNewValue = newValue; } public String getFactorId() { 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-01-18 16:16:00 UTC (rev 31) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/event/InputDesignScenarioEvent.java 2012-01-18 16:58:27 UTC (rev 32) @@ -26,6 +26,7 @@ import fr.reseaumexico.model.InputDesign; import fr.reseaumexico.model.Scenario; + import java.util.EventObject; /** @@ -40,7 +41,8 @@ protected Scenario scenario; - public InputDesignScenarioEvent(InputDesign inputDesign, Scenario scenario) { + public InputDesignScenarioEvent(InputDesign inputDesign, + Scenario scenario) { super(inputDesign); this.scenario = scenario; } 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-01-18 16:16:00 UTC (rev 31) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/event/ScenarioFactorValueEvent.java 2012-01-18 16:58:27 UTC (rev 32) @@ -24,11 +24,13 @@ */ package fr.reseaumexico.model.event; +import fr.reseaumexico.model.Factor; import fr.reseaumexico.model.Scenario; + import java.util.EventObject; /** - * Event fired when {@link fr.reseaumexico.model.Factor} change on {@link Scenario} + * Event fired when {@link Factor} change on {@link Scenario} * * @author sletellier <letellier@codelutin.com> * @since 0.1 @@ -38,10 +40,15 @@ private static final long serialVersionUID = 1L; protected String factorId; + protected Object factorOldValue; + protected Object factorNewValue; - public ScenarioFactorValueEvent(Scenario scenario, String factorId, Object factorOldValue, Object factorNewValue) { + public ScenarioFactorValueEvent(Scenario scenario, + String factorId, + Object factorOldValue, + Object factorNewValue) { super(scenario); this.factorId = factorId; this.factorOldValue = factorOldValue; 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-18 16:16:00 UTC (rev 31) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ExperimentDesignParser.java 2012-01-18 16:58:27 UTC (rev 32) @@ -39,56 +39,31 @@ import fr.reseaumexico.model.Level; import fr.reseaumexico.model.LevelImpl; import fr.reseaumexico.model.MexicoTechnicalException; +import fr.reseaumexico.model.MexicoXmlConstant; import fr.reseaumexico.model.ValueType; +import org.xmlpull.v1.XmlPullParser; +import org.xmlpull.v1.XmlPullParserException; + import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; 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.DISTRIBUTION_PARAMETER_NAME; -import static fr.reseaumexico.model.MexicoXmlConstant.DISTRIBUTION_PARAMETER_VALUE; -import static fr.reseaumexico.model.MexicoXmlConstant.DISTRIBUTION_PARAMETER_VALUE_TYPE; -import static fr.reseaumexico.model.MexicoXmlConstant.DOMAIN; -import static fr.reseaumexico.model.MexicoXmlConstant.DOMAIN_DISTRIBUTION_NAME; -import static fr.reseaumexico.model.MexicoXmlConstant.DOMAIN_DISTRIBUTION_PARAMETER; -import static fr.reseaumexico.model.MexicoXmlConstant.DOMAIN_LEVEL; -import static fr.reseaumexico.model.MexicoXmlConstant.DOMAIN_NAME; -import static fr.reseaumexico.model.MexicoXmlConstant.DOMAIN_NOMINAL_VALUE; -import static fr.reseaumexico.model.MexicoXmlConstant.DOMAIN_VALUE_TYPE; -import static fr.reseaumexico.model.MexicoXmlConstant.EXPERIMENT_DESIGN; -import static fr.reseaumexico.model.MexicoXmlConstant.EXPERIMENT_DESIGN_AUTHOR; -import static fr.reseaumexico.model.MexicoXmlConstant.EXPERIMENT_DESIGN_DATE; -import static fr.reseaumexico.model.MexicoXmlConstant.EXPERIMENT_DESIGN_DESCRIPTION; -import static fr.reseaumexico.model.MexicoXmlConstant.EXPERIMENT_DESIGN_ID; -import static fr.reseaumexico.model.MexicoXmlConstant.EXPERIMENT_DESIGN_LICENCE; -import static fr.reseaumexico.model.MexicoXmlConstant.FACTOR; -import static fr.reseaumexico.model.MexicoXmlConstant.FACTORS; -import static fr.reseaumexico.model.MexicoXmlConstant.FACTOR_DESCRIPTION; -import static fr.reseaumexico.model.MexicoXmlConstant.FACTOR_ID; -import static fr.reseaumexico.model.MexicoXmlConstant.FEATURE; -import static fr.reseaumexico.model.MexicoXmlConstant.FEATURE_NAME; -import static fr.reseaumexico.model.MexicoXmlConstant.FEATURE_VALUE; -import static fr.reseaumexico.model.MexicoXmlConstant.FEATURE_VALUE_TYPE; -import static fr.reseaumexico.model.MexicoXmlConstant.LEVEL_VALUE; -import static fr.reseaumexico.model.MexicoXmlConstant.LEVEL_WEIGHT; - /** - * Parser for experiment design xml files, build a {@link ExperimentDesign} model + * Parser for experiment design xml files, build a {@link ExperimentDesign} model. * * @author sletellier <letellier@codelutin.com> * @since 0.1 */ -public class ExperimentDesignParser extends MexicoXmlParser<ExperimentDesign> { +public class ExperimentDesignParser extends MexicoXmlParser<ExperimentDesign> implements MexicoXmlConstant { protected Map<String, Factor> factors; public ExperimentDesignParser(File file) throws FileNotFoundException { super(file); - this.factors = Maps.newHashMap(); + factors = Maps.newHashMap(); } @Override @@ -135,6 +110,7 @@ parser.nextTag(); } } + protected void parseFactors(XmlPullParser parser, ExperimentDesign model) throws IOException, XmlPullParserException { // factors @@ -210,6 +186,7 @@ return factor; } + protected Domain parseDomain(XmlPullParser parser) throws XmlPullParserException, IOException { Domain domain = new DomainImpl(); @@ -238,7 +215,7 @@ // distributionParameters int eventType = parser.nextTag(); if (eventType == XmlPullParser.START_TAG && - parserEqual(parser, DOMAIN_DISTRIBUTION_PARAMETER)) { + parserEqual(parser, DOMAIN_DISTRIBUTION_PARAMETER)) { List<DistributionParameter> distributionParameters = Lists.newArrayList(); while (parserEqual(parser, DOMAIN_DISTRIBUTION_PARAMETER)) { 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-01-18 16:16:00 UTC (rev 31) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/InputDesignParser.java 2012-01-18 16:58:27 UTC (rev 32) @@ -34,14 +34,15 @@ import fr.reseaumexico.model.Scenario; import fr.reseaumexico.model.ScenarioImpl; import fr.reseaumexico.model.ValueType; +import org.xmlpull.v1.XmlPullParser; +import org.xmlpull.v1.XmlPullParserException; + import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; 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-01-18 16:16:00 UTC (rev 31) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/MexicoXmlParser.java 2012-01-18 16:58:27 UTC (rev 32) @@ -27,6 +27,7 @@ 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.text.ParseException; @@ -47,7 +48,7 @@ public Date parseDate(String toParse) throws ParseException { return DateFormatFactory.getMexicoDateFormat().parse(toParse); } - + public Object getTypedValue(ValueType type, String value) { return MexicoUtil.getTypedValue(type, value); } 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-01-18 16:16:00 UTC (rev 31) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/XmlParser.java 2012-01-18 16:58:27 UTC (rev 32) @@ -24,28 +24,29 @@ */ 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.FileNotFoundException; import java.io.FileReader; import java.io.IOException; 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 - * + * * @author sletellier <letellier@codelutin.com> + * @see XmlPullParser * @since 0.1 - * @see XmlPullParser */ public abstract class XmlParser<M> extends FileReader { public XmlParser(File file) throws FileNotFoundException { super(file); } - + public M getModel() throws XmlPullParserException, IOException, ParseException { XmlPullParserFactory factory = XmlPullParserFactory.newInstance(); 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-01-18 16:16:00 UTC (rev 31) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/ExperimentDesignXmlWriter.java 2012-01-18 16:58:27 UTC (rev 32) @@ -29,37 +29,13 @@ 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; -import static fr.reseaumexico.model.MexicoXmlConstant.DISTRIBUTION_PARAMETER_NAME; -import static fr.reseaumexico.model.MexicoXmlConstant.DISTRIBUTION_PARAMETER_VALUE; -import static fr.reseaumexico.model.MexicoXmlConstant.DISTRIBUTION_PARAMETER_VALUE_TYPE; -import static fr.reseaumexico.model.MexicoXmlConstant.DOMAIN; -import static fr.reseaumexico.model.MexicoXmlConstant.DOMAIN_DISTRIBUTION_NAME; -import static fr.reseaumexico.model.MexicoXmlConstant.DOMAIN_DISTRIBUTION_PARAMETER; -import static fr.reseaumexico.model.MexicoXmlConstant.DOMAIN_LEVEL; -import static fr.reseaumexico.model.MexicoXmlConstant.DOMAIN_NAME; -import static fr.reseaumexico.model.MexicoXmlConstant.DOMAIN_NOMINAL_VALUE; -import static fr.reseaumexico.model.MexicoXmlConstant.DOMAIN_VALUE_TYPE; -import static fr.reseaumexico.model.MexicoXmlConstant.EXPERIMENT_DESIGN; -import static fr.reseaumexico.model.MexicoXmlConstant.EXPERIMENT_DESIGN_AUTHOR; -import static fr.reseaumexico.model.MexicoXmlConstant.EXPERIMENT_DESIGN_DATE; -import static fr.reseaumexico.model.MexicoXmlConstant.EXPERIMENT_DESIGN_DESCRIPTION; -import static fr.reseaumexico.model.MexicoXmlConstant.EXPERIMENT_DESIGN_ID; -import static fr.reseaumexico.model.MexicoXmlConstant.EXPERIMENT_DESIGN_LICENCE; -import static fr.reseaumexico.model.MexicoXmlConstant.FACTOR; -import static fr.reseaumexico.model.MexicoXmlConstant.FACTORS; -import static fr.reseaumexico.model.MexicoXmlConstant.FACTOR_DESCRIPTION; -import static fr.reseaumexico.model.MexicoXmlConstant.FACTOR_ID; -import static fr.reseaumexico.model.MexicoXmlConstant.FACTOR_NAME; -import static fr.reseaumexico.model.MexicoXmlConstant.FACTOR_UNIT; -import static fr.reseaumexico.model.MexicoXmlConstant.LEVEL_VALUE; -import static fr.reseaumexico.model.MexicoXmlConstant.LEVEL_WEIGHT; - /** * 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-01-18 16:16:00 UTC (rev 31) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/InputDesignXmlWriter.java 2012-01-18 16:58:27 UTC (rev 32) @@ -27,19 +27,12 @@ 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.Date; import java.util.Map; -import static fr.reseaumexico.model.MexicoXmlConstant.FACTOR; -import static fr.reseaumexico.model.MexicoXmlConstant.INPUT_DESIGN; -import static fr.reseaumexico.model.MexicoXmlConstant.INPUT_DESIGN_DATE; -import static fr.reseaumexico.model.MexicoXmlConstant.SCENARIO; -import static fr.reseaumexico.model.MexicoXmlConstant.SCENARIO_FACTOR_VALUES; -import static fr.reseaumexico.model.MexicoXmlConstant.SCENARIO_NAME; -import static fr.reseaumexico.model.MexicoXmlConstant.SCENARIO_ORDER_NUMBER; - /** * Writer to create input design file with {@link InputDesign} model * @@ -83,8 +76,8 @@ addParameter(scenariosXmlNode, SCENARIO_ORDER_NUMBER, scenario.getOrderNumber()); // factor values - Map<Factor,Object> factorValues = scenario.getFactorValues(); - for (Map.Entry<Factor,Object> entry : factorValues.entrySet()) { + Map<Factor, Object> factorValues = scenario.getFactorValues(); + for (Map.Entry<Factor, Object> entry : factorValues.entrySet()) { Object value = entry.getValue(); XmlNode factorValueXmlNode = XmlNode.createElement(scenariosXmlNode, SCENARIO_FACTOR_VALUES, String.valueOf(value)); factorValueXmlNode.addAttribute(FACTOR, entry.getKey().getId()); 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-01-18 16:16:00 UTC (rev 31) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/MexicoXmlWriter.java 2012-01-18 16:58:27 UTC (rev 32) @@ -26,23 +26,20 @@ 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; import java.util.Date; -import static fr.reseaumexico.model.MexicoXmlConstant.FEATURE; -import static fr.reseaumexico.model.MexicoXmlConstant.FEATURE_NAME; -import static fr.reseaumexico.model.MexicoXmlConstant.FEATURE_VALUE; -import static fr.reseaumexico.model.MexicoXmlConstant.FEATURE_VALUE_TYPE; - /** * Abstract writer create mexico files with specific model * * @author sletellier <letellier@codelutin.com> * @since 0.1 */ -public abstract class MexicoXmlWriter<M> extends XmlWriter<M> { +public abstract class MexicoXmlWriter<M> extends XmlWriter<M> implements MexicoXmlConstant { protected MexicoXmlWriter(File file, M model) throws IOException { super(file, model); 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-18 16:16:00 UTC (rev 31) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/XmlNode.java 2012-01-18 16:58:27 UTC (rev 32) @@ -26,15 +26,16 @@ 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.LinkedList; import java.util.Map; import java.util.Set; -import org.apache.commons.lang3.StringEscapeUtils; -import org.apache.commons.lang3.StringUtils; /** * Represent an XML node - * + * * @author sletellier <letellier@codelutin.com> * @since 0.1 */ @@ -57,16 +58,16 @@ public XmlNode(String tagName, String text) { this.tagName = tagName; this.text = text; - this.children = Lists.newLinkedList(); - this.attributes = Maps.newHashMap(); + children = Lists.newLinkedList(); + attributes = Maps.newHashMap(); } - + public void add(XmlNode e) { - this.children.add(e); + children.add(e); } - + public void addAttribute(String name, String value) { - this.attributes.put(name, value); + attributes.put(name, value); } public String toXml(int indent) { @@ -98,30 +99,30 @@ addToBuilder(stringBuilder, END_TAG, getIndentPrefix(start, indent), tagName); } } - + protected void addToBuilder(StringBuilder stringBuilder, String template, String prefix, String tagName) { stringBuilder.append(String.format(template, prefix, tagName, getAttributesAsString())); } - + protected String getIndentPrefix(int start, int lenght) { String result = ""; - for (int i=0;i<start + lenght;i++) { + for (int i = 0; i < start + lenght; i++) { result += " "; } return result; } - + protected String getAttributesAsString() { StringBuilder builder = new StringBuilder(); - Set<Map.Entry<String,String>> entries = attributes.entrySet(); - for (Map.Entry<String,String> entry : entries) { + Set<Map.Entry<String, String>> entries = attributes.entrySet(); + for (Map.Entry<String, String> entry : entries) { // add to builder param like : name="value" builder.append(" ") - .append(entry.getKey()) - .append("=\"") - .append(StringEscapeUtils.escapeXml(entry.getValue())) - .append("\""); + .append(entry.getKey()) + .append("=\"") + .append(StringEscapeUtils.escapeXml(entry.getValue())) + .append("\""); } return builder.toString(); } 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-01-18 16:16:00 UTC (rev 31) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/XmlWriter.java 2012-01-18 16:58:27 UTC (rev 32) @@ -48,7 +48,7 @@ public void write() throws IOException { String toWrite = getRootElement().toXml(INDENT); - super.write(toWrite); + write(toWrite); } public abstract XmlNode getRootElement(); Modified: trunk/jmexico-model/src/main/xmi/mexico.properties =================================================================== --- trunk/jmexico-model/src/main/xmi/mexico.properties 2012-01-18 16:16:00 UTC (rev 31) +++ trunk/jmexico-model/src/main/xmi/mexico.properties 2012-01-18 16:58:27 UTC (rev 32) @@ -1,3 +1,27 @@ +### +# #%L +# JMexico :: Model +# +# $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% +### model.tagValue.constantPrefix=PROPERTY_ model.tagValue.version=0.1 Modified: trunk/jmexico-model/src/main/xmi/mexico.zargo =================================================================== (Binary files differ) Modified: trunk/jmexico-model/src/site/site_fr.xml =================================================================== --- trunk/jmexico-model/src/site/site_fr.xml 2012-01-18 16:16:00 UTC (rev 31) +++ trunk/jmexico-model/src/site/site_fr.xml 2012-01-18 16:58:27 UTC (rev 32) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- #%L - JMexico :: Swing Editor + JMexico :: Model $Id$ $HeadURL$ Modified: trunk/src/site/resources/examples/experimentDesign.xml =================================================================== --- trunk/src/site/resources/examples/experimentDesign.xml 2012-01-18 16:16:00 UTC (rev 31) +++ trunk/src/site/resources/examples/experimentDesign.xml 2012-01-18 16:58:27 UTC (rev 32) @@ -647,4 +647,4 @@ <feature name="ScaleValue_name" value="tres eleve" valueType="STRING"/> </factor> </factors> -</experimentDesign> \ No newline at end of file +</experimentDesign> Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2012-01-18 16:16:00 UTC (rev 31) +++ trunk/src/site/rst/index.rst 2012-01-18 16:58:27 UTC (rev 32) @@ -66,4 +66,4 @@ Ensuite ouvrir l'input design d'exemple... .. _experimentDesign: ./examples/experimentDesign.xml -.. _inputDesign: ./examples/inputDesign.xml \ No newline at end of file +.. _inputDesign: ./examples/inputDesign.xml