Author: tchemit Date: 2010-03-18 10:16:31 +0100 (Thu, 18 Mar 2010) New Revision: 1791 Log: reformat code Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidator.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorDetector.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorEvent.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorField.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorListener.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorMessage.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorScope.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorUtil.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/XWorkBeanValidator.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidator.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessage.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageListModel.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageListMouseListener.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageListRenderer.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageTableModel.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageTableMouseListener.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageTableRenderer.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorUtil.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/ui/AbstractBeanValidatorUI.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/ui/IconValidationUI.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/ui/ImageValidationUI.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/ui/TranslucentValidationUI.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidator.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidator.java 2010-03-15 22:30:47 UTC (rev 1790) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidator.java 2010-03-18 09:16:31 UTC (rev 1791) @@ -32,7 +32,10 @@ import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; import java.util.ArrayList; +import java.util.Collections; import java.util.EnumMap; +import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -49,7 +52,7 @@ * * @param <B> type of the bean to validate. * - * @author chemit + * @author tchemit <chemit@codelutin.com> */ public class BeanValidator<B> { @@ -70,11 +73,11 @@ /** to chain to a prent validator */ protected BeanValidator<?> parentValidator; /** state to indicate that validator has changed since the last time bean was setted */ - protected boolean changed = false; + protected boolean changed; /** state of the validator (is true if no errors of error scope is found) */ protected boolean valid = true; /** bean to be watched */ - protected B bean = null; + protected B bean; /** to add and remove PropertyChangeListener on watched beans */ protected EventSetDescriptor beanEventDescriptor; /** list of fields watched by this validator */ @@ -92,9 +95,9 @@ public BeanValidator(Class<B> beanClass, String contextName) { this.beanClass = beanClass; - this.pcs = new PropertyChangeSupport(this); - this.conversionErrors = new TreeMap<String, String>(); - this.validators = new EnumMap<BeanValidatorScope, XWorkBeanValidator<B>>(BeanValidatorScope.class); + pcs = new PropertyChangeSupport(this); + conversionErrors = new TreeMap<String, String>(); + validators = new EnumMap<BeanValidatorScope, XWorkBeanValidator<B>>(BeanValidatorScope.class); setContextName(contextName); @@ -124,7 +127,7 @@ } public Set<BeanValidatorScope> getScopes() { - return new java.util.HashSet<BeanValidatorScope>(validators.keySet()); + return new HashSet<BeanValidatorScope>(validators.keySet()); } /** @@ -378,9 +381,9 @@ errors.clear(); errors.add(conversionError); } else { - errors = java.util.Collections.singletonList(conversionError); + errors = Collections.singletonList(conversionError); if (newMessages == XWorkBeanValidator.EMPTY_RESULT) { - newMessages = new java.util.HashMap<String, List<String>>(); + newMessages = new HashMap<String, List<String>>(); } // add the concrete conversion error newMessages.put(entry.getKey(), errors); @@ -459,9 +462,9 @@ protected synchronized void initFields() { - Set<String> detectedFieldNames = new java.util.HashSet<String>(); + Set<String> detectedFieldNames = new HashSet<String>(); EnumMap<BeanValidatorScope, Set<String>> tmp = new EnumMap<BeanValidatorScope, Set<String>>(BeanValidatorScope.class); - Set<BeanValidatorField<B>> detectedFields = new java.util.HashSet<BeanValidatorField<B>>(); + Set<BeanValidatorField<B>> detectedFields = new HashSet<BeanValidatorField<B>>(); validators.clear(); @@ -496,13 +499,13 @@ tmp.clear(); detectedFieldNames.clear(); - this.fields = java.util.Collections.unmodifiableSet(detectedFields); + fields = Collections.unmodifiableSet(detectedFields); } protected EventSetDescriptor getBeanEventDescriptor(B bean) { if (beanEventDescriptor == null) { // check that the bean is listenable, otherwise, can't use the validator on it - this.beanEventDescriptor = BeanValidatorUtil.getPropertyChangeListenerDescriptor(bean.getClass()); + beanEventDescriptor = BeanValidatorUtil.getPropertyChangeListenerDescriptor(bean.getClass()); } return beanEventDescriptor; } Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorDetector.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorDetector.java 2010-03-15 22:30:47 UTC (rev 1790) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorDetector.java 2010-03-18 09:16:31 UTC (rev 1791) @@ -38,7 +38,7 @@ * Un detecteur de validateurs pour un liste de classes données et un * répertoire où chercher les fichiers de validation. * - * @author chemit + * @author tchemit <chemit@codelutin.com> * * @since 1.6.0 */ Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorEvent.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorEvent.java 2010-03-15 22:30:47 UTC (rev 1790) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorEvent.java 2010-03-18 09:16:31 UTC (rev 1791) @@ -20,14 +20,16 @@ */ package jaxx.runtime.validator; +import java.util.EventObject; + /** * The definition of an event on {@link BeanValidatorListener} * to be fired by a {@link BeanValidator}. * - * @author chemit + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ -public class BeanValidatorEvent extends java.util.EventObject { +public class BeanValidatorEvent extends EventObject { private static final long serialVersionUID = 1L; /** the field impacted by the validator */ @@ -41,8 +43,8 @@ super(source); this.field = field; this.scope = scope; - this.messagestoAdd = toAdd; - this.messagestoDelete = toDelete; + messagestoAdd = toAdd; + messagestoDelete = toDelete; } @Override Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorField.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorField.java 2010-03-15 22:30:47 UTC (rev 1790) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorField.java 2010-03-18 09:16:31 UTC (rev 1791) @@ -20,6 +20,8 @@ */ package jaxx.runtime.validator; +import com.opensymphony.xwork2.validator.FieldValidator; + import static org.nuiton.i18n.I18n._; import javax.swing.event.EventListenerList; @@ -34,12 +36,12 @@ * Definition of a field to be handled in a {@link BeanValidator}. * <p/> * A such class is only registred in {@link BeanValidator } when the field of the bean - * was found in validator xml configuration file for a {@link com.opensymphony.xwork2.validator.FieldValidator} only. + * was found in validator xml configuration file for a {@link FieldValidator} only. * <p/> * This class use properties {@link #beanClass}, {@link #name} to define * his naturel order. * - * @author chemit + * @author tchemit <chemit@codelutin.com> * @param <B> the type of the bean handled by the validator and this field of validation. * @since 1.3 */ @@ -159,7 +161,7 @@ Set<String> currentMessages = getMessages(scope); // detect messages to delete - Set<String> toDelete = new java.util.HashSet<String>(currentMessages); + Set<String> toDelete = new HashSet<String>(currentMessages); toDelete.removeAll(messages); if (!toDelete.isEmpty()) { @@ -169,7 +171,7 @@ } // detect messages to add - Set<String> toAdd = new java.util.HashSet<String>(messages); + Set<String> toAdd = new HashSet<String>(messages); toAdd.removeAll(currentMessages); if (!toAdd.isEmpty()) { @@ -193,7 +195,7 @@ public String getI18nError(String error) { String text; - if (error.indexOf("##") == -1) { + if (!error.contains("##")) { text = _(error); } else { StringTokenizer stk = new StringTokenizer(error, "##"); Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorListener.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorListener.java 2010-03-15 22:30:47 UTC (rev 1790) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorListener.java 2010-03-18 09:16:31 UTC (rev 1791) @@ -20,13 +20,15 @@ */ package jaxx.runtime.validator; +import java.util.EventListener; + /** * The listener contract to be used on {@link BeanValidator} * - * @author chemit + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ -public interface BeanValidatorListener extends java.util.EventListener { +public interface BeanValidatorListener extends EventListener { /** * Invoked when a validator detects some changes on a field. Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorMessage.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorMessage.java 2010-03-15 22:30:47 UTC (rev 1790) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorMessage.java 2010-03-18 09:16:31 UTC (rev 1791) @@ -25,7 +25,7 @@ * * @param <E> type of message (use for override {@link #compareTo(Object)} method. * - * @author chemit + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class BeanValidatorMessage<E extends BeanValidatorMessage<?>> implements Comparable<E> { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorScope.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorScope.java 2010-03-15 22:30:47 UTC (rev 1790) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorScope.java 2010-03-18 09:16:31 UTC (rev 1791) @@ -29,7 +29,7 @@ * <p/> * Always begin with error, then if no error found, try warning, then info... * - * @author chemit + * @author tchemit <chemit@codelutin.com> */ public enum BeanValidatorScope { @@ -56,7 +56,7 @@ INFO(n_("validator.scope.info.label")); private final String label; - private BeanValidatorScope(String label) { + BeanValidatorScope(String label) { this.label = label; } Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorUtil.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorUtil.java 2010-03-15 22:30:47 UTC (rev 1790) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorUtil.java 2010-03-18 09:16:31 UTC (rev 1791) @@ -40,7 +40,7 @@ /** * The helper class for validation module. * - * @author chemit + * @author tchemit <chemit@codelutin.com> */ public class BeanValidatorUtil { @@ -125,7 +125,7 @@ } } for (String validatorId : validatorIds) { - BeanValidator beanValidator = jaxxValidator.getValidator(validatorId); + BeanValidator<?> beanValidator = jaxxValidator.getValidator(validatorId); beanValidator.setChanged(newValue); } } @@ -165,7 +165,7 @@ } } - public static EventSetDescriptor getPropertyChangeListenerDescriptor(Class beanClass) { + public static EventSetDescriptor getPropertyChangeListenerDescriptor(Class<?> beanClass) { try { // check that the bean is listenable, otherwise, can't use // the validator on it Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/XWorkBeanValidator.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/XWorkBeanValidator.java 2010-03-15 22:30:47 UTC (rev 1790) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/XWorkBeanValidator.java 2010-03-18 09:16:31 UTC (rev 1791) @@ -31,12 +31,15 @@ import com.opensymphony.xwork2.validator.FieldValidator; import com.opensymphony.xwork2.validator.ValidationException; import com.opensymphony.xwork2.validator.Validator; + +import java.util.ArrayList; import java.util.Collection; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import java.util.Collections; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -45,12 +48,12 @@ * * A customized validator for a given bean. * - * Use the method {@link #validate(java.lang.Object)} to obtain the messages + * Use the method {@link #validate(Object)} to obtain the messages * detected by the validator for the given bean. * * @param <B> type of the bean to validate. * - * @author chemit + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class XWorkBeanValidator<B> { @@ -71,7 +74,7 @@ // -- protected ValidationAwareSupport validationSupport; protected DelegatingValidatorContext validationContext; - protected transient ActionValidatorManager validator; + protected ActionValidatorManager validator; protected ActionContext context; public XWorkBeanValidator(Class<B> beanClass, String contextName) { @@ -205,7 +208,7 @@ result = new HashMap<String, List<String>>(messages.size()); for (Object fieldName : messages.keySet()) { Collection<?> c = (Collection<?>) messages.get(fieldName); - List<String> mm = new java.util.ArrayList<String>(c.size()); + List<String> mm = new ArrayList<String>(c.size()); for (Object message : c) { mm.add(message + ""); } @@ -239,7 +242,7 @@ fieldNames = null; } - Set<String> detectedFieldNames = new java.util.HashSet<String>(); + Set<String> detectedFieldNames = new HashSet<String>(); int skip = 0; if (contextName != null && !includeDefaultContext) { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidator.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidator.java 2010-03-15 22:30:47 UTC (rev 1790) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidator.java 2010-03-18 09:16:31 UTC (rev 1791) @@ -38,7 +38,7 @@ import jaxx.runtime.validator.BeanValidatorField; /** - * La surcharge de {@link jaxx.runtime.validator.BeanValidator} pour les ui swing + * La surcharge de {@link BeanValidator} pour les ui swing * <p/> * /** * <p/> @@ -110,8 +110,8 @@ * </pre> * * @param <B> le type de bean a valider - * @author poussin - * @author chemit + * @author poussin <poussin@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @version 1.0 */ public class SwingValidator<B> extends BeanValidator<B> { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessage.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessage.java 2010-03-15 22:30:47 UTC (rev 1790) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessage.java 2010-03-18 09:16:31 UTC (rev 1791) @@ -28,7 +28,7 @@ /** * The object to box a validation message within an u. * - * @author chemit + * @author tchemit <chemit@codelutin.com> * @since 1.3 * @see BeanValidatorMessage */ @@ -42,7 +42,7 @@ public SwingValidatorMessage(SwingValidator<?> validator, BeanValidatorField<?> field, String message, BeanValidatorScope scope, JComponent editor) { super(validator, field, message, scope); - this.fieldName = field.getName(); + fieldName = field.getName(); this.editor = editor; } Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageListModel.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageListModel.java 2010-03-15 22:30:47 UTC (rev 1790) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageListModel.java 2010-03-18 09:16:31 UTC (rev 1791) @@ -22,10 +22,14 @@ import jaxx.runtime.validator.BeanValidatorEvent; +import javax.swing.AbstractListModel; import javax.swing.JComponent; import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; import java.util.List; import jaxx.runtime.validator.BeanValidatorField; +import jaxx.runtime.validator.BeanValidatorListener; import jaxx.runtime.validator.BeanValidatorScope; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -33,11 +37,11 @@ /** * The model of the list of validation's messages * - * @author chemit + * @author tchemit <chemit@codelutin.com> */ public class SwingValidatorMessageListModel - extends javax.swing.AbstractListModel - implements jaxx.runtime.validator.BeanValidatorListener { + extends AbstractListModel + implements BeanValidatorListener { private static final long serialVersionUID = 1L; /** to use log facility, just put in your code: log.info(\"...\"); */ @@ -49,7 +53,7 @@ public SwingValidatorMessageListModel() { validators = new ArrayList<SwingValidator<?>>(); - data = new java.util.ArrayList<SwingValidatorMessage>(); + data = new ArrayList<SwingValidatorMessage>(); } public boolean isEmpty() { @@ -134,7 +138,7 @@ if (sort) { // resort datas - java.util.Collections.sort(data); + Collections.sort(data); // notify fireContentsChanged(this, 0, getSize() - 1); @@ -143,7 +147,7 @@ protected void removeMessages(SwingValidator<?> validator, BeanValidatorField<?> field, BeanValidatorScope scope, boolean notify, String... messages) { - List<String> messagesToDel = new java.util.ArrayList<String>(java.util.Arrays.asList(messages)); + List<String> messagesToDel = new ArrayList<String>(Arrays.asList(messages)); // do it in reverse mode (only one pass in that way since index // will stay coherent while removing them) Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageListMouseListener.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageListMouseListener.java 2010-03-15 22:30:47 UTC (rev 1790) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageListMouseListener.java 2010-03-18 09:16:31 UTC (rev 1791) @@ -29,11 +29,11 @@ import java.awt.event.MouseEvent; /** - * A mouse listener to put on a {@link javax.swing.JList} with a {@link SwingValidatorMessageListModel} as a model. + * A mouse listener to put on a {@link JList} with a {@link SwingValidatorMessageListModel} as a model. * <p/> * When a double click occurs, find the selected error in model and then focus to the associated component of error. * - * @author chemit + * @author tchemit <chemit@codelutin.com> */ public class SwingValidatorMessageListMouseListener extends MouseAdapter { @@ -77,4 +77,4 @@ return entry; } -} \ No newline at end of file +} Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageListRenderer.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageListRenderer.java 2010-03-15 22:30:47 UTC (rev 1790) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageListRenderer.java 2010-03-18 09:16:31 UTC (rev 1791) @@ -32,7 +32,7 @@ * A simple render of a table of validator's messages, says a table that use * a {@link SwingValidatorMessageTableModel} model. * - * @author chemit + * @author tchemit <chemit@codelutin.com> * @since 1.3 * @see SwingValidatorMessageTableModel */ @@ -106,4 +106,4 @@ String fieldName = SwingValidatorUtil.getFieldName(model, value); return fieldName; } -} \ No newline at end of file +} Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageTableModel.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageTableModel.java 2010-03-15 22:30:47 UTC (rev 1790) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageTableModel.java 2010-03-18 09:16:31 UTC (rev 1791) @@ -23,9 +23,13 @@ import jaxx.runtime.validator.BeanValidatorEvent; import javax.swing.JComponent; +import javax.swing.table.AbstractTableModel; import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; import java.util.List; import jaxx.runtime.validator.BeanValidatorField; +import jaxx.runtime.validator.BeanValidatorListener; import jaxx.runtime.validator.BeanValidatorScope; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -35,12 +39,12 @@ * <p/> * The model listens validators messages and update his internal model from it. * - * @author chemit + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class SwingValidatorMessageTableModel - extends javax.swing.table.AbstractTableModel - implements jaxx.runtime.validator.BeanValidatorListener { + extends AbstractTableModel + implements BeanValidatorListener { private static final long serialVersionUID = 1L; /** @@ -61,7 +65,7 @@ public SwingValidatorMessageTableModel() { super(); validators = new ArrayList<SwingValidator<?>>(); - data = new java.util.ArrayList<SwingValidatorMessage>(); + data = new ArrayList<SwingValidatorMessage>(); } /** @@ -246,7 +250,7 @@ if (sort) { // resort datas - java.util.Collections.sort(data); + Collections.sort(data); // notify fireTableDataChanged(); @@ -268,7 +272,7 @@ if (sort) { // resort datas - java.util.Collections.sort(data); + Collections.sort(data); // notify fireTableDataChanged(); @@ -289,7 +293,7 @@ if (sort) { // resort datas - java.util.Collections.sort(data); + Collections.sort(data); // notify fireTableDataChanged(); @@ -298,7 +302,7 @@ protected void removeMessages(SwingValidator<?> validator, BeanValidatorField<?> field, BeanValidatorScope scope, boolean notify, String... messages) { - List<String> messagesToDel = new java.util.ArrayList<String>(java.util.Arrays.asList(messages)); + List<String> messagesToDel = new ArrayList<String>(Arrays.asList(messages)); // do it in reverse mode (only one pass in that way since index // will stay coherent while removing them) @@ -317,7 +321,7 @@ protected void removeMessages(SwingValidator<?> validator, String fieldName, BeanValidatorScope scope, boolean notify, String... messages) { - List<String> messagesToDel = new java.util.ArrayList<String>(java.util.Arrays.asList(messages)); + List<String> messagesToDel = new ArrayList<String>(Arrays.asList(messages)); // do it in reverse mode (only one pass in that way since index // will stay coherent while removing them) @@ -350,4 +354,4 @@ } } } -} \ No newline at end of file +} Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageTableMouseListener.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageTableMouseListener.java 2010-03-15 22:30:47 UTC (rev 1790) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageTableMouseListener.java 2010-03-18 09:16:31 UTC (rev 1791) @@ -24,6 +24,7 @@ import org.apache.commons.logging.LogFactory; import javax.swing.JComponent; +import javax.swing.JList; import javax.swing.JTable; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; @@ -31,11 +32,11 @@ import java.beans.PropertyChangeSupport; /** - * A mouse listener to put on a {@link javax.swing.JList} with a {@link SwingValidatorMessageTableModel} as a model. + * A mouse listener to put on a {@link JList} with a {@link SwingValidatorMessageTableModel} as a model. * <p/> * When a double click occurs, find the selected error in model and then focus to the associated component of error. * - * @author chemit + * @author tchemit <chemit@codelutin.com> */ public class SwingValidatorMessageTableMouseListener extends MouseAdapter { @@ -111,4 +112,4 @@ pcs.removePropertyChangeListener(propertyName, listener); } -} \ No newline at end of file +} Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageTableRenderer.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageTableRenderer.java 2010-03-15 22:30:47 UTC (rev 1790) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageTableRenderer.java 2010-03-18 09:16:31 UTC (rev 1791) @@ -32,7 +32,7 @@ * A simple render of a table of validator's messages, says a table that use * a {@link SwingValidatorMessageTableModel} model. * - * @author chemit + * @author tchemit <chemit@codelutin.com> * @since 1.3 * @see SwingValidatorMessageTableModel */ @@ -100,4 +100,4 @@ String fieldName = SwingValidatorUtil.getFieldName(model, value); return fieldName; } -} \ No newline at end of file +} Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorUtil.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorUtil.java 2010-03-15 22:30:47 UTC (rev 1790) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorUtil.java 2010-03-18 09:16:31 UTC (rev 1791) @@ -28,6 +28,7 @@ import javax.swing.JList; import javax.swing.JTable; import java.awt.event.MouseListener; +import java.util.Arrays; import javax.swing.ImageIcon; import javax.swing.JComponent; import javax.swing.RowSorter; @@ -37,7 +38,7 @@ /** * The helper class for validation module. * - * @author chemit + * @author tchemit <chemit@codelutin.com> */ public class SwingValidatorUtil extends BeanValidatorUtil { @@ -80,7 +81,7 @@ */ public static void installUI(JTable errorTable, SwingValidatorMessageTableRenderer render) { errorTable.setDefaultRenderer(Object.class, render); - errorTable.getRowSorter().setSortKeys(java.util.Arrays.asList(new RowSorter.SortKey(0, SortOrder.ASCENDING))); + errorTable.getRowSorter().setSortKeys(Arrays.asList(new RowSorter.SortKey(0, SortOrder.ASCENDING))); SwingUtil.setI18nTableHeaderRenderer(errorTable, n_("validator.scope.header"), n_("validator.scope.header.tip"), @@ -213,4 +214,4 @@ } return icon; } -} \ No newline at end of file +} Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/ui/AbstractBeanValidatorUI.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/ui/AbstractBeanValidatorUI.java 2010-03-15 22:30:47 UTC (rev 1790) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/ui/AbstractBeanValidatorUI.java 2010-03-18 09:16:31 UTC (rev 1791) @@ -27,12 +27,14 @@ import org.apache.commons.logging.LogFactory; import org.jdesktop.jxlayer.plaf.AbstractLayerUI; +import javax.swing.JComponent; + /** * Abstract renderer * - * @author chemit + * @author tchemit <chemit@codelutin.com> */ -public abstract class AbstractBeanValidatorUI extends AbstractLayerUI<javax.swing.JComponent> implements BeanValidatorListener { +public abstract class AbstractBeanValidatorUI extends AbstractLayerUI<JComponent> implements BeanValidatorListener { /** to use log facility, just put in your code: log.info(\"...\"); */ private static final Log log = LogFactory.getLog(AbstractBeanValidatorUI.class); Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/ui/IconValidationUI.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/ui/IconValidationUI.java 2010-03-15 22:30:47 UTC (rev 1790) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/ui/IconValidationUI.java 2010-03-18 09:16:31 UTC (rev 1791) @@ -31,7 +31,13 @@ import jaxx.runtime.validator.BeanValidatorField; import jaxx.runtime.validator.BeanValidatorScope; -/** @author chemit */ + +/** + * An implementation of {@link AbstractBeanValidatorUI} which paints a + * icon on top right corner. + * + * @author tchemit <chemit@codelutin.com> + */ public class IconValidationUI extends AbstractBeanValidatorUI { // The icon to be shown at the layer's corner Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/ui/ImageValidationUI.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/ui/ImageValidationUI.java 2010-03-15 22:30:47 UTC (rev 1790) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/ui/ImageValidationUI.java 2010-03-18 09:16:31 UTC (rev 1791) @@ -32,7 +32,13 @@ import jaxx.runtime.validator.BeanValidatorField; import jaxx.runtime.validator.BeanValidatorScope; -/** @author chemit */ + +/** + * An implementation of {@link AbstractBeanValidatorUI} which paints a + * icon on top right corner. + * + * @author tchemit <chemit@codelutin.com> + */ public class ImageValidationUI extends AbstractBeanValidatorUI { protected static BufferedImage errorIcon; @@ -96,4 +102,4 @@ } } } -} \ No newline at end of file +} Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/ui/TranslucentValidationUI.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/ui/TranslucentValidationUI.java 2010-03-15 22:30:47 UTC (rev 1790) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/ui/TranslucentValidationUI.java 2010-03-18 09:16:31 UTC (rev 1791) @@ -31,7 +31,13 @@ import java.awt.Rectangle; import jaxx.runtime.validator.BeanValidatorField; -/** @author chemit */ +/** + * An implementation of {@link AbstractBeanValidatorUI} which paints a + * translucent backgroud color (green for ok, red for error, yellow for + * warning). + * + * @author tchemit <chemit@codelutin.com> + */ public class TranslucentValidationUI extends AbstractBeanValidatorUI { protected Color errorHightlight;