Author: tchemit Date: 2010-06-01 15:38:43 +0200 (Tue, 01 Jun 2010) New Revision: 1943 Url: http://nuiton.org/repositories/revision/jaxx/1943 Log: - Evolution #653: Use nuiton-utils 1.3.1 and his new Converter api Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/ClassCellEditor.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidator.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/field/ExistingDirectoryFieldValidator.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/field/FieldExpressionWithParamsValidator.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/CategoryModel.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/ConfigTableModel.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/OptionModel.java trunk/pom.xml Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/ClassCellEditor.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/ClassCellEditor.java 2010-06-01 01:06:33 UTC (rev 1942) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/ClassCellEditor.java 2010-06-01 13:38:43 UTC (rev 1943) @@ -25,7 +25,7 @@ package jaxx.runtime.swing.editor; import org.apache.commons.beanutils.Converter; -import org.nuiton.util.ConverterUtil; +import org.nuiton.util.converter.ConverterUtil; import javax.swing.DefaultCellEditor; import javax.swing.JTable; Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidator.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidator.java 2010-06-01 01:06:33 UTC (rev 1942) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidator.java 2010-06-01 13:38:43 UTC (rev 1943) @@ -28,7 +28,7 @@ import org.apache.commons.beanutils.Converter; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.ConverterUtil; +import org.nuiton.util.converter.ConverterUtil; import javax.swing.event.EventListenerList; import java.beans.*; Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/field/ExistingDirectoryFieldValidator.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/field/ExistingDirectoryFieldValidator.java 2010-06-01 01:06:33 UTC (rev 1942) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/field/ExistingDirectoryFieldValidator.java 2010-06-01 13:38:43 UTC (rev 1943) @@ -68,7 +68,7 @@ @Override public void validate(Object object) throws ValidationException { String fieldName = getFieldName(); - Object value = this.getFieldValue(fieldName, object); + Object value = getFieldValue(fieldName, object); if (value==null) { // no value defined addFieldError(fieldName, object); Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/field/FieldExpressionWithParamsValidator.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/field/FieldExpressionWithParamsValidator.java 2010-06-01 01:06:33 UTC (rev 1942) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/field/FieldExpressionWithParamsValidator.java 2010-06-01 13:38:43 UTC (rev 1943) @@ -31,7 +31,7 @@ import java.util.StringTokenizer; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.nuiton.util.ConverterUtil; +import org.nuiton.util.converter.ConverterUtil; /** * Extends {@link FieldExpressionValidator} to add some extra parameters available Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/CategoryModel.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/CategoryModel.java 2010-06-01 01:06:33 UTC (rev 1942) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/CategoryModel.java 2010-06-01 13:38:43 UTC (rev 1943) @@ -29,6 +29,7 @@ import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; +import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -37,22 +38,30 @@ /** * le modele d'une categorie d'options. - * + * <p/> * Une categorie est un ensemble d'options. * * @author tchemit */ -public class CategoryModel implements Iterable<OptionModel> { +public class CategoryModel implements Iterable<OptionModel>, Serializable { + private static final long serialVersionUID = 1L; + public static final String RELOAD_PROPERTY_NAME = "reload"; + public static final String MODIFIED_PROPERTY_NAME = "modified"; + public static final String VALID_PROPERTY_NAME = "valid"; + /** category short name (i18n key) */ protected String category; + /** category long name (i18n key) */ protected String categoryLabel; + /** options of the category */ protected List<OptionModel> entries; + /** suport of modification */ protected PropertyChangeSupport pcs = new PropertyChangeSupport(this); Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/ConfigTableModel.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/ConfigTableModel.java 2010-06-01 01:06:33 UTC (rev 1942) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/ConfigTableModel.java 2010-06-01 13:38:43 UTC (rev 1943) @@ -25,7 +25,7 @@ package jaxx.runtime.swing.editor.config.model; -import org.nuiton.util.ConverterUtil; +import org.nuiton.util.converter.ConverterUtil; import javax.swing.table.AbstractTableModel; import java.beans.PropertyChangeEvent; Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/OptionModel.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/OptionModel.java 2010-06-01 01:06:33 UTC (rev 1942) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/OptionModel.java 2010-06-01 13:38:43 UTC (rev 1943) @@ -36,6 +36,7 @@ */ public class OptionModel implements OptionDef { + private static final long serialVersionUID = 1L; /** * la definition de l'option ( venant de la config) */ @@ -44,11 +45,11 @@ * un drapeau pour savoir si l'option est valide (n'est pas utilisé actuellement) */ protected boolean valid = true; + /** * un drapeau pour savoir si l'option a été sauvée */ protected boolean saved; - /** * la valeur non modifié de l'option */ @@ -61,6 +62,7 @@ * le nom de la propriété javaBean (peut etre null, si option sans support javaBean) */ protected String propertyName; + /** * l'editeur utilise pour modifier graphiquement l'option */ Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-01 01:06:33 UTC (rev 1942) +++ trunk/pom.xml 2010-06-01 13:38:43 UTC (rev 1943) @@ -393,7 +393,8 @@ <!-- pour un muli module on doit fixer le projectId --> <projectId>jaxx</projectId> - <lutinutil.version>1.3</lutinutil.version> + <lutinutil.version>1.3.1-SNAPSHOT</lutinutil.version> + <i18n.version>1.2.2</i18n.version> <jxlayer.version>3.0.3</jxlayer.version>