This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jmexico. See http://git.codelutin.com/jmexico.git commit 8d8a4f506b9f8e9ff6ca4a7e3f09464db8fd1030 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Jun 6 17:10:50 2015 +0200 rendre la javadoc compatible jdk8 + fix build (refs #7192) --- .../editor/demo/MexicoEditorDemoUIHandler.java | 4 +- .../editor/demo/MexicoEditorDemoUIModel.java | 2 +- .../editor/demo/RunMexicoEditorDemo.java | 3 +- jmexico-editor-demo/src/site/rst/index.rst | 1 + jmexico-editor-demo/src/site/site_fr.xml | 8 ++- .../reseaumexico/editor/AbstractScenarioModel.java | 3 +- .../fr/reseaumexico/editor/CloneScenarioModel.java | 2 +- .../fr/reseaumexico/editor/CloneScenarioPanel.jaxx | 16 ++--- .../reseaumexico/editor/ExportScenarioModel.java | 2 +- .../reseaumexico/editor/ExportScenarioPanel.jaxx | 38 +++++------ .../editor/ImportScenarioListener.java | 2 +- .../reseaumexico/editor/ImportScenarioModel.java | 4 +- .../reseaumexico/editor/ImportScenarioPanel.jaxx | 2 +- .../editor/InputDesignEditorHandler.java | 73 +++++++++++----------- .../editor/InputDesignEditorModel.java | 2 +- .../fr/reseaumexico/editor/InputDesignTable.java | 9 ++- .../editor/MexicoDecoratorProvider.java | 5 +- .../reseaumexico/editor/RenameScenarioPanel.jaxx | 16 ++--- .../editor/factorValue/FactorValueCellEditor.java | 25 +++++--- .../factorValue/FactorValueCellRenderer.java | 8 ++- .../factorValue/FactorValueEditorFactory.java | 13 ++-- .../src/site/site_fr.xml | 9 ++- .../fr/reseaumexico/model/AbstractMexicoBean.java | 2 +- .../fr/reseaumexico/model/DateFormatFactory.java | 3 +- .../fr/reseaumexico/model/InputDesignImpl.java | 8 +-- .../model/MexicoTechnicalException.java | 2 +- .../java/fr/reseaumexico/model/MexicoUtil.java | 5 +- .../fr/reseaumexico/model/MexicoXmlConstant.java | 35 ++++++++++- .../java/fr/reseaumexico/model/ScenarioImpl.java | 5 +- .../model/event/InputDesignFactorEvent.java | 2 +- .../model/event/InputDesignScenarioEvent.java | 3 +- .../model/event/ScenarioFactorValueEvent.java | 3 +- .../model/parser/ExperimentDesignParser.java | 2 +- .../model/parser/InputDesignParser.java | 2 +- .../reseaumexico/model/parser/MexicoXmlParser.java | 2 +- .../model/parser/ScenarioCSVParser.java | 24 ++++--- .../model/parser/ScenarioXmlParser.java | 2 +- .../fr/reseaumexico/model/parser/XmlParser.java | 2 +- .../model/writer/ExperimentDesignXmlWriter.java | 2 +- .../model/writer/InputDesignXmlWriter.java | 2 +- .../reseaumexico/model/writer/MexicoXmlWriter.java | 5 +- .../model/writer/ScenarioXmlWriter.java | 2 +- .../java/fr/reseaumexico/model/writer/XmlNode.java | 13 +++- .../fr/reseaumexico/model/writer/XmlWriter.java | 2 +- jmexico-model/src/site/rst/index.rst | 1 + jmexico-model/src/site/site_fr.xml | 8 ++- src/site/rst/index.rst | 1 + src/site/site_fr.xml | 35 ++++++----- 48 files changed, 244 insertions(+), 176 deletions(-) diff --git a/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUIHandler.java b/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUIHandler.java index 41e9290..93d1ed1 100644 --- a/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUIHandler.java +++ b/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUIHandler.java @@ -41,7 +41,7 @@ import static org.nuiton.i18n.I18n._; /** * Handler of main UI * - * @author sletellier <letellier@codelutin.com> + * @author sletellier - letellier@codelutin.com * @since 0.1 */ public class MexicoEditorDemoUIHandler { @@ -108,7 +108,7 @@ public class MexicoEditorDemoUIHandler { public void scenarioRemoved(InputDesignScenarioEvent event) { ui.setInputDesign(event.getSource()); } - + @Override public void scenarioRenamed(InputDesignScenarioEvent event) { ui.setInputDesign(event.getSource()); diff --git a/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUIModel.java b/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUIModel.java index a30fba7..93391f4 100644 --- a/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUIModel.java +++ b/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUIModel.java @@ -26,7 +26,7 @@ import org.jdesktop.beans.AbstractSerializableBean; import java.io.File; -/** @author sletellier <letellier@codelutin.com> */ +/** @author sletellier - letellier@codelutin.com */ public class MexicoEditorDemoUIModel extends AbstractSerializableBean { private static final long serialVersionUID = 1L; diff --git a/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/RunMexicoEditorDemo.java b/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/RunMexicoEditorDemo.java index 3a6805c..22fa3f9 100644 --- a/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/RunMexicoEditorDemo.java +++ b/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/RunMexicoEditorDemo.java @@ -21,7 +21,6 @@ */ package fr.reseaumexico.editor.demo; -import fr.reseaumexico.editor.factorValue.FactorValueCellEditor; import fr.reseaumexico.editor.factorValue.FactorValueEditorFactory; import jaxx.runtime.context.JAXXInitialContext; import jaxx.runtime.swing.ErrorDialogUI; @@ -33,7 +32,7 @@ import org.nuiton.i18n.init.DefaultI18nInitializer; import java.io.File; /** - * @author sletellier <letellier@codelutin.com> + * @author sletellier - letellier@codelutin.com * @since 0.1 */ public class RunMexicoEditorDemo { diff --git a/jmexico-editor-demo/src/site/rst/index.rst b/jmexico-editor-demo/src/site/rst/index.rst index 546125a..23d2ed8 100644 --- a/jmexico-editor-demo/src/site/rst/index.rst +++ b/jmexico-editor-demo/src/site/rst/index.rst @@ -19,6 +19,7 @@ .. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - + ====================== JMexico - Swing Editor ====================== diff --git a/jmexico-editor-demo/src/site/site_fr.xml b/jmexico-editor-demo/src/site/site_fr.xml index 4b6e0d9..d67bbd6 100644 --- a/jmexico-editor-demo/src/site/site_fr.xml +++ b/jmexico-editor-demo/src/site/site_fr.xml @@ -21,8 +21,10 @@ #L% --> - -<project name="${project.name}"> +<project name="${project.name}" + xmlns="http://maven.apache.org/DECORATION/1.4.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"> <body> @@ -37,5 +39,7 @@ <item name="Lancer la démo" href="jnlp/launch.jnlp"/> </menu> + <menu ref="reports"/> + </body> </project> diff --git a/jmexico-editor/src/main/java/fr/reseaumexico/editor/AbstractScenarioModel.java b/jmexico-editor/src/main/java/fr/reseaumexico/editor/AbstractScenarioModel.java index 7542fa9..4c3bb7c 100644 --- a/jmexico-editor/src/main/java/fr/reseaumexico/editor/AbstractScenarioModel.java +++ b/jmexico-editor/src/main/java/fr/reseaumexico/editor/AbstractScenarioModel.java @@ -25,13 +25,12 @@ package fr.reseaumexico.editor; import fr.reseaumexico.model.Scenario; import org.jdesktop.beans.AbstractSerializableBean; -import java.io.File; import java.util.Collection; /** * Model toimport a scenarion into a input design. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit - chemit@codelutin.com * @since 0.7 */ public class AbstractScenarioModel<M extends AbstractScenarioModel> extends AbstractSerializableBean { diff --git a/jmexico-editor/src/main/java/fr/reseaumexico/editor/CloneScenarioModel.java b/jmexico-editor/src/main/java/fr/reseaumexico/editor/CloneScenarioModel.java index cd9ce13..c21ab20 100644 --- a/jmexico-editor/src/main/java/fr/reseaumexico/editor/CloneScenarioModel.java +++ b/jmexico-editor/src/main/java/fr/reseaumexico/editor/CloneScenarioModel.java @@ -25,7 +25,7 @@ package fr.reseaumexico.editor; /** * Model for clone scenario operation. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit - chemit@codelutin.com * @since 0.7 */ public class CloneScenarioModel extends AbstractScenarioModel<CloneScenarioModel> { diff --git a/jmexico-editor/src/main/java/fr/reseaumexico/editor/CloneScenarioPanel.jaxx b/jmexico-editor/src/main/java/fr/reseaumexico/editor/CloneScenarioPanel.jaxx index f7c49c8..2cf4754 100644 --- a/jmexico-editor/src/main/java/fr/reseaumexico/editor/CloneScenarioPanel.jaxx +++ b/jmexico-editor/src/main/java/fr/reseaumexico/editor/CloneScenarioPanel.jaxx @@ -37,13 +37,13 @@ public void init(CloneScenarioModel model) { </script> <row fill='both'> - <cell> - <JLabel id='selectedScenarioLabel'/> - </cell> - <cell> - <JComboBox id='selectedScenarioEditor' - onItemStateChanged='InputDesignEditorHandler.onSelectedScenarioChanged(model, event)'/> - </cell> + <cell> + <JLabel id='selectedScenarioLabel'/> + </cell> + <cell> + <JComboBox id='selectedScenarioEditor' + onItemStateChanged='InputDesignEditorHandler.onSelectedScenarioChanged(model, event)'/> + </cell> </row> <row fill='both'> <cell> @@ -53,5 +53,5 @@ public void init(CloneScenarioModel model) { <JTextField id='scenarioNameEditor' onKeyReleased='model.setScenarioName(((JTextField)event.getSource()).getText())'/> </cell> - </row> + </row> </Table> diff --git a/jmexico-editor/src/main/java/fr/reseaumexico/editor/ExportScenarioModel.java b/jmexico-editor/src/main/java/fr/reseaumexico/editor/ExportScenarioModel.java index eba686c..475aeb1 100644 --- a/jmexico-editor/src/main/java/fr/reseaumexico/editor/ExportScenarioModel.java +++ b/jmexico-editor/src/main/java/fr/reseaumexico/editor/ExportScenarioModel.java @@ -27,7 +27,7 @@ import java.io.File; /** * Model to export a scenario. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit - chemit@codelutin.com * @since 0.7 */ public class ExportScenarioModel extends AbstractScenarioModel<ExportScenarioModel> { diff --git a/jmexico-editor/src/main/java/fr/reseaumexico/editor/ExportScenarioPanel.jaxx b/jmexico-editor/src/main/java/fr/reseaumexico/editor/ExportScenarioPanel.jaxx index e5dc62f..e9464ff 100644 --- a/jmexico-editor/src/main/java/fr/reseaumexico/editor/ExportScenarioPanel.jaxx +++ b/jmexico-editor/src/main/java/fr/reseaumexico/editor/ExportScenarioPanel.jaxx @@ -22,7 +22,7 @@ <Table id='panel' layout='{new BorderLayout()}'> <import> - jaxx.runtime.swing.editor.FileEditor + jaxx.runtime.swing.editor.FileEditor </import> <ExportScenarioModel id='model'/> @@ -41,13 +41,13 @@ public void init(ExportScenarioModel model) { </script> <row fill='both'> - <cell> - <JLabel id='selectedScenarioLabel'/> - </cell> - <cell> - <JComboBox id='selectedScenarioEditor' - onItemStateChanged='InputDesignEditorHandler.onSelectedScenarioChanged(model, event)'/> - </cell> + <cell> + <JLabel id='selectedScenarioLabel'/> + </cell> + <cell> + <JComboBox id='selectedScenarioEditor' + onItemStateChanged='InputDesignEditorHandler.onSelectedScenarioChanged(model, event)'/> + </cell> </row> <row fill='both'> <cell> @@ -59,17 +59,17 @@ public void init(ExportScenarioModel model) { </cell> </row> <row fill='both'> - <cell> - <JLabel id='exportFilenameLabel'/> - </cell> - <cell> - <JTextField id='exportFilenameEditor' - onKeyReleased='model.setExportFilename(((JTextField)event.getSource()).getText())'/> - </cell> + <cell> + <JLabel id='exportFilenameLabel'/> + </cell> + <cell> + <JTextField id='exportFilenameEditor' + onKeyReleased='model.setExportFilename(((JTextField)event.getSource()).getText())'/> + </cell> </row> <row fill='both'> - <cell columns='2'> - <JLabel id='exportFilenameLabelInfo'/> - </cell> - </row> + <cell columns='2'> + <JLabel id='exportFilenameLabelInfo'/> + </cell> + </row> </Table> diff --git a/jmexico-editor/src/main/java/fr/reseaumexico/editor/ImportScenarioListener.java b/jmexico-editor/src/main/java/fr/reseaumexico/editor/ImportScenarioListener.java index 9e800fe..727f400 100644 --- a/jmexico-editor/src/main/java/fr/reseaumexico/editor/ImportScenarioListener.java +++ b/jmexico-editor/src/main/java/fr/reseaumexico/editor/ImportScenarioListener.java @@ -24,7 +24,7 @@ package fr.reseaumexico.editor; /** * Import scenario listener. - * + * * @author echatellier */ public interface ImportScenarioListener { diff --git a/jmexico-editor/src/main/java/fr/reseaumexico/editor/ImportScenarioModel.java b/jmexico-editor/src/main/java/fr/reseaumexico/editor/ImportScenarioModel.java index a6e28d2..d5fb41b 100644 --- a/jmexico-editor/src/main/java/fr/reseaumexico/editor/ImportScenarioModel.java +++ b/jmexico-editor/src/main/java/fr/reseaumexico/editor/ImportScenarioModel.java @@ -25,9 +25,9 @@ package fr.reseaumexico.editor; import java.io.File; /** - * Model toimport a scenarion into a input design. + * Model to import a scenarion into a input design. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit - chemit@codelutin.com * @since 0.7 */ public class ImportScenarioModel extends AbstractScenarioModel<ImportScenarioModel> { diff --git a/jmexico-editor/src/main/java/fr/reseaumexico/editor/ImportScenarioPanel.jaxx b/jmexico-editor/src/main/java/fr/reseaumexico/editor/ImportScenarioPanel.jaxx index c7db942..86a66a5 100644 --- a/jmexico-editor/src/main/java/fr/reseaumexico/editor/ImportScenarioPanel.jaxx +++ b/jmexico-editor/src/main/java/fr/reseaumexico/editor/ImportScenarioPanel.jaxx @@ -22,7 +22,7 @@ <Table id='panel' layout='{new BorderLayout()}'> <import> - jaxx.runtime.swing.editor.FileEditor + jaxx.runtime.swing.editor.FileEditor </import> <ImportScenarioModel id='model'/> diff --git a/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorHandler.java b/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorHandler.java index f720492..88c209e 100644 --- a/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorHandler.java +++ b/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorHandler.java @@ -21,32 +21,8 @@ */ package fr.reseaumexico.editor; -import static org.nuiton.i18n.I18n._; - -import java.awt.event.ItemEvent; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import java.io.File; -import java.io.IOException; -import java.util.Collection; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - -import javax.swing.JOptionPane; - -import jaxx.runtime.swing.editor.FileEditor; -import jaxx.runtime.swing.renderer.DecoratorProviderTableCellRenderer; - -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jdesktop.swingx.JXTable; - import com.google.common.base.Function; import com.google.common.collect.Maps; - import fr.reseaumexico.editor.factorValue.FactorValueCellEditor; import fr.reseaumexico.editor.factorValue.FactorValueCellRenderer; import fr.reseaumexico.editor.factorValue.FactorValueEditorFactory; @@ -57,10 +33,30 @@ import fr.reseaumexico.model.ScenarioImpl; import fr.reseaumexico.model.parser.ScenarioCSVParser; import fr.reseaumexico.model.parser.ScenarioXmlParser; import fr.reseaumexico.model.writer.ScenarioXmlWriter; +import jaxx.runtime.swing.editor.FileEditor; +import jaxx.runtime.swing.renderer.DecoratorProviderTableCellRenderer; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jdesktop.swingx.JXTable; + +import javax.swing.JOptionPane; +import java.awt.event.ItemEvent; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import java.io.File; +import java.io.IOException; +import java.util.Collection; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + +import static org.nuiton.i18n.I18n._; /** - * @author sletellier <letellier@codelutin.com> - * @author tchemit <chemit@codelutin.com> + * @author sletellier - letellier@codelutin.com + * @author tchemit - chemit@codelutin.com * @since 0.1 */ public class InputDesignEditorHandler { @@ -80,6 +76,7 @@ public class InputDesignEditorHandler { public void initUI() { ui.getModel().addPropertyChangeListener(InputDesignEditorModel.PROPERTY_INPUT_DESIGN, new PropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent evt) { FactorValueEditorFactory factorValueEditorFactory = @@ -143,7 +140,7 @@ public class InputDesignEditorHandler { inputDesign.addScenario(scenarioToAdd); } } - + public void renameScenario() { InputDesign inputDesign = ui.getInputDesign(); @@ -160,9 +157,9 @@ public class InputDesignEditorHandler { for (Scenario scenario : scenarios) { if (scenario.getName().equals(model.getScenarioName())) { JOptionPane.showMessageDialog(ui, - _("jmexico.action.scenario.rename.alreadyexists", model.getScenarioName()), - _("jmexico.title.scenario.rename"), - JOptionPane.ERROR_MESSAGE); + _("jmexico.action.scenario.rename.alreadyexists", model.getScenarioName()), + _("jmexico.title.scenario.rename"), + JOptionPane.ERROR_MESSAGE); return; } } @@ -264,7 +261,7 @@ public class InputDesignEditorHandler { log.info("Import scenario '" + scenarioName + "' from " + importFile); } List<Factor> factors = ui.getModel().getFactors(); - + // test file type if (importFile.getName().endsWith("." + _("jmexico.config.scenario.extension.csv"))) { @@ -281,6 +278,7 @@ public class InputDesignEditorHandler { protected void importCSVScenario(List<Factor> factors, File importFile, String scenarioName) { Map<String, Factor> factorsNameMap = Maps.uniqueIndex(factors, new Function<Factor, String>() { + @Override public String apply(Factor input) { return input.getName(); @@ -319,14 +317,15 @@ public class InputDesignEditorHandler { /** * Parse import file as XML. - * - * @param factors factors - * @param importFile import file + * + * @param factors factors + * @param importFile import file * @param scenarioName scenario name */ protected void importXMLScenario(List<Factor> factors, File importFile, String scenarioName) { - + Map<String, Factor> factorsMap = Maps.uniqueIndex(factors, new Function<Factor, String>() { + @Override public String apply(Factor input) { return input.getId(); @@ -469,7 +468,7 @@ public class InputDesignEditorHandler { return doIt; } - + protected boolean showRenameScenarioUI(RenameScenarioModel model) { // show ui @@ -625,7 +624,7 @@ public class InputDesignEditorHandler { fileEditor.setAcceptAllFileFilterUsed(false); fileEditor.setExts(getScenarioExtension() + "," + _("jmexico.config.scenario.extension.csv")); fileEditor.setExtsDescription(_("jmexico.config.scenario.extension.description") + "," + - _("jmexico.config.scenario.extension.csv.description")); + _("jmexico.config.scenario.extension.csv.description")); int response = JOptionPane.showConfirmDialog( ui, diff --git a/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorModel.java b/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorModel.java index fe77375..91bad99 100644 --- a/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorModel.java +++ b/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorModel.java @@ -45,7 +45,7 @@ import static org.nuiton.i18n.I18n._; /** * Model of {@link InputDesignEditor} UI. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit - chemit@codelutin.com * @since 0.7 */ public class InputDesignEditorModel extends AbstractSerializableBean implements InputDesignScenarioListener { diff --git a/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignTable.java b/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignTable.java index 44ee749..44fc50b 100644 --- a/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignTable.java +++ b/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignTable.java @@ -1,8 +1,7 @@ package fr.reseaumexico.editor; -import org.jdesktop.swingx.JXTable; - import fr.reseaumexico.model.Factor; +import org.jdesktop.swingx.JXTable; /* * #%L @@ -28,7 +27,7 @@ import fr.reseaumexico.model.Factor; /** * Surcharge pour pouvoir redefinir la méthode getStringAt et faire fonctionner la recherche. - * + * * @author Eric Chatellier */ public class InputDesignTable extends JXTable { @@ -40,10 +39,10 @@ public class InputDesignTable extends JXTable { public String getStringAt(int row, int column) { String result = null; - + if (column == 0) { // traduction du facteur - Factor factor = (Factor)getValueAt(row, column); + Factor factor = (Factor) getValueAt(row, column); result = factor.getName(); } else { result = super.getStringAt(row, column); diff --git a/jmexico-editor/src/main/java/fr/reseaumexico/editor/MexicoDecoratorProvider.java b/jmexico-editor/src/main/java/fr/reseaumexico/editor/MexicoDecoratorProvider.java index ba13617..6522861 100644 --- a/jmexico-editor/src/main/java/fr/reseaumexico/editor/MexicoDecoratorProvider.java +++ b/jmexico-editor/src/main/java/fr/reseaumexico/editor/MexicoDecoratorProvider.java @@ -27,8 +27,8 @@ import org.nuiton.util.decorator.Decorator; import org.nuiton.util.decorator.DecoratorProvider; /** - * @author sletellier <letellier@codelutin.com> - * @author tchemit <chemit@codelutin.com> + * @author sletellier - letellier@codelutin.com + * @author tchemit - chemit@codelutin.com * @since 0.1 */ public class MexicoDecoratorProvider extends DecoratorProvider { @@ -36,6 +36,7 @@ public class MexicoDecoratorProvider extends DecoratorProvider { @Override protected void loadDecorators() { registerDecorator(new Decorator<Factor>(Factor.class) { + private static final long serialVersionUID = 1L; @Override diff --git a/jmexico-editor/src/main/java/fr/reseaumexico/editor/RenameScenarioPanel.jaxx b/jmexico-editor/src/main/java/fr/reseaumexico/editor/RenameScenarioPanel.jaxx index a20d72e..fea7ee7 100644 --- a/jmexico-editor/src/main/java/fr/reseaumexico/editor/RenameScenarioPanel.jaxx +++ b/jmexico-editor/src/main/java/fr/reseaumexico/editor/RenameScenarioPanel.jaxx @@ -37,13 +37,13 @@ public void init(RenameScenarioModel model) { </script> <row fill='both'> - <cell> - <JLabel id='selectedScenarioLabel'/> - </cell> - <cell> - <JComboBox id='selectedScenarioEditor' - onItemStateChanged='InputDesignEditorHandler.onSelectedScenarioChanged(model, event)'/> - </cell> + <cell> + <JLabel id='selectedScenarioLabel'/> + </cell> + <cell> + <JComboBox id='selectedScenarioEditor' + onItemStateChanged='InputDesignEditorHandler.onSelectedScenarioChanged(model, event)'/> + </cell> </row> <row fill='both'> <cell> @@ -53,5 +53,5 @@ public void init(RenameScenarioModel model) { <JTextField id='scenarioNameEditor' onKeyReleased='model.setScenarioName(((JTextField)event.getSource()).getText())'/> </cell> - </row> + </row> </Table> diff --git a/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueCellEditor.java b/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueCellEditor.java index cf5720e..491e7e1 100644 --- a/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueCellEditor.java +++ b/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueCellEditor.java @@ -22,24 +22,25 @@ package fr.reseaumexico.editor.factorValue; import fr.reseaumexico.model.Factor; -import java.awt.Component; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.FocusEvent; -import java.awt.event.FocusListener; +import jaxx.runtime.JAXXContext; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + import javax.swing.AbstractCellEditor; import javax.swing.JComboBox; import javax.swing.JTable; import javax.swing.JTextField; import javax.swing.table.TableCellEditor; -import jaxx.runtime.JAXXContext; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import java.awt.Component; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.FocusEvent; +import java.awt.event.FocusListener; /** * Cell editor for factor values * - * @author sletellier <letellier@codelutin.com> + * @author sletellier - letellier@codelutin.com * @see TableCellEditor * @since 0.1 */ @@ -54,11 +55,17 @@ public class FactorValueCellEditor extends AbstractCellEditor private static Log log = LogFactory.getLog(FactorValueCellEditor.class); protected JTable table; + protected Factor factor; + protected Object currentValue; + protected JTextField defaultInlineEditor; + protected FactorValueEditorFactory.FactorValueCellEditor specificEditor; + protected boolean isEditing; + protected FactorValueEditorFactory factory; public FactorValueCellEditor(JAXXContext context) { diff --git a/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueCellRenderer.java b/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueCellRenderer.java index c02d2e8..fc33c8f 100644 --- a/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueCellRenderer.java +++ b/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueCellRenderer.java @@ -22,18 +22,20 @@ package fr.reseaumexico.editor.factorValue; import fr.reseaumexico.model.Factor; -import java.awt.Component; +import jaxx.runtime.JAXXContext; + import javax.swing.JTable; import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellRenderer; -import jaxx.runtime.JAXXContext; +import java.awt.Component; /** - * @author sletellier <letellier@codelutin.com> + * @author sletellier - letellier@codelutin.com */ public class FactorValueCellRenderer implements TableCellRenderer { protected FactorValueEditorFactory factory; + protected TableCellRenderer delegate; public FactorValueCellRenderer(JAXXContext context) { diff --git a/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueEditorFactory.java b/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueEditorFactory.java index 86b0f78..dce1e70 100644 --- a/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueEditorFactory.java +++ b/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueEditorFactory.java @@ -25,18 +25,19 @@ import com.google.common.collect.Maps; import fr.reseaumexico.model.Domain; import fr.reseaumexico.model.Factor; import fr.reseaumexico.model.ValueType; -import java.awt.Component; -import java.util.Map; +import jaxx.runtime.swing.editor.NumberEditor; +import org.apache.commons.lang3.StringUtils; + import javax.swing.JCheckBox; import javax.swing.JDialog; import javax.swing.JTextField; -import jaxx.runtime.swing.editor.NumberEditor; -import org.apache.commons.lang3.StringUtils; +import java.awt.Component; +import java.util.Map; /** * Factory used to open specific editor to input factor value * - * @author sletellier <letellier@codelutin.com> + * @author sletellier - letellier@codelutin.com * @since 0.1 */ public class FactorValueEditorFactory { @@ -49,7 +50,7 @@ public class FactorValueEditorFactory { * @param factor concerned * @param value value to edit * @return {@link FactorValueEditor} contain editor to open as {@link JDialog}, - * null if cell editor must be used + * null if cell editor must be used */ public FactorValueEditor getDialogEditor(Factor factor, Object value) { diff --git a/jmexico-editor-demo/src/site/site_fr.xml b/jmexico-editor/src/site/site_fr.xml similarity index 77% copy from jmexico-editor-demo/src/site/site_fr.xml copy to jmexico-editor/src/site/site_fr.xml index 4b6e0d9..3c56c38 100644 --- a/jmexico-editor-demo/src/site/site_fr.xml +++ b/jmexico-editor/src/site/site_fr.xml @@ -21,8 +21,10 @@ #L% --> - -<project name="${project.name}"> +<project name="${project.name}" + xmlns="http://maven.apache.org/DECORATION/1.4.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"> <body> @@ -34,8 +36,9 @@ <menu name="Utilisateur"> <item name="Accueil" href="index.html"/> - <item name="Lancer la démo" href="jnlp/launch.jnlp"/> </menu> + <menu ref="reports"/> + </body> </project> diff --git a/jmexico-model/src/main/java/fr/reseaumexico/model/AbstractMexicoBean.java b/jmexico-model/src/main/java/fr/reseaumexico/model/AbstractMexicoBean.java index 112e860..5758318 100644 --- a/jmexico-model/src/main/java/fr/reseaumexico/model/AbstractMexicoBean.java +++ b/jmexico-model/src/main/java/fr/reseaumexico/model/AbstractMexicoBean.java @@ -31,7 +31,7 @@ import java.util.List; /** * Abstract bean class. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit - chemit@codelutin.com * @since 1.8 */ public abstract class AbstractMexicoBean extends AbstractSerializableBean { diff --git a/jmexico-model/src/main/java/fr/reseaumexico/model/DateFormatFactory.java b/jmexico-model/src/main/java/fr/reseaumexico/model/DateFormatFactory.java index d32e57f..0245b4d 100644 --- a/jmexico-model/src/main/java/fr/reseaumexico/model/DateFormatFactory.java +++ b/jmexico-model/src/main/java/fr/reseaumexico/model/DateFormatFactory.java @@ -27,13 +27,14 @@ import java.text.SimpleDateFormat; /** * Factory for format all jmexico dates using {@link SimpleDateFormat} * - * @author sletellier <letellier@codelutin.com> + * @author sletellier - letellier@codelutin.com * @see SimpleDateFormat * @since 0.1 */ public class DateFormatFactory { public static final String MEXICO_DATE_PATTERN = "yyyy-MM-dd"; + protected static DateFormat mexicoDateFormat; public static DateFormat getMexicoDateFormat() { diff --git a/jmexico-model/src/main/java/fr/reseaumexico/model/InputDesignImpl.java b/jmexico-model/src/main/java/fr/reseaumexico/model/InputDesignImpl.java index 42c6426..7e2722e 100644 --- a/jmexico-model/src/main/java/fr/reseaumexico/model/InputDesignImpl.java +++ b/jmexico-model/src/main/java/fr/reseaumexico/model/InputDesignImpl.java @@ -23,7 +23,6 @@ package fr.reseaumexico.model; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - import fr.reseaumexico.model.event.InputDesignFactorEvent; import fr.reseaumexico.model.event.InputDesignFactorListener; import fr.reseaumexico.model.event.InputDesignScenarioEvent; @@ -31,17 +30,16 @@ 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 * - * @author sletellier <letellier@codelutin.com> + * @author sletellier - letellier@codelutin.com * @since 0.1 */ public class InputDesignImpl extends InputDesign { @@ -158,7 +156,7 @@ public class InputDesignImpl extends InputDesign { listener.scenarioAdded(event); } } - + protected void fireInputDesignScenarioRenamed(Scenario scenario) { InputDesignScenarioEvent event = new InputDesignScenarioEvent(this, scenario); InputDesignScenarioListener[] listeners = listenerList.getListeners(InputDesignScenarioListener.class); diff --git a/jmexico-model/src/main/java/fr/reseaumexico/model/MexicoTechnicalException.java b/jmexico-model/src/main/java/fr/reseaumexico/model/MexicoTechnicalException.java index 7749c5c..3a64935 100644 --- a/jmexico-model/src/main/java/fr/reseaumexico/model/MexicoTechnicalException.java +++ b/jmexico-model/src/main/java/fr/reseaumexico/model/MexicoTechnicalException.java @@ -24,7 +24,7 @@ package fr.reseaumexico.model; /** * Mexico technical exception * - * @author sletellier <letellier@codelutin.com> + * @author sletellier - letellier@codelutin.com * @since 0.1 */ public class MexicoTechnicalException extends RuntimeException { diff --git a/jmexico-model/src/main/java/fr/reseaumexico/model/MexicoUtil.java b/jmexico-model/src/main/java/fr/reseaumexico/model/MexicoUtil.java index b129e45..a1857b5 100644 --- a/jmexico-model/src/main/java/fr/reseaumexico/model/MexicoUtil.java +++ b/jmexico-model/src/main/java/fr/reseaumexico/model/MexicoUtil.java @@ -25,11 +25,12 @@ import com.google.common.base.Function; import org.apache.commons.lang3.StringUtils; /** - * @author sletellier <letellier@codelutin.com> + * @author sletellier - letellier@codelutin.com */ public class MexicoUtil { - public static final Function<Factor,String> GET_FACTOR_NAME = new Function<Factor, String>() { + public static final Function<Factor, String> GET_FACTOR_NAME = new Function<Factor, String>() { + @Override public String apply(Factor input) { return input.getName(); diff --git a/jmexico-model/src/main/java/fr/reseaumexico/model/MexicoXmlConstant.java b/jmexico-model/src/main/java/fr/reseaumexico/model/MexicoXmlConstant.java index 6a18aa3..0bba186 100644 --- a/jmexico-model/src/main/java/fr/reseaumexico/model/MexicoXmlConstant.java +++ b/jmexico-model/src/main/java/fr/reseaumexico/model/MexicoXmlConstant.java @@ -26,43 +26,76 @@ import java.beans.Introspector; /** * Regroup all mexico xml constants tags * - * @author sletellier <letellier@codelutin.com> + * @author sletellier - letellier@codelutin.com * @since 0.1 */ public interface MexicoXmlConstant { 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; } diff --git a/jmexico-model/src/main/java/fr/reseaumexico/model/ScenarioImpl.java b/jmexico-model/src/main/java/fr/reseaumexico/model/ScenarioImpl.java index 13c4bf2..8a5f556 100644 --- a/jmexico-model/src/main/java/fr/reseaumexico/model/ScenarioImpl.java +++ b/jmexico-model/src/main/java/fr/reseaumexico/model/ScenarioImpl.java @@ -24,13 +24,14 @@ package fr.reseaumexico.model; import com.google.common.collect.Maps; import fr.reseaumexico.model.event.ScenarioFactorValueEvent; import fr.reseaumexico.model.event.ScenarioFactorValueListener; -import java.util.Map; + import javax.swing.event.EventListenerList; +import java.util.Map; /** * Implementation of {@link Scenario} to provide listener API * - * @author sletellier <letellier@codelutin.com> + * @author sletellier - letellier@codelutin.com * @since 0.1 */ public class ScenarioImpl extends Scenario { diff --git a/jmexico-model/src/main/java/fr/reseaumexico/model/event/InputDesignFactorEvent.java b/jmexico-model/src/main/java/fr/reseaumexico/model/event/InputDesignFactorEvent.java index c29fe78..ce0d0ed 100644 --- a/jmexico-model/src/main/java/fr/reseaumexico/model/event/InputDesignFactorEvent.java +++ b/jmexico-model/src/main/java/fr/reseaumexico/model/event/InputDesignFactorEvent.java @@ -28,7 +28,7 @@ import fr.reseaumexico.model.Scenario; /** * Event fired when {@link Factor} change on {@link InputDesign} * - * @author sletellier <letellier@codelutin.com> + * @author sletellier - letellier@codelutin.com * @since 0.1 */ public class InputDesignFactorEvent extends InputDesignScenarioEvent { diff --git a/jmexico-model/src/main/java/fr/reseaumexico/model/event/InputDesignScenarioEvent.java b/jmexico-model/src/main/java/fr/reseaumexico/model/event/InputDesignScenarioEvent.java index ed2c746..c23619d 100644 --- a/jmexico-model/src/main/java/fr/reseaumexico/model/event/InputDesignScenarioEvent.java +++ b/jmexico-model/src/main/java/fr/reseaumexico/model/event/InputDesignScenarioEvent.java @@ -23,12 +23,13 @@ package fr.reseaumexico.model.event; import fr.reseaumexico.model.InputDesign; import fr.reseaumexico.model.Scenario; + import java.util.EventObject; /** * Event fired when {@link Scenario} change on {@link InputDesign} * - * @author sletellier <letellier@codelutin.com> + * @author sletellier - letellier@codelutin.com * @since 0.1 */ public class InputDesignScenarioEvent extends EventObject { diff --git a/jmexico-model/src/main/java/fr/reseaumexico/model/event/ScenarioFactorValueEvent.java b/jmexico-model/src/main/java/fr/reseaumexico/model/event/ScenarioFactorValueEvent.java index 425ec87..6a48003 100644 --- a/jmexico-model/src/main/java/fr/reseaumexico/model/event/ScenarioFactorValueEvent.java +++ b/jmexico-model/src/main/java/fr/reseaumexico/model/event/ScenarioFactorValueEvent.java @@ -23,12 +23,13 @@ package fr.reseaumexico.model.event; import fr.reseaumexico.model.Factor; import fr.reseaumexico.model.Scenario; + import java.util.EventObject; /** * Event fired when {@link Factor} change on {@link Scenario} * - * @author sletellier <letellier@codelutin.com> + * @author sletellier - letellier@codelutin.com * @since 0.1 */ public class ScenarioFactorValueEvent extends EventObject { diff --git a/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ExperimentDesignParser.java b/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ExperimentDesignParser.java index 720b526..1aec93b 100644 --- a/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ExperimentDesignParser.java +++ b/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ExperimentDesignParser.java @@ -49,7 +49,7 @@ import java.util.Map; /** * Parser for experiment design xml files, build a {@link ExperimentDesign} model. * - * @author sletellier <letellier@codelutin.com> + * @author sletellier - letellier@codelutin.com * @since 0.1 */ public class ExperimentDesignParser extends MexicoXmlParser<ExperimentDesign> implements MexicoXmlConstant { diff --git a/jmexico-model/src/main/java/fr/reseaumexico/model/parser/InputDesignParser.java b/jmexico-model/src/main/java/fr/reseaumexico/model/parser/InputDesignParser.java index 12db159..2f62ad4 100644 --- a/jmexico-model/src/main/java/fr/reseaumexico/model/parser/InputDesignParser.java +++ b/jmexico-model/src/main/java/fr/reseaumexico/model/parser/InputDesignParser.java @@ -40,7 +40,7 @@ import static fr.reseaumexico.model.MexicoXmlConstant.SCENARIO; /** * Parser for input design xml files, build a {@link InputDesign} model. * - * @author sletellier <letellier@codelutin.com> + * @author sletellier - letellier@codelutin.com * @since 0.1 */ public class InputDesignParser extends MexicoXmlParser<InputDesign> { diff --git a/jmexico-model/src/main/java/fr/reseaumexico/model/parser/MexicoXmlParser.java b/jmexico-model/src/main/java/fr/reseaumexico/model/parser/MexicoXmlParser.java index c7d01aa..08919ee 100644 --- a/jmexico-model/src/main/java/fr/reseaumexico/model/parser/MexicoXmlParser.java +++ b/jmexico-model/src/main/java/fr/reseaumexico/model/parser/MexicoXmlParser.java @@ -31,7 +31,7 @@ import java.util.Date; /** * Abstract parser to get model from xml file using XPP3 for mexico * - * @author sletellier <letellier@codelutin.com> + * @author sletellier - letellier@codelutin.com * @since 0.1 */ public abstract class MexicoXmlParser<M> extends XmlParser<M> { diff --git a/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ScenarioCSVParser.java b/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ScenarioCSVParser.java index e2f3450..bddbeb7 100644 --- a/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ScenarioCSVParser.java +++ b/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ScenarioCSVParser.java @@ -22,15 +22,6 @@ package fr.reseaumexico.model.parser; * #L% */ -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Map; - -import org.apache.commons.collections.CollectionUtils; - import com.csvreader.CsvReader; import com.google.common.base.Charsets; import com.google.common.collect.ArrayListMultimap; @@ -39,12 +30,19 @@ import com.google.common.collect.Maps; import com.google.common.collect.Multimap; import com.google.common.collect.Multimaps; import com.google.common.io.Files; - import fr.reseaumexico.model.Factor; import fr.reseaumexico.model.MexicoUtil; import fr.reseaumexico.model.Scenario; import fr.reseaumexico.model.ScenarioImpl; import fr.reseaumexico.model.ValueType; +import org.apache.commons.collections.CollectionUtils; + +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; /** * Parser for input design csv files, build a {@link Scenario} model. @@ -82,7 +80,7 @@ public class ScenarioCSVParser { CsvReader csvReader = null; try { - + // csv file doesn't contains headers, so it's not a real // csv file csvReader = new CsvReader(Files.newReader(file, Charsets.UTF_8), ','); @@ -102,14 +100,14 @@ public class ScenarioCSVParser { // ok use the first one :( factor = possibleFactors.iterator().next(); } else { - + // really not found // keep factor name unknownFactors.add(factorName); continue; } } - + ValueType valueType = factor.getDomain().getValueType(); // factor value diff --git a/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ScenarioXmlParser.java b/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ScenarioXmlParser.java index 31bd535..43627b2 100644 --- a/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ScenarioXmlParser.java +++ b/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ScenarioXmlParser.java @@ -54,7 +54,7 @@ import static fr.reseaumexico.model.MexicoXmlConstant.SCENARIO_ORDER_NUMBER; /** * Parser for input design xml files, build a {@link Scenario} model. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit - chemit@codelutin.com * @since 0.7 */ public class ScenarioXmlParser extends MexicoXmlParser<Scenario> { diff --git a/jmexico-model/src/main/java/fr/reseaumexico/model/parser/XmlParser.java b/jmexico-model/src/main/java/fr/reseaumexico/model/parser/XmlParser.java index e2c066a..eb815df 100644 --- a/jmexico-model/src/main/java/fr/reseaumexico/model/parser/XmlParser.java +++ b/jmexico-model/src/main/java/fr/reseaumexico/model/parser/XmlParser.java @@ -37,7 +37,7 @@ import java.text.ParseException; /** * Abstract parser to get model from xml file using XPP3 * - * @author sletellier <letellier@codelutin.com> + * @author sletellier - letellier@codelutin.com * @see XmlPullParser * @since 0.1 */ diff --git a/jmexico-model/src/main/java/fr/reseaumexico/model/writer/ExperimentDesignXmlWriter.java b/jmexico-model/src/main/java/fr/reseaumexico/model/writer/ExperimentDesignXmlWriter.java index 7a01552..56f5416 100644 --- a/jmexico-model/src/main/java/fr/reseaumexico/model/writer/ExperimentDesignXmlWriter.java +++ b/jmexico-model/src/main/java/fr/reseaumexico/model/writer/ExperimentDesignXmlWriter.java @@ -35,7 +35,7 @@ import java.util.Date; /** * Writer to create experiment design file with {@link ExperimentDesign} model * - * @author sletellier <letellier@codelutin.com> + * @author sletellier - letellier@codelutin.com * @since 0.1 */ public class ExperimentDesignXmlWriter extends MexicoXmlWriter<ExperimentDesign> { diff --git a/jmexico-model/src/main/java/fr/reseaumexico/model/writer/InputDesignXmlWriter.java b/jmexico-model/src/main/java/fr/reseaumexico/model/writer/InputDesignXmlWriter.java index 6669dfc..625064c 100644 --- a/jmexico-model/src/main/java/fr/reseaumexico/model/writer/InputDesignXmlWriter.java +++ b/jmexico-model/src/main/java/fr/reseaumexico/model/writer/InputDesignXmlWriter.java @@ -31,7 +31,7 @@ import java.util.Date; /** * Writer to create input design file with {@link InputDesign} model * - * @author sletellier <letellier@codelutin.com> + * @author sletellier - letellier@codelutin.com * @since 0.1 */ public class InputDesignXmlWriter extends MexicoXmlWriter<InputDesign> { diff --git a/jmexico-model/src/main/java/fr/reseaumexico/model/writer/MexicoXmlWriter.java b/jmexico-model/src/main/java/fr/reseaumexico/model/writer/MexicoXmlWriter.java index 4907f77..71ccb1e 100644 --- a/jmexico-model/src/main/java/fr/reseaumexico/model/writer/MexicoXmlWriter.java +++ b/jmexico-model/src/main/java/fr/reseaumexico/model/writer/MexicoXmlWriter.java @@ -24,15 +24,14 @@ package fr.reseaumexico.model.writer; 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; /** * Abstract writer create mexico files with specific model * - * @author sletellier <letellier@codelutin.com> + * @author sletellier - letellier@codelutin.com * @since 0.1 */ public abstract class MexicoXmlWriter<M> extends XmlWriter<M> implements MexicoXmlConstant { diff --git a/jmexico-model/src/main/java/fr/reseaumexico/model/writer/ScenarioXmlWriter.java b/jmexico-model/src/main/java/fr/reseaumexico/model/writer/ScenarioXmlWriter.java index 6459de4..6be500e 100644 --- a/jmexico-model/src/main/java/fr/reseaumexico/model/writer/ScenarioXmlWriter.java +++ b/jmexico-model/src/main/java/fr/reseaumexico/model/writer/ScenarioXmlWriter.java @@ -32,7 +32,7 @@ import java.util.Map; /** * Writes a scenario from a input design as a xml file. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit - chemit@codelutin.com * @since 0.7 */ public class ScenarioXmlWriter extends MexicoXmlWriter<Scenario> { diff --git a/jmexico-model/src/main/java/fr/reseaumexico/model/writer/XmlNode.java b/jmexico-model/src/main/java/fr/reseaumexico/model/writer/XmlNode.java index 26a2a9e..99f8d61 100644 --- a/jmexico-model/src/main/java/fr/reseaumexico/model/writer/XmlNode.java +++ b/jmexico-model/src/main/java/fr/reseaumexico/model/writer/XmlNode.java @@ -23,28 +23,35 @@ package fr.reseaumexico.model.writer; 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 * - * @author sletellier <letellier@codelutin.com> + * @author sletellier - letellier@codelutin.com * @since 0.1 */ public class XmlNode { public static final String XML_META = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"; + public static final String CLOSED_TAG = "%s<%s%s/>\n"; + public static final String START_TAG = "%s<%s%s>"; + public static final String END_TAG = "%s</%s>\n"; protected List<XmlNode> children; + protected Map<String, String> attributes; + protected String tagName; + protected String text; public XmlNode(String tagName) { diff --git a/jmexico-model/src/main/java/fr/reseaumexico/model/writer/XmlWriter.java b/jmexico-model/src/main/java/fr/reseaumexico/model/writer/XmlWriter.java index 168ead3..ea41bb7 100644 --- a/jmexico-model/src/main/java/fr/reseaumexico/model/writer/XmlWriter.java +++ b/jmexico-model/src/main/java/fr/reseaumexico/model/writer/XmlWriter.java @@ -32,7 +32,7 @@ import java.io.Writer; /** * Abstract writer to create xml files using {@link XmlNode} * - * @author sletellier <letellier@codelutin.com> + * @author sletellier - letellier@codelutin.com * @since 0.1 */ public abstract class XmlWriter<M> { diff --git a/jmexico-model/src/site/rst/index.rst b/jmexico-model/src/site/rst/index.rst index d825e1b..2a18462 100644 --- a/jmexico-model/src/site/rst/index.rst +++ b/jmexico-model/src/site/rst/index.rst @@ -19,6 +19,7 @@ .. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - + =============== JMexico - Model =============== diff --git a/jmexico-model/src/site/site_fr.xml b/jmexico-model/src/site/site_fr.xml index bf1f5a5..bd9d311 100644 --- a/jmexico-model/src/site/site_fr.xml +++ b/jmexico-model/src/site/site_fr.xml @@ -21,8 +21,10 @@ #L% --> - -<project name="${project.name}"> +<project name="${project.name}" + xmlns="http://maven.apache.org/DECORATION/1.4.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"> <body> @@ -36,5 +38,7 @@ <item name="Accueil" href="index.html"/> </menu> + <menu ref="reports"/> + </body> </project> diff --git a/src/site/rst/index.rst b/src/site/rst/index.rst index 15d0927..368953a 100644 --- a/src/site/rst/index.rst +++ b/src/site/rst/index.rst @@ -19,6 +19,7 @@ .. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - + ======= JMexico ======= diff --git a/src/site/site_fr.xml b/src/site/site_fr.xml index 74ecd87..890a3e1 100644 --- a/src/site/site_fr.xml +++ b/src/site/site_fr.xml @@ -21,8 +21,10 @@ #L% --> - -<project name="JMexico"> +<project name="${project.name}" + xmlns="http://maven.apache.org/DECORATION/1.4.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"> <bannerLeft> <name>${project.name}</name> @@ -30,30 +32,35 @@ </bannerLeft> <poweredBy> - <logo href="http://maven.apache.org" name="Maven" - img="${project.url}/images/logos/maven-feather.png"/> - <logo href="http://maven-site.nuiton.org/jrst" name="JRst" - img="${project.url}/images/jrst-logo.png"/> <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" - img="${project.url}/images/restructuredtext-logo.png"/> + img="${siteCommonResourcesUrl}/images/logos/restructuredtext-logo.png"/> + + <logo href="https://jrst.nuiton.org" name="JRst" + img="${siteCommonResourcesUrl}/images/logos/jrst-logo.png"/> + + <logo href="https://jaxx.nuiton.org" name="JAXX" + img="${siteCommonResourcesUrl}/images/logos/jaxx-logo.png"/> + <logo href="http://argouml.tigris.org/" name="ArgoUML" - img="images/argouml-logo.png"/> - <logo href="http://maven-site.nuiton.org/jaxx" name="JAXX" - img="images/jaxx-logo.png"/> + img="${siteCommonResourcesUrl}/images/logos/argouml-logo.png"/> </poweredBy> <body> - <breadcrumbs> - <item name="${project.name}" href="index.html"/> - </breadcrumbs> - <links> + <item name="Forge" href="https://forge.codelutin.com"/> + <item name="Code Lutin" href="https://codelutin.com"/> <item name="Inra" href="http://www.inra.fr/"/> <item name="CIAM" href="http://ciam.inra.fr/ciam/"/> </links> + <breadcrumbs> + <item name="${project.name}" href="${project.url}/index.html"/> + <item name="${project.version}" href="${project.url}/v/${siteDeployClassifier}/index.html"/> + </breadcrumbs> + + <menu name="Utilisateur"> <item name="Accueil" href="index.html"/> <item name="Lancer la démo" href="jmexico-editor-demo/jnlp/launch.jnlp"/> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.