Author: ivaynberg
Date: Sun May 18 17:01:44 2008
New Revision: 657699
URL: http://svn.apache.org/viewvc?rev=657699&view=rev
Log:
generics cleanup
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/EnumeratedType.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/Generics.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/PackageName.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/Packages.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/AbstractStringList.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/StringValue.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/Strings.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/interpolator/MapVariableInterpolator.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/CssTemplate.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/JavaScriptTemplate.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/PackagedTextTemplate.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/TextTemplate.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateDecorator.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateHeaderContributor.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateLink.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateSharedResourceFactory.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/EnumeratedType.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/EnumeratedType.java?rev=657699&r1=657698&r2=657699&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/EnumeratedType.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/EnumeratedType.java
Sun May 18 17:01:44 2008
@@ -20,7 +20,6 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
import org.apache.wicket.util.string.StringValue;
@@ -41,7 +40,7 @@
*/
private static final long serialVersionUID = 1L;
/** Map of type values by class */
- private static final Map<String, List> valueListByClass = new
ConcurrentHashMap<String, List>();
+ private static final Map<String, List<EnumeratedType>> valueListByClass
= Generics.newConcurrentHashMap();
/**
* Constructor.
@@ -64,7 +63,7 @@
* The enumerated type subclass to get values for
* @return List of all values of the given subclass
*/
- public static List<EnumeratedType> getValues(final Class< ? extends
EnumeratedType> c)
+ public static List<EnumeratedType> getValues(final Class<? extends
EnumeratedType> c)
{
// Get values for class
List<EnumeratedType> valueList =
valueListByClass.get(c.getName());
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/Generics.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/Generics.java?rev=657699&r1=657698&r2=657699&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/Generics.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/Generics.java
Sun May 18 17:01:44 2008
@@ -18,6 +18,7 @@
import java.util.HashMap;
import java.util.Iterator;
+import java.util.concurrent.ConcurrentHashMap;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
@@ -42,7 +43,7 @@
* @return <code>delegate</code> iterator cast to proper generics type
*/
@SuppressWarnings("unchecked")
- public static <T> Iterator<T> iterator(Iterator< ? > delegate)
+ public static <T> Iterator<T> iterator(Iterator<?> delegate)
{
return (Iterator<T>)delegate;
}
@@ -55,7 +56,7 @@
* @return <code>model</code>
*/
@SuppressWarnings("unchecked")
- public static <T> IModel<T> model(Model< ? > model)
+ public static <T> IModel<T> model(Model<?> model)
{
return (IModel<T>)model;
}
@@ -65,11 +66,37 @@
*
* @param <K>
* @param <V>
- * @return
+ * @return new hash map
*/
public static <K, V> HashMap<K, V> newHashMap()
{
return new HashMap<K, V>();
}
+ /**
+ * Creates a new ConcurrentHashMap
+ *
+ * @param <K>
+ * @param <V>
+ * @return new hash map
+ */
+ public static <K, V> ConcurrentHashMap<K, V> newConcurrentHashMap()
+ {
+ return new ConcurrentHashMap<K, V>();
+ }
+
+ /**
+ * Creates a new ConcurrentHashMap
+ *
+ * @param <K>
+ * @param <V>
+ * @param initialCapacity
+ * initial capacity
+ * @return new hash map
+ */
+ public static <K, V> ConcurrentHashMap<K, V> newConcurrentHashMap(int
initialCapacity)
+ {
+ return new ConcurrentHashMap<K, V>(initialCapacity);
+ }
+
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java?rev=657699&r1=657698&r2=657699&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java
Sun May 18 17:01:44 2008
@@ -101,10 +101,11 @@
private static final class ReplaceObjectInputStream extends
ObjectInputStream
{
private final ClassLoader classloader;
- private final HashMap replacedComponents;
+ private final HashMap<String, Component<?>> replacedComponents;
- private ReplaceObjectInputStream(InputStream in, HashMap
replacedComponents,
- ClassLoader classloader) throws IOException
+ private ReplaceObjectInputStream(InputStream in,
+ HashMap<String, Component<?>> replacedComponents,
ClassLoader classloader)
+ throws IOException
{
super(in);
this.replacedComponents = replacedComponents;
@@ -116,7 +117,7 @@
// bundle, i.e.
// The classes can be resolved by OSGI classresolver
implementation
@Override
- protected Class resolveClass(ObjectStreamClass desc) throws
IOException,
+ protected Class<?> resolveClass(ObjectStreamClass desc) throws
IOException,
ClassNotFoundException
{
String className = desc.getName();
@@ -135,7 +136,7 @@
IApplicationSettings applicationSettings =
application.getApplicationSettings();
IClassResolver classResolver =
applicationSettings.getClassResolver();
- Class candidate = null;
+ Class<?> candidate = null;
try
{
candidate =
classResolver.resolveClass(className);
@@ -168,10 +169,10 @@
private static final class ReplaceObjectOutputStream extends
ObjectOutputStream
{
- private final HashMap replacedComponents;
+ private final HashMap<String, Component<?>> replacedComponents;
- private ReplaceObjectOutputStream(OutputStream out, HashMap
replacedComponents)
- throws IOException
+ private ReplaceObjectOutputStream(OutputStream out,
+ HashMap<String, Component<?>> replacedComponents)
throws IOException
{
super(out);
this.replacedComponents = replacedComponents;
@@ -183,8 +184,9 @@
{
if (obj instanceof Component)
{
- String name = ((Component)obj).getPath();
- replacedComponents.put(name, obj);
+ final Component<?> component =
(Component<?>)obj;
+ String name = component.getPath();
+ replacedComponents.put(name, component);
return name;
}
return super.replaceObject(obj);
@@ -237,7 +239,7 @@
private static final int SHORT = 3;
/** defaults for primitives. */
- private static final HashMap primitiveDefaults = new HashMap();
+ private static final HashMap<Class<?>, Object> primitiveDefaults =
Generics.newHashMap();
/**
* The default object stream factory to use. Keep this as a static here
opposed to in
@@ -283,7 +285,7 @@
{
return BigDecimal.valueOf(0L);
}
- Class c = value.getClass();
+ Class<?> c = value.getClass();
if (c == BigDecimal.class)
{
return (BigDecimal)value;
@@ -322,7 +324,7 @@
{
return BigInteger.valueOf(0L);
}
- Class c = value.getClass();
+ Class<?> c = value.getClass();
if (c == BigInteger.class)
{
return (BigInteger)value;
@@ -361,7 +363,7 @@
{
return false;
}
- Class c = value.getClass();
+ Class<?> c = value.getClass();
if (c == Boolean.class)
{
return ((Boolean)value).booleanValue();
@@ -436,7 +438,7 @@
try
{
final ByteArrayOutputStream out = new
ByteArrayOutputStream(256);
- final HashMap replacedObjects = new HashMap();
+ final HashMap<String, Component<?>>
replacedObjects = Generics.newHashMap();
ObjectOutputStream oos = new
ReplaceObjectOutputStream(out, replacedObjects);
oos.writeObject(object);
ObjectInputStream ois = new
ReplaceObjectInputStream(new ByteArrayInputStream(
@@ -482,7 +484,7 @@
// This override is required to resolve
classes inside in different bundle, i.e.
// The classes can be resolved by OSGI
classresolver implementation
@Override
- protected Class
resolveClass(ObjectStreamClass desc) throws IOException,
+ protected Class<?>
resolveClass(ObjectStreamClass desc) throws IOException,
ClassNotFoundException
{
String className =
desc.getName();
@@ -503,7 +505,7 @@
IApplicationSettings
applicationSettings = application.getApplicationSettings();
IClassResolver classResolver =
applicationSettings.getClassResolver();
- Class candidate = null;
+ Class<?> candidate = null;
try
{
candidate =
classResolver.resolveClass(className);
@@ -618,6 +620,9 @@
* This method also detects when arrays are being converted and
converts the components of one
* array to the type of the other.
*
+ * @param <T>
+ * type to convert to
+ *
* @param value
* an object to be converted to the given type
* @param toType
@@ -634,7 +639,7 @@
/* If array -> array then convert components of array
individually */
if (value.getClass().isArray() && toType.isArray())
{
- Class< ? > componentType =
toType.getComponentType();
+ Class<?> componentType =
toType.getComponentType();
result = Array.newInstance(componentType,
Array.getLength(value));
for (int i = 0, icount =
Array.getLength(value); i < icount; i++)
@@ -715,7 +720,7 @@
{
return 0.0;
}
- Class c = value.getClass();
+ Class<?> c = value.getClass();
if (c.getSuperclass() == Number.class)
{
return ((Number)value).doubleValue();
@@ -837,7 +842,7 @@
{
if (value != null)
{
- Class c = value.getClass();
+ Class<?> c = value.getClass();
if (c == Integer.class)
{
return INT;
@@ -976,7 +981,7 @@
{
return 0L;
}
- Class c = value.getClass();
+ Class<?> c = value.getClass();
if (c.getSuperclass() == Number.class)
{
return ((Number)value).longValue();
@@ -1006,7 +1011,7 @@
{
try
{
- Class c = Classes.resolveClass(className);
+ Class<?> c = Classes.resolveClass(className);
if (c == null)
{
throw new
WicketRuntimeException("Unable to create " + className);
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/PackageName.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/PackageName.java?rev=657699&r1=657698&r2=657699&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/PackageName.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/PackageName.java
Sun May 18 17:01:44 2008
@@ -36,7 +36,7 @@
* The class to get a PackageName object for
* @return The PackageName object
*/
- public static PackageName forClass(final Class c)
+ public static PackageName forClass(final Class<?> c)
{
return new PackageName(Packages.extractPackageName(c));
}
@@ -65,11 +65,12 @@
/**
* @see java.lang.Object#equals(java.lang.Object)
*/
+ @Override
public boolean equals(Object that)
{
if (that instanceof PackageName)
{
- return ((PackageName)that).name.equals(this.name);
+ return ((PackageName)that).name.equals(name);
}
return false;
}
@@ -85,6 +86,7 @@
/**
* @see java.lang.Object#toString()
*/
+ @Override
public String toString()
{
return name;
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/Packages.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/Packages.java?rev=657699&r1=657698&r2=657699&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/Packages.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/Packages.java
Sun May 18 17:01:44 2008
@@ -38,7 +38,7 @@
* The relative path to the class
* @return The absolute path
*/
- public static String absolutePath(final Class p, final String
relativePath)
+ public static String absolutePath(final Class<?> p, final String
relativePath)
{
String packName = extractPackageName(p);
return absolutePath(packName, relativePath);
@@ -124,7 +124,7 @@
* the class
* @return the package name
*/
- public static String extractPackageName(final Class forClass)
+ public static String extractPackageName(final Class<?> forClass)
{
String classname = forClass.getName();
String parent = parent(classname);
@@ -163,7 +163,7 @@
* the class
* @return the scope string
*/
- public static String resolveScope(final Class forClass)
+ public static String resolveScope(final Class<?> forClass)
{
String packName = extractPackageName(forClass);
return packName.replace('.', '/');
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/AbstractStringList.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/AbstractStringList.java?rev=657699&r1=657698&r2=657699&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/AbstractStringList.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/AbstractStringList.java
Sun May 18 17:01:44 2008
@@ -93,13 +93,13 @@
*
* @return An array containing exactly this sequence of Strings
*/
- public final List toList()
+ public final List<String> toList()
{
// Get number of Strings
final int size = size();
// Allocate list of exactly the right size
- final List strings = new ArrayList(size);
+ final List<String> strings = new ArrayList<String>(size);
// Add strings to list
for (int i = 0; i < size; i++)
@@ -190,6 +190,7 @@
*
* @return String version of this object
*/
+ @Override
public String toString()
{
return "[" + join() + "]";
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/StringValue.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/StringValue.java?rev=657699&r1=657698&r2=657699&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/StringValue.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/StringValue.java
Sun May 18 17:01:44 2008
@@ -303,7 +303,7 @@
* @return The converted value
* @throws StringValueConversionException
*/
- public final Object to(final Class type) throws
StringValueConversionException
+ public final Object to(final Class<?> type) throws
StringValueConversionException
{
if (type == String.class)
{
@@ -680,6 +680,7 @@
/**
* @return The string value
*/
+ @Override
public final String toString()
{
return text;
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/Strings.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/Strings.java?rev=657699&r1=657698&r2=657699&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/Strings.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/Strings.java
Sun May 18 17:01:44 2008
@@ -63,9 +63,9 @@
static
{
- LINE_SEPARATOR = (String)AccessController.doPrivileged(new
PrivilegedAction()
+ LINE_SEPARATOR = AccessController.doPrivileged(new
PrivilegedAction<String>()
{
- public Object run()
+ public String run()
{
return System.getProperty("line.separator");
}
@@ -1138,9 +1138,9 @@
* the location where the component was created or added in
the java code.
* @return a string giving the line precise location where the
component was added or created.
*/
- public static String toString(final Component< ? > component, final
Throwable location)
+ public static String toString(final Component<?> component, final
Throwable location)
{
- Class componentClass = component.getClass();
+ Class<?> componentClass = component.getClass();
// try to find the component type, if it is an inner element,
then get
// the parent component.
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/interpolator/MapVariableInterpolator.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/interpolator/MapVariableInterpolator.java?rev=657699&r1=657698&r2=657699&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/interpolator/MapVariableInterpolator.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/interpolator/MapVariableInterpolator.java
Sun May 18 17:01:44 2008
@@ -30,7 +30,7 @@
public class MapVariableInterpolator extends VariableInterpolator
{
/** Map of variables */
- private Map variables;
+ private Map<?, ?> variables;
/**
* Constructor.
@@ -40,7 +40,7 @@
* @param variables
* the variables to substitute
*/
- public MapVariableInterpolator(final String string, final Map variables)
+ public MapVariableInterpolator(final String string, final Map<?, ?>
variables)
{
super(string);
this.variables = variables;
@@ -59,7 +59,7 @@
* <code>${varname}</code> string will be left in the
<code>String</code> so that
* multiple interpolators can be chained
*/
- public MapVariableInterpolator(String string, final Map variables,
+ public MapVariableInterpolator(String string, final Map<?, ?> variables,
boolean exceptionOnNullVarValue)
{
super(string, exceptionOnNullVarValue);
@@ -72,7 +72,7 @@
* @param variables
* the <code>Map</code> of variables
*/
- public final void setVariables(final Map variables)
+ public final void setVariables(final Map<?, ?> variables)
{
this.variables = variables;
}
@@ -84,6 +84,7 @@
* the variable name
* @return the value
*/
+ @Override
protected String getValue(final String variableName)
{
return Strings.toString(variables.get(variableName));
@@ -98,7 +99,7 @@
* the variables to substitute
* @return the interpolated <code>String</code>
*/
- public static String interpolate(String string, Map variables)
+ public static String interpolate(String string, Map<?, ?> variables)
{
return new MapVariableInterpolator(string,
variables).toString();
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/CssTemplate.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/CssTemplate.java?rev=657699&r1=657698&r2=657699&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/CssTemplate.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/CssTemplate.java
Sun May 18 17:01:44 2008
@@ -45,6 +45,7 @@
/**
* @see
org.apache.wicket.util.template.TextTemplateDecorator#getBeforeTemplateContents()
*/
+ @Override
public String getBeforeTemplateContents()
{
return CssUtils.INLINE_OPEN_TAG;
@@ -53,6 +54,7 @@
/**
* @see
org.apache.wicket.util.template.TextTemplateDecorator#getAfterTemplateContents()
*/
+ @Override
public String getAfterTemplateContents()
{
return CssUtils.INLINE_CLOSE_TAG;
@@ -66,7 +68,8 @@
* ignored
* @return <code>this</code>, for chaining purposes
*/
- public TextTemplate interpolate(final Map variables)
+ @Override
+ public TextTemplate interpolate(final Map<String, Object> variables)
{
return this;
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/JavaScriptTemplate.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/JavaScriptTemplate.java?rev=657699&r1=657698&r2=657699&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/JavaScriptTemplate.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/JavaScriptTemplate.java
Sun May 18 17:01:44 2008
@@ -45,6 +45,7 @@
/**
* @see
org.apache.wicket.util.template.TextTemplateDecorator#getBeforeTemplateContents()
*/
+ @Override
public String getBeforeTemplateContents()
{
return JavascriptUtils.SCRIPT_OPEN_TAG;
@@ -53,6 +54,7 @@
/**
* @see
org.apache.wicket.util.template.TextTemplateDecorator#getAfterTemplateContents()
*/
+ @Override
public String getAfterTemplateContents()
{
return JavascriptUtils.SCRIPT_CLOSE_TAG;
@@ -66,7 +68,8 @@
* ignored
* @return <code>this</code>, for chaining purposes
*/
- public TextTemplate interpolate(final Map variables)
+ @Override
+ public TextTemplate interpolate(final Map<String, Object> variables)
{
return this;
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/PackagedTextTemplate.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/PackagedTextTemplate.java?rev=657699&r1=657698&r2=657699&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/PackagedTextTemplate.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/PackagedTextTemplate.java
Sun May 18 17:01:44 2008
@@ -59,7 +59,7 @@
private final String className;
- CachedTextTemplateKey(Class clazz, String path)
+ CachedTextTemplateKey(Class<?> clazz, String path)
{
className = clazz.getName();
}
@@ -108,7 +108,7 @@
* @param fileName
* the name of the file, relative to the <code>clazz</code>
position
*/
- public PackagedTextTemplate(final Class clazz, final String fileName)
+ public PackagedTextTemplate(final Class<?> clazz, final String fileName)
{
this(clazz, fileName, "text");
}
@@ -124,7 +124,8 @@
* @param contentType
* the mime type of this resource, such as
"<code>image/jpeg</code>" or "<code>text/html</code>"
*/
- public PackagedTextTemplate(final Class clazz, final String fileName,
final String contentType)
+ public PackagedTextTemplate(final Class<?> clazz, final String fileName,
+ final String contentType)
{
this(clazz, fileName, contentType, null);
}
@@ -142,8 +143,8 @@
* @param encoding
* the file's encoding, for example, "<code>UTF-8</code>"
*/
- public PackagedTextTemplate(final Class clazz, final String fileName,
final String contentType,
- final String encoding)
+ public PackagedTextTemplate(final Class<?> clazz, final String fileName,
+ final String contentType, final String encoding)
{
super(contentType);
@@ -227,7 +228,7 @@
* @return this for chaining
*/
@Override
- public final TextTemplate interpolate(Map variables)
+ public final TextTemplate interpolate(Map<String, Object> variables)
{
if (variables != null)
{
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/TextTemplate.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/TextTemplate.java?rev=657699&r1=657698&r2=657699&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/TextTemplate.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/TextTemplate.java
Sun May 18 17:01:44 2008
@@ -24,9 +24,9 @@
/**
* Represents a text template that can do variable interpolation.
- *
+ *
* @see org.apache.wicket.util.string.interpolator.VariableInterpolator
- *
+ *
* @author Eelco Hillenius
* @author Jonathan Locke
* @since 1.2.6
@@ -64,7 +64,7 @@
* the variables to interpolate
* @return the result of the interpolation
*/
- public String asString(Map variables)
+ public String asString(Map<String, Object> variables)
{
if (variables != null)
{
@@ -76,6 +76,7 @@
/**
* @see
org.apache.wicket.util.resource.AbstractResourceStream#asString()
*/
+ @Override
public String asString()
{
return getString();
@@ -86,6 +87,7 @@
*
* @return the <code>String</code> resource
*/
+ @Override
public abstract String getString();
/**
@@ -95,5 +97,5 @@
* variables to interpolate into this
<code>TextTemplate</code>
* @return <code>this</code>, for chaining purposes
*/
- public abstract TextTemplate interpolate(Map variables);
+ public abstract TextTemplate interpolate(Map<String, Object> variables);
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateDecorator.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateDecorator.java?rev=657699&r1=657698&r2=657699&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateDecorator.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateDecorator.java
Sun May 18 17:01:44 2008
@@ -65,6 +65,7 @@
* [EMAIL PROTECTED] #getAfterTemplateContents()}
* @see org.apache.wicket.util.template.TextTemplate#asString()
*/
+ @Override
public String asString()
{
StringBuffer b = new StringBuffer();
@@ -81,7 +82,8 @@
* [EMAIL PROTECTED] #getAfterTemplateContents()}.
* @see
org.apache.wicket.util.template.TextTemplate#asString(java.util.Map)
*/
- public String asString(Map variables)
+ @Override
+ public String asString(Map<String, Object> variables)
{
StringBuffer b = new StringBuffer();
b.append(getBeforeTemplateContents());
@@ -115,6 +117,7 @@
/**
* @see
org.apache.wicket.util.resource.AbstractStringResourceStream#close()
*/
+ @Override
public void close() throws IOException
{
decorated.close();
@@ -123,6 +126,7 @@
/**
* @see java.lang.Object#equals(java.lang.Object)
*/
+ @Override
public boolean equals(Object obj)
{
return decorated.equals(obj);
@@ -131,6 +135,7 @@
/**
* @see
org.apache.wicket.util.resource.AbstractStringResourceStream#getContentType()
*/
+ @Override
public String getContentType()
{
return decorated.getContentType();
@@ -139,6 +144,7 @@
/**
* @see
org.apache.wicket.util.resource.AbstractStringResourceStream#getInputStream()
*/
+ @Override
public InputStream getInputStream() throws
ResourceStreamNotFoundException
{
return decorated.getInputStream();
@@ -147,6 +153,7 @@
/**
* @see
org.apache.wicket.util.resource.AbstractResourceStream#getLocale()
*/
+ @Override
public Locale getLocale()
{
return decorated.getLocale();
@@ -155,6 +162,7 @@
/**
* @see java.lang.Object#hashCode()
*/
+ @Override
public int hashCode()
{
return decorated.hashCode();
@@ -163,6 +171,7 @@
/**
* @see
org.apache.wicket.util.resource.AbstractStringResourceStream#lastModifiedTime()
*/
+ @Override
public Time lastModifiedTime()
{
return decorated.lastModifiedTime();
@@ -171,6 +180,7 @@
/**
* @see org.apache.wicket.util.resource.IResourceStream#length()
*/
+ @Override
public long length()
{
return decorated.length();
@@ -179,6 +189,7 @@
/**
* @see
org.apache.wicket.util.resource.AbstractResourceStream#setCharset(java.nio.charset.Charset)
*/
+ @Override
public void setCharset(Charset charset)
{
decorated.setCharset(charset);
@@ -187,6 +198,7 @@
/**
* @see
org.apache.wicket.util.resource.AbstractStringResourceStream#setLastModified(org.apache.wicket.util.time.Time)
*/
+ @Override
public void setLastModified(Time lastModified)
{
decorated.setLastModified(lastModified);
@@ -195,6 +207,7 @@
/**
* @see
org.apache.wicket.util.resource.AbstractResourceStream#setLocale(java.util.Locale)
*/
+ @Override
public void setLocale(Locale locale)
{
decorated.setLocale(locale);
@@ -203,6 +216,7 @@
/**
* @see org.apache.wicket.util.template.TextTemplate#getString()
*/
+ @Override
public String getString()
{
return decorated.getString();
@@ -211,6 +225,7 @@
/**
* @see java.lang.Object#toString()
*/
+ @Override
public String toString()
{
return decorated.toString();
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateHeaderContributor.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateHeaderContributor.java?rev=657699&r1=657698&r2=657699&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateHeaderContributor.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateHeaderContributor.java
Sun May 18 17:01:44 2008
@@ -37,7 +37,7 @@
/**
* This model holds the template and returns the interpolation of the
template.
*/
- private static final class TemplateModel extends LoadableDetachableModel
+ private static final class TemplateModel extends
LoadableDetachableModel<String>
{
private static final long serialVersionUID = 1L;
@@ -50,7 +50,7 @@
* The <code>IModel</code> that holds any variables for
interpolation. It should return a
* [EMAIL PROTECTED] Map} or <code>null</code>.
*/
- private final IModel variablesModel;
+ private final IModel<Map<String, Object>> variablesModel;
/**
* Constructor.
@@ -61,7 +61,7 @@
* the <code>IModel</code> that holds any variables
for interpolation. It
* should return a [EMAIL PROTECTED] Map} or
<code>null</code>.
*/
- protected TemplateModel(TextTemplate template, IModel
variablesModel)
+ protected TemplateModel(TextTemplate template,
IModel<Map<String, Object>> variablesModel)
{
if (template == null)
{
@@ -75,6 +75,7 @@
/**
* @see org.apache.wicket.model.IModel#detach()
*/
+ @Override
public void detach()
{
if (variablesModel != null)
@@ -84,11 +85,12 @@
super.detach();
}
- protected Object load()
+ @Override
+ protected String load()
{
if (variablesModel != null)
{
- Map variables = (Map)variablesModel.getObject();
+ Map<String, Object> variables =
variablesModel.getObject();
if (variables != null)
{
return template.asString(variables);
@@ -109,7 +111,8 @@
* the variables to interpolate
* @return the <code>TextTemplateHeaderContributor</code> instance
*/
- public static TextTemplateHeaderContributor forCss(TextTemplate
template, IModel variablesModel)
+ public static TextTemplateHeaderContributor forCss(TextTemplate
template,
+ IModel<Map<String, Object>> variablesModel)
{
return new TextTemplateHeaderContributor(new
CssTemplate(template), variablesModel);
}
@@ -129,8 +132,8 @@
* the variables to interpolate
* @return the <code>TextTemplateHeaderContributor</code> instance
*/
- public static TextTemplateHeaderContributor forCss(final Class clazz,
final String fileName,
- IModel variablesModel)
+ public static TextTemplateHeaderContributor forCss(final Class<?>
clazz, final String fileName,
+ IModel<Map<String, Object>> variablesModel)
{
return forCss(new PackagedTextTemplate(clazz, fileName),
variablesModel);
}
@@ -147,7 +150,7 @@
* @return the <code>TextTemplateHeaderContributor</code> instance
*/
public static TextTemplateHeaderContributor forJavaScript(TextTemplate
template,
- IModel variablesModel)
+ IModel<Map<String, Object>> variablesModel)
{
return new TextTemplateHeaderContributor(new
JavaScriptTemplate(template), variablesModel);
}
@@ -167,8 +170,8 @@
* the variables to interpolate
* @return the <code>TextTemplateHeaderContributor</code> instance
*/
- public static TextTemplateHeaderContributor forJavaScript(final Class
clazz,
- final String fileName, IModel variablesModel)
+ public static TextTemplateHeaderContributor forJavaScript(final
Class<?> clazz,
+ final String fileName, IModel<Map<String, Object>>
variablesModel)
{
return forJavaScript(new PackagedTextTemplate(clazz, fileName),
variablesModel);
}
@@ -181,7 +184,8 @@
* @param variablesModel
* optional <code>IModel</code> for variable substitution
*/
- protected TextTemplateHeaderContributor(TextTemplate template, IModel
variablesModel)
+ protected TextTemplateHeaderContributor(TextTemplate template,
+ IModel<Map<String, Object>> variablesModel)
{
super(new TemplateModel(template, variablesModel));
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateLink.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateLink.java?rev=657699&r1=657698&r2=657699&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateLink.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateLink.java
Sun May 18 17:01:44 2008
@@ -28,7 +28,7 @@
* @author Jonathan Locke
* @since 1.2.6
*/
-public class TextTemplateLink extends ResourceLink
+public class TextTemplateLink extends ResourceLink<Void>
{
private static final long serialVersionUID = 1L;
@@ -43,7 +43,7 @@
* variables to interpolate into the template held by the
shared resource factory
*/
public TextTemplateLink(final String id, final
TextTemplateSharedResourceFactory factory,
- final Map variables)
+ final Map<String, Object> variables)
{
super(id, factory.resourceReference(variables));
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateSharedResourceFactory.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateSharedResourceFactory.java?rev=657699&r1=657698&r2=657699&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateSharedResourceFactory.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateSharedResourceFactory.java
Sun May 18 17:01:44 2008
@@ -58,7 +58,7 @@
/**
* Shared resource scope.
*/
- private final WeakReference/* <Class> */scopeRef;
+ private final WeakReference<Class<?>> scopeRef;
/**
* <code>TextTemplate</code> to use to create resources.
@@ -84,10 +84,10 @@
* @param scope
* the scope in shared resources at which to add resources
*/
- public TextTemplateSharedResourceFactory(final TextTemplate template,
final Class scope)
+ public TextTemplateSharedResourceFactory(final TextTemplate template,
final Class<?> scope)
{
this.template = template;
- scopeRef = new WeakReference(scope);
+ scopeRef = new WeakReference<Class<?>>(scope);
}
/**
@@ -99,7 +99,7 @@
* @return a <code>ResourceReference</code> to the template encoded as
a resource with the
* given variables interpolated
*/
- public ResourceReference resourceReference(final Map variables)
+ public ResourceReference resourceReference(final Map<String, Object>
variables)
{
final String uniqueName = sharedResourceName(variables);
final String templateValue = template.asString(variables);
@@ -114,17 +114,20 @@
/**
* @see
org.apache.wicket.Resource#getResourceStream()
*/
+ @Override
public IResourceStream getResourceStream()
{
return new
AbstractStringResourceStream()
{
private static final long
serialVersionUID = 1L;
+ @Override
protected String getString()
{
return templateValue;
}
+ @Override
public long length()
{
return
templateValue.length();
@@ -134,7 +137,7 @@
};
sharedResources.add(uniqueName, newResource);
}
- return new ResourceReference((Class)scopeRef.get(), uniqueName);
+ return new ResourceReference(scopeRef.get(), uniqueName);
}
/**
@@ -144,10 +147,10 @@
* variables that parameterize the linked-to resource
* @return a unique name for the variables to use as a resource key
*/
- protected String sharedResourceName(final Map variables)
+ protected String sharedResourceName(final Map<String, Object> variables)
{
final StringBuffer buffer = new StringBuffer();
- for (final Iterator iterator = variables.values().iterator();
iterator.hasNext();)
+ for (final Iterator<Object> iterator =
variables.values().iterator(); iterator.hasNext();)
{
final String value = iterator.next().toString();
buffer.append(encodeValue(value));
