[LMS-288]

- 'list-plate-types' no longer outputs CONTROL_LAYOUT (which is a sample but not a pate).

SVN: 5550

common/source/java/ch/systemsx/cisd/common/collections/AbstractCollectionDecorator.java

@@ -41,7 +41,7 @@ public abstract class AbstractCollectionDecorator<E> implements Collection<E>
      * 
      * @param coll the collection to decorate, must not be <code>null</code>.
      */
-    protected AbstractCollectionDecorator(Collection<E> coll)
+    protected AbstractCollectionDecorator(final Collection<E> coll)
     {
         assert coll != null;
         this.collection = coll;
@@ -61,12 +61,12 @@ public abstract class AbstractCollectionDecorator<E> implements Collection<E>
     // Collection
     //
 
-    public boolean add(E object)
+    public boolean add(final E object)
     {
         return collection.add(object);
     }
 
-    public boolean addAll(Collection<? extends E> coll)
+    public boolean addAll(final Collection<? extends E> coll)
     {
         return collection.addAll(coll);
     }
@@ -76,7 +76,7 @@ public abstract class AbstractCollectionDecorator<E> implements Collection<E>
         collection.clear();
     }
 
-    public boolean contains(Object object)
+    public boolean contains(final Object object)
     {
         return collection.contains(object);
     }
@@ -91,7 +91,7 @@ public abstract class AbstractCollectionDecorator<E> implements Collection<E>
         return collection.iterator();
     }
 
-    public boolean remove(Object object)
+    public boolean remove(final Object object)
     {
         return collection.remove(object);
     }
@@ -106,22 +106,22 @@ public abstract class AbstractCollectionDecorator<E> implements Collection<E>
         return collection.toArray();
     }
 
-    public <T> T[] toArray(T[] object)
+    public <T> T[] toArray(final T[] object)
     {
         return collection.toArray(object);
     }
 
-    public boolean containsAll(Collection<?> coll)
+    public boolean containsAll(final Collection<?> coll)
     {
         return collection.containsAll(coll);
     }
 
-    public boolean removeAll(Collection<?> coll)
+    public boolean removeAll(final Collection<?> coll)
     {
         return collection.removeAll(coll);
     }
 
-    public boolean retainAll(Collection<?> coll)
+    public boolean retainAll(final Collection<?> coll)
     {
         return collection.retainAll(coll);
     }
@@ -131,7 +131,7 @@ public abstract class AbstractCollectionDecorator<E> implements Collection<E>
     //
 
     @Override
-    public final boolean equals(Object object)
+    public final boolean equals(final Object object)
     {
         if (object == this)
         {

common/source/java/ch/systemsx/cisd/common/collections/FilteredCollection.java

@@ -45,7 +45,7 @@ public class FilteredCollection<E> extends AbstractCollectionDecorator<E>
      *            <code>null</code>.
      * @return a new filtered collection.
      */
-    public static <E> Collection<E> decorate(Collection<E> coll, Validator<E> validator)
+    public static <E> Collection<E> decorate(final Collection<E> coll, final Validator<E> validator)
     {
         return new FilteredCollection<E>(coll, validator);
     }
@@ -57,7 +57,7 @@ public class FilteredCollection<E> extends AbstractCollectionDecorator<E>
      * @param validator the <code>Validator</code> to use for validation. Must not be
      *            <code>null</code>.
      */
-    protected FilteredCollection(Collection<E> collection, Validator<E> validator)
+    protected FilteredCollection(final Collection<E> collection, final Validator<E> validator)
     {
         super(filterCollection(collection, validator));
         assert validator != null;
@@ -73,14 +73,14 @@ public class FilteredCollection<E> extends AbstractCollectionDecorator<E>
      * </p>
      */
     @SuppressWarnings("unchecked")
-    protected final static <E> Collection<E> filterCollection(Collection<? extends E> collection,
-            Validator<E> validator)
+    protected final static <E> Collection<E> filterCollection(final Collection<? extends E> collection,
+            final Validator<E> validator)
     {
         if (collection == null)
         {
             return null;
         }
-        for (Iterator<? extends E> iter = collection.iterator(); iter.hasNext(); )
+        for (final Iterator<? extends E> iter = collection.iterator(); iter.hasNext(); )
         {
             if (validator.isValid(iter.next()) == false)
             {
@@ -95,7 +95,7 @@ public class FilteredCollection<E> extends AbstractCollectionDecorator<E>
      * 
      * @param object the object being added
      */
-    protected boolean isValid(E object)
+    protected boolean isValid(final E object)
     {
         return validator.isValid(object);
     }
@@ -105,7 +105,7 @@ public class FilteredCollection<E> extends AbstractCollectionDecorator<E>
     //
 
     @Override
-    public final boolean add(E object)
+    public final boolean add(final E object)
     {
         if (isValid(object))
         {
@@ -115,10 +115,10 @@ public class FilteredCollection<E> extends AbstractCollectionDecorator<E>
     }
 
     @Override
-    public final boolean addAll(Collection<? extends E> collection)
+    public final boolean addAll(final Collection<? extends E> collection)
     {
         boolean changed = false;
-        for (E e : collection)
+        for (final E e : collection)
         {
             if (add(e) && changed == false)
             {

common/source/java/ch/systemsx/cisd/common/collections/FilteredList.java

@@ -40,7 +40,7 @@ public final class FilteredList<E> extends FilteredCollection<E> implements List
      * @param validator the <code>Validator</code> to use for validation. Must not be
      *            <code>null</code>
      */
-    protected FilteredList(List<E> list, Validator<E> validator)
+    protected FilteredList(final List<E> list, final Validator<E> validator)
     {
         super(list, validator);
     }
@@ -55,7 +55,7 @@ public final class FilteredList<E> extends FilteredCollection<E> implements List
      * @param validator the <code>Validator</code> to use for validation. Must not be
      *            <code>null</code>
      */
-    public static <E> List<E> decorate(List<E> list, Validator<E> validator)
+    public static <E> List<E> decorate(final List<E> list, final Validator<E> validator)
     {
         return new FilteredList<E>(list, validator);
     }
@@ -74,22 +74,22 @@ public final class FilteredList<E> extends FilteredCollection<E> implements List
     // List
     //
 
-    public E get(int index)
+    public E get(final int index)
     {
         return getList().get(index);
     }
 
-    public int indexOf(Object object)
+    public int indexOf(final Object object)
     {
         return getList().indexOf(object);
     }
 
-    public int lastIndexOf(Object object)
+    public int lastIndexOf(final Object object)
     {
         return getList().lastIndexOf(object);
     }
 
-    public E remove(int index)
+    public E remove(final int index)
     {
         return getList().remove(index);
     }
@@ -99,12 +99,12 @@ public final class FilteredList<E> extends FilteredCollection<E> implements List
         return getList().listIterator();
     }
 
-    public ListIterator<E> listIterator(int i)
+    public ListIterator<E> listIterator(final int i)
     {
         return getList().listIterator(i);
     }
 
-    public E set(int index, E object)
+    public E set(final int index, final E object)
     {
         if (isValid(object))
         {
@@ -113,12 +113,12 @@ public final class FilteredList<E> extends FilteredCollection<E> implements List
         return null;
     }
 
-    public List<E> subList(int fromIndex, int toIndex)
+    public List<E> subList(final int fromIndex, final int toIndex)
     {
         return new FilteredList<E>(getList().subList(fromIndex, toIndex), validator);
     }
 
-    public void add(int index, E object)
+    public void add(final int index, final E object)
     {
         if (isValid(object))
         {
@@ -126,7 +126,7 @@ public final class FilteredList<E> extends FilteredCollection<E> implements List
         }
     }
 
-    public boolean addAll(int index, Collection<? extends E> collection)
+    public boolean addAll(final int index, final Collection<? extends E> collection)
     {
         return getList().addAll(index, filterCollection(collection, validator));
     }