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