Author: jdonnerstag
Date: Sat Sep 26 10:48:04 2009
New Revision: 819108
URL: http://svn.apache.org/viewvc?rev=819108&view=rev
Log:
fixed: Widen type-constraint on TextTemplate.interpolate(Map<String, Object>
variables)
Issue: WICKET-2409
Modified:
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/template/CssTemplate.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/CssTemplate.java?rev=819108&r1=819107&r2=819108&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
Sat Sep 26 10:48:04 2009
@@ -69,7 +69,7 @@
* @return <code>this</code>, for chaining purposes
*/
@Override
- public TextTemplate interpolate(final Map<String, Object> variables)
+ public TextTemplate interpolate(final Map<String, ?> 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=819108&r1=819107&r2=819108&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
Sat Sep 26 10:48:04 2009
@@ -69,7 +69,7 @@
* @return <code>this</code>, for chaining purposes
*/
@Override
- public TextTemplate interpolate(final Map<String, Object> variables)
+ public TextTemplate interpolate(final Map<String, ?> 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=819108&r1=819107&r2=819108&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
Sat Sep 26 10:48:04 2009
@@ -237,7 +237,7 @@
* @return this for chaining
*/
@Override
- public final TextTemplate interpolate(Map<String, Object> variables)
+ public final TextTemplate interpolate(Map<String, ?> 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=819108&r1=819107&r2=819108&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
Sat Sep 26 10:48:04 2009
@@ -65,7 +65,7 @@
* the variables to interpolate
* @return the result of the interpolation
*/
- public String asString(Map<String, Object> variables)
+ public String asString(Map<String, ?> variables)
{
if (variables != null)
{
@@ -98,5 +98,5 @@
* variables to interpolate into this
<code>TextTemplate</code>
* @return <code>this</code>, for chaining purposes
*/
- public abstract TextTemplate interpolate(Map<String, Object> variables);
+ public abstract TextTemplate interpolate(Map<String, ?> 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=819108&r1=819107&r2=819108&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
Sat Sep 26 10:48:04 2009
@@ -83,7 +83,7 @@
* @see
org.apache.wicket.util.template.TextTemplate#asString(java.util.Map)
*/
@Override
- public String asString(Map<String, Object> variables)
+ public String asString(Map<String, ?> variables)
{
StringBuffer b = new StringBuffer();
b.append(getBeforeTemplateContents());
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=819108&r1=819107&r2=819108&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
Sat Sep 26 10:48:04 2009
@@ -50,7 +50,7 @@
* The <code>IModel</code> that holds any variables for
interpolation. It should return a
* {...@link Map} or <code>null</code>.
*/
- private final IModel<Map<String, Object>> variablesModel;
+ private final IModel<Map<String, ?>> variablesModel;
/**
* Constructor.
@@ -61,7 +61,7 @@
* the <code>IModel</code> that holds any variables
for interpolation. It should
* return a {...@link Map} or <code>null</code>.
*/
- protected TemplateModel(TextTemplate template,
IModel<Map<String, Object>> variablesModel)
+ protected TemplateModel(TextTemplate template,
IModel<Map<String, ?>> variablesModel)
{
if (template == null)
{
@@ -90,7 +90,7 @@
{
if (variablesModel != null)
{
- Map<String, Object> variables =
variablesModel.getObject();
+ Map<String, ?> variables =
variablesModel.getObject();
if (variables != null)
{
return template.asString(variables);
@@ -112,7 +112,7 @@
* @return the <code>TextTemplateHeaderContributor</code> instance
*/
public static TextTemplateHeaderContributor forCss(TextTemplate
template,
- IModel<Map<String, Object>> variablesModel)
+ IModel<Map<String, ?>> variablesModel)
{
return new TextTemplateHeaderContributor(new
CssTemplate(template), variablesModel);
}
@@ -133,7 +133,7 @@
* @return the <code>TextTemplateHeaderContributor</code> instance
*/
public static TextTemplateHeaderContributor forCss(final Class<?>
clazz, final String fileName,
- IModel<Map<String, Object>> variablesModel)
+ IModel<Map<String, ?>> variablesModel)
{
return forCss(new PackagedTextTemplate(clazz, fileName),
variablesModel);
}
@@ -150,7 +150,7 @@
* @return the <code>TextTemplateHeaderContributor</code> instance
*/
public static TextTemplateHeaderContributor forJavaScript(TextTemplate
template,
- IModel<Map<String, Object>> variablesModel)
+ IModel<Map<String, ?>> variablesModel)
{
return new TextTemplateHeaderContributor(new
JavaScriptTemplate(template), variablesModel);
}
@@ -171,7 +171,7 @@
* @return the <code>TextTemplateHeaderContributor</code> instance
*/
public static TextTemplateHeaderContributor forJavaScript(final
Class<?> clazz,
- final String fileName, IModel<Map<String, Object>>
variablesModel)
+ final String fileName, IModel<Map<String, ?>> variablesModel)
{
return forJavaScript(new PackagedTextTemplate(clazz, fileName),
variablesModel);
}
@@ -185,7 +185,7 @@
* optional <code>IModel</code> for variable substitution
*/
protected TextTemplateHeaderContributor(TextTemplate template,
- IModel<Map<String, Object>> variablesModel)
+ IModel<Map<String, ?>> 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=819108&r1=819107&r2=819108&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
Sat Sep 26 10:48:04 2009
@@ -45,7 +45,7 @@
* variables to interpolate into the template held by the
shared resource factory
*/
public TextTemplateLink(final String id, final
TextTemplateSharedResourceFactory factory,
- final Map<String, Object> variables)
+ final Map<String, ?> 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=819108&r1=819107&r2=819108&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
Sat Sep 26 10:48:04 2009
@@ -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<String, Object>
variables)
+ public ResourceReference resourceReference(final Map<String, ?>
variables)
{
final String uniqueName = sharedResourceName(variables);
final String templateValue = template.asString(variables);
@@ -142,10 +142,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<String, Object> variables)
+ protected String sharedResourceName(final Map<String, ?> variables)
{
final StringBuffer buffer = new StringBuffer();
- for (final Iterator<Object> iterator =
variables.values().iterator(); iterator.hasNext();)
+ for (final Iterator<?> iterator =
variables.values().iterator(); iterator.hasNext();)
{
final String value = iterator.next().toString();
buffer.append(encodeValue(value));
