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 [4/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...
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/value/CopyOnWriteValueMap.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/value/CopyOnWriteValueMap.java?rev=1042221&r1=1042220&r2=1042221&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/value/CopyOnWriteValueMap.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/value/CopyOnWriteValueMap.java Sat Dec 4 18:33:54 2010
@@ -49,7 +49,7 @@ public class CopyOnWriteValueMap impleme
* @param wrapped
* the wrapped <code>IValueMap</code>
*/
- public CopyOnWriteValueMap(IValueMap wrapped)
+ public CopyOnWriteValueMap(final IValueMap wrapped)
{
this.wrapped = wrapped;
}
@@ -79,7 +79,7 @@ public class CopyOnWriteValueMap impleme
/**
* @see java.util.Map#containsKey(Object)
*/
- public boolean containsKey(Object key)
+ public boolean containsKey(final Object key)
{
return wrapped.containsKey(key);
}
@@ -87,7 +87,7 @@ public class CopyOnWriteValueMap impleme
/**
* @see java.util.Map#containsValue(Object)
*/
- public boolean containsValue(Object value)
+ public boolean containsValue(final Object value)
{
return wrapped.containsValue(value);
}
@@ -105,7 +105,7 @@ public class CopyOnWriteValueMap impleme
* @see java.util.Map#equals(Object)
*/
@Override
- public boolean equals(Object o)
+ public boolean equals(final Object o)
{
return wrapped.equals(o);
}
@@ -113,7 +113,7 @@ public class CopyOnWriteValueMap impleme
/**
* @see java.util.Map#get(Object)
*/
- public Object get(Object key)
+ public Object get(final Object key)
{
return wrapped.get(key);
}
@@ -121,7 +121,7 @@ public class CopyOnWriteValueMap impleme
/**
* @see IValueMap#getBoolean(String)
*/
- public boolean getBoolean(String key) throws StringValueConversionException
+ public boolean getBoolean(final String key) throws StringValueConversionException
{
return wrapped.getBoolean(key);
}
@@ -129,7 +129,7 @@ public class CopyOnWriteValueMap impleme
/**
* @see IValueMap#getCharSequence(String)
*/
- public CharSequence getCharSequence(String key)
+ public CharSequence getCharSequence(final String key)
{
return wrapped.getCharSequence(key);
}
@@ -137,7 +137,7 @@ public class CopyOnWriteValueMap impleme
/**
* @see IValueMap#getDouble(String)
*/
- public double getDouble(String key) throws StringValueConversionException
+ public double getDouble(final String key) throws StringValueConversionException
{
return wrapped.getDouble(key);
}
@@ -145,7 +145,8 @@ public class CopyOnWriteValueMap impleme
/**
* @see IValueMap#getDouble(String, double)
*/
- public double getDouble(String key, double defaultValue) throws StringValueConversionException
+ public double getDouble(final String key, final double defaultValue)
+ throws StringValueConversionException
{
return wrapped.getDouble(key, defaultValue);
}
@@ -153,7 +154,7 @@ public class CopyOnWriteValueMap impleme
/**
* @see IValueMap#getDuration(String)
*/
- public Duration getDuration(String key) throws StringValueConversionException
+ public Duration getDuration(final String key) throws StringValueConversionException
{
return wrapped.getDuration(key);
}
@@ -161,7 +162,8 @@ public class CopyOnWriteValueMap impleme
/**
* @see IValueMap#getInt(String, int)
*/
- public int getInt(String key, int defaultValue) throws StringValueConversionException
+ public int getInt(final String key, final int defaultValue)
+ throws StringValueConversionException
{
return wrapped.getInt(key, defaultValue);
}
@@ -169,7 +171,7 @@ public class CopyOnWriteValueMap impleme
/**
* @see IValueMap#getInt(String)
*/
- public int getInt(String key) throws StringValueConversionException
+ public int getInt(final String key) throws StringValueConversionException
{
return wrapped.getInt(key);
}
@@ -177,7 +179,7 @@ public class CopyOnWriteValueMap impleme
/**
* @see IValueMap#getKey(String)
*/
- public String getKey(String key)
+ public String getKey(final String key)
{
return wrapped.getKey(key);
}
@@ -185,7 +187,8 @@ public class CopyOnWriteValueMap impleme
/**
* @see IValueMap#getLong(String, long)
*/
- public long getLong(String key, long defaultValue) throws StringValueConversionException
+ public long getLong(final String key, final long defaultValue)
+ throws StringValueConversionException
{
return wrapped.getLong(key, defaultValue);
}
@@ -193,7 +196,7 @@ public class CopyOnWriteValueMap impleme
/**
* @see IValueMap#getLong(String)
*/
- public long getLong(String key) throws StringValueConversionException
+ public long getLong(final String key) throws StringValueConversionException
{
return wrapped.getLong(key);
}
@@ -201,7 +204,7 @@ public class CopyOnWriteValueMap impleme
/**
* @see IValueMap#getString(String, String)
*/
- public String getString(String key, String defaultValue)
+ public String getString(final String key, final String defaultValue)
{
return wrapped.getString(key, defaultValue);
}
@@ -209,7 +212,7 @@ public class CopyOnWriteValueMap impleme
/**
* @see IValueMap#getString(String)
*/
- public String getString(String key)
+ public String getString(final String key)
{
return wrapped.getString(key);
}
@@ -217,7 +220,7 @@ public class CopyOnWriteValueMap impleme
/**
* @see IValueMap#getStringArray(String)
*/
- public String[] getStringArray(String key)
+ public String[] getStringArray(final String key)
{
return wrapped.getStringArray(key);
}
@@ -225,7 +228,7 @@ public class CopyOnWriteValueMap impleme
/**
* @see IValueMap#getStringValue(String)
*/
- public StringValue getStringValue(String key)
+ public StringValue getStringValue(final String key)
{
return wrapped.getStringValue(key);
}
@@ -233,7 +236,7 @@ public class CopyOnWriteValueMap impleme
/**
* @see IValueMap#getTime(String)
*/
- public Time getTime(String key) throws StringValueConversionException
+ public Time getTime(final String key) throws StringValueConversionException
{
return wrapped.getTime(key);
}
@@ -274,7 +277,7 @@ public class CopyOnWriteValueMap impleme
/**
* @see java.util.Map#put(Object, Object)
*/
- public Object put(String key, Object value)
+ public Object put(final String key, final Object value)
{
checkAndCopy();
return wrapped.put(key, value);
@@ -283,7 +286,7 @@ public class CopyOnWriteValueMap impleme
/**
* @see java.util.Map#putAll(Map)
*/
- public void putAll(Map<? extends String, ? extends Object> map)
+ public void putAll(final Map<? extends String, ? extends Object> map)
{
checkAndCopy();
wrapped.putAll(map);
@@ -292,7 +295,7 @@ public class CopyOnWriteValueMap impleme
/**
* @see java.util.Map#remove(Object)
*/
- public Object remove(Object key)
+ public Object remove(final Object key)
{
checkAndCopy();
return wrapped.remove(key);
@@ -331,7 +334,7 @@ public class CopyOnWriteValueMap impleme
* @see IValueMap#getAsBoolean(String)
*
*/
- public Boolean getAsBoolean(String key)
+ public Boolean getAsBoolean(final String key)
{
return wrapped.getAsBoolean(key);
}
@@ -340,7 +343,7 @@ public class CopyOnWriteValueMap impleme
* @see IValueMap#getAsBoolean(String, boolean)
*
*/
- public boolean getAsBoolean(String key, boolean defaultValue)
+ public boolean getAsBoolean(final String key, final boolean defaultValue)
{
return wrapped.getAsBoolean(key, defaultValue);
}
@@ -348,7 +351,7 @@ public class CopyOnWriteValueMap impleme
/**
* @see IValueMap#getAsInteger(String)
*/
- public Integer getAsInteger(String key)
+ public Integer getAsInteger(final String key)
{
return wrapped.getAsInteger(key);
}
@@ -356,7 +359,7 @@ public class CopyOnWriteValueMap impleme
/**
* @see IValueMap#getAsInteger(String, int)
*/
- public int getAsInteger(String key, int defaultValue)
+ public int getAsInteger(final String key, final int defaultValue)
{
return wrapped.getAsInteger(key, defaultValue);
}
@@ -364,7 +367,7 @@ public class CopyOnWriteValueMap impleme
/**
* @see IValueMap#getAsLong(String)
*/
- public Long getAsLong(String key)
+ public Long getAsLong(final String key)
{
return wrapped.getAsLong(key);
}
@@ -372,7 +375,7 @@ public class CopyOnWriteValueMap impleme
/**
* @see IValueMap#getAsLong(String, long)
*/
- public long getAsLong(String key, long defaultValue)
+ public long getAsLong(final String key, final long defaultValue)
{
return wrapped.getAsLong(key, defaultValue);
}
@@ -380,7 +383,7 @@ public class CopyOnWriteValueMap impleme
/**
* @see IValueMap#getAsDouble(String)
*/
- public Double getAsDouble(String key)
+ public Double getAsDouble(final String key)
{
return wrapped.getAsDouble(key);
}
@@ -388,7 +391,7 @@ public class CopyOnWriteValueMap impleme
/**
* @see IValueMap#getAsDouble(String, double)
*/
- public double getAsDouble(String key, double defaultValue)
+ public double getAsDouble(final String key, final double defaultValue)
{
return wrapped.getAsDouble(key, defaultValue);
}
@@ -396,7 +399,7 @@ public class CopyOnWriteValueMap impleme
/**
* @see IValueMap#getAsDuration(String)
*/
- public Duration getAsDuration(String key)
+ public Duration getAsDuration(final String key)
{
return wrapped.getAsDuration(key);
}
@@ -404,7 +407,7 @@ public class CopyOnWriteValueMap impleme
/**
* @see IValueMap#getAsDuration(String, Duration)
*/
- public Duration getAsDuration(String key, Duration defaultValue)
+ public Duration getAsDuration(final String key, final Duration defaultValue)
{
return wrapped.getAsDuration(key, defaultValue);
}
@@ -412,7 +415,7 @@ public class CopyOnWriteValueMap impleme
/**
* @see IValueMap#getAsTime(String)
*/
- public Time getAsTime(String key)
+ public Time getAsTime(final String key)
{
return wrapped.getAsTime(key);
}
@@ -420,7 +423,7 @@ public class CopyOnWriteValueMap impleme
/**
* @see IValueMap#getAsTime(String, Time)
*/
- public Time getAsTime(String key, Time defaultValue)
+ public Time getAsTime(final String key, final Time defaultValue)
{
return wrapped.getAsTime(key, defaultValue);
}
@@ -428,7 +431,7 @@ public class CopyOnWriteValueMap impleme
/**
* @see IValueMap#getAsEnum(String, Class)
*/
- public <T extends Enum<T>> T getAsEnum(String key, Class<T> eClass)
+ public <T extends Enum<T>> T getAsEnum(final String key, final Class<T> eClass)
{
return wrapped.getAsEnum(key, eClass);
}
@@ -436,7 +439,7 @@ public class CopyOnWriteValueMap impleme
/**
* @see IValueMap#getAsEnum
*/
- public <T extends Enum<T>> T getAsEnum(String key, T defaultValue)
+ public <T extends Enum<T>> T getAsEnum(final String key, final T defaultValue)
{
return wrapped.getAsEnum(key, defaultValue);
}
@@ -444,7 +447,8 @@ public class CopyOnWriteValueMap impleme
/**
* @see IValueMap#getAsEnum(String, Class, Enum)
*/
- public <T extends Enum<T>> T getAsEnum(String key, Class<T> eClass, T defaultValue)
+ public <T extends Enum<T>> T getAsEnum(final String key, final Class<T> eClass,
+ final T defaultValue)
{
return wrapped.getAsEnum(key, eClass, defaultValue);
}
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/value/LongValue.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/value/LongValue.java?rev=1042221&r1=1042220&r2=1042221&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/value/LongValue.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/value/LongValue.java Sat Dec 4 18:33:54 2010
@@ -226,7 +226,7 @@ public class LongValue implements Compar
* if either argument is {@code null}
* @return max value
*/
- public static <T extends LongValue> T max(T lhs, T rhs)
+ public static <T extends LongValue> T max(final T lhs, final T rhs)
{
Args.notNull(lhs, "lhs");
Args.notNull(rhs, "rhs");
@@ -246,7 +246,7 @@ public class LongValue implements Compar
* @param rhs
* @return max of two values or {@code null} if they are both null
*/
- public static <T extends LongValue> T maxNullSafe(T lhs, T rhs)
+ public static <T extends LongValue> T maxNullSafe(final T lhs, final T rhs)
{
if (lhs == rhs)
{
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/value/ValueMap.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/value/ValueMap.java?rev=1042221&r1=1042220&r2=1042221&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/value/ValueMap.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/value/ValueMap.java Sat Dec 4 18:33:54 2010
@@ -311,7 +311,7 @@ public class ValueMap extends LinkedHash
{
return null;
}
- else if (o.getClass().isArray() && Array.getLength(o) > 0)
+ else if (o.getClass().isArray() && (Array.getLength(o) > 0))
{
// if it is an array just get the first value
final Object arrayValue = Array.get(o, 0);
@@ -341,7 +341,7 @@ public class ValueMap extends LinkedHash
{
return null;
}
- else if (o.getClass().isArray() && Array.getLength(o) > 0)
+ else if (o.getClass().isArray() && (Array.getLength(o) > 0))
{
// if it is an array just get the first value
final Object arrayValue = Array.get(o, 0);
@@ -583,7 +583,7 @@ public class ValueMap extends LinkedHash
* @see IValueMap#getAsBoolean(String)
*
*/
- public Boolean getAsBoolean(String key)
+ public Boolean getAsBoolean(final String key)
{
if (!containsKey(key))
{
@@ -604,7 +604,7 @@ public class ValueMap extends LinkedHash
* @see IValueMap#getAsBoolean(String, boolean)
*
*/
- public boolean getAsBoolean(String key, boolean defaultValue)
+ public boolean getAsBoolean(final String key, final boolean defaultValue)
{
if (!containsKey(key))
{
@@ -624,7 +624,7 @@ public class ValueMap extends LinkedHash
/**
* @see IValueMap#getAsInteger(String)
*/
- public Integer getAsInteger(String key)
+ public Integer getAsInteger(final String key)
{
if (!containsKey(key))
{
@@ -644,7 +644,7 @@ public class ValueMap extends LinkedHash
/**
* @see IValueMap#getAsInteger(String, int)
*/
- public int getAsInteger(String key, int defaultValue)
+ public int getAsInteger(final String key, final int defaultValue)
{
try
{
@@ -659,7 +659,7 @@ public class ValueMap extends LinkedHash
/**
* @see IValueMap#getAsLong(String)
*/
- public Long getAsLong(String key)
+ public Long getAsLong(final String key)
{
if (!containsKey(key))
{
@@ -679,7 +679,7 @@ public class ValueMap extends LinkedHash
/**
* @see IValueMap#getAsLong(String, long)
*/
- public long getAsLong(String key, long defaultValue)
+ public long getAsLong(final String key, final long defaultValue)
{
try
{
@@ -694,7 +694,7 @@ public class ValueMap extends LinkedHash
/**
* @see IValueMap#getAsDouble(String)
*/
- public Double getAsDouble(String key)
+ public Double getAsDouble(final String key)
{
if (!containsKey(key))
{
@@ -822,7 +822,7 @@ public class ValueMap extends LinkedHash
* @param <T>
* @return Enum
*/
- @SuppressWarnings( { "unchecked" })
+ @SuppressWarnings({ "unchecked" })
private <T extends Enum<T>> T getEnumImpl(final String key, final Class<?> eClass,
final T defaultValue)
{
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/visit/ClassVisitFilter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/visit/ClassVisitFilter.java?rev=1042221&r1=1042220&r2=1042221&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/visit/ClassVisitFilter.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/visit/ClassVisitFilter.java Sat Dec 4 18:33:54 2010
@@ -31,19 +31,19 @@ public class ClassVisitFilter implements
* @param clazz
* class of objects that visitors should be restricted to
*/
- public ClassVisitFilter(Class<?> clazz)
+ public ClassVisitFilter(final Class<?> clazz)
{
this.clazz = clazz;
}
/** {@inheritDoc} */
- public boolean visitChildren(Object object)
+ public boolean visitChildren(final Object object)
{
return true;
}
/** {@inheritDoc} */
- public boolean visitObject(Object object)
+ public boolean visitObject(final Object object)
{
return clazz.isAssignableFrom(object.getClass());
}
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/visit/IVisitFilter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/visit/IVisitFilter.java?rev=1042221&r1=1042220&r2=1042221&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/visit/IVisitFilter.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/visit/IVisitFilter.java Sat Dec 4 18:33:54 2010
@@ -45,13 +45,13 @@ public interface IVisitFilter
public static IVisitFilter ANY = new IVisitFilter()
{
/** {@inheritDoc} */
- public boolean visitObject(Object object)
+ public boolean visitObject(final Object object)
{
return true;
}
/** {@inheritDoc} */
- public boolean visitChildren(Object object)
+ public boolean visitChildren(final Object object)
{
return true;
}
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/visit/Visit.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/visit/Visit.java?rev=1042221&r1=1042220&r2=1042221&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/visit/Visit.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/visit/Visit.java Sat Dec 4 18:33:54 2010
@@ -40,7 +40,7 @@ public class Visit<R> implements IVisit<
}
/** {@inheritDoc} */
- public void stop(R result)
+ public void stop(final R result)
{
action = Action.STOP;
this.result = result;
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/visit/Visits.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/visit/Visits.java?rev=1042221&r1=1042220&r2=1042221&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/visit/Visits.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/visit/Visits.java Sat Dec 4 18:33:54 2010
@@ -33,7 +33,7 @@ public class Visits
{
private final T singleton;
- public SingletonIterable(T singleton)
+ public SingletonIterable(final T singleton)
{
this.singleton = singleton;
}
@@ -61,7 +61,8 @@ public class Visits
* the visitor
* @return return value from the {@code visitor} or {@code null} if none
*/
- public static final <S, R> R visit(Iterable<? super S> container, final IVisitor<S, R> visitor)
+ public static final <S, R> R visit(final Iterable<? super S> container,
+ final IVisitor<S, R> visitor)
{
return (R)visitChildren(new SingletonIterable(container), visitor, IVisitFilter.ANY);
}
@@ -85,8 +86,8 @@ public class Visits
* filter used to limit the types of objects that will be visited
* @return return value from the {@code visitor} or {@code null} if none
*/
- public static final <S, R> R visit(Iterable<? super S> container, final IVisitor<S, R> visitor,
- IVisitFilter filter)
+ public static final <S, R> R visit(final Iterable<? super S> container,
+ final IVisitor<S, R> visitor, final IVisitFilter filter)
{
return (R)visitChildren(new SingletonIterable(container), visitor, filter);
}
@@ -110,16 +111,16 @@ public class Visits
* filter used to limit the types of objects that will be visited
* @return return value from the {@code visitor} or {@code null} if none
*/
- public static final <S, R> R visitChildren(Iterable<? super S> container,
- final IVisitor<S, R> visitor, IVisitFilter filter)
+ public static final <S, R> R visitChildren(final Iterable<? super S> container,
+ final IVisitor<S, R> visitor, final IVisitFilter filter)
{
Visit<R> visit = new Visit<R>();
visitChildren(container, visitor, filter, visit);
return visit.getResult();
}
- private static final <S, R> void visitChildren(Iterable<? super S> container,
- final IVisitor<S, R> visitor, IVisitFilter filter, Visit<R> visit)
+ private static final <S, R> void visitChildren(final Iterable<? super S> container,
+ final IVisitor<S, R> visitor, final IVisitFilter filter, final Visit<R> visit)
{
if (visitor == null)
{
@@ -137,7 +138,7 @@ public class Visits
// Call visitor
@SuppressWarnings("unchecked")
- S s = (S) child;
+ S s = (S)child;
visitor.component(s, childTraversal);
if (childTraversal.isStopped())
@@ -156,7 +157,7 @@ public class Visits
filter.visitChildren(child))
{
// visit the children in the container
- visitChildren((Iterable<? super S>) child, visitor, filter, visit);
+ visitChildren((Iterable<? super S>)child, visitor, filter, visit);
if (visit.isStopped())
{
@@ -185,7 +186,7 @@ public class Visits
* the visitor
* @return return value from the {@code visitor} or {@code null} if none
*/
- public static final <S, R> R visitChildren(Iterable<? super S> container,
+ public static final <S, R> R visitChildren(final Iterable<? super S> container,
final IVisitor<S, R> visitor)
{
return visitChildren(container, visitor, IVisitFilter.ANY);
@@ -209,7 +210,7 @@ public class Visits
* the visitor
* @return return value from the {@code visitor} or {@code null} if none
*/
- public static final <S, R> R visitPostOrder(S root,
+ public static final <S, R> R visitPostOrder(final S root,
final org.apache.wicket.util.visit.IVisitor<S, R> visitor)
{
return visitPostOrder(root, visitor, IVisitFilter.ANY);
@@ -235,8 +236,8 @@ public class Visits
* filter used to limit the types of objects that will be visited
* @return return value from the {@code visitor} or {@code null} if none
*/
- public static final <S, R> R visitPostOrder(Object root,
- final org.apache.wicket.util.visit.IVisitor<S, R> visitor, IVisitFilter filter)
+ public static final <S, R> R visitPostOrder(final Object root,
+ final org.apache.wicket.util.visit.IVisitor<S, R> visitor, final IVisitFilter filter)
{
if (visitor == null)
{
@@ -248,9 +249,9 @@ public class Visits
return visit.getResult();
}
- private static final <S, R> void visitPostOrderHelper(Object component,
- final org.apache.wicket.util.visit.IVisitor<S, R> visitor, IVisitFilter filter,
- Visit<R> visit)
+ private static final <S, R> void visitPostOrderHelper(final Object component,
+ final org.apache.wicket.util.visit.IVisitor<S, R> visitor, final IVisitFilter filter,
+ final Visit<R> visit)
{
if (component instanceof Iterable<?>)
@@ -259,7 +260,7 @@ public class Visits
if (filter.visitChildren(container))
{
Visit<R> childTraversal = new Visit<R>();
- for (final Object child : ((Iterable<?>) component))
+ for (final Object child : ((Iterable<?>)component))
{
visitPostOrderHelper(child, visitor, filter, childTraversal);
if (childTraversal.isStopped())
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/xml/CustomEntityResolver.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/xml/CustomEntityResolver.java?rev=1042221&r1=1042220&r2=1042221&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/xml/CustomEntityResolver.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/xml/CustomEntityResolver.java Sat Dec 4 18:33:54 2010
@@ -16,20 +16,22 @@
*/
package org.apache.wicket.util.xml;
-import org.apache.wicket.util.lang.Args;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-import javax.servlet.Filter;
import java.io.IOException;
import java.io.InputStream;
import java.util.HashMap;
import java.util.Map;
+import javax.servlet.Filter;
+
+import org.apache.wicket.util.lang.Args;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
/**
- * entity resolver that tries to locate a document type definition (DTD) using a set of custom entity resolvers
- *
+ * entity resolver that tries to locate a document type definition (DTD) using a set of custom
+ * entity resolvers
+ *
* @author pete
*/
public class CustomEntityResolver implements EntityResolver
@@ -38,7 +40,7 @@ public class CustomEntityResolver implem
/**
* get default instances of custom entity resolver with preloaded well-known entities
- *
+ *
* @return instance of resolver
*/
public static CustomEntityResolver getPreloaded()
@@ -46,30 +48,37 @@ public class CustomEntityResolver implem
CustomEntityResolver resolver = new CustomEntityResolver();
resolver.put(new EntityKey("-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN",
- "http://java.sun.com/dtd/web-app_2_3.dtd"),
- new ServletApiEntityLocator("web-app_2_3.dtd"));
+ "http://java.sun.com/dtd/web-app_2_3.dtd"), new ServletApiEntityLocator(
+ "web-app_2_3.dtd"));
return resolver;
}
/**
* add custom entity resolver
- *
- * @param key key for lookup (contains id and url)
- * @param locator locator for looking up entity
+ *
+ * @param key
+ * key for lookup (contains id and url)
+ * @param locator
+ * locator for looking up entity
*/
- public void put(EntityKey key, EntityLocator locator)
+ public void put(final EntityKey key, final EntityLocator locator)
{
Args.notNull(key, "key");
Args.notNull(locator, "locator");
entities.put(key, locator);
}
- public InputSource resolveEntity(String id, String url) throws SAXException, IOException
+ public InputSource resolveEntity(final String id, final String url) throws SAXException,
+ IOException
{
for (Map.Entry<EntityKey, EntityLocator> entry : entities.entrySet())
+ {
if (entry.getKey().id.equals(id) || entry.getKey().url.equals(url))
+ {
return entry.getValue().locateInputSource();
+ }
+ }
return null;
}
@@ -84,7 +93,7 @@ public class CustomEntityResolver implem
private final String id;
private final String url;
- private EntityKey(String id, String url)
+ private EntityKey(final String id, final String url)
{
Args.notEmpty(id, "id");
Args.notEmpty(url, "url");
@@ -93,17 +102,23 @@ public class CustomEntityResolver implem
}
@Override
- public boolean equals(Object o)
+ public boolean equals(final Object o)
{
if (this == o)
+ {
return true;
+ }
if (!(o instanceof EntityKey))
+ {
return false;
+ }
- EntityKey key = (EntityKey) o;
+ EntityKey key = (EntityKey)o;
if (!id.equals(key.id))
+ {
return false;
+ }
return url.equals(key.url);
}
@@ -134,14 +149,14 @@ public class CustomEntityResolver implem
{
private final String name;
- private ServletApiEntityLocator(String name)
+ private ServletApiEntityLocator(final String name)
{
this.name = name;
}
/**
* resolve servlet api resource, where e.g. 'web-app_2_3.dtd' is located
- *
+ *
* @return input source
*/
public InputSource locateInputSource()
@@ -149,7 +164,9 @@ public class CustomEntityResolver implem
InputStream stream = Filter.class.getResourceAsStream("resources/" + name);
if (stream == null)
+ {
return null;
+ }
return new InputSource(stream);
}
Modified: wicket/trunk/wicket-util/src/test/java/org/apache/wicket/util/file/WebXmlFileTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/test/java/org/apache/wicket/util/file/WebXmlFileTest.java?rev=1042221&r1=1042220&r2=1042221&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/test/java/org/apache/wicket/util/file/WebXmlFileTest.java (original)
+++ wicket/trunk/wicket-util/src/test/java/org/apache/wicket/util/file/WebXmlFileTest.java Sat Dec 4 18:33:54 2010
@@ -60,8 +60,8 @@ public class WebXmlFileTest extends Test
* @throws SAXException
* @throws IOException
*/
- public void filterOrServlet(boolean servlet) throws ParserConfigurationException, SAXException,
- IOException
+ public void filterOrServlet(final boolean servlet) throws ParserConfigurationException,
+ SAXException, IOException
{
String tag = servlet ? "servlet" : "filter";
@@ -90,9 +90,9 @@ public class WebXmlFileTest extends Test
* @param url
* @return webxml
*/
- private String getWebXml(String filter, String url)
+ private String getWebXml(final String filter, final String url)
{
- StringBuilder webxml = new StringBuilder();
+ StringBuilder webxml = new StringBuilder();
webxml.append("<web-app>");
webxml.append("<" + filter + ">");
webxml.append(" <" + filter + "-name>HelloWorldApplication</" + filter + "-name>");