Author: jdonnerstag
Date: Sun Apr 13 02:21:04 2008
New Revision: 647547
URL: http://svn.apache.org/viewvc?rev=647547&view=rev
Log:
generics
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/ContainerInfo.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/DefaultMarkupCacheKeyProvider.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/DefaultMarkupResourceStreamProvider.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/IMarkupCache.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/IMarkupCacheKeyProvider.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/IMarkupResourceStreamProvider.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/Markup.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupCache.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupParser.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/AjaxServerAndClientTimeFilter.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/CompressedPackageResource.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/ContainerWithAssociatedMarkupHelper.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/HeaderPartContainer.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/IHeaderPartContainerProvider.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/IPackageResourceGuard.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/JavascriptPackageResource.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/PackageResource.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebMarkupContainer.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebMarkupContainerWithAssociatedMarkup.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebPage.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HeadForceTagIdHandler.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/ContainerInfo.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/ContainerInfo.java?rev=647547&r1=647546&r2=647547&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/ContainerInfo.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/ContainerInfo.java
Sun Apr 13 02:21:04 2008
@@ -19,6 +19,7 @@
import java.lang.ref.WeakReference;
import java.util.Locale;
+import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
/**
@@ -31,7 +32,7 @@
*/
public class ContainerInfo
{
- private final WeakReference/* <Class> */containerClassRef;
+ private final WeakReference<Class< ? extends Component>>
containerClassRef;
private final Locale locale;
private final String style;
private final String variation;
@@ -43,10 +44,10 @@
* @param container
* The container to create the information from
*/
- public ContainerInfo(final MarkupContainer container)
+ public ContainerInfo(final MarkupContainer< ? > container)
{
- this(container.getClass(), container.getLocale(),
container.getStyle(), null, container
- .getMarkupType());
+ this(container.getClass(), container.getLocale(),
container.getStyle(), null,
+ container.getMarkupType());
}
/**
@@ -58,11 +59,11 @@
* @param variation
* @param fileExtension
*/
- public ContainerInfo(final Class containerClass, final Locale locale,
final String style,
- final String variation, final String fileExtension)
+ public ContainerInfo(final Class< ? extends Component> containerClass,
final Locale locale,
+ final String style, final String variation, final String
fileExtension)
{
super();
- this.containerClassRef = new WeakReference(containerClass);
+ containerClassRef = new WeakReference<Class< ? extends
Component>>(containerClass);
this.locale = locale;
this.style = style;
this.variation = variation;
@@ -73,9 +74,9 @@
*
* @return The container class
*/
- public Class getContainerClass()
+ public Class< ? extends Component> getContainerClass()
{
- return (Class)containerClassRef.get();
+ return containerClassRef.get();
}
/**
@@ -118,9 +119,9 @@
*
* @see java.lang.Object#toString()
*/
+ @Override
public String toString()
{
- return ((Class)containerClassRef.get()).getName() + ":" +
locale + ":" + style + ":" +
- fileExtension;
+ return containerClassRef.get().getName() + ":" + locale + ":" +
style + ":" + fileExtension;
}
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/DefaultMarkupCacheKeyProvider.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/DefaultMarkupCacheKeyProvider.java?rev=647547&r1=647546&r2=647547&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/DefaultMarkupCacheKeyProvider.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/DefaultMarkupCacheKeyProvider.java
Sun Apr 13 02:21:04 2008
@@ -48,7 +48,7 @@
* @return Key that uniquely identifies any markup that might be
associated with this markup
* container.
*/
- public String getCacheKey(final MarkupContainer container, final Class
clazz)
+ public String getCacheKey(final MarkupContainer< ? > container, final
Class< ? > clazz)
{
final String classname = clazz.getName();
final Locale locale = container.getLocale();
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/DefaultMarkupResourceStreamProvider.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/DefaultMarkupResourceStreamProvider.java?rev=647547&r1=647546&r2=647547&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/DefaultMarkupResourceStreamProvider.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/DefaultMarkupResourceStreamProvider.java
Sun Apr 13 02:21:04 2008
@@ -36,8 +36,7 @@
public class DefaultMarkupResourceStreamProvider implements
IMarkupResourceStreamProvider
{
/** Log for reporting. */
- private static final Logger log = LoggerFactory
- .getLogger(DefaultMarkupResourceStreamProvider.class);
+ private static final Logger log =
LoggerFactory.getLogger(DefaultMarkupResourceStreamProvider.class);
/**
* Constructor.
@@ -62,12 +61,13 @@
* The container the markup should be associated with
* @return A IResourceStream if the resource was found
*/
- public IResourceStream getMarkupResourceStream(final MarkupContainer
container,
- Class containerClass)
+ public IResourceStream getMarkupResourceStream(final MarkupContainer< ?
> container,
+ Class< ? > containerClass)
{
// Get locator to search for the resource
- final IResourceStreamLocator locator =
Application.get().getResourceSettings()
- .getResourceStreamLocator();
+ final IResourceStreamLocator locator = Application.get()
+ .getResourceSettings()
+ .getResourceStreamLocator();
String style = container.getStyle();
Locale locale = container.getLocale();
@@ -80,13 +80,13 @@
{
String path = containerClass.getName().replace('.',
'/');
IResourceStream resourceStream =
locator.locate(container.getClass(), path, style,
- locale, ext);
+ locale, ext);
// Did we find it already?
if (resourceStream != null)
{
return new MarkupResourceStream(resourceStream,
new ContainerInfo(container),
- containerClass);
+ containerClass);
}
// Walk up the class hierarchy one level, if markup has
not
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/IMarkupCache.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/IMarkupCache.java?rev=647547&r1=647546&r2=647547&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/IMarkupCache.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/IMarkupCache.java
Sun Apr 13 02:21:04 2008
@@ -47,8 +47,8 @@
* reloaded. Whatever is in the cache, it will be ignored
* @return Markup resource
*/
- Markup getMarkup(final MarkupContainer< ? > container,
- final Class< ? extends MarkupContainer< ? >> clazz, final
boolean enforceReload);
+ Markup getMarkup(final MarkupContainer< ? > container, final Class< ? >
clazz,
+ final boolean enforceReload);
/**
* Gets a fresh markup stream that contains the (immutable) markup
resource for this class.
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/IMarkupCacheKeyProvider.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/IMarkupCacheKeyProvider.java?rev=647547&r1=647546&r2=647547&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/IMarkupCacheKeyProvider.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/IMarkupCacheKeyProvider.java
Sun Apr 13 02:21:04 2008
@@ -39,5 +39,5 @@
* The container the markup should be associated with
* @return A IResourceStream if the resource was found
*/
- String getCacheKey(final MarkupContainer container, Class
containerClass);
+ String getCacheKey(final MarkupContainer< ? > container, Class< ? >
containerClass);
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/IMarkupResourceStreamProvider.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/IMarkupResourceStreamProvider.java?rev=647547&r1=647546&r2=647547&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/IMarkupResourceStreamProvider.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/IMarkupResourceStreamProvider.java
Sun Apr 13 02:21:04 2008
@@ -48,5 +48,5 @@
* @return A IResourceStream if the resource was found
*/
IResourceStream getMarkupResourceStream(final MarkupContainer< ? >
container,
- Class< ? extends MarkupContainer< ? >> containerClass);
+ Class< ? > containerClass);
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/Markup.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/Markup.java?rev=647547&r1=647546&r2=647547&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/Markup.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/Markup.java Sun
Apr 13 02:21:04 2008
@@ -49,15 +49,13 @@
public static final Markup NO_MARKUP = new
Markup(MarkupResourceData.NO_MARKUP_RESOURCE_DATA);
/** The list of markup elements */
- private/* final */List markupElements;
+ private/* final */List<MarkupElement> markupElements;
/** The associated markup */
private final MarkupResourceData markupResourceData;
- /**
- * A cache which maps (componentPath + id) to the componentTags index
in the markup
- */
- private Map componentMap;
+ /** A cache which maps (componentPath + id) to the componentTags index
in the markup */
+ private Map<String, Integer> componentMap;
/**
* Used at markup load time to maintain the current component path (not
id) while adding markup
@@ -74,7 +72,7 @@
Markup(final MarkupResourceData markupResourceData)
{
this.markupResourceData = markupResourceData;
- markupElements = new ArrayList();
+ markupElements = new ArrayList<MarkupElement>();
}
/**
@@ -87,7 +85,7 @@
*/
public final MarkupElement get(final int index)
{
- return (MarkupElement)markupElements.get(index);
+ return markupElements.get(index);
}
/**
@@ -139,7 +137,7 @@
{
for (int i = 0; i < markupElements.size(); i++)
{
- MarkupElement elem =
(MarkupElement)markupElements.get(i);
+ MarkupElement elem = markupElements.get(i);
if (elem instanceof ComponentTag)
{
// Make the tag immutable
@@ -161,12 +159,12 @@
{
// Only if the tag has wicket:id="xx" and open or open-close
if ((tag.isOpen() || tag.isOpenClose()) &&
-
tag.getAttributes().containsKey(getMarkupResourceData().getWicketId()))
+
tag.getAttributes().containsKey(getMarkupResourceData().getWicketId()))
{
// Add the tag to the cache
if (componentMap == null)
{
- componentMap = new HashMap();
+ componentMap = new HashMap<String, Integer>();
}
/*
@@ -197,11 +195,11 @@
* @return componentPath
*/
private StringBuffer setComponentPathForTag(final StringBuffer
componentPath,
- final ComponentTag tag)
+ final ComponentTag tag)
{
// Only if the tag has wicket:id="xx" and open or open-close
if ((tag.isOpen() || tag.isOpenClose()) &&
-
tag.getAttributes().containsKey(markupResourceData.getWicketId()))
+
tag.getAttributes().containsKey(markupResourceData.getWicketId()))
{
// With open-close the path does not change. It
can/will not have
// children. The same is true for HTML tags like <br>
or <img>
@@ -236,7 +234,7 @@
{
// For example <wicket:message> does not have an id
if ((tag.getOpenTag() == null) ||
-
tag.getOpenTag().getAttributes().containsKey(markupResourceData.getWicketId()))
+
tag.getOpenTag().getAttributes().containsKey(markupResourceData.getWicketId()))
{
// Remove the last element from the component
path
int index = currentPath.lastIndexOf(":");
@@ -292,7 +290,7 @@
return -1;
}
- final Integer value = (Integer)componentMap.get(completePath);
+ final Integer value = componentMap.get(completePath);
if (value == null)
{
// not found
@@ -356,13 +354,14 @@
/**
* @return String representation of markup list
*/
+ @Override
public final String toString()
{
final AppendingStringBuffer buf = new
AppendingStringBuffer(400);
buf.append(markupResourceData.toString());
buf.append("\n");
- final Iterator iter = markupElements.iterator();
+ final Iterator<MarkupElement> iter = markupElements.iterator();
while (iter.hasNext())
{
buf.append(iter.next());
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupCache.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupCache.java?rev=647547&r1=647546&r2=647547&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupCache.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupCache.java
Sun Apr 13 02:21:04 2008
@@ -203,7 +203,7 @@
* @see
org.apache.wicket.markup.IMarkupCache#getMarkupStream(org.apache.wicket.MarkupContainer,
* boolean, boolean)
*/
- public final MarkupStream getMarkupStream(final MarkupContainer
container,
+ public final MarkupStream getMarkupStream(final MarkupContainer< ? >
container,
final boolean enforceReload, final boolean throwException)
{
if (container == null)
@@ -234,7 +234,7 @@
/**
* @see
org.apache.wicket.markup.IMarkupCache#hasAssociatedMarkup(org.apache.wicket.MarkupContainer)
*/
- public final boolean hasAssociatedMarkup(final MarkupContainer
container)
+ public final boolean hasAssociatedMarkup(final MarkupContainer< ? >
container)
{
return getMarkup(container, container.getClass(), false) !=
Markup.NO_MARKUP;
}
@@ -267,10 +267,10 @@
* @see
org.apache.wicket.markup.IMarkupCache#getMarkup(org.apache.wicket.MarkupContainer,
* java.lang.Class, boolean)
*/
- public final Markup getMarkup(final MarkupContainer container, final
Class clazz,
+ public final Markup getMarkup(final MarkupContainer< ? > container,
final Class< ? > clazz,
final boolean enforceReload)
{
- Class containerClass = clazz;
+ Class< ? > containerClass = clazz;
if (clazz == null)
{
containerClass = container.getClass();
@@ -338,7 +338,7 @@
* @param container
* @return Markup.NO_MARKUP
*/
- protected Markup onMarkupNotFound(final String cacheKey, final
MarkupContainer container)
+ protected Markup onMarkupNotFound(final String cacheKey, final
MarkupContainer< ? > container)
{
if (log.isDebugEnabled())
{
@@ -392,7 +392,8 @@
* @param container
* @return null, if not found or to enforce reloading the markup
*/
- protected Markup getMarkupFromCache(final CharSequence cacheKey, final
MarkupContainer container)
+ protected Markup getMarkupFromCache(final CharSequence cacheKey,
+ final MarkupContainer< ? > container)
{
if (cacheKey != null)
{
@@ -417,7 +418,7 @@
* reloaded. Whatever is in the cache, it will be ignored
* @return The markup
*/
- private final Markup loadMarkup(final MarkupContainer container,
+ private final Markup loadMarkup(final MarkupContainer< ? > container,
final MarkupResourceStream markupResourceStream, final boolean
enforceReload)
{
String cacheKey = markupResourceStream.getCacheKey();
@@ -473,7 +474,7 @@
* reloaded. Whatever is in the cache, it will be ignored
* @return The markup in the stream
*/
- private final Markup loadMarkupAndWatchForChanges(final MarkupContainer
container,
+ private final Markup loadMarkupAndWatchForChanges(final
MarkupContainer< ? > container,
final MarkupResourceStream markupResourceStream, final boolean
enforceReload)
{
final String cacheKey = markupResourceStream.getCacheKey();
@@ -531,7 +532,7 @@
* The MarkupContainer requesting the markup resource stream
* @return IMarkupResourceStreamProvider
*/
- public IMarkupCacheKeyProvider getMarkupCacheKeyProvider(final
MarkupContainer container)
+ public IMarkupCacheKeyProvider getMarkupCacheKeyProvider(final
MarkupContainer< ? > container)
{
if (container instanceof IMarkupCacheKeyProvider)
{
@@ -553,7 +554,7 @@
* @return IMarkupResourceStreamProvider
*/
protected IMarkupResourceStreamProvider getMarkupResourceStreamProvider(
- final MarkupContainer container)
+ final MarkupContainer< ? > container)
{
if (container instanceof IMarkupResourceStreamProvider)
{
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupParser.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupParser.java?rev=647547&r1=647546&r2=647547&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupParser.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupParser.java
Sun Apr 13 02:21:04 2008
@@ -195,6 +195,7 @@
* @see #appendMarkupFilter(IMarkupFilter)
* @deprecated since 1.3
*/
+ @Deprecated
protected void initFilterChain()
{
throw new WicketRuntimeException("This method is no longer
suppoert: since 1.3");
@@ -221,7 +222,8 @@
* The filter will be added before the beforeFilter. If
beforeFilter == null or
* beforeFilter not found than append to the end
*/
- public final void appendMarkupFilter(final IMarkupFilter filter, final
Class beforeFilter)
+ public final void appendMarkupFilter(final IMarkupFilter filter,
+ final Class< ? extends IMarkupFilter> beforeFilter)
{
if ((beforeFilter == null) || (markupFilterChain == null))
{
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java?rev=647547&r1=647546&r2=647547&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java
Sun Apr 13 02:21:04 2008
@@ -20,6 +20,7 @@
import java.io.InputStream;
import java.util.Locale;
+import org.apache.wicket.Component;
import org.apache.wicket.util.lang.Classes;
import org.apache.wicket.util.resource.IFixedLocationResourceStream;
import org.apache.wicket.util.resource.IResourceStream;
@@ -78,7 +79,7 @@
* @param markupClass
*/
public MarkupResourceStream(final IResourceStream resourceStream,
- final ContainerInfo containerInfo, final Class markupClass)
+ final ContainerInfo containerInfo, final Class< ? > markupClass)
{
this.resourceStream = resourceStream;
this.containerInfo = containerInfo;
@@ -168,7 +169,7 @@
*
* @return The directly associated class
*/
- public Class getMarkupClass()
+ public Class< ? extends Component< ? >> getMarkupClass()
{
return Classes.resolveClass(markupClassName);
}
@@ -207,6 +208,7 @@
*
* @see java.lang.Object#toString()
*/
+ @Override
public String toString()
{
return resourceStream.toString();
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/AjaxServerAndClientTimeFilter.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/AjaxServerAndClientTimeFilter.java?rev=647547&r1=647546&r2=647547&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/AjaxServerAndClientTimeFilter.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/AjaxServerAndClientTimeFilter.java
Sun Apr 13 02:21:04 2008
@@ -63,23 +63,22 @@
endScript.append("';\n").append(JavascriptUtils.SCRIPT_CLOSE_TAG).append("\n");
responseBuffer.insert(bodyIndex - 1, endScript);
responseBuffer.insert(headIndex + 6, "\n" +
JavascriptUtils.SCRIPT_OPEN_TAG +
- "\nvar clientTimeVariable = new
Date().getTime();\n" +
- JavascriptUtils.SCRIPT_CLOSE_TAG +
"\n");
+ "\nvar clientTimeVariable = new
Date().getTime();\n" +
+ JavascriptUtils.SCRIPT_CLOSE_TAG + "\n");
}
else if (ajaxStart != -1 && ajaxEnd != -1)
{
AppendingStringBuffer startScript = new
AppendingStringBuffer(250);
startScript.append("<evaluate><![CDATA[window.defaultStatus='");
startScript.append(getStatusString(timeTaken,
-
"ajax.ServerAndClientTimeFilter.statustext"));
+ "ajax.ServerAndClientTimeFilter.statustext"));
startScript.append("';]]></evaluate>");
responseBuffer.insert(ajaxEnd, startScript.toString());
responseBuffer.insert(ajaxStart + 15,
- "<evaluate><![CDATA[clientTimeVariable
= new Date().getTime();]]></evaluate>");
+ "<evaluate><![CDATA[clientTimeVariable = new
Date().getTime();]]></evaluate>");
}
log.info(timeTaken + "ms server time taken for request " +
- RequestCycle.get().getRequest().getURL() + "
response size: " +
- responseBuffer.length());
+ RequestCycle.get().getRequest().getURL() + " response
size: " + responseBuffer.length());
return responseBuffer;
}
@@ -95,9 +94,8 @@
private String getStatusString(long timeTaken, String resourceKey)
{
final String txt =
Application.get().getResourceSettings().getLocalizer().getString(
- resourceKey, null,
- "Server parsetime: ${servertime}, Client
parsetime: ${clienttime}");
- final Map map = new HashMap(4);
+ resourceKey, null, "Server parsetime: ${servertime},
Client parsetime: ${clienttime}");
+ final Map<String, String> map = new HashMap<String, String>(4);
map.put("clienttime", "' + (new Date().getTime() -
clientTimeVariable)/1000 + 's");
map.put("servertime", ((double)timeTaken) / 1000 + "s");
return MapVariableInterpolator.interpolate(txt, map);
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/CompressedPackageResource.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/CompressedPackageResource.java?rev=647547&r1=647546&r2=647547&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/CompressedPackageResource.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/CompressedPackageResource.java
Sun Apr 13 02:21:04 2008
@@ -45,6 +45,10 @@
*/
public class CompressedPackageResource extends PackageResource
{
+ private static final long serialVersionUID = 1L;
+
+ private final IResourceStream resourceStream;
+
/**
* IResourceStream implementation which compresses the data with gzip
if the requests header
* Accept-Encoding contains string gzip
@@ -54,7 +58,7 @@
private static final long serialVersionUID = 1L;
/** Cache for compressed data */
- private SoftReference cache = new SoftReference(null);
+ private SoftReference<byte[]> cache = new
SoftReference<byte[]>(null);
/** Timestamp of the cache */
private Time timeStamp = null;
@@ -136,7 +140,7 @@
IResourceStream stream = getOriginalResourceStream();
try
{
- byte ret[] = (byte[])cache.get();
+ byte ret[] = cache.get();
if (ret != null && timeStamp != null)
{
if
(timeStamp.equals(stream.lastModifiedTime()))
@@ -152,7 +156,7 @@
stream.close();
ret = out.toByteArray();
timeStamp = stream.lastModifiedTime();
- cache = new SoftReference(ret);
+ cache = new SoftReference<byte[]>(ret);
return ret;
}
catch (IOException e)
@@ -168,8 +172,6 @@
protected abstract IResourceStream getOriginalResourceStream();
}
- private static final long serialVersionUID = 1L;
-
/**
* Gets the resource for a given set of criteria. Only one resource
will be loaded for the same
* criteria.
@@ -189,13 +191,13 @@
* when the target resource is not accepted by
* [EMAIL PROTECTED] IPackageResourceGuard the package
resource guard}.
*/
- public static PackageResource get(final Class scope, final String path,
final Locale locale,
- final String style)
+ public static PackageResource get(final Class< ? > scope, final String
path,
+ final Locale locale, final String style)
{
final SharedResources sharedResources =
Application.get().getSharedResources();
PackageResource resource =
(PackageResource)sharedResources.get(scope, path, locale, style,
- true);
+ true);
if (resource == null)
{
resource = new CompressedPackageResource(scope, path,
locale, style);
@@ -204,8 +206,6 @@
return resource;
}
- private final IResourceStream resourceStream;
-
/**
* Hidden constructor.
*
@@ -219,7 +219,7 @@
* @param style
* The style of the resource
*/
- protected CompressedPackageResource(Class scope, String path, Locale
locale, String style)
+ protected CompressedPackageResource(Class< ? > scope, String path,
Locale locale, String style)
{
super(scope, path, locale, style);
resourceStream = newResourceStream();
@@ -236,6 +236,11 @@
{
private static final long serialVersionUID = 1L;
+ /**
+ *
+ * @see
org.apache.wicket.markup.html.CompressedPackageResource.CompressingResourceStream#getOriginalResourceStream()
+ */
+ @Override
protected IResourceStream getOriginalResourceStream()
{
return getPackageResourceStream();
@@ -259,6 +264,7 @@
*
* @see
org.apache.wicket.markup.html.PackageResource#getResourceStream()
*/
+ @Override
public IResourceStream getResourceStream()
{
return resourceStream;
@@ -288,6 +294,7 @@
/**
* @see
org.apache.wicket.markup.html.WebResource#setHeaders(org.apache.wicket.protocol.http.WebResponse)
*/
+ @Override
protected void setHeaders(WebResponse response)
{
super.setHeaders(response);
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/ContainerWithAssociatedMarkupHelper.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/ContainerWithAssociatedMarkupHelper.java?rev=647547&r1=647546&r2=647547&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/ContainerWithAssociatedMarkupHelper.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/ContainerWithAssociatedMarkupHelper.java
Sun Apr 13 02:21:04 2008
@@ -43,14 +43,14 @@
private boolean noMoreWicketHeadTagsAllowed = false;
/** The markup container the helper is associated with */
- private final WebMarkupContainer container;
+ private final WebMarkupContainer< ? > container;
/**
* @param container
*/
public ContainerWithAssociatedMarkupHelper(final
IHeaderPartContainerProvider container)
{
- this.container = (WebMarkupContainer)container;
+ this.container = (WebMarkupContainer< ? >)container;
}
/**
@@ -65,7 +65,8 @@
* @param htmlContainer
* The HtmlHeaderContainer added to the Page
*/
- public final void renderHeadFromAssociatedMarkupFile(final
HtmlHeaderContainer htmlContainer)
+ public final void renderHeadFromAssociatedMarkupFile(
+ final HtmlHeaderContainer< ? > htmlContainer)
{
// Gracefully getAssociateMarkupStream. Throws no exception in
case
// markup is not found
@@ -81,14 +82,14 @@
noMoreWicketHeadTagsAllowed = false;
while (nextHeaderMarkup(markupStream) != -1)
{
- Class markupClass =
((WicketTag)markupStream.getTag()).getMarkupClass();
+ Class< ? > markupClass =
((WicketTag)markupStream.getTag()).getMarkupClass();
if (markupClass == null)
{
markupClass = markupStream.getContainerClass();
}
// Create a HeaderPartContainer and associate the markup
- final HeaderPartContainer headerPart =
getHeaderPart(markupClass, markupStream
- .getCurrentIndex());
+ final HeaderPartContainer headerPart =
getHeaderPart(markupClass,
+ markupStream.getCurrentIndex());
if (headerPart != null)
{
// A component's header section must only be
added once,
@@ -131,7 +132,7 @@
* The java class the wicket:head tag is directly associated
with
* @return the header part for this panel/border or null if it doesn't
have a wicket:head tag.
*/
- private final HeaderPartContainer getHeaderPart(final Class
markupClass, final int index)
+ private final HeaderPartContainer getHeaderPart(final Class< ? >
markupClass, final int index)
{
// Gracefully getAssociateMarkupStream. Throws no exception in
case
// markup is not found
@@ -151,14 +152,14 @@
// create a unique id for the
HtmlHeaderContainer to be
// created
final String headerId = "_" +
Classes.simpleName(markupClass) +
- container.getVariation() +
"Header" + index;
+ container.getVariation() + "Header" +
index;
// Create the header container and associate
the markup with
// it
String scope = wTag.getAttributes().getString(
-
markupStream.getWicketNamespace() + ":scope");
- final HeaderPartContainer headerContainer =
((IHeaderPartContainerProvider)container)
-
.newHeaderPartContainer(headerId, scope);
+ markupStream.getWicketNamespace() +
":scope");
+ final HeaderPartContainer headerContainer =
((IHeaderPartContainerProvider)container).newHeaderPartContainer(
+ headerId, scope);
headerContainer.setMyMarkupStream(markupStream);
headerContainer.setRenderBodyOnly(true);
@@ -168,7 +169,7 @@
}
throw new WicketRuntimeException("Programming error: expected a
WicketTag: " +
- markupStream.toString());
+ markupStream.toString());
}
/**
@@ -197,13 +198,13 @@
if (noMoreWicketHeadTagsAllowed == true)
{
throw new MarkupException(
- "<wicket:head>
tags are only allowed before <body>, </head>, <wicket:panel> etc. tag");
+ "<wicket:head> tags are
only allowed before <body>, </head>, <wicket:panel> etc. tag");
}
return
associatedMarkupStream.getCurrentIndex();
}
// wicket:head must be before border, panel or
extend
else if (tag.isOpen() &&
- (tag.isPanelTag() ||
tag.isBorderTag() || tag.isExtendTag()))
+ (tag.isPanelTag() || tag.isBorderTag()
|| tag.isExtendTag()))
{
noMoreWicketHeadTagsAllowed = true;
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/HeaderPartContainer.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/HeaderPartContainer.java?rev=647547&r1=647546&r2=647547&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/HeaderPartContainer.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/HeaderPartContainer.java
Sun Apr 13 02:21:04 2008
@@ -27,13 +27,17 @@
* which has been added to the Page.
*
* @author Juergen Donnerstag
+ * @param <T>
+ * The model object type
*/
-public final class HeaderPartContainer extends WebMarkupContainer implements
IComponentResolver
+public final class HeaderPartContainer<T> extends WebMarkupContainer<T>
+ implements
+ IComponentResolver
{
private static final long serialVersionUID = 1L;
/** The panel or bordered page the header part is associated with */
- private final MarkupContainer container;
+ private final MarkupContainer< ? > container;
/** <wicket:head scope="...">. A kind of namespace */
private final String scope;
@@ -46,7 +50,8 @@
* @param scope
* The scope of the wicket:head tag
*/
- public HeaderPartContainer(final String id, final MarkupContainer
container, final String scope)
+ public HeaderPartContainer(final String id, final MarkupContainer< ? >
container,
+ final String scope)
{
super(id);
this.container = container;
@@ -66,12 +71,12 @@
/**
* @see IComponentResolver#resolve(MarkupContainer, MarkupStream,
ComponentTag)
*/
- public final boolean resolve(final MarkupContainer container, final
MarkupStream markupStream,
- final ComponentTag tag)
+ public final boolean resolve(final MarkupContainer< ? > container,
+ final MarkupStream markupStream, final ComponentTag tag)
{
// The tag must be resolved against the panel and not against
the
// page
- Component component = this.container.get(tag.getId());
+ Component< ? > component = this.container.get(tag.getId());
if (component != null)
{
component.render(markupStream);
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/IHeaderPartContainerProvider.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/IHeaderPartContainerProvider.java?rev=647547&r1=647546&r2=647547&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/IHeaderPartContainerProvider.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/IHeaderPartContainerProvider.java
Sun Apr 13 02:21:04 2008
@@ -34,5 +34,5 @@
* The default scope of the header
* @return The new HeaderPartContainer
*/
- HeaderPartContainer newHeaderPartContainer(String id, String scope);
+ HeaderPartContainer< ? > newHeaderPartContainer(String id, String
scope);
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/IPackageResourceGuard.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/IPackageResourceGuard.java?rev=647547&r1=647546&r2=647547&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/IPackageResourceGuard.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/IPackageResourceGuard.java
Sun Apr 13 02:21:04 2008
@@ -36,5 +36,5 @@
*
* @return True if access is permitted, false otherwise
*/
- boolean accept(final Class scope, final String path);
+ boolean accept(final Class< ? > scope, final String path);
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/JavascriptPackageResource.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/JavascriptPackageResource.java?rev=647547&r1=647546&r2=647547&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/JavascriptPackageResource.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/JavascriptPackageResource.java
Sun Apr 13 02:21:04 2008
@@ -42,6 +42,10 @@
*/
public class JavascriptPackageResource extends CompressedPackageResource
{
+ private static final long serialVersionUID = 1L;;
+
+ private static final Logger log =
LoggerFactory.getLogger(JavascriptPackageResource.class);
+
/**
* Resource Stream that caches the stripped content.
*
@@ -52,7 +56,7 @@
private static final long serialVersionUID = 1L;
/** Cache for compressed data */
- private SoftReference cache = new SoftReference(null);
+ private SoftReference<byte[]> cache = new
SoftReference<byte[]>(null);
/** Timestamp of the cache */
private Time timeStamp = null;
@@ -120,7 +124,7 @@
IResourceStream stream = getOriginalResourceStream();
try
{
- byte ret[] = (byte[])cache.get();
+ byte ret[] = cache.get();
if (ret != null && timeStamp != null)
{
if
(timeStamp.equals(stream.lastModifiedTime()))
@@ -135,7 +139,7 @@
stream.close();
ret = filterContent(out.toByteArray());
timeStamp = stream.lastModifiedTime();
- cache = new SoftReference(ret);
+ cache = new SoftReference<byte[]>(ret);
return ret;
}
catch (IOException e)
@@ -153,10 +157,6 @@
protected abstract IResourceStream getOriginalResourceStream();
}
- private static final long serialVersionUID = 1L;;
-
- private static final Logger log =
LoggerFactory.getLogger(JavascriptPackageResource.class);
-
/**
* Gets the resource for a given set of criteria. Only one resource
will be loaded for the same
* criteria.
@@ -176,13 +176,13 @@
* when the target resource is not accepted by
* [EMAIL PROTECTED] IPackageResourceGuard the package
resource guard}.
*/
- public static PackageResource get(final Class scope, final String path,
final Locale locale,
- final String style)
+ public static PackageResource get(final Class< ? > scope, final String
path,
+ final Locale locale, final String style)
{
final SharedResources sharedResources =
Application.get().getSharedResources();
PackageResource resource =
(PackageResource)sharedResources.get(scope, path, locale, style,
- true);
+ true);
if (resource == null)
{
@@ -200,7 +200,7 @@
* @param locale
* @param style
*/
- public JavascriptPackageResource(Class scope, String path, Locale
locale, String style)
+ public JavascriptPackageResource(Class< ? > scope, String path, Locale
locale, String style)
{
super(scope, path, locale, style);
}
@@ -208,18 +208,21 @@
/**
* @see
org.apache.wicket.markup.html.CompressedPackageResource#newResourceStream()
*/
+ @Override
protected IResourceStream newResourceStream()
{
final FilteringResourceStream filteringStream = new
FilteringResourceStream()
{
private static final long serialVersionUID = 1L;
+ @Override
protected byte[] filterContent(byte[] input)
{
try
{
- if
(Application.get().getResourceSettings()
-
.getStripJavascriptCommentsAndWhitespace())
+ if (Application.get()
+ .getResourceSettings()
+
.getStripJavascriptCommentsAndWhitespace())
{
String s = new String(input,
"UTF-8");
return
JavascriptStripper.stripCommentsAndWhitespace(s).getBytes("UTF-8");
@@ -237,6 +240,7 @@
}
}
+ @Override
protected IResourceStream getOriginalResourceStream()
{
return getPackageResourceStream();
@@ -247,6 +251,7 @@
{
private static final long serialVersionUID = 1L;
+ @Override
protected IResourceStream getOriginalResourceStream()
{
return filteringStream;
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/PackageResource.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/PackageResource.java?rev=647547&r1=647546&r2=647547&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/PackageResource.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/PackageResource.java
Sun Apr 13 02:21:04 2008
@@ -92,6 +92,7 @@
*
* @deprecated Will be removed in 2.0; contribute resources one by one
instead
*/
+ @Deprecated
public static final Pattern EXTENSION_CSS = Pattern.compile(".*\\.css");
/**
@@ -99,6 +100,7 @@
*
* @deprecated Will be removed in 2.0; contribute resources one by one
instead
*/
+ @Deprecated
public static final Pattern EXTENSION_JS = Pattern.compile(".*\\.js");
/** log. */
@@ -124,7 +126,8 @@
* shared resources so that they don't have to be
pre-registered anymore. Will be
* removed in 2.0
*/
- public static void bind(Application application, Class scope, Pattern
pattern)
+ @Deprecated
+ public static void bind(Application application, Class< ? > scope,
Pattern pattern)
{
}
@@ -150,7 +153,9 @@
* shared resources so that they don't have to be
pre-registered anymore. Will be
* removed in 2.0
*/
- public static void bind(Application application, Class scope, Pattern
pattern, boolean recurse)
+ @Deprecated
+ public static void bind(Application application, Class< ? > scope,
Pattern pattern,
+ boolean recurse)
{
}
@@ -166,7 +171,7 @@
* The name of the resource (like "myfile.js")
* @throw IllegalArgumentException when the requested package resource
was not found
*/
- public static void bind(Application application, Class scope, String
name)
+ public static void bind(Application application, Class< ? > scope,
String name)
{
bind(application, scope, name, null, null);
}
@@ -185,7 +190,7 @@
* The locale of the resource.
* @throw IllegalArgumentException when the requested package resource
was not found
*/
- public static void bind(Application application, Class scope, String
name, Locale locale)
+ public static void bind(Application application, Class< ? > scope,
String name, Locale locale)
{
bind(application, scope, name, locale, null);
}
@@ -206,7 +211,7 @@
* The style of the resource.
* @throw IllegalArgumentException when the requested package resource
was not found
*/
- public static void bind(Application application, Class scope, String
name, Locale locale,
+ public static void bind(Application application, Class< ? > scope,
String name, Locale locale,
String style)
{
if (name == null)
@@ -246,7 +251,7 @@
* The style of the resource (see [EMAIL PROTECTED]
org.apache.wicket.Session})
* @return true if a resource could be loaded, false otherwise
*/
- public static boolean exists(final Class scope, final String path,
final Locale locale,
+ public static boolean exists(final Class< ? > scope, final String path,
final Locale locale,
final String style)
{
String absolutePath = Packages.absolutePath(scope, path);
@@ -268,7 +273,8 @@
* @return The resources, never null but may be empty
* @deprecated Will be removed in 2.0; contribute resources one by one
instead
*/
- public static PackageResource[] get(Class scope, Pattern pattern)
+ @Deprecated
+ public static PackageResource[] get(Class< ? > scope, Pattern pattern)
{
return get(scope, pattern, false);
}
@@ -289,7 +295,8 @@
* @return The resources, never null but may be empty
* @deprecated Will be removed in 2.0; contribute resources one by one
instead
*/
- public static PackageResource[] get(Class scope, Pattern pattern,
boolean recurse)
+ @Deprecated
+ public static PackageResource[] get(Class< ? > scope, Pattern pattern,
boolean recurse)
{
final List resources = new ArrayList();
String packageRef =
Strings.replaceAll(PackageName.forClass(scope).getName(), ".", "/")
@@ -379,7 +386,7 @@
* The path to the resource
* @return The resource
*/
- public static PackageResource get(final Class scope, final String path)
+ public static PackageResource get(final Class< ? > scope, final String
path)
{
return get(scope, path, null, null);
}
@@ -400,8 +407,8 @@
* The style of the resource (see [EMAIL PROTECTED]
org.apache.wicket.Session})
* @return The resource
*/
- public static PackageResource get(final Class scope, final String path,
final Locale locale,
- final String style)
+ public static PackageResource get(final Class< ? > scope, final String
path,
+ final Locale locale, final String style)
{
final SharedResources sharedResources =
Application.get().getSharedResources();
PackageResource resource =
(PackageResource)sharedResources.get(scope, path, locale, style,
@@ -414,7 +421,7 @@
}
/* removed in 2.0 */
- private static void scanJarFile(Class scope, Pattern pattern, boolean
recurse,
+ private static void scanJarFile(Class< ? > scope, Pattern pattern,
boolean recurse,
final List resources, String packageRef, JarFile jf)
{
Enumeration enumeration = jf.entries();
@@ -462,7 +469,7 @@
* @param style
* The style of the resource
*/
- protected PackageResource(final Class scope, final String path, final
Locale locale,
+ protected PackageResource(final Class< ? > scope, final String path,
final Locale locale,
final String style)
{
// Convert resource path to absolute path relative to base
package
@@ -528,6 +535,7 @@
/**
* @return Gets the resource for the component.
*/
+ @Override
public IResourceStream getResourceStream()
{
return getResourceStream(true);
@@ -584,7 +592,7 @@
*
* @return the scoping class
*/
- public final Class getScope()
+ public final Class< ? > getScope()
{
return Classes.resolveClass(scopeName);
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebMarkupContainer.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebMarkupContainer.java?rev=647547&r1=647546&r2=647547&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebMarkupContainer.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebMarkupContainer.java
Sun Apr 13 02:21:04 2008
@@ -45,7 +45,7 @@
/**
* @see org.apache.wicket.Component#Component(String, IModel)
*/
- public WebMarkupContainer(final String id, IModel model)
+ public WebMarkupContainer(final String id, IModel<T> model)
{
super(id, model);
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebMarkupContainerWithAssociatedMarkup.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebMarkupContainerWithAssociatedMarkup.java?rev=647547&r1=647546&r2=647547&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebMarkupContainerWithAssociatedMarkup.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebMarkupContainerWithAssociatedMarkup.java
Sun Apr 13 02:21:04 2008
@@ -65,7 +65,7 @@
* @param container
* The HtmlHeaderContainer added to the Page
*/
- protected final void renderHeadFromAssociatedMarkupFile(final
HtmlHeaderContainer container)
+ protected final void renderHeadFromAssociatedMarkupFile(final
HtmlHeaderContainer< ? > container)
{
if (markupHelper == null)
{
@@ -79,8 +79,8 @@
* @see
org.apache.wicket.markup.html.IHeaderPartContainerProvider#newHeaderPartContainer(java.lang.String,
* java.lang.String)
*/
- public HeaderPartContainer newHeaderPartContainer(final String id,
final String scope)
+ public HeaderPartContainer< ? > newHeaderPartContainer(final String id,
final String scope)
{
- return new HeaderPartContainer(id, this, scope);
+ return new HeaderPartContainer<Object>(id, this, scope);
}
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebPage.java?rev=647547&r1=647546&r2=647547&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebPage.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebPage.java
Sun Apr 13 02:21:04 2008
@@ -90,6 +90,7 @@
/**
* @see
org.apache.wicket.markup.html.IHeaderContributor#renderHead(IHeaderResponse)
*/
+ @Override
public final void renderHead(final IHeaderResponse headResponse)
{
Response response = headResponse.getResponse();
@@ -264,6 +265,7 @@
*
* @return Markup type for HTML
*/
+ @Override
public String getMarkupType()
{
return "html";
@@ -331,6 +333,7 @@
/**
* @see org.apache.wicket.Page#configureResponse()
*/
+ @Override
protected void configureResponse()
{
super.configureResponse();
@@ -384,14 +387,15 @@
return new BookmarkablePageLink(id,
getApplication().getHomePage());
}
+ @Override
protected void onAfterRender()
{
super.onAfterRender();
if (getApplication().getConfigurationType() ==
Application.DEVELOPMENT)
{
- HtmlHeaderContainer header =
(HtmlHeaderContainer)visitChildren(new IVisitor()
+ HtmlHeaderContainer header =
(HtmlHeaderContainer)visitChildren(new IVisitor<Component< ? >>()
{
- public Object component(Component component)
+ public Object component(Component< ? >
component)
{
if (component instanceof
HtmlHeaderContainer)
{
@@ -421,12 +425,12 @@
// Make sure all Components interested
in contributing to the header
// and there attached behaviors are
asked.
final HtmlHeaderContainer finalHeader =
header;
- visitChildren(new IVisitor()
+ visitChildren(new IVisitor<Component< ?
>>()
{
/**
* @see
org.apache.wicket.Component.IVisitor#component(org.apache.wicket.Component)
*/
- public Object
component(Component component)
+ public Object
component(Component< ? > component)
{
component.renderHead(finalHeader);
return
CONTINUE_TRAVERSAL;
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java?rev=647547&r1=647546&r2=647547&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java
Sun Apr 13 02:21:04 2008
@@ -62,8 +62,10 @@
* </ul>
*
* @author Juergen Donnerstag
+ * @param <T>
+ * The model object type
*/
-public class HtmlHeaderContainer extends WebMarkupContainer
+public class HtmlHeaderContainer<T> extends WebMarkupContainer<T>
{
private static final long serialVersionUID = 1L;
@@ -73,7 +75,7 @@
* name directly associated with the markup which contains the
wicket:head. It can be modified
* by means of the scope attribute.
*/
- private transient Map renderedComponentsPerScope;
+ private transient Map<String, List<String>> renderedComponentsPerScope;
/**
* Header response that is responsible for filtering duplicate
contributions.
@@ -106,6 +108,7 @@
* @see
org.apache.wicket.MarkupContainer#onComponentTagBody(org.apache.wicket.markup.MarkupStream,
* org.apache.wicket.markup.ComponentTag)
*/
+ @Override
protected final void onComponentTagBody(MarkupStream markupStream,
ComponentTag openTag)
{
// We are able to automatically add <head> to the page if it is
@@ -170,9 +173,9 @@
{
if (renderOpenAndCloseTags())
webResponse.write("<head>");
-
+
webResponse.write(output);
-
+
if (renderOpenAndCloseTags())
webResponse.write("</head>");
}
@@ -184,10 +187,11 @@
}
}
- protected boolean renderOpenAndCloseTags() {
+ protected boolean renderOpenAndCloseTags()
+ {
return true;
}
-
+
/**
* Ask all child components of the Page if they have something to
contribute to the <head>
* section of the HTML output. Every component interested must
implement IHeaderContributor.
@@ -202,18 +206,18 @@
* @param container
* The header component container
*/
- private final void renderHeaderSections(final MarkupContainer page,
- final HtmlHeaderContainer container)
+ private final void renderHeaderSections(final MarkupContainer< ? > page,
+ final HtmlHeaderContainer< ? > container)
{
page.renderHead(container);
// Make sure all Components interested in contributing to the
header
// and there attached behaviors are asked.
- page.visitChildren(new IVisitor()
+ page.visitChildren(new IVisitor<Component< ? >>()
{
/**
* @see
org.apache.wicket.Component.IVisitor#component(org.apache.wicket.Component)
*/
- public Object component(Component component)
+ public Object component(Component< ? > component)
{
if (component.isVisible())
{
@@ -231,6 +235,7 @@
/**
* @see org.apache.wicket.MarkupContainer#isTransparentResolver()
*/
+ @Override
public boolean isTransparentResolver()
{
return true;
@@ -249,18 +254,13 @@
{
if (renderedComponentsPerScope == null)
{
- renderedComponentsPerScope = new HashMap();
+ renderedComponentsPerScope = new HashMap<String,
List<String>>();
}
- // if (scope == null)
- // {
- // scope =
header.getMarkupStream().getContainerClass().getName();
- // }
-
- List componentScope =
(List)renderedComponentsPerScope.get(scope);
+ List<String> componentScope =
renderedComponentsPerScope.get(scope);
if (componentScope == null)
{
- componentScope = new ArrayList();
+ componentScope = new ArrayList<String>();
renderedComponentsPerScope.put(scope, componentScope);
}
@@ -272,6 +272,11 @@
return true;
}
+ /**
+ *
+ * @see org.apache.wicket.Component#onDetach()
+ */
+ @Override
protected void onDetach()
{
super.onDetach();
@@ -293,6 +298,7 @@
// no (portlet) headerResponse override, create a
default one
headerResponse = new HeaderResponse()
{
+ @Override
protected Response getRealResponse()
{
return
HtmlHeaderContainer.this.getResponse();
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HeadForceTagIdHandler.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HeadForceTagIdHandler.java?rev=647547&r1=647546&r2=647547&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HeadForceTagIdHandler.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HeadForceTagIdHandler.java
Sun Apr 13 02:21:04 2008
@@ -54,7 +54,7 @@
* @param markupFileClass
* Used to generated the a common prefix for the id
*/
- public HeadForceTagIdHandler(final Class< ? extends Component< ? >>
markupFileClass)
+ public HeadForceTagIdHandler(final Class< ? extends Component>
markupFileClass)
{
// generate the prefix from class name
final AppendingStringBuffer buffer = new
AppendingStringBuffer(markupFileClass.getName());
