You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jd...@apache.org on 2010/12/04 19:33:59 UTC
svn commit: r1042221 [1/4] - in /wicket/trunk/wicket-util/src:
main/java/org/apache/wicket/util/
main/java/org/apache/wicket/util/collections/
main/java/org/apache/wicket/util/convert/
main/java/org/apache/wicket/util/convert/converter/ main/java/org/a...
Author: jdonnerstag
Date: Sat Dec 4 18:33:54 2010
New Revision: 1042221
URL: http://svn.apache.org/viewvc?rev=1042221&view=rev
Log:
applied Eclipse cleanup to wicket-util
Modified:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/LongEncoder.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/ValueProvider.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/ClassMetaCache.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/ConcurrentHashSet.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/IntHashMap.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/MiniMap.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/MultiMap.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/ConversionException.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/MaskConverter.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractConverter.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractDecimalConverter.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractIntegerConverter.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractNumberConverter.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/BooleanConverter.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/ByteConverter.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/CharacterConverter.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/DateConverter.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/DoubleConverter.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/FloatConverter.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/IntegerConverter.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/LongConverter.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/ShortConverter.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlDateConverter.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlTimeConverter.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlTimestampConverter.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/ZeroPaddingIntegerConverter.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/crypt/Base64.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/crypt/CachingSunJceCryptFactory.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/crypt/ClassCryptFactory.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/crypt/CryptFactoryCachingDecorator.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/crypt/StringUtils.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/crypt/TrivialCrypt.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/diff/AddDelta.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/diff/ChangeDelta.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/diff/Chunk.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/diff/DeleteDelta.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/diff/Delta.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/diff/Diff.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/diff/DiffException.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/diff/DifferentiationFailedException.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/diff/PatchFailedException.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/diff/Revision.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/diff/ToString.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/diff/myers/DiffNode.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/diff/myers/MyersDiff.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/diff/myers/PathNode.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/diff/myers/Snake.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/file/FileCleaner.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/file/Files.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/file/Folder.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/file/WebXmlFile.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/io/ByteArrayOutputStream.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/io/ByteCountingOutputStream.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/io/Connections.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/io/DeferredFileOutputStream.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/io/FullyBufferedReader.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/io/HandleArrayListStack.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/io/IOUtils.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/io/Streams.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/io/StringBufferWriter.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/io/ThresholdingOutputStream.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/io/XmlReader.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Args.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Arrays.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Bytes.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Checks.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/EnumeratedType.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Exceptions.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Generics.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Objects.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/PackageName.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/CssLicenseHeaderHandler.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/HtmlLicenseHeaderHandler.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/JavaScriptLicenseHeaderHandler.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/PropertiesLicenseHeaderHandler.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/VelocityLicenseHeaderHandler.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/XmlPrologHeaderHandler.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/listener/ChangeListenerSet.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/listener/ListenerCollection.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/parse/metapattern/parsers/CommaSeparatedVariableParser.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/parse/metapattern/parsers/IntegerVariableAssignmentParser.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/parse/metapattern/parsers/TagNameParser.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/parse/metapattern/parsers/VariableAssignmentParser.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/parse/metapattern/parsers/WordParser.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/resource/AbstractResourceStream.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/resource/AbstractStringResourceStream.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/resource/XSLTResourceStream.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/string/AppendingStringBuffer.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/string/PrependingStringBuffer.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/string/StringValue.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/string/interpolator/MapVariableInterpolator.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/string/interpolator/VariableInterpolator.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/time/Duration.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/time/TimeFrame.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/time/TimeMap.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/time/TimeOfDay.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/upload/DiskFileItem.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/upload/DiskFileItemFactory.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/upload/FileUpload.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/upload/FileUploadBase.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/upload/FileUploadException.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/upload/MultipartFormInputStream.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/upload/ParameterParser.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/upload/ServletFileUpload.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/upload/ServletRequestContext.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/value/AttributeMap.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/value/CopyOnWriteValueMap.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/value/LongValue.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/value/ValueMap.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/visit/ClassVisitFilter.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/visit/IVisitFilter.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/visit/Visit.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/visit/Visits.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/xml/CustomEntityResolver.java
wicket/trunk/wicket-util/src/test/java/org/apache/wicket/util/file/WebXmlFileTest.java
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/LongEncoder.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/LongEncoder.java?rev=1042221&r1=1042220&r2=1042221&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/LongEncoder.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/LongEncoder.java Sat Dec 4 18:33:54 2010
@@ -47,7 +47,7 @@ public class LongEncoder
* @param value
* @return encoded value
*/
- public static String encode(long value)
+ public static String encode(final long value)
{
return encode(value, DEFAULT);
}
@@ -58,7 +58,7 @@ public class LongEncoder
* @param value
* @return decoded value
*/
- public static long decode(String value)
+ public static long decode(final String value)
{
return decode(value, DEFAULT);
}
@@ -70,7 +70,7 @@ public class LongEncoder
* @param alphabet
* @return encoded value
*/
- public static String encode(long value, String alphabet)
+ public static String encode(long value, final String alphabet)
{
final int len = alphabet.length() - 1;
PrependingStringBuffer buff = new PrependingStringBuffer();
@@ -100,7 +100,7 @@ public class LongEncoder
* @param alphabet
* @return decoded value
*/
- public static long decode(String value, String alphabet)
+ public static long decode(final String value, final String alphabet)
{
final int factor = alphabet.length() - 1;
final boolean negative = alphabet.charAt(factor) == value.charAt(0);
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/ValueProvider.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/ValueProvider.java?rev=1042221&r1=1042220&r2=1042221&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/ValueProvider.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/ValueProvider.java Sat Dec 4 18:33:54 2010
@@ -33,7 +33,7 @@ public class ValueProvider<T> implements
* @param value
* value to provide
*/
- public ValueProvider(T value)
+ public ValueProvider(final T value)
{
this.value = value;
}
@@ -53,7 +53,7 @@ public class ValueProvider<T> implements
* value
* @return provider
*/
- public static <T> ValueProvider<T> of(T value)
+ public static <T> ValueProvider<T> of(final T value)
{
return new ValueProvider<T>(value);
}
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/ClassMetaCache.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/ClassMetaCache.java?rev=1042221&r1=1042220&r2=1042221&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/ClassMetaCache.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/ClassMetaCache.java Sat Dec 4 18:33:54 2010
@@ -42,7 +42,7 @@ public class ClassMetaCache<T>
* the value that should be stored in cache
* @return value previously stored in cache for this key, or {@code null} if none
*/
- public T put(Class<?> key, T value)
+ public T put(final Class<?> key, final T value)
{
ConcurrentHashMap<String, T> container = getClassLoaderCache(key.getClassLoader(), true);
return container.put(key(key), value);
@@ -55,7 +55,7 @@ public class ClassMetaCache<T>
* the class that is the key for the value
* @return value stored in cache or {@code null} if none
*/
- public T get(Class<?> key)
+ public T get(final Class<?> key)
{
ConcurrentHashMap<String, T> container = getClassLoaderCache(key.getClassLoader(), false);
if (container == null)
@@ -74,7 +74,8 @@ public class ClassMetaCache<T>
* @return a {@link ConcurrentHashMap} mapping class names to injectable fields, never
* <code>null</code>
*/
- private ConcurrentHashMap<String, T> getClassLoaderCache(ClassLoader classLoader, boolean create)
+ private ConcurrentHashMap<String, T> getClassLoaderCache(final ClassLoader classLoader,
+ final boolean create)
{
ConcurrentHashMap<String, T> container = cache.get(classLoader);
if (container == null)
@@ -113,7 +114,7 @@ public class ClassMetaCache<T>
*
* @return string representation of the clazz
*/
- private static String key(Class<?> clazz)
+ private static String key(final Class<?> clazz)
{
return clazz.getName();
}
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/ConcurrentHashSet.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/ConcurrentHashSet.java?rev=1042221&r1=1042220&r2=1042221&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/ConcurrentHashSet.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/ConcurrentHashSet.java Sat Dec 4 18:33:54 2010
@@ -63,7 +63,7 @@ public class ConcurrentHashSet<E> extend
* @throws NullPointerException
* if the specified collection is null.
*/
- public ConcurrentHashSet(Collection<? extends E> c)
+ public ConcurrentHashSet(final Collection<? extends E> c)
{
map = new ConcurrentHashMap<E, Object>(Math.max((int)(c.size() / .75f) + 1, 16));
addAll(c);
@@ -80,7 +80,7 @@ public class ConcurrentHashSet<E> extend
* @throws IllegalArgumentException
* if the initial capacity is less than zero, or if the load factor is nonpositive.
*/
- public ConcurrentHashSet(int initialCapacity, float loadFactor)
+ public ConcurrentHashSet(final int initialCapacity, final float loadFactor)
{
map = new ConcurrentHashMap<E, Object>(initialCapacity, loadFactor, 16);
}
@@ -94,7 +94,7 @@ public class ConcurrentHashSet<E> extend
* @throws IllegalArgumentException
* if the initial capacity is less than zero.
*/
- public ConcurrentHashSet(int initialCapacity)
+ public ConcurrentHashSet(final int initialCapacity)
{
map = new ConcurrentHashMap<E, Object>(initialCapacity);
}
@@ -134,7 +134,7 @@ public class ConcurrentHashSet<E> extend
* @see java.util.AbstractCollection#contains(java.lang.Object)
*/
@Override
- public boolean contains(Object o)
+ public boolean contains(final Object o)
{
return map.containsKey(o);
}
@@ -144,7 +144,7 @@ public class ConcurrentHashSet<E> extend
* @see java.util.AbstractCollection#add(java.lang.Object)
*/
@Override
- public boolean add(E o)
+ public boolean add(final E o)
{
return map.put(o, PRESENT) == null;
}
@@ -154,7 +154,7 @@ public class ConcurrentHashSet<E> extend
* @see java.util.AbstractCollection#remove(java.lang.Object)
*/
@Override
- public boolean remove(Object o)
+ public boolean remove(final Object o)
{
return map.remove(o) == PRESENT;
}
@@ -194,7 +194,7 @@ public class ConcurrentHashSet<E> extend
* @param s
* @throws java.io.IOException
*/
- private void writeObject(java.io.ObjectOutputStream s) throws java.io.IOException
+ private void writeObject(final java.io.ObjectOutputStream s) throws java.io.IOException
{
s.defaultWriteObject();
s.writeInt(map.size());
@@ -213,7 +213,7 @@ public class ConcurrentHashSet<E> extend
* @throws IOException
*/
@SuppressWarnings("unchecked")
- private void readObject(ObjectInputStream inputStream) throws ClassNotFoundException,
+ private void readObject(final ObjectInputStream inputStream) throws ClassNotFoundException,
IOException
{
inputStream.defaultReadObject();
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/IntHashMap.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/IntHashMap.java?rev=1042221&r1=1042220&r2=1042221&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/IntHashMap.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/IntHashMap.java Sat Dec 4 18:33:54 2010
@@ -101,7 +101,7 @@ public class IntHashMap<V> implements Cl
* if the initial capacity is negative or the load factor is nonpositive.
*/
@SuppressWarnings("unchecked")
- public IntHashMap(int initialCapacity, float loadFactor)
+ public IntHashMap(int initialCapacity, final float loadFactor)
{
if (initialCapacity < 0)
{
@@ -112,7 +112,7 @@ public class IntHashMap<V> implements Cl
{
initialCapacity = MAXIMUM_CAPACITY;
}
- if (loadFactor <= 0 || Float.isNaN(loadFactor))
+ if ((loadFactor <= 0) || Float.isNaN(loadFactor))
{
throw new IllegalArgumentException("Illegal load factor: " + //$NON-NLS-1$
loadFactor);
@@ -140,7 +140,7 @@ public class IntHashMap<V> implements Cl
* @throws IllegalArgumentException
* if the initial capacity is negative.
*/
- public IntHashMap(int initialCapacity)
+ public IntHashMap(final int initialCapacity)
{
this(initialCapacity, DEFAULT_LOAD_FACTOR);
}
@@ -177,7 +177,7 @@ public class IntHashMap<V> implements Cl
* @param length
* @return The index for the hash integer for the given length
*/
- static int indexFor(int h, int length)
+ static int indexFor(final int h, final int length)
{
return h & (length - 1);
}
@@ -215,7 +215,7 @@ public class IntHashMap<V> implements Cl
* contains no mapping for this key.
* @see #put(int, Object)
*/
- public V get(int key)
+ public V get(final int key)
{
int i = indexFor(key, table.length);
Entry<V> e = table[i];
@@ -240,7 +240,7 @@ public class IntHashMap<V> implements Cl
* The key whose presence in this map is to be tested
* @return <tt>true</tt> if this map contains a mapping for the specified key.
*/
- public boolean containsKey(int key)
+ public boolean containsKey(final int key)
{
int i = indexFor(key, table.length);
Entry<V> e = table[i];
@@ -262,11 +262,11 @@ public class IntHashMap<V> implements Cl
* @param key
* @return The Entry object for the given hash key
*/
- Entry<V> getEntry(int key)
+ Entry<V> getEntry(final int key)
{
int i = indexFor(key, table.length);
Entry<V> e = table[i];
- while (e != null && !(key == e.key))
+ while ((e != null) && !(key == e.key))
{
e = e.next;
}
@@ -285,7 +285,7 @@ public class IntHashMap<V> implements Cl
* mapping for key. A <tt>null</tt> return can also indicate that the HashMap previously
* associated <tt>null</tt> with the specified key.
*/
- public V put(int key, V value)
+ public V put(final int key, final V value)
{
int i = indexFor(key, table.length);
@@ -312,7 +312,7 @@ public class IntHashMap<V> implements Cl
* @param key
* @param value
*/
- private void putForCreate(int key, V value)
+ private void putForCreate(final int key, final V value)
{
int i = indexFor(key, table.length);
@@ -333,7 +333,7 @@ public class IntHashMap<V> implements Cl
createEntry(key, value, i);
}
- void putAllForCreate(IntHashMap<V> m)
+ void putAllForCreate(final IntHashMap<V> m)
{
for (Entry<V> entry : m.entrySet())
{
@@ -353,7 +353,7 @@ public class IntHashMap<V> implements Cl
* unless current capacity is MAXIMUM_CAPACITY (in which case value is irrelevant).
*/
@SuppressWarnings("unchecked")
- void resize(int newCapacity)
+ void resize(final int newCapacity)
{
Entry<V>[] oldTable = table;
int oldCapacity = oldTable.length;
@@ -374,7 +374,7 @@ public class IntHashMap<V> implements Cl
*
* @param newTable
*/
- void transfer(Entry<V>[] newTable)
+ void transfer(final Entry<V>[] newTable)
{
Entry<V>[] src = table;
int newCapacity = newTable.length;
@@ -406,7 +406,7 @@ public class IntHashMap<V> implements Cl
* @throws NullPointerException
* if the specified map is null.
*/
- public void putAll(IntHashMap<V> m)
+ public void putAll(final IntHashMap<V> m)
{
int numKeysToBeAdded = m.size();
if (numKeysToBeAdded == 0)
@@ -454,7 +454,7 @@ public class IntHashMap<V> implements Cl
* mapping for key. A <tt>null</tt> return can also indicate that the map previously
* associated <tt>null</tt> with the specified key.
*/
- public V remove(int key)
+ public V remove(final int key)
{
Entry<V> e = removeEntryForKey(key);
return (e == null ? null : e.value);
@@ -467,7 +467,7 @@ public class IntHashMap<V> implements Cl
* @param key
* @return The Entry object that was removed
*/
- Entry<V> removeEntryForKey(int key)
+ Entry<V> removeEntryForKey(final int key)
{
int i = indexFor(key, table.length);
Entry<V> prev = table[i];
@@ -504,7 +504,7 @@ public class IntHashMap<V> implements Cl
* @return The entry that was removed
*/
@SuppressWarnings("unchecked")
- Entry<V> removeMapping(Object o)
+ Entry<V> removeMapping(final Object o)
{
if (!(o instanceof Entry))
{
@@ -520,7 +520,7 @@ public class IntHashMap<V> implements Cl
while (e != null)
{
Entry<V> next = e.next;
- if (e.key == key && e.equals(entry))
+ if ((e.key == key) && e.equals(entry))
{
modCount++;
size--;
@@ -562,7 +562,7 @@ public class IntHashMap<V> implements Cl
* value whose presence in this map is to be tested.
* @return <tt>true</tt> if this map maps one or more keys to the specified value.
*/
- public boolean containsValue(Object value)
+ public boolean containsValue(final Object value)
{
if (value == null)
{
@@ -649,7 +649,7 @@ public class IntHashMap<V> implements Cl
* @param v
* @param n
*/
- Entry(int k, V v, Entry<V> n)
+ Entry(final int k, final V v, final Entry<V> n)
{
value = v;
next = n;
@@ -676,7 +676,7 @@ public class IntHashMap<V> implements Cl
* @param newValue
* @return The previous value
*/
- public V setValue(V newValue)
+ public V setValue(final V newValue)
{
V oldValue = value;
value = newValue;
@@ -688,7 +688,7 @@ public class IntHashMap<V> implements Cl
*/
@SuppressWarnings("unchecked")
@Override
- public boolean equals(Object o)
+ public boolean equals(final Object o)
{
if (!(o instanceof Entry))
{
@@ -701,7 +701,7 @@ public class IntHashMap<V> implements Cl
{
Object v1 = getValue();
Object v2 = e.getValue();
- if (v1 == v2 || (v1 != null && v1.equals(v2)))
+ if ((v1 == v2) || ((v1 != null) && v1.equals(v2)))
{
return true;
}
@@ -738,7 +738,7 @@ public class IntHashMap<V> implements Cl
* @param value
* @param bucketIndex
*/
- void addEntry(int key, V value, int bucketIndex)
+ void addEntry(final int key, final V value, final int bucketIndex)
{
table[bucketIndex] = new Entry<V>(key, value, table[bucketIndex]);
if (size++ >= threshold)
@@ -758,7 +758,7 @@ public class IntHashMap<V> implements Cl
* @param value
* @param bucketIndex
*/
- void createEntry(int key, V value, int bucketIndex)
+ void createEntry(final int key, final V value, final int bucketIndex)
{
table[bucketIndex] = new Entry<V>(key, value, table[bucketIndex]);
size++;
@@ -779,7 +779,7 @@ public class IntHashMap<V> implements Cl
Entry<V> n = null;
if (size != 0)
{ // advance to first entry
- while (i > 0 && (n = t[--i]) == null)
+ while ((i > 0) && ((n = t[--i]) == null))
{
/* NoOp */;
}
@@ -811,7 +811,7 @@ public class IntHashMap<V> implements Cl
Entry<V> n = e.next;
Entry<V>[] t = table;
int i = index;
- while (n == null && i > 0)
+ while ((n == null) && (i > 0))
{
n = t[--i];
}
@@ -934,7 +934,7 @@ public class IntHashMap<V> implements Cl
* @see java.util.AbstractCollection#contains(java.lang.Object)
*/
@Override
- public boolean contains(Object o)
+ public boolean contains(final Object o)
{
if (o instanceof Number)
{
@@ -947,7 +947,7 @@ public class IntHashMap<V> implements Cl
* @see java.util.AbstractCollection#remove(java.lang.Object)
*/
@Override
- public boolean remove(Object o)
+ public boolean remove(final Object o)
{
if (o instanceof Number)
{
@@ -1006,7 +1006,7 @@ public class IntHashMap<V> implements Cl
* @see java.util.AbstractCollection#contains(java.lang.Object)
*/
@Override
- public boolean contains(Object o)
+ public boolean contains(final Object o)
{
return containsValue(o);
}
@@ -1054,7 +1054,7 @@ public class IntHashMap<V> implements Cl
*/
@SuppressWarnings("unchecked")
@Override
- public boolean contains(Object o)
+ public boolean contains(final Object o)
{
if (!(o instanceof Entry))
{
@@ -1062,14 +1062,14 @@ public class IntHashMap<V> implements Cl
}
Entry<V> e = (Entry<V>)o;
Entry<V> candidate = getEntry(e.getKey());
- return candidate != null && candidate.equals(e);
+ return (candidate != null) && candidate.equals(e);
}
/**
* @see java.util.AbstractCollection#remove(java.lang.Object)
*/
@Override
- public boolean remove(Object o)
+ public boolean remove(final Object o)
{
return removeMapping(o) != null;
}
@@ -1107,7 +1107,7 @@ public class IntHashMap<V> implements Cl
* order that they are returned by <tt>entrySet().iterator()</tt>.
*
*/
- private void writeObject(java.io.ObjectOutputStream s) throws IOException
+ private void writeObject(final java.io.ObjectOutputStream s) throws IOException
{
// Write out the threshold, loadfactor, and any hidden stuff
s.defaultWriteObject();
@@ -1136,7 +1136,8 @@ public class IntHashMap<V> implements Cl
* @throws ClassNotFoundException
*/
@SuppressWarnings("unchecked")
- private void readObject(java.io.ObjectInputStream s) throws IOException, ClassNotFoundException
+ private void readObject(final java.io.ObjectInputStream s) throws IOException,
+ ClassNotFoundException
{
// Read in the threshold, loadfactor, and any hidden stuff
s.defaultReadObject();
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/MiniMap.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/MiniMap.java?rev=1042221&r1=1042220&r2=1042221&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/MiniMap.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/MiniMap.java Sat Dec 4 18:33:54 2010
@@ -197,7 +197,7 @@ public class MiniMap<K, V> implements Ma
/**
* @see java.util.Map#putAll(java.util.Map)
*/
- public void putAll(Map<? extends K, ? extends V> map)
+ public void putAll(final Map<? extends K, ? extends V> map)
{
for (final Entry<? extends K, ? extends V> entry : map.entrySet())
{
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/MultiMap.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/MultiMap.java?rev=1042221&r1=1042220&r2=1042221&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/MultiMap.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/MultiMap.java Sat Dec 4 18:33:54 2010
@@ -53,7 +53,7 @@ public class MultiMap<K, V> extends Hash
*
* @see HashMap#HashMap(int, float)
*/
- public MultiMap(int initialCapacity, float loadFactor)
+ public MultiMap(final int initialCapacity, final float loadFactor)
{
super(initialCapacity, loadFactor);
}
@@ -65,7 +65,7 @@ public class MultiMap<K, V> extends Hash
*
* @see HashMap#HashMap(int)
*/
- public MultiMap(int initialCapacity)
+ public MultiMap(final int initialCapacity)
{
super(initialCapacity);
}
@@ -77,7 +77,7 @@ public class MultiMap<K, V> extends Hash
*
* @see HashMap#HashMap(Map)
*/
- public MultiMap(Map<? extends K, ? extends List<V>> m)
+ public MultiMap(final Map<? extends K, ? extends List<V>> m)
{
super(m);
}
@@ -88,7 +88,7 @@ public class MultiMap<K, V> extends Hash
* @param key
* @param value
*/
- public void addValue(K key, V value)
+ public void addValue(final K key, final V value)
{
List<V> list = get(key);
if (list == null)
@@ -105,7 +105,7 @@ public class MultiMap<K, V> extends Hash
* @param key
* @param value
*/
- public void removeValue(K key, V value)
+ public void removeValue(final K key, final V value)
{
List<V> list = get(key);
if (list != null)
@@ -121,7 +121,7 @@ public class MultiMap<K, V> extends Hash
* @param key
* @param value
*/
- public void replaceValues(K key, V value)
+ public void replaceValues(final K key, final V value)
{
List<V> list = get(key);
if (list != null)
@@ -141,10 +141,10 @@ public class MultiMap<K, V> extends Hash
* @param key
* @return first value
*/
- public V getFirstValue(K key)
+ public V getFirstValue(final K key)
{
List<V> list = get(key);
- if (list != null && !list.isEmpty())
+ if ((list != null) && !list.isEmpty())
{
return list.get(0);
}
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/ConversionException.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/ConversionException.java?rev=1042221&r1=1042220&r2=1042221&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/ConversionException.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/ConversionException.java Sat Dec 4 18:33:54 2010
@@ -58,7 +58,7 @@ public class ConversionException extends
* @param message
* message
*/
- public ConversionException(String message)
+ public ConversionException(final String message)
{
super(message);
}
@@ -71,7 +71,7 @@ public class ConversionException extends
* @param cause
* cause
*/
- public ConversionException(String message, Throwable cause)
+ public ConversionException(final String message, final Throwable cause)
{
super(message, cause);
}
@@ -82,7 +82,7 @@ public class ConversionException extends
* @param cause
* cause
*/
- public ConversionException(Throwable cause)
+ public ConversionException(final Throwable cause)
{
super(cause);
}
@@ -144,7 +144,7 @@ public class ConversionException extends
* the converter.
* @return This
*/
- public final ConversionException setConverter(IConverter converter)
+ public final ConversionException setConverter(final IConverter converter)
{
this.converter = converter;
return this;
@@ -157,7 +157,7 @@ public class ConversionException extends
* the used format.
* @return This
*/
- public final ConversionException setFormat(Format format)
+ public final ConversionException setFormat(final Format format)
{
this.format = format;
return this;
@@ -170,7 +170,7 @@ public class ConversionException extends
* the used locale.
* @return This
*/
- public final ConversionException setLocale(Locale locale)
+ public final ConversionException setLocale(final Locale locale)
{
this.locale = locale;
return this;
@@ -183,7 +183,7 @@ public class ConversionException extends
* the tried value.
* @return This
*/
- public final ConversionException setSourceValue(Object sourceValue)
+ public final ConversionException setSourceValue(final Object sourceValue)
{
this.sourceValue = sourceValue;
return this;
@@ -196,7 +196,7 @@ public class ConversionException extends
* sets the target property type
* @return This
*/
- public final ConversionException setTargetType(Class<?> targetType)
+ public final ConversionException setTargetType(final Class<?> targetType)
{
this.targetType = targetType;
return this;
@@ -219,7 +219,7 @@ public class ConversionException extends
* sets the resource key
* @return This
*/
- public ConversionException setResourceKey(String resourceKey)
+ public ConversionException setResourceKey(final String resourceKey)
{
this.resourceKey = resourceKey;
return this;
@@ -234,9 +234,9 @@ public class ConversionException extends
* variable value
* @return this for chaining
*/
- public ConversionException setVariable(String name, Object value)
+ public ConversionException setVariable(final String name, final Object value)
{
- if (name == null || name.trim().length() == 0)
+ if ((name == null) || (name.trim().length() == 0))
{
throw new IllegalArgumentException(
"Argument [[name]] cannot be null or an empty string");
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/MaskConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/MaskConverter.java?rev=1042221&r1=1042220&r2=1042221&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/MaskConverter.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/MaskConverter.java Sat Dec 4 18:33:54 2010
@@ -98,7 +98,7 @@ public class MaskConverter<C> implements
* @param maskFormatter
* The mask formatter to use for masking and unmasking values
*/
- public MaskConverter(MaskFormatter maskFormatter)
+ public MaskConverter(final MaskFormatter maskFormatter)
{
if (maskFormatter == null)
{
@@ -115,7 +115,7 @@ public class MaskConverter<C> implements
* The mask to use for this converter instance
* @see MaskFormatter
*/
- public MaskConverter(String mask)
+ public MaskConverter(final String mask)
{
this(mask, String.class);
}
@@ -129,7 +129,7 @@ public class MaskConverter<C> implements
* The type to convert string values to.
* @see MaskFormatter
*/
- public MaskConverter(String mask, Class<?> type)
+ public MaskConverter(final String mask, final Class<?> type)
{
try
{
@@ -149,7 +149,7 @@ public class MaskConverter<C> implements
*
* @see org.apache.wicket.util.convert.IConverter#convertToObject(java.lang.String, Locale)
*/
- public C convertToObject(String value, Locale locale)
+ public C convertToObject(final String value, final Locale locale)
{
try
{
@@ -166,7 +166,7 @@ public class MaskConverter<C> implements
*
* @see org.apache.wicket.util.convert.IConverter#convertToString(java.lang.Object, Locale)
*/
- public String convertToString(C value, Locale locale)
+ public String convertToString(final C value, final Locale locale)
{
try
{
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractConverter.java?rev=1042221&r1=1042220&r2=1042221&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractConverter.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractConverter.java Sat Dec 4 18:33:54 2010
@@ -48,7 +48,7 @@ public abstract class AbstractConverter<
* @throws ConversionException
* Thrown if parsing fails
*/
- protected C parse(final Format format, final Object value, Locale locale)
+ protected C parse(final Format format, final Object value, final Locale locale)
{
final ParsePosition position = new ParsePosition(0);
final String stringValue = value.toString();
@@ -73,7 +73,7 @@ public abstract class AbstractConverter<
* @return The ConversionException
*/
protected ConversionException newConversionException(final String message, final Object value,
- Locale locale)
+ final Locale locale)
{
return new ConversionException(message).setSourceValue(value)
.setTargetType(getTargetType())
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractDecimalConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractDecimalConverter.java?rev=1042221&r1=1042220&r2=1042221&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractDecimalConverter.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractDecimalConverter.java Sat Dec 4 18:33:54 2010
@@ -40,7 +40,7 @@ public abstract class AbstractDecimalCon
* @return Returns the numberFormat.
*/
@Override
- public NumberFormat getNumberFormat(Locale locale)
+ public NumberFormat getNumberFormat(final Locale locale)
{
NumberFormat numberFormat = numberFormats.get(locale);
if (numberFormat == null)
@@ -58,7 +58,7 @@ public abstract class AbstractDecimalCon
* @param locale
* @return number format
*/
- protected NumberFormat newNumberFormat(Locale locale)
+ protected NumberFormat newNumberFormat(final Locale locale)
{
return NumberFormat.getInstance(locale);
}
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractIntegerConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractIntegerConverter.java?rev=1042221&r1=1042220&r2=1042221&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractIntegerConverter.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractIntegerConverter.java Sat Dec 4 18:33:54 2010
@@ -40,7 +40,7 @@ public abstract class AbstractIntegerCon
* @return Returns the numberFormat.
*/
@Override
- public NumberFormat getNumberFormat(Locale locale)
+ public NumberFormat getNumberFormat(final Locale locale)
{
NumberFormat numberFormat = numberFormats.get(locale);
if (numberFormat == null)
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractNumberConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractNumberConverter.java?rev=1042221&r1=1042220&r2=1042221&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractNumberConverter.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractNumberConverter.java Sat Dec 4 18:33:54 2010
@@ -103,7 +103,7 @@ public abstract class AbstractNumberConv
* @see org.apache.wicket.util.convert.IConverter#convertToString(C, Locale)
*/
@Override
- public String convertToString(final Number value, Locale locale)
+ public String convertToString(final Number value, final Locale locale)
{
NumberFormat fmt = getNumberFormat(locale);
if (fmt != null)
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/BooleanConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/BooleanConverter.java?rev=1042221&r1=1042220&r2=1042221&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/BooleanConverter.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/BooleanConverter.java Sat Dec 4 18:33:54 2010
@@ -41,7 +41,7 @@ public class BooleanConverter extends Ab
/**
* @see org.apache.wicket.util.convert.IConverter#convertToObject(java.lang.String,Locale)
*/
- public Boolean convertToObject(final String value, Locale locale)
+ public Boolean convertToObject(final String value, final Locale locale)
{
try
{
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/ByteConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/ByteConverter.java?rev=1042221&r1=1042220&r2=1042221&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/ByteConverter.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/ByteConverter.java Sat Dec 4 18:33:54 2010
@@ -39,7 +39,7 @@ public class ByteConverter extends Abstr
/**
* @see org.apache.wicket.util.convert.IConverter#convertToObject(java.lang.String,Locale)
*/
- public Byte convertToObject(final String value, Locale locale)
+ public Byte convertToObject(final String value, final Locale locale)
{
final Number number = parse(value, Byte.MIN_VALUE, Byte.MAX_VALUE, locale);
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/CharacterConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/CharacterConverter.java?rev=1042221&r1=1042220&r2=1042221&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/CharacterConverter.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/CharacterConverter.java Sat Dec 4 18:33:54 2010
@@ -39,7 +39,7 @@ public class CharacterConverter extends
/**
* @see org.apache.wicket.util.convert.IConverter#convertToObject(java.lang.String,Locale)
*/
- public Character convertToObject(final String value, Locale locale)
+ public Character convertToObject(final String value, final Locale locale)
{
int length = value.length();
if (length == 0)
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/DateConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/DateConverter.java?rev=1042221&r1=1042220&r2=1042221&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/DateConverter.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/DateConverter.java Sat Dec 4 18:33:54 2010
@@ -34,9 +34,9 @@ public class DateConverter extends Abstr
/**
* @see org.apache.wicket.util.convert.IConverter#convertToObject(java.lang.String,Locale)
*/
- public Date convertToObject(final String value, Locale locale)
+ public Date convertToObject(final String value, final Locale locale)
{
- if (value == null || Strings.isEmpty(value))
+ if ((value == null) || Strings.isEmpty(value))
{
return null;
}
@@ -50,7 +50,7 @@ public class DateConverter extends Abstr
* @see org.apache.wicket.util.convert.IConverter#convertToString(Object, java.util.Locale)
*/
@Override
- public String convertToString(final Date value, Locale locale)
+ public String convertToString(final Date value, final Locale locale)
{
final DateFormat dateFormat = getDateFormat(locale);
if (dateFormat != null)
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/DoubleConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/DoubleConverter.java?rev=1042221&r1=1042220&r2=1042221&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/DoubleConverter.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/DoubleConverter.java Sat Dec 4 18:33:54 2010
@@ -39,7 +39,7 @@ public class DoubleConverter extends Abs
/**
* @see org.apache.wicket.util.convert.IConverter#convertToObject(String, java.util.Locale)
*/
- public Double convertToObject(final String value, Locale locale)
+ public Double convertToObject(final String value, final Locale locale)
{
final Number number = parse(value, -Double.MAX_VALUE, Double.MAX_VALUE, locale);
// Double.MIN is the smallest nonzero positive number, not the largest
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/FloatConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/FloatConverter.java?rev=1042221&r1=1042220&r2=1042221&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/FloatConverter.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/FloatConverter.java Sat Dec 4 18:33:54 2010
@@ -39,7 +39,7 @@ public class FloatConverter extends Abst
/**
* @see org.apache.wicket.util.convert.IConverter#convertToObject(java.lang.String,Locale)
*/
- public Float convertToObject(final String value, Locale locale)
+ public Float convertToObject(final String value, final Locale locale)
{
final Number number = parse(value, -Float.MAX_VALUE, Float.MAX_VALUE, locale);
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/IntegerConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/IntegerConverter.java?rev=1042221&r1=1042220&r2=1042221&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/IntegerConverter.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/IntegerConverter.java Sat Dec 4 18:33:54 2010
@@ -39,7 +39,7 @@ public class IntegerConverter extends Ab
/**
* @see org.apache.wicket.util.convert.IConverter#convertToObject(java.lang.String,Locale)
*/
- public Integer convertToObject(final String value, Locale locale)
+ public Integer convertToObject(final String value, final Locale locale)
{
final Number number = parse(value, Integer.MIN_VALUE, Integer.MAX_VALUE, locale);
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/LongConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/LongConverter.java?rev=1042221&r1=1042220&r2=1042221&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/LongConverter.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/LongConverter.java Sat Dec 4 18:33:54 2010
@@ -39,7 +39,7 @@ public class LongConverter extends Abstr
/**
* @see org.apache.wicket.util.convert.IConverter#convertToObject(java.lang.String,Locale)
*/
- public Long convertToObject(final String value, Locale locale)
+ public Long convertToObject(final String value, final Locale locale)
{
final Number number = parse(value, Long.MIN_VALUE, Long.MAX_VALUE, locale);
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/ShortConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/ShortConverter.java?rev=1042221&r1=1042220&r2=1042221&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/ShortConverter.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/ShortConverter.java Sat Dec 4 18:33:54 2010
@@ -39,7 +39,7 @@ public class ShortConverter extends Abst
/**
* @see org.apache.wicket.util.convert.IConverter#convertToObject(java.lang.String,Locale)
*/
- public Short convertToObject(final String value, Locale locale)
+ public Short convertToObject(final String value, final Locale locale)
{
final Number number = parse(value, Short.MIN_VALUE, Short.MAX_VALUE, locale);
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlDateConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlDateConverter.java?rev=1042221&r1=1042220&r2=1042221&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlDateConverter.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlDateConverter.java Sat Dec 4 18:33:54 2010
@@ -32,9 +32,9 @@ public class SqlDateConverter extends Ab
/**
* @see org.apache.wicket.util.convert.IConverter#convertToObject(java.lang.String,Locale)
*/
- public Date convertToObject(final String value, Locale locale)
+ public Date convertToObject(final String value, final Locale locale)
{
- if (value == null || Strings.isEmpty(value))
+ if ((value == null) || Strings.isEmpty(value))
{
return null;
}
@@ -49,7 +49,7 @@ public class SqlDateConverter extends Ab
* java.util.Locale)
*/
@Override
- public String convertToString(final Date value, Locale locale)
+ public String convertToString(final Date value, final Locale locale)
{
final DateFormat dateFormat = getDateFormat(locale);
if (dateFormat != null)
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlTimeConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlTimeConverter.java?rev=1042221&r1=1042220&r2=1042221&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlTimeConverter.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlTimeConverter.java Sat Dec 4 18:33:54 2010
@@ -33,7 +33,7 @@ public class SqlTimeConverter extends Ab
private static final long serialVersionUID = 1L;
/** @see org.apache.wicket.util.convert.converter.DateConverter#convertToObject(java.lang.String,java.util.Locale) */
- public Time convertToObject(String value, Locale locale)
+ public Time convertToObject(final String value, Locale locale)
{
if (value == null)
{
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlTimestampConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlTimestampConverter.java?rev=1042221&r1=1042220&r2=1042221&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlTimestampConverter.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlTimestampConverter.java Sat Dec 4 18:33:54 2010
@@ -49,7 +49,7 @@ public class SqlTimestampConverter exten
* @param dateFormat
* See java.text.DateFormat for details. Defaults to DateFormat.SHORT
*/
- public SqlTimestampConverter(int dateFormat)
+ public SqlTimestampConverter(final int dateFormat)
{
this.dateFormat = dateFormat;
timeFormat = DateFormat.SHORT;
@@ -63,7 +63,7 @@ public class SqlTimestampConverter exten
* timeFormat See java.text.DateFormat for details. Defaults to DateFormat.SHORT
* @param timeFormat
*/
- public SqlTimestampConverter(int dateFormat, int timeFormat)
+ public SqlTimestampConverter(final int dateFormat, final int timeFormat)
{
this.dateFormat = dateFormat;
this.timeFormat = timeFormat;
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/ZeroPaddingIntegerConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/ZeroPaddingIntegerConverter.java?rev=1042221&r1=1042220&r2=1042221&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/ZeroPaddingIntegerConverter.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/ZeroPaddingIntegerConverter.java Sat Dec 4 18:33:54 2010
@@ -37,7 +37,7 @@ public class ZeroPaddingIntegerConverter
* @param zeroPadLength
* Minimum length of String to be outputted (will be zero-padded).
*/
- public ZeroPaddingIntegerConverter(int zeroPadLength)
+ public ZeroPaddingIntegerConverter(final int zeroPadLength)
{
this.zeroPadLength = zeroPadLength;
}
@@ -47,7 +47,7 @@ public class ZeroPaddingIntegerConverter
* java.util.Locale)
*/
@Override
- public String convertToString(Integer value, Locale locale)
+ public String convertToString(final Integer value, final Locale locale)
{
String result = super.convertToString(value, locale);
@@ -62,7 +62,7 @@ public class ZeroPaddingIntegerConverter
/**
* @see org.apache.wicket.util.convert.IConverter#convertToObject(java.lang.String,Locale)
*/
- public Integer convertToObject(final String value, Locale locale)
+ public Integer convertToObject(final String value, final Locale locale)
{
final Number number = parse(value, Integer.MIN_VALUE, Integer.MAX_VALUE, locale);
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/crypt/Base64.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/crypt/Base64.java?rev=1042221&r1=1042220&r2=1042221&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/crypt/Base64.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/crypt/Base64.java Sat Dec 4 18:33:54 2010
@@ -229,7 +229,7 @@ public class Base64
* to <code>false</code>.
* @since 1.4
*/
- public Base64(boolean urlSafe)
+ public Base64(final boolean urlSafe)
{
this(CHUNK_SIZE, CHUNK_SEPARATOR, urlSafe);
}
@@ -254,7 +254,7 @@ public class Base64
* into lines (chunks). Ignored when decoding.
* @since 1.4
*/
- public Base64(int lineLength)
+ public Base64(final int lineLength)
{
this(lineLength, CHUNK_SEPARATOR);
}
@@ -283,7 +283,7 @@ public class Base64
* Thrown when the provided lineSeparator included some base64 characters.
* @since 1.4
*/
- public Base64(int lineLength, byte[] lineSeparator)
+ public Base64(final int lineLength, final byte[] lineSeparator)
{
this(lineLength, lineSeparator, false);
}
@@ -316,7 +316,7 @@ public class Base64
* work!
* @since 1.4
*/
- public Base64(int lineLength, byte[] lineSeparator, boolean urlSafe)
+ public Base64(int lineLength, byte[] lineSeparator, final boolean urlSafe)
{
if (lineSeparator == null)
{
@@ -405,7 +405,7 @@ public class Base64
* available).
* @return The number of bytes successfully extracted into the provided byte[] array.
*/
- int readResults(byte[] b, int bPos, int bAvail)
+ int readResults(final byte[] b, final int bPos, final int bAvail)
{
if (buffer != null)
{
@@ -442,11 +442,11 @@ public class Base64
* @param outAvail
* Amount of bytes available for direct buffering.
*/
- void setInitialBuffer(byte[] out, int outPos, int outAvail)
+ void setInitialBuffer(final byte[] out, final int outPos, final int outAvail)
{
// We can re-use consumer's original output array under
// special circumstances, saving on some System.arraycopy().
- if (out != null && out.length == outAvail)
+ if ((out != null) && (out.length == outAvail))
{
buffer = out;
pos = outPos;
@@ -472,7 +472,7 @@ public class Base64
* @param inAvail
* Amount of bytes available from input for encoding.
*/
- void encode(byte[] in, int inPos, int inAvail)
+ void encode(final byte[] in, int inPos, final int inAvail)
{
if (eof)
{
@@ -483,7 +483,7 @@ public class Base64
if (inAvail < 0)
{
eof = true;
- if (buffer == null || buffer.length - pos < encodeSize)
+ if ((buffer == null) || (buffer.length - pos < encodeSize))
{
resizeBuffer();
}
@@ -511,7 +511,7 @@ public class Base64
}
break;
}
- if (lineLength > 0 && pos > 0)
+ if ((lineLength > 0) && (pos > 0))
{
System.arraycopy(lineSeparator, 0, buffer, pos, lineSeparator.length);
pos += lineSeparator.length;
@@ -521,7 +521,7 @@ public class Base64
{
for (int i = 0; i < inAvail; i++)
{
- if (buffer == null || buffer.length - pos < encodeSize)
+ if ((buffer == null) || (buffer.length - pos < encodeSize))
{
resizeBuffer();
}
@@ -539,7 +539,7 @@ public class Base64
buffer[pos++] = encodeTable[(x >> 6) & MASK_6BITS];
buffer[pos++] = encodeTable[x & MASK_6BITS];
currentLinePos += 4;
- if (lineLength > 0 && lineLength <= currentLinePos)
+ if ((lineLength > 0) && (lineLength <= currentLinePos))
{
System.arraycopy(lineSeparator, 0, buffer, pos, lineSeparator.length);
pos += lineSeparator.length;
@@ -575,7 +575,7 @@ public class Base64
* @param inAvail
* Amount of bytes available from input for encoding.
*/
- void decode(byte[] in, int inPos, int inAvail)
+ void decode(final byte[] in, int inPos, final int inAvail)
{
if (eof)
{
@@ -587,7 +587,7 @@ public class Base64
}
for (int i = 0; i < inAvail; i++)
{
- if (buffer == null || buffer.length - pos < decodeSize)
+ if ((buffer == null) || (buffer.length - pos < decodeSize))
{
resizeBuffer();
}
@@ -600,7 +600,7 @@ public class Base64
}
else
{
- if (b >= 0 && b < DECODE_TABLE.length)
+ if ((b >= 0) && (b < DECODE_TABLE.length))
{
int result = DECODE_TABLE[b];
if (result >= 0)
@@ -621,7 +621,7 @@ public class Base64
// Two forms of EOF as far as base64 decoder is concerned: actual
// EOF (-1) and first time '=' character is encountered in stream.
// This approach makes the '=' padding characters completely optional.
- if (eof && modulus != 0)
+ if (eof && (modulus != 0))
{
x = x << 6;
switch (modulus)
@@ -647,10 +647,10 @@ public class Base64
* <code>false</code> otherwise.
* @since 1.4
*/
- public static boolean isBase64(byte octet)
+ public static boolean isBase64(final byte octet)
{
- return octet == PAD ||
- (octet >= 0 && octet < DECODE_TABLE.length && DECODE_TABLE[octet] != -1);
+ return (octet == PAD) ||
+ ((octet >= 0) && (octet < DECODE_TABLE.length) && (DECODE_TABLE[octet] != -1));
}
/**
@@ -662,7 +662,7 @@ public class Base64
* @return <code>true</code> if all bytes are valid characters in the Base64 alphabet or if the
* byte array is empty; false, otherwise
*/
- public static boolean isArrayByteBase64(byte[] arrayOctet)
+ public static boolean isArrayByteBase64(final byte[] arrayOctet)
{
for (byte octet : arrayOctet)
{
@@ -683,7 +683,7 @@ public class Base64
* @return <code>true</code> if any byte is a valid character in the Base64 alphabet; false
* herwise
*/
- private static boolean containsBase64Byte(byte[] arrayOctet)
+ private static boolean containsBase64Byte(final byte[] arrayOctet)
{
for (byte octet : arrayOctet)
{
@@ -702,7 +702,7 @@ public class Base64
* binary data to encode
* @return byte[] containing Base64 characters in their UTF-8 representation.
*/
- public static byte[] encodeBase64(byte[] binaryData)
+ public static byte[] encodeBase64(final byte[] binaryData)
{
return encodeBase64(binaryData, false);
}
@@ -715,7 +715,7 @@ public class Base64
* @return String containing Base64 characters.
* @since 1.4
*/
- public static String encodeBase64String(byte[] binaryData)
+ public static String encodeBase64String(final byte[] binaryData)
{
return StringUtils.newStringUtf8(encodeBase64(binaryData, true));
}
@@ -729,7 +729,7 @@ public class Base64
* @return byte[] containing Base64 characters in their UTF-8 representation.
* @since 1.4
*/
- public static byte[] encodeBase64URLSafe(byte[] binaryData)
+ public static byte[] encodeBase64URLSafe(final byte[] binaryData)
{
return encodeBase64(binaryData, false, true);
}
@@ -743,7 +743,7 @@ public class Base64
* @return String containing Base64 characters
* @since 1.4
*/
- public static String encodeBase64URLSafeString(byte[] binaryData)
+ public static String encodeBase64URLSafeString(final byte[] binaryData)
{
return StringUtils.newStringUtf8(encodeBase64(binaryData, false, true));
}
@@ -756,7 +756,7 @@ public class Base64
* binary data to encode
* @return Base64 characters chunked in 76 character blocks
*/
- public static byte[] encodeBase64Chunked(byte[] binaryData)
+ public static byte[] encodeBase64Chunked(final byte[] binaryData)
{
return encodeBase64(binaryData, true);
}
@@ -769,7 +769,7 @@ public class Base64
* @return a byte array containing binary data
* @since 1.4
*/
- public byte[] decode(String pArray)
+ public byte[] decode(final String pArray)
{
return decode(StringUtils.getBytesUtf8(pArray));
}
@@ -781,10 +781,10 @@ public class Base64
* A byte array containing Base64 character data
* @return a byte array containing binary data
*/
- public byte[] decode(byte[] pArray)
+ public byte[] decode(final byte[] pArray)
{
reset();
- if (pArray == null || pArray.length == 0)
+ if ((pArray == null) || (pArray.length == 0))
{
return pArray;
}
@@ -819,7 +819,7 @@ public class Base64
* Thrown when the input array needs an output array bigger than
* {@link Integer#MAX_VALUE}
*/
- public static byte[] encodeBase64(byte[] binaryData, boolean isChunked)
+ public static byte[] encodeBase64(final byte[] binaryData, final boolean isChunked)
{
return encodeBase64(binaryData, isChunked, false);
}
@@ -842,7 +842,8 @@ public class Base64
* {@link Integer#MAX_VALUE}
* @since 1.4
*/
- public static byte[] encodeBase64(byte[] binaryData, boolean isChunked, boolean urlSafe)
+ public static byte[] encodeBase64(final byte[] binaryData, final boolean isChunked,
+ final boolean urlSafe)
{
return encodeBase64(binaryData, isChunked, urlSafe, Integer.MAX_VALUE);
}
@@ -866,10 +867,10 @@ public class Base64
* Thrown when the input array needs an output array bigger than maxResultSize
* @since 1.4
*/
- public static byte[] encodeBase64(byte[] binaryData, boolean isChunked, boolean urlSafe,
- int maxResultSize)
+ public static byte[] encodeBase64(final byte[] binaryData, final boolean isChunked,
+ final boolean urlSafe, final int maxResultSize)
{
- if (binaryData == null || binaryData.length == 0)
+ if ((binaryData == null) || (binaryData.length == 0))
{
return binaryData;
}
@@ -894,7 +895,7 @@ public class Base64
* @return Array containing decoded data.
* @since 1.4
*/
- public static byte[] decodeBase64(String base64String)
+ public static byte[] decodeBase64(final String base64String)
{
return new Base64().decode(base64String);
}
@@ -906,7 +907,7 @@ public class Base64
* Byte array containing Base64 data
* @return Array containing decoded data.
*/
- public static byte[] decodeBase64(byte[] base64Data)
+ public static byte[] decodeBase64(final byte[] base64Data)
{
return new Base64().decode(base64Data);
}
@@ -918,7 +919,7 @@ public class Base64
* the byte to check
* @return true if byte is whitespace, false otherwise
*/
- private static boolean isWhiteSpace(byte byteToCheck)
+ private static boolean isWhiteSpace(final byte byteToCheck)
{
switch (byteToCheck)
{
@@ -943,7 +944,7 @@ public class Base64
* @return A String containing only Base64 character data
* @since 1.4
*/
- public String encodeToString(byte[] pArray)
+ public String encodeToString(final byte[] pArray)
{
return StringUtils.newStringUtf8(encode(pArray));
}
@@ -956,10 +957,10 @@ public class Base64
* a byte array containing binary data
* @return A byte array containing only Base64 character data
*/
- public byte[] encode(byte[] pArray)
+ public byte[] encode(final byte[] pArray)
{
reset();
- if (pArray == null || pArray.length == 0)
+ if ((pArray == null) || (pArray.length == 0))
{
return pArray;
}
@@ -975,7 +976,7 @@ public class Base64
}
// In URL-SAFE mode we skip the padding characters, so sometimes our
// final length is a bit smaller.
- if (isUrlSafe() && pos < buf.length)
+ if (isUrlSafe() && (pos < buf.length))
{
byte[] smallerBuf = new byte[pos];
System.arraycopy(buf, 0, smallerBuf, 0, pos);
@@ -998,7 +999,8 @@ public class Base64
* @return amount of space needed to encoded the supplied array. Returns a long since a max-len
* array will require Integer.MAX_VALUE + 33%.
*/
- private static long getEncodeLength(byte[] pArray, int chunkSize, byte[] chunkSeparator)
+ private static long getEncodeLength(final byte[] pArray, int chunkSize,
+ final byte[] chunkSeparator)
{
// base64 always encodes to multiples of 4.
chunkSize = (chunkSize / 4) * 4;
@@ -1030,7 +1032,7 @@ public class Base64
* @return A BigInteger
* @since 1.4
*/
- public static BigInteger decodeInteger(byte[] pArray)
+ public static BigInteger decodeInteger(final byte[] pArray)
{
return new BigInteger(1, decodeBase64(pArray));
}
@@ -1045,7 +1047,7 @@ public class Base64
* if null is passed in
* @since 1.4
*/
- public static byte[] encodeInteger(BigInteger bigInt)
+ public static byte[] encodeInteger(final BigInteger bigInt)
{
if (bigInt == null)
{
@@ -1061,7 +1063,7 @@ public class Base64
* <code>BigInteger</code> to be converted
* @return a byte array representation of the BigInteger parameter
*/
- static byte[] toIntegerBytes(BigInteger bigInt)
+ static byte[] toIntegerBytes(final BigInteger bigInt)
{
int bitlen = bigInt.bitLength();
// round bitlen
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/crypt/CachingSunJceCryptFactory.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/crypt/CachingSunJceCryptFactory.java?rev=1042221&r1=1042220&r2=1042221&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/crypt/CachingSunJceCryptFactory.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/crypt/CachingSunJceCryptFactory.java Sat Dec 4 18:33:54 2010
@@ -30,7 +30,7 @@ public class CachingSunJceCryptFactory e
* @param encryptionKey
* encryption key
*/
- public CachingSunJceCryptFactory(String encryptionKey)
+ public CachingSunJceCryptFactory(final String encryptionKey)
{
super(new ClassCryptFactory(SunJceCrypt.class, encryptionKey));
}
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/crypt/ClassCryptFactory.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/crypt/ClassCryptFactory.java?rev=1042221&r1=1042220&r2=1042221&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/crypt/ClassCryptFactory.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/crypt/ClassCryptFactory.java Sat Dec 4 18:33:54 2010
@@ -42,7 +42,7 @@ public class ClassCryptFactory implement
* @param encryptionKey
* encryption key
*/
- public ClassCryptFactory(Class<?> cryptClass, String encryptionKey)
+ public ClassCryptFactory(final Class<?> cryptClass, final String encryptionKey)
{
if (cryptClass == null)
{
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/crypt/CryptFactoryCachingDecorator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/crypt/CryptFactoryCachingDecorator.java?rev=1042221&r1=1042220&r2=1042221&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/crypt/CryptFactoryCachingDecorator.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/crypt/CryptFactoryCachingDecorator.java Sat Dec 4 18:33:54 2010
@@ -33,7 +33,7 @@ public class CryptFactoryCachingDecorato
* @param delegate
* the crypt factory whose {@link ICryptFactory#newCrypt()} call will be cached
*/
- public CryptFactoryCachingDecorator(ICryptFactory delegate)
+ public CryptFactoryCachingDecorator(final ICryptFactory delegate)
{
if (delegate == null)
{
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/crypt/StringUtils.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/crypt/StringUtils.java?rev=1042221&r1=1042220&r2=1042221&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/crypt/StringUtils.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/crypt/StringUtils.java Sat Dec 4 18:33:54 2010
@@ -47,7 +47,7 @@ public class StringUtils
* charsets</a>
* @see #getBytesUnchecked(String, String)
*/
- public static byte[] getBytesIso8859_1(String string)
+ public static byte[] getBytesIso8859_1(final String string)
{
return StringUtils.getBytesUnchecked(string, CharEncoding.ISO_8859_1);
}
@@ -66,7 +66,7 @@ public class StringUtils
* charsets</a>
* @see #getBytesUnchecked(String, String)
*/
- public static byte[] getBytesUsAscii(String string)
+ public static byte[] getBytesUsAscii(final String string)
{
return StringUtils.getBytesUnchecked(string, CharEncoding.US_ASCII);
}
@@ -85,7 +85,7 @@ public class StringUtils
* charsets</a>
* @see #getBytesUnchecked(String, String)
*/
- public static byte[] getBytesUtf16(String string)
+ public static byte[] getBytesUtf16(final String string)
{
return StringUtils.getBytesUnchecked(string, CharEncoding.UTF_16);
}
@@ -104,7 +104,7 @@ public class StringUtils
* charsets</a>
* @see #getBytesUnchecked(String, String)
*/
- public static byte[] getBytesUtf16Be(String string)
+ public static byte[] getBytesUtf16Be(final String string)
{
return StringUtils.getBytesUnchecked(string, CharEncoding.UTF_16BE);
}
@@ -123,7 +123,7 @@ public class StringUtils
* charsets</a>
* @see #getBytesUnchecked(String, String)
*/
- public static byte[] getBytesUtf16Le(String string)
+ public static byte[] getBytesUtf16Le(final String string)
{
return StringUtils.getBytesUnchecked(string, CharEncoding.UTF_16LE);
}
@@ -142,7 +142,7 @@ public class StringUtils
* charsets</a>
* @see #getBytesUnchecked(String, String)
*/
- public static byte[] getBytesUtf8(String string)
+ public static byte[] getBytesUtf8(final String string)
{
return StringUtils.getBytesUnchecked(string, CharEncoding.UTF_8);
}
@@ -167,7 +167,7 @@ public class StringUtils
* @see CharEncoding
* @see String#getBytes(String)
*/
- public static byte[] getBytesUnchecked(String string, String charsetName)
+ public static byte[] getBytesUnchecked(final String string, final String charsetName)
{
if (string == null)
{
@@ -183,8 +183,8 @@ public class StringUtils
}
}
- private static IllegalStateException newIllegalStateException(String charsetName,
- UnsupportedEncodingException e)
+ private static IllegalStateException newIllegalStateException(final String charsetName,
+ final UnsupportedEncodingException e)
{
return new IllegalStateException(charsetName + ": " + e);
}
@@ -210,7 +210,7 @@ public class StringUtils
* @see CharEncoding
* @see String#String(byte[], String)
*/
- public static String newString(byte[] bytes, String charsetName)
+ public static String newString(final byte[] bytes, final String charsetName)
{
if (bytes == null)
{
@@ -238,7 +238,7 @@ public class StringUtils
* Thrown when a {@link UnsupportedEncodingException} is caught, which should never
* happen since the charset is required.
*/
- public static String newStringIso8859_1(byte[] bytes)
+ public static String newStringIso8859_1(final byte[] bytes)
{
return StringUtils.newString(bytes, CharEncoding.ISO_8859_1);
}
@@ -255,7 +255,7 @@ public class StringUtils
* Thrown when a {@link UnsupportedEncodingException} is caught, which should never
* happen since the charset is required.
*/
- public static String newStringUsAscii(byte[] bytes)
+ public static String newStringUsAscii(final byte[] bytes)
{
return StringUtils.newString(bytes, CharEncoding.US_ASCII);
}
@@ -272,7 +272,7 @@ public class StringUtils
* Thrown when a {@link UnsupportedEncodingException} is caught, which should never
* happen since the charset is required.
*/
- public static String newStringUtf16(byte[] bytes)
+ public static String newStringUtf16(final byte[] bytes)
{
return StringUtils.newString(bytes, CharEncoding.UTF_16);
}
@@ -289,7 +289,7 @@ public class StringUtils
* Thrown when a {@link UnsupportedEncodingException} is caught, which should never
* happen since the charset is required.
*/
- public static String newStringUtf16Be(byte[] bytes)
+ public static String newStringUtf16Be(final byte[] bytes)
{
return StringUtils.newString(bytes, CharEncoding.UTF_16BE);
}
@@ -306,7 +306,7 @@ public class StringUtils
* Thrown when a {@link UnsupportedEncodingException} is caught, which should never
* happen since the charset is required.
*/
- public static String newStringUtf16Le(byte[] bytes)
+ public static String newStringUtf16Le(final byte[] bytes)
{
return StringUtils.newString(bytes, CharEncoding.UTF_16LE);
}
@@ -323,7 +323,7 @@ public class StringUtils
* Thrown when a {@link UnsupportedEncodingException} is caught, which should never
* happen since the charset is required.
*/
- public static String newStringUtf8(byte[] bytes)
+ public static String newStringUtf8(final byte[] bytes)
{
return StringUtils.newString(bytes, CharEncoding.UTF_8);
}
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/crypt/TrivialCrypt.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/crypt/TrivialCrypt.java?rev=1042221&r1=1042220&r2=1042221&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/crypt/TrivialCrypt.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/crypt/TrivialCrypt.java Sat Dec 4 18:33:54 2010
@@ -37,7 +37,7 @@ public class TrivialCrypt extends Abstra
* @see org.apache.wicket.util.crypt.AbstractCrypt#crypt(byte[], int)
*/
@Override
- protected byte[] crypt(byte[] input, int mode) throws GeneralSecurityException
+ protected byte[] crypt(final byte[] input, final int mode) throws GeneralSecurityException
{
final byte[] result = new byte[input.length];
for (int i = 0; i < input.length; i++)
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/diff/AddDelta.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/diff/AddDelta.java?rev=1042221&r1=1042220&r2=1042221&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/diff/AddDelta.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/diff/AddDelta.java Sat Dec 4 18:33:54 2010
@@ -76,7 +76,7 @@ public class AddDelta extends Delta
* @param origpos
* @param rev
*/
- public AddDelta(int origpos, Chunk rev)
+ public AddDelta(final int origpos, final Chunk rev)
{
init(new Chunk(origpos, 0), rev);
}
@@ -85,7 +85,7 @@ public class AddDelta extends Delta
* @see org.apache.wicket.util.diff.Delta#verify(java.util.List)
*/
@Override
- public void verify(List<Object> target) throws PatchFailedException
+ public void verify(final List<Object> target) throws PatchFailedException
{
if (original.first() > target.size())
{
@@ -97,7 +97,7 @@ public class AddDelta extends Delta
* @see org.apache.wicket.util.diff.Delta#applyTo(java.util.List)
*/
@Override
- public void applyTo(List<Object> target)
+ public void applyTo(final List<Object> target)
{
revised.applyAdd(original.first(), target);
}
@@ -106,7 +106,7 @@ public class AddDelta extends Delta
* @see org.apache.wicket.util.diff.Delta#toString(java.lang.StringBuffer)
*/
@Override
- public void toString(StringBuilder s)
+ public void toString(final StringBuilder s)
{
s.append(original.anchor());
s.append("a");
@@ -119,7 +119,7 @@ public class AddDelta extends Delta
* @see org.apache.wicket.util.diff.Delta#toRCSString(java.lang.StringBuffer, java.lang.String)
*/
@Override
- public void toRCSString(StringBuilder s, String EOL)
+ public void toRCSString(final StringBuilder s, final String EOL)
{
s.append("a");
s.append(original.anchor());
@@ -133,7 +133,7 @@ public class AddDelta extends Delta
* @see org.apache.wicket.util.diff.Delta#accept(org.apache.wicket.util.diff.RevisionVisitor)
*/
@Override
- public void accept(RevisionVisitor visitor)
+ public void accept(final RevisionVisitor visitor)
{
visitor.visit(this);
}
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/diff/ChangeDelta.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/diff/ChangeDelta.java?rev=1042221&r1=1042220&r2=1042221&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/diff/ChangeDelta.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/diff/ChangeDelta.java Sat Dec 4 18:33:54 2010
@@ -82,7 +82,7 @@ public class ChangeDelta extends Delta
* @param orig
* @param rev
*/
- public ChangeDelta(Chunk orig, Chunk rev)
+ public ChangeDelta(final Chunk orig, final Chunk rev)
{
init(orig, rev);
}
@@ -91,7 +91,7 @@ public class ChangeDelta extends Delta
* @see org.apache.wicket.util.diff.Delta#verify(java.util.List)
*/
@Override
- public void verify(List<Object> target) throws PatchFailedException
+ public void verify(final List<Object> target) throws PatchFailedException
{
if (!original.verify(target))
{
@@ -107,7 +107,7 @@ public class ChangeDelta extends Delta
* @see org.apache.wicket.util.diff.Delta#applyTo(java.util.List)
*/
@Override
- public void applyTo(List<Object> target)
+ public void applyTo(final List<Object> target)
{
original.applyDelete(target);
revised.applyAdd(original.first(), target);
@@ -117,7 +117,7 @@ public class ChangeDelta extends Delta
* @see org.apache.wicket.util.diff.Delta#toString(java.lang.StringBuffer)
*/
@Override
- public void toString(StringBuilder s)
+ public void toString(final StringBuilder s)
{
original.rangeString(s);
s.append("c");
@@ -133,7 +133,7 @@ public class ChangeDelta extends Delta
* @see org.apache.wicket.util.diff.Delta#toRCSString(java.lang.StringBuffer, java.lang.String)
*/
@Override
- public void toRCSString(StringBuilder s, String EOL)
+ public void toRCSString(final StringBuilder s, final String EOL)
{
s.append("d");
s.append(original.rcsfrom());
@@ -152,7 +152,7 @@ public class ChangeDelta extends Delta
* @see org.apache.wicket.util.diff.Delta#accept(org.apache.wicket.util.diff.RevisionVisitor)
*/
@Override
- public void accept(RevisionVisitor visitor)
+ public void accept(final RevisionVisitor visitor)
{
visitor.visit(this);
}