You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2011/11/16 23:52:10 UTC

svn commit: r1202919 [5/7] - in /wicket/trunk/wicket-core/src: main/java/org/apache/wicket/ main/java/org/apache/wicket/ajax/ main/java/org/apache/wicket/ajax/calldecorator/ main/java/org/apache/wicket/ajax/form/ main/java/org/apache/wicket/ajax/markup...

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/RenderPageRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/RenderPageRequestHandler.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/RenderPageRequestHandler.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/RenderPageRequestHandler.java Wed Nov 16 22:51:59 2011
@@ -121,6 +121,7 @@ public class RenderPageRequestHandler
 	}
 
 	/** {@inheritDoc} */
+	@Override
 	public Class<? extends IRequestablePage> getPageClass()
 	{
 		return pageProvider.getPageClass();
@@ -129,18 +130,21 @@ public class RenderPageRequestHandler
 	/**
 	 * @see org.apache.wicket.request.handler.IPageRequestHandler#getPageId()
 	 */
+	@Override
 	public Integer getPageId()
 	{
 		return pageProvider.getPageId();
 	}
 
 	/** {@inheritDoc} */
+	@Override
 	public PageParameters getPageParameters()
 	{
 		return pageProvider.getPageParameters();
 	}
 
 	/** {@inheritDoc} */
+	@Override
 	public void detach(IRequestCycle requestCycle)
 	{
 		if (logData == null)
@@ -149,29 +153,34 @@ public class RenderPageRequestHandler
 	}
 
 	/** {@inheritDoc} */
+	@Override
 	public PageLogData getLogData()
 	{
 		return logData;
 	}
 
 	/** {@inheritDoc} */
+	@Override
 	public IRequestablePage getPage()
 	{
 		return pageProvider.getPageInstance();
 	}
 
 	/** {@inheritDoc} */
+	@Override
 	public void respond(IRequestCycle requestCycle)
 	{
 		PageRenderer renderer = Application.get().getPageRendererProvider().get(this);
 		renderer.respond((RequestCycle)requestCycle);
 	}
 
+	@Override
 	public final boolean isPageInstanceCreated()
 	{
 		return pageProvider.hasPageInstance();
 	}
 
+	@Override
 	public final Integer getRenderCount()
 	{
 		return pageProvider.getRenderCount();

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/resource/ResourceReferenceRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/resource/ResourceReferenceRequestHandler.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/resource/ResourceReferenceRequestHandler.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/resource/ResourceReferenceRequestHandler.java Wed Nov 16 22:51:59 2011
@@ -84,6 +84,7 @@ public class ResourceReferenceRequestHan
 	/**
 	 * @see org.apache.org.apache.wicket.request.IRequestHandler#detach(org.apache.wicket.request.cycle.RequestCycle)
 	 */
+	@Override
 	public void detach(IRequestCycle requestCycle)
 	{
 		if (logData == null)
@@ -91,6 +92,7 @@ public class ResourceReferenceRequestHan
 	}
 
 	/** {@inheritDoc} */
+	@Override
 	public ResourceReferenceLogData getLogData()
 	{
 		return logData;
@@ -100,6 +102,7 @@ public class ResourceReferenceRequestHan
 	/**
 	 * @see org.apache.org.apache.wicket.request.IRequestHandler#respond(org.apache.wicket.request.cycle.RequestCycle)
 	 */
+	@Override
 	public void respond(IRequestCycle requestCycle)
 	{
 		new ResourceRequestHandler(getResourceReference().getResource(), getPageParameters()).respond(requestCycle);

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/resource/ResourceRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/resource/ResourceRequestHandler.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/resource/ResourceRequestHandler.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/resource/ResourceRequestHandler.java Wed Nov 16 22:51:59 2011
@@ -70,6 +70,7 @@ public class ResourceRequestHandler impl
 	/**
 	 * @see org.apache.org.apache.wicket.request.IRequestHandler#respond(org.apache.wicket.request.cycle.RequestCycle)
 	 */
+	@Override
 	public void respond(final IRequestCycle requestCycle)
 	{
 		IResource.Attributes a = new IResource.Attributes(requestCycle.getRequest(),
@@ -80,6 +81,7 @@ public class ResourceRequestHandler impl
 	/**
 	 * @see org.apache.org.apache.wicket.request.IRequestHandler#detach(org.apache.wicket.request.cycle.RequestCycle)
 	 */
+	@Override
 	public void detach(IRequestCycle requestCycle)
 	{
 	}

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/resource/ResourceStreamRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/resource/ResourceStreamRequestHandler.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/resource/ResourceStreamRequestHandler.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/resource/ResourceStreamRequestHandler.java Wed Nov 16 22:51:59 2011
@@ -87,6 +87,7 @@ public class ResourceStreamRequestHandle
 		this.fileName = fileName;
 	}
 
+	@Override
 	public void detach(IRequestCycle requestCycle)
 	{
 		if (logData == null)
@@ -95,6 +96,7 @@ public class ResourceStreamRequestHandle
 	}
 
 	/** {@inheritDoc} */
+	@Override
 	public ResourceStreamLogData getLogData()
 	{
 		return logData;
@@ -124,6 +126,7 @@ public class ResourceStreamRequestHandle
 	 * 
 	 * @see org.apache.wicket.request.IRequestHandler#respond(org.apache.wicket.request.IRequestCycle)
 	 */
+	@Override
 	public void respond(IRequestCycle requestCycle)
 	{
 		Attributes attributes = new Attributes(requestCycle.getRequest(),

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java Wed Nov 16 22:51:59 2011
@@ -166,6 +166,7 @@ public abstract class AbstractBookmarkab
 	/**
 	 * @see IRequestMapper#getCompatibilityScore(Request)
 	 */
+	@Override
 	public abstract int getCompatibilityScore(Request request);
 
 	/**
@@ -258,6 +259,7 @@ public abstract class AbstractBookmarkab
 	/**
 	 * @see org.apache.wicket.request.IRequestMapper#mapRequest(org.apache.wicket.request.Request)
 	 */
+	@Override
 	public IRequestHandler mapRequest(Request request)
 	{
 		UrlInfo urlInfo = parseRequest(request);
@@ -299,6 +301,7 @@ public abstract class AbstractBookmarkab
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public Url mapHandler(IRequestHandler requestHandler)
 	{
 		// TODO see if we can refactor this to remove dependency on instanceof checks below and

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java Wed Nov 16 22:51:59 2011
@@ -76,6 +76,7 @@ class BasicResourceReferenceMapper exten
 		this.cachingStrategy = cachingStrategy;
 	}
 
+	@Override
 	public IRequestHandler mapRequest(Request request)
 	{
 		Url url = request.getUrl();
@@ -148,6 +149,7 @@ class BasicResourceReferenceMapper exten
 		return scope.getName();
 	}
 
+	@Override
 	public Url mapHandler(IRequestHandler requestHandler)
 	{
 		if (requestHandler instanceof ResourceReferenceRequestHandler)
@@ -230,6 +232,7 @@ class BasicResourceReferenceMapper exten
 		return null;
 	}
 
+	@Override
 	public int getCompatibilityScore(Request request)
 	{
 		Url url = request.getUrl();

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/BufferedResponseMapper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/BufferedResponseMapper.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/BufferedResponseMapper.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/BufferedResponseMapper.java Wed Nov 16 22:51:59 2011
@@ -92,6 +92,7 @@ public class BufferedResponseMapper impl
 	/**
 	 * @see org.apache.wicket.request.IRequestMapper#mapRequest(org.apache.wicket.request.Request)
 	 */
+	@Override
 	public IRequestHandler mapRequest(Request request)
 	{
 		request = getRequest(request);
@@ -110,6 +111,7 @@ public class BufferedResponseMapper impl
 	/**
 	 * @see org.apache.wicket.request.IRequestMapper#mapHandler(org.apache.org.apache.wicket.request.IRequestHandler)
 	 */
+	@Override
 	public Url mapHandler(IRequestHandler requestHandler)
 	{
 		return null;
@@ -118,6 +120,7 @@ public class BufferedResponseMapper impl
 	/**
 	 * @see org.apache.wicket.request.IRequestMapper#getCompatibilityScore(org.apache.wicket.request.Request)
 	 */
+	@Override
 	public int getCompatibilityScore(Request request)
 	{
 		request = getRequest(request);

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/CryptoMapper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/CryptoMapper.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/CryptoMapper.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/CryptoMapper.java Wed Nov 16 22:51:59 2011
@@ -81,11 +81,13 @@ public class CryptoMapper implements IRe
 		this.cryptProvider = Args.notNull(cryptProvider, "cryptProvider");
 	}
 
+	@Override
 	public int getCompatibilityScore(final Request request)
 	{
 		return 0;
 	}
 
+	@Override
 	public Url mapHandler(final IRequestHandler requestHandler)
 	{
 		final Url url = wrappedMapper.mapHandler(requestHandler);
@@ -98,6 +100,7 @@ public class CryptoMapper implements IRe
 		return encryptUrl(url);
 	}
 
+	@Override
 	public IRequestHandler mapRequest(final Request request)
 	{
 		Url url = decryptUrl(request, request.getUrl());
@@ -214,6 +217,7 @@ public class CryptoMapper implements IRe
 			this.application = application;
 		}
 
+		@Override
 		public ICrypt get()
 		{
 			return application.getSecuritySettings().getCryptFactory().newCrypt();

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/PageInstanceMapper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/PageInstanceMapper.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/PageInstanceMapper.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/PageInstanceMapper.java Wed Nov 16 22:51:59 2011
@@ -56,6 +56,7 @@ public class PageInstanceMapper extends 
 	/**
 	 * @see org.apache.wicket.request.IRequestMapper#mapRequest(org.apache.wicket.request.Request)
 	 */
+	@Override
 	public IRequestHandler mapRequest(Request request)
 	{
 		Url url = request.getUrl();
@@ -99,6 +100,7 @@ public class PageInstanceMapper extends 
 	/**
 	 * @see org.apache.wicket.request.IRequestMapper#mapHandler(org.apache.org.apache.wicket.request.IRequestHandler)
 	 */
+	@Override
 	public Url mapHandler(IRequestHandler requestHandler)
 	{
 		PageComponentInfo info = null;
@@ -147,6 +149,7 @@ public class PageInstanceMapper extends 
 	/**
 	 * @see org.apache.wicket.request.IRequestMapper#getCompatibilityScore(org.apache.wicket.request.Request)
 	 */
+	@Override
 	public int getCompatibilityScore(final Request request)
 	{
 		int score = 0;

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/ResourceMapper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/ResourceMapper.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/ResourceMapper.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/ResourceMapper.java Wed Nov 16 22:51:59 2011
@@ -114,6 +114,7 @@ public class ResourceMapper extends Abst
 		parametersEncoder = encoder;
 	}
 
+	@Override
 	public IRequestHandler mapRequest(final Request request)
 	{
 		final Url url = new Url(request.getUrl());
@@ -149,11 +150,13 @@ public class ResourceMapper extends Abst
 		return new ResourceReferenceRequestHandler(resourceReference, parameters);
 	}
 
+	@Override
 	public int getCompatibilityScore(Request request)
 	{
 		return 0; // pages always have priority over resources
 	}
 
+	@Override
 	public Url mapHandler(IRequestHandler requestHandler)
 	{
 		if ((requestHandler instanceof ResourceReferenceRequestHandler) == false)

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/AbstractResource.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/AbstractResource.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/AbstractResource.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/AbstractResource.java Wed Nov 16 22:51:59 2011
@@ -471,6 +471,7 @@ public abstract class AbstractResource i
 	 * 
 	 * @see org.apache.wicket.request.resource.IResource#respond(org.apache.wicket.request.resource.IResource.Attributes)
 	 */
+	@Override
 	public final void respond(final Attributes attributes)
 	{
 		// Get a "new" ResourceResponse to write a response

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/ContextRelativeResource.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/ContextRelativeResource.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/ContextRelativeResource.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/ContextRelativeResource.java Wed Nov 16 22:51:59 2011
@@ -65,11 +65,13 @@ public class ContextRelativeResource ext
 		path = pathRelativeToContextRoot;
 	}
 	
+	@Override
 	public Serializable getCacheKey()
 	{
 		return CACHE_PREFIX + path;
 	}
 
+	@Override
 	public IResourceStream getCacheableResourceStream()
 	{
 		return new WebExternalResourceStream(path);

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java Wed Nov 16 22:51:59 2011
@@ -183,6 +183,7 @@ public class PackageResource extends Abs
 	 * @see org.apache.wicket.request.resource.caching.IStaticCacheableResource#getCacheableResourceStream()
 	 * @see #getResourceStream()
 	 */
+	@Override
 	public IResourceStream getCacheableResourceStream()
 	{
 		// get resource locator
@@ -196,6 +197,7 @@ public class PackageResource extends Abs
 			getCurrentLocale(), null, false);
 	}
 
+	@Override
 	public Serializable getCacheKey()
 	{
 		IResourceStream stream = getCacheableResourceStream();

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/FilenameWithVersionResourceCachingStrategy.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/FilenameWithVersionResourceCachingStrategy.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/FilenameWithVersionResourceCachingStrategy.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/FilenameWithVersionResourceCachingStrategy.java Wed Nov 16 22:51:59 2011
@@ -90,6 +90,7 @@ public class FilenameWithVersionResource
 		return versionPrefix;
 	}
 
+	@Override
 	public void decorateUrl(ResourceUrl url, IStaticCacheableResource resource)
 	{
 		// get version string for requested resource
@@ -138,6 +139,7 @@ public class FilenameWithVersionResource
 		url.setFileName(versionedFilename.toString());
 	}
 
+	@Override
 	public void undecorateUrl(ResourceUrl url)
 	{
 		final String filename = url.getFileName();
@@ -171,6 +173,7 @@ public class FilenameWithVersionResource
 	 * 
 	 * @param response
 	 */
+	@Override
 	public void decorateResponse(AbstractResource.ResourceResponse response, IStaticCacheableResource resource)
 	{
 		response.setCacheDurationToMaximum();

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/NoOpResourceCachingStrategy.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/NoOpResourceCachingStrategy.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/NoOpResourceCachingStrategy.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/NoOpResourceCachingStrategy.java Wed Nov 16 22:51:59 2011
@@ -34,14 +34,17 @@ public class NoOpResourceCachingStrategy
 	 */
 	public static final IResourceCachingStrategy INSTANCE = new NoOpResourceCachingStrategy();
 
+	@Override
 	public void decorateUrl(ResourceUrl url, IStaticCacheableResource resource)
 	{
 	}
 
+	@Override
 	public void undecorateUrl(ResourceUrl url)
 	{
 	}
 
+	@Override
 	public void decorateResponse(AbstractResource.ResourceResponse response, IStaticCacheableResource resource)
 	{
 	}

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/QueryStringWithVersionResourceCachingStrategy.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/QueryStringWithVersionResourceCachingStrategy.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/QueryStringWithVersionResourceCachingStrategy.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/QueryStringWithVersionResourceCachingStrategy.java Wed Nov 16 22:51:59 2011
@@ -91,6 +91,7 @@ public class QueryStringWithVersionResou
 		return versionParameter;
 	}
 
+	@Override
 	public void decorateUrl(ResourceUrl url, final IStaticCacheableResource resource)
 	{
 		String version = resourceVersion.getVersion(resource);
@@ -101,6 +102,7 @@ public class QueryStringWithVersionResou
 		}
 	}
 
+	@Override
 	public void undecorateUrl(ResourceUrl url)
 	{
 		final INamedParameters parameters = url.getParameters();
@@ -111,6 +113,7 @@ public class QueryStringWithVersionResou
 		}
 	}
 
+	@Override
 	public void decorateResponse(AbstractResource.ResourceResponse response, IStaticCacheableResource resource)
 	{
 		response.setCacheDurationToMaximum();

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/CachingResourceVersion.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/CachingResourceVersion.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/CachingResourceVersion.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/CachingResourceVersion.java Wed Nov 16 22:51:59 2011
@@ -93,6 +93,7 @@ public class CachingResourceVersion impl
 			new MostRecentlyUsedMap<Serializable, String>(maxEntries));
 	}
 
+	@Override
 	public String getVersion(IStaticCacheableResource resource)
 	{
 		// get unique cache key for resource reference

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/LastModifiedResourceVersion.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/LastModifiedResourceVersion.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/LastModifiedResourceVersion.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/LastModifiedResourceVersion.java Wed Nov 16 22:51:59 2011
@@ -35,6 +35,7 @@ public class LastModifiedResourceVersion
 {
 	private static final Logger log = LoggerFactory.getLogger(LastModifiedResourceVersion.class);
 	
+	@Override
 	public String getVersion(IStaticCacheableResource resource)
 	{
 		// get last modified timestamp of resource

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/MessageDigestResourceVersion.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/MessageDigestResourceVersion.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/MessageDigestResourceVersion.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/MessageDigestResourceVersion.java Wed Nov 16 22:51:59 2011
@@ -113,6 +113,7 @@ public class MessageDigestResourceVersio
 		this.bufferSize = Args.notNull(bufferSize, "bufferSize");
 	}
 
+	@Override
 	public String getVersion(IStaticCacheableResource resource)
 	{
 		IResourceStream stream = resource.getCacheableResourceStream();

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/RequestCycleCachedResourceVersion.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/RequestCycleCachedResourceVersion.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/RequestCycleCachedResourceVersion.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/RequestCycleCachedResourceVersion.java Wed Nov 16 22:51:59 2011
@@ -59,6 +59,7 @@ public class RequestCycleCachedResourceV
 		this.delegate = Args.notNull(delegate, "delegate");
 	}
 
+	@Override
 	public String getVersion(IStaticCacheableResource resource)
 	{
 		// get current request cycle

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/StaticResourceVersion.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/StaticResourceVersion.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/StaticResourceVersion.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/StaticResourceVersion.java Wed Nov 16 22:51:59 2011
@@ -41,6 +41,7 @@ public class StaticResourceVersion imple
 		this.version = Args.notNull(version, "version");
 	}
 
+	@Override
 	public String getVersion(IStaticCacheableResource resource)
 	{
 		return version;

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/IsoPropertiesFilePropertiesLoader.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/IsoPropertiesFilePropertiesLoader.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/IsoPropertiesFilePropertiesLoader.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/IsoPropertiesFilePropertiesLoader.java Wed Nov 16 22:51:59 2011
@@ -45,6 +45,7 @@ public class IsoPropertiesFileProperties
 	/**
 	 * @see org.apache.wicket.resource.IPropertiesLoader#getFileExtension()
 	 */
+	@Override
 	public final String getFileExtension()
 	{
 		return extension;
@@ -53,6 +54,7 @@ public class IsoPropertiesFileProperties
 	/**
 	 * @see org.apache.wicket.resource.IPropertiesLoader#loadJavaProperties(java.io.InputStream)
 	 */
+	@Override
 	public java.util.Properties loadJavaProperties(final InputStream in) throws IOException
 	{
 		java.util.Properties properties = new java.util.Properties();
@@ -63,6 +65,7 @@ public class IsoPropertiesFileProperties
 	/**
 	 * @see org.apache.wicket.resource.IPropertiesLoader#loadWicketProperties(java.io.InputStream)
 	 */
+	@Override
 	public ValueMap loadWicketProperties(InputStream inputStream)
 	{
 		return null;

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/NoOpTextCompressor.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/NoOpTextCompressor.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/NoOpTextCompressor.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/NoOpTextCompressor.java Wed Nov 16 22:51:59 2011
@@ -27,6 +27,7 @@ import org.apache.wicket.javascript.IJav
  */
 public class NoOpTextCompressor implements IJavaScriptCompressor, ICssCompressor
 {
+	@Override
 	public String compress(String original)
 	{
 		return original;

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/PropertiesFactory.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/PropertiesFactory.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/PropertiesFactory.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/PropertiesFactory.java Wed Nov 16 22:51:59 2011
@@ -102,6 +102,7 @@ public class PropertiesFactory implement
 	/**
 	 * @see org.apache.wicket.resource.IPropertiesFactory#addListener(org.apache.wicket.resource.IPropertiesChangeListener)
 	 */
+	@Override
 	public void addListener(final IPropertiesChangeListener listener)
 	{
 		// Make sure listeners are added only once
@@ -114,6 +115,7 @@ public class PropertiesFactory implement
 	/**
 	 * @see org.apache.wicket.resource.IPropertiesFactory#clearCache()
 	 */
+	@Override
 	public final void clearCache()
 	{
 		if (propertiesCache != null)
@@ -129,6 +131,7 @@ public class PropertiesFactory implement
 	 * 
 	 * @see org.apache.wicket.resource.IPropertiesFactory#load(java.lang.Class, java.lang.String)
 	 */
+	@Override
 	public Properties load(final Class<?> clazz, final String path)
 	{
 		// Check the cache
@@ -259,6 +262,7 @@ public class PropertiesFactory implement
 	{
 		watcher.add(resourceStream, new IChangeListener()
 		{
+			@Override
 			public void onChange()
 			{
 				log.info("A properties files has changed. Removing all entries " +

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/UtfPropertiesFilePropertiesLoader.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/UtfPropertiesFilePropertiesLoader.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/UtfPropertiesFilePropertiesLoader.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/UtfPropertiesFilePropertiesLoader.java Wed Nov 16 22:51:59 2011
@@ -66,6 +66,7 @@ public class UtfPropertiesFileProperties
 	/**
 	 * @see org.apache.wicket.resource.IPropertiesLoader#getFileExtension()
 	 */
+	@Override
 	public final String getFileExtension()
 	{
 		return fileExtension;
@@ -74,6 +75,7 @@ public class UtfPropertiesFileProperties
 	/**
 	 * @see org.apache.wicket.resource.IPropertiesLoader#loadJavaProperties(java.io.InputStream)
 	 */
+	@Override
 	public java.util.Properties loadJavaProperties(final InputStream in) throws IOException
 	{
 		if (load == null)
@@ -107,6 +109,7 @@ public class UtfPropertiesFileProperties
 	/**
 	 * @see org.apache.wicket.resource.IPropertiesLoader#loadWicketProperties(java.io.InputStream)
 	 */
+	@Override
 	public ValueMap loadWicketProperties(InputStream inputStream)
 	{
 		return null;

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/XmlFilePropertiesLoader.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/XmlFilePropertiesLoader.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/XmlFilePropertiesLoader.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/XmlFilePropertiesLoader.java Wed Nov 16 22:51:59 2011
@@ -44,6 +44,7 @@ public class XmlFilePropertiesLoader imp
 	/**
 	 * @see org.apache.wicket.resource.IPropertiesLoader#getFileExtension()
 	 */
+	@Override
 	public final String getFileExtension()
 	{
 		return fileExtension;
@@ -53,6 +54,7 @@ public class XmlFilePropertiesLoader imp
 	 * @throws IOException
 	 * @see org.apache.wicket.resource.IPropertiesLoader#loadJavaProperties(java.io.InputStream)
 	 */
+	@Override
 	public java.util.Properties loadJavaProperties(final InputStream in) throws IOException
 	{
 		java.util.Properties properties = new java.util.Properties();
@@ -63,6 +65,7 @@ public class XmlFilePropertiesLoader imp
 	/**
 	 * @see org.apache.wicket.resource.IPropertiesLoader#loadWicketProperties(java.io.InputStream)
 	 */
+	@Override
 	public ValueMap loadWicketProperties(InputStream inputStream)
 	{
 		return null;

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/filtering/AbstractHeaderResponseFilter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/filtering/AbstractHeaderResponseFilter.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/filtering/AbstractHeaderResponseFilter.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/filtering/AbstractHeaderResponseFilter.java Wed Nov 16 22:51:59 2011
@@ -42,21 +42,25 @@ public abstract class AbstractHeaderResp
 		this.name = name;
 	}
 
+	@Override
 	public String getName()
 	{
 		return name;
 	}
 
+	@Override
 	public boolean acceptReference(ResourceReference object)
 	{
 		return true;
 	}
 
+	@Override
 	public boolean acceptOtherJavaScript()
 	{
 		return true;
 	}
 
+	@Override
 	public boolean acceptOtherCss()
 	{
 		return true;

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/filtering/HeaderResponseContainerFilteringHeaderResponse.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/filtering/HeaderResponseContainerFilteringHeaderResponse.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/filtering/HeaderResponseContainerFilteringHeaderResponse.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/filtering/HeaderResponseContainerFilteringHeaderResponse.java Wed Nov 16 22:51:59 2011
@@ -169,6 +169,7 @@ public class HeaderResponseContainerFilt
 	{
 		forReference(reference, new Runnable()
 		{
+			@Override
 			public void run()
 			{
 				getRealResponse().renderJavaScriptReference(reference);
@@ -188,6 +189,7 @@ public class HeaderResponseContainerFilt
 	{
 		forReference(reference, new Runnable()
 		{
+			@Override
 			public void run()
 			{
 				getRealResponse().renderJavaScriptReference(reference, pageParameters, id);
@@ -200,6 +202,7 @@ public class HeaderResponseContainerFilt
 	{
 		forJavaScript(new Runnable()
 		{
+			@Override
 			public void run()
 			{
 				getRealResponse().renderJavaScriptReference(url);
@@ -212,6 +215,7 @@ public class HeaderResponseContainerFilt
 	{
 		forJavaScript(new Runnable()
 		{
+			@Override
 			public void run()
 			{
 				getRealResponse().renderJavaScriptReference(url, id);
@@ -224,6 +228,7 @@ public class HeaderResponseContainerFilt
 	{
 		forJavaScript(new Runnable()
 		{
+			@Override
 			public void run()
 			{
 				getRealResponse().renderJavaScript(javascript, id);
@@ -236,6 +241,7 @@ public class HeaderResponseContainerFilt
 	{
 		forReference(reference, new Runnable()
 		{
+			@Override
 			public void run()
 			{
 				getRealResponse().renderCSSReference(reference);
@@ -248,6 +254,7 @@ public class HeaderResponseContainerFilt
 	{
 		forCss(new Runnable()
 		{
+			@Override
 			public void run()
 			{
 				getRealResponse().renderCSSReference(url);
@@ -267,6 +274,7 @@ public class HeaderResponseContainerFilt
 	{
 		forReference(reference, new Runnable()
 		{
+			@Override
 			public void run()
 			{
 				getRealResponse().renderCSSReference(reference, pageParameters, media);
@@ -279,6 +287,7 @@ public class HeaderResponseContainerFilt
 	{
 		forCss(new Runnable()
 		{
+			@Override
 			public void run()
 			{
 				getRealResponse().renderCSSReference(url, media);
@@ -291,6 +300,7 @@ public class HeaderResponseContainerFilt
 	{
 		forJavaScript(new Runnable()
 		{
+			@Override
 			public void run()
 			{
 				getRealResponse().renderOnDomReadyJavaScript(javascript);
@@ -303,6 +313,7 @@ public class HeaderResponseContainerFilt
 	{
 		forJavaScript(new Runnable()
 		{
+			@Override
 			public void run()
 			{
 				getRealResponse().renderOnLoadJavaScript(javascript);
@@ -316,6 +327,7 @@ public class HeaderResponseContainerFilt
 	{
 		forJavaScript(new Runnable()
 		{
+			@Override
 			public void run()
 			{
 				getRealResponse().renderOnEventJavaScript(target, event, javascript);

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/filtering/OppositeHeaderResponseFilter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/filtering/OppositeHeaderResponseFilter.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/filtering/OppositeHeaderResponseFilter.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/filtering/OppositeHeaderResponseFilter.java Wed Nov 16 22:51:59 2011
@@ -46,21 +46,25 @@ public class OppositeHeaderResponseFilte
 		this.other = other;
 	}
 
+	@Override
 	public String getName()
 	{
 		return name;
 	}
 
+	@Override
 	public boolean acceptReference(ResourceReference ref)
 	{
 		return !other.acceptReference(ref);
 	}
 
+	@Override
 	public boolean acceptOtherJavaScript()
 	{
 		return !other.acceptOtherJavaScript();
 	}
 
+	@Override
 	public boolean acceptOtherCss()
 	{
 		return !other.acceptOtherCss();

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/loader/BundleStringResourceLoader.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/loader/BundleStringResourceLoader.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/loader/BundleStringResourceLoader.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/loader/BundleStringResourceLoader.java Wed Nov 16 22:51:59 2011
@@ -51,6 +51,7 @@ public class BundleStringResourceLoader 
 	/**
 	 * Get the value via a Java ResourceBundle
 	 */
+	@Override
 	public final String loadStringResource(final Class<?> clazz, final String key, Locale locale,
 		final String style, final String variation)
 	{
@@ -84,6 +85,7 @@ public class BundleStringResourceLoader 
 	 *            ignored
 	 * @return The string resource value or null if resource not found
 	 */
+	@Override
 	public final String loadStringResource(final Component component, final String key,
 		Locale locale, final String style, final String variation)
 	{

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/loader/ComponentStringResourceLoader.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/loader/ComponentStringResourceLoader.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/loader/ComponentStringResourceLoader.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/loader/ComponentStringResourceLoader.java Wed Nov 16 22:51:59 2011
@@ -112,6 +112,7 @@ public class ComponentStringResourceLoad
 	 * @see org.apache.wicket.resource.loader.IStringResourceLoader#loadStringResource(java.lang.Class,
 	 *      java.lang.String, java.util.Locale, java.lang.String, java.lang.String)
 	 */
+	@Override
 	public String loadStringResource(Class<?> clazz, final String key, final Locale locale,
 		final String style, final String variation)
 	{
@@ -205,6 +206,7 @@ public class ComponentStringResourceLoad
 	 * @see org.apache.wicket.resource.loader.IStringResourceLoader#loadStringResource(org.apache.wicket.Component,
 	 *      java.lang.String, java.util.Locale, java.lang.String, java.lang.String)
 	 */
+	@Override
 	public String loadStringResource(final Component component, final String key,
 		final Locale locale, final String style, final String variation)
 	{

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/response/filter/AjaxServerAndClientTimeFilter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/response/filter/AjaxServerAndClientTimeFilter.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/response/filter/AjaxServerAndClientTimeFilter.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/response/filter/AjaxServerAndClientTimeFilter.java Wed Nov 16 22:51:59 2011
@@ -58,6 +58,7 @@ public class AjaxServerAndClientTimeFilt
 	/**
 	 * @see org.apache.wicket.IResponseFilter#filter(org.apache.wicket.util.string.AppendingStringBuffer)
 	 */
+	@Override
 	public AppendingStringBuffer filter(AppendingStringBuffer responseBuffer)
 	{
 		int headIndex = responseBuffer.indexOf("<head>");

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/response/filter/EmptySrcAttributeCheckFilter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/response/filter/EmptySrcAttributeCheckFilter.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/response/filter/EmptySrcAttributeCheckFilter.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/response/filter/EmptySrcAttributeCheckFilter.java Wed Nov 16 22:51:59 2011
@@ -44,6 +44,7 @@ public class EmptySrcAttributeCheckFilte
 	/**
 	 * @see org.apache.wicket.IResponseFilter#filter(AppendingStringBuffer)
 	 */
+	@Override
 	public AppendingStringBuffer filter(final AppendingStringBuffer responseBuffer)
 	{
 		int pos = responseBuffer.indexOf("src=\"\"");

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/response/filter/ServerAndClientTimeFilter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/response/filter/ServerAndClientTimeFilter.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/response/filter/ServerAndClientTimeFilter.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/response/filter/ServerAndClientTimeFilter.java Wed Nov 16 22:51:59 2011
@@ -58,6 +58,7 @@ public class ServerAndClientTimeFilter i
 	/**
 	 * @see org.apache.wicket.IResponseFilter#filter(AppendingStringBuffer)
 	 */
+	@Override
 	public AppendingStringBuffer filter(AppendingStringBuffer responseBuffer)
 	{
 		int headIndex = responseBuffer.indexOf("<head>");

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/serialize/java/JavaSerializer.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/serialize/java/JavaSerializer.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/serialize/java/JavaSerializer.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/serialize/java/JavaSerializer.java Wed Nov 16 22:51:59 2011
@@ -64,6 +64,7 @@ public class JavaSerializer implements I
 		this.applicationKey = applicationKey;
 	}
 
+	@Override
 	public byte[] serialize(final Object object)
 	{
 		try
@@ -97,6 +98,7 @@ public class JavaSerializer implements I
 		return null;
 	}
 
+	@Override
 	public Object deserialize(final byte[] data)
 	{
 		ThreadContext old = ThreadContext.get(false);

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/session/DefaultPageFactory.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/session/DefaultPageFactory.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/session/DefaultPageFactory.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/session/DefaultPageFactory.java Wed Nov 16 22:51:59 2011
@@ -57,6 +57,7 @@ public final class DefaultPageFactory im
 	 */
 	private final ConcurrentMap<String, Boolean> pageToBookmarkableCache = new ConcurrentHashMap<String, Boolean>();
 
+	@Override
 	public final <C extends IRequestablePage> Page newPage(final Class<C> pageClass)
 	{
 		try
@@ -84,6 +85,7 @@ public final class DefaultPageFactory im
 		}
 	}
 
+	@Override
 	public final <C extends IRequestablePage> Page newPage(final Class<C> pageClass,
 		final PageParameters parameters)
 	{
@@ -227,6 +229,7 @@ public final class DefaultPageFactory im
 		return msg + "'. Might be it doesn't exist, may be it is not visible (public).";
 	}
 
+	@Override
 	public <C extends IRequestablePage> boolean isBookmarkable(Class<C> pageClass)
 	{
 		Boolean bookmarkable = pageToBookmarkableCache.get(pageClass.getName());

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/session/HttpSessionStore.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/session/HttpSessionStore.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/session/HttpSessionStore.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/session/HttpSessionStore.java Wed Nov 16 22:51:59 2011
@@ -96,6 +96,7 @@ public class HttpSessionStore implements
 	/**
 	 * @see org.apache.wicket.session.ISessionStore#bind(Request, Session)
 	 */
+	@Override
 	public final void bind(final Request request, final Session newSession)
 	{
 		if (getAttribute(request, Session.SESSION_ATTRIBUTE_NAME) != newSession)
@@ -118,6 +119,7 @@ public class HttpSessionStore implements
 		}
 	}
 
+	@Override
 	public void flushSession(Request request, Session session)
 	{
 		if (getAttribute(request, Session.SESSION_ATTRIBUTE_NAME) != session)
@@ -134,6 +136,7 @@ public class HttpSessionStore implements
 	/**
 	 * @see org.apache.wicket.session.ISessionStore#destroy()
 	 */
+	@Override
 	public void destroy()
 	{
 	}
@@ -142,6 +145,7 @@ public class HttpSessionStore implements
 	 * @see org.apache.wicket.session.ISessionStore#getSessionId(org.apache.wicket.request.Request,
 	 *      boolean)
 	 */
+	@Override
 	public String getSessionId(final Request request, final boolean create)
 	{
 		String id = null;
@@ -168,6 +172,7 @@ public class HttpSessionStore implements
 	/**
 	 * @see org.apache.wicket.session.ISessionStore#invalidate(Request)
 	 */
+	@Override
 	public final void invalidate(final Request request)
 	{
 		HttpSession httpSession = getHttpSession(request, false);
@@ -181,6 +186,7 @@ public class HttpSessionStore implements
 	/**
 	 * @see org.apache.wicket.session.ISessionStore#lookup(org.apache.wicket.request.Request)
 	 */
+	@Override
 	public final Session lookup(final Request request)
 	{
 		String sessionId = getSessionId(request, false);
@@ -243,6 +249,7 @@ public class HttpSessionStore implements
 	 * @see org.apache.wicket.session.ISessionStore#getAttribute(org.apache.wicket.request.Request,
 	 *      java.lang.String)
 	 */
+	@Override
 	public final Serializable getAttribute(final Request request, final String name)
 	{
 		HttpSession httpSession = getHttpSession(request, false);
@@ -256,6 +263,7 @@ public class HttpSessionStore implements
 	/**
 	 * @see org.apache.wicket.session.ISessionStore#getAttributeNames(org.apache.wicket.request.Request)
 	 */
+	@Override
 	public final List<String> getAttributeNames(final Request request)
 	{
 		List<String> list = new ArrayList<String>();
@@ -281,6 +289,7 @@ public class HttpSessionStore implements
 	 * @see org.apache.wicket.session.ISessionStore#removeAttribute(org.apache.wicket.request.Request,
 	 *      java.lang.String)
 	 */
+	@Override
 	public final void removeAttribute(final Request request, final String name)
 	{
 		HttpSession httpSession = getHttpSession(request, false);
@@ -305,6 +314,7 @@ public class HttpSessionStore implements
 	 * @see org.apache.wicket.session.ISessionStore#setAttribute(org.apache.wicket.request.Request,
 	 *      java.lang.String, java.io.Serializable)
 	 */
+	@Override
 	public final void setAttribute(final Request request, final String name,
 		final Serializable value)
 	{
@@ -332,6 +342,7 @@ public class HttpSessionStore implements
 	/**
 	 * @see org.apache.wicket.session.ISessionStore#registerUnboundListener(org.apache.wicket.session.ISessionStore.UnboundListener)
 	 */
+	@Override
 	public final void registerUnboundListener(final UnboundListener listener)
 	{
 		unboundListeners.add(listener);
@@ -340,6 +351,7 @@ public class HttpSessionStore implements
 	/**
 	 * @see org.apache.wicket.session.ISessionStore#unregisterUnboundListener(org.apache.wicket.session.ISessionStore.UnboundListener)
 	 */
+	@Override
 	public final void unregisterUnboundListener(final UnboundListener listener)
 	{
 		unboundListeners.remove(listener);
@@ -348,6 +360,7 @@ public class HttpSessionStore implements
 	/**
 	 * @see org.apache.wicket.session.ISessionStore#getUnboundListener()
 	 */
+	@Override
 	public final Set<UnboundListener> getUnboundListener()
 	{
 		return Collections.unmodifiableSet(unboundListeners);
@@ -386,6 +399,7 @@ public class HttpSessionStore implements
 		/**
 		 * @see javax.servlet.http.HttpSessionBindingListener#valueBound(javax.servlet.http.HttpSessionBindingEvent)
 		 */
+		@Override
 		public void valueBound(final HttpSessionBindingEvent evg)
 		{
 		}
@@ -393,6 +407,7 @@ public class HttpSessionStore implements
 		/**
 		 * @see javax.servlet.http.HttpSessionBindingListener#valueUnbound(javax.servlet.http.HttpSessionBindingEvent)
 		 */
+		@Override
 		public void valueUnbound(final HttpSessionBindingEvent evt)
 		{
 			if (log.isDebugEnabled())

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/ApplicationSettings.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/ApplicationSettings.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/ApplicationSettings.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/ApplicationSettings.java Wed Nov 16 22:51:59 2011
@@ -52,6 +52,7 @@ public class ApplicationSettings impleme
 	/**
 	 * @see org.apache.wicket.settings.IApplicationSettings#getAccessDeniedPage()
 	 */
+	@Override
 	public Class<? extends Page> getAccessDeniedPage()
 	{
 		return accessDeniedPage.get();
@@ -60,11 +61,13 @@ public class ApplicationSettings impleme
 	/**
 	 * @see org.apache.wicket.settings.IApplicationSettings#getClassResolver()
 	 */
+	@Override
 	public IClassResolver getClassResolver()
 	{
 		return classResolver;
 	}
 
+	@Override
 	public Bytes getDefaultMaximumUploadSize()
 	{
 		return defaultMaximumUploadSize;
@@ -73,6 +76,7 @@ public class ApplicationSettings impleme
 	/**
 	 * @see org.apache.wicket.settings.IApplicationSettings#getInternalErrorPage()
 	 */
+	@Override
 	public Class<? extends Page> getInternalErrorPage()
 	{
 		return internalErrorPage.get();
@@ -81,6 +85,7 @@ public class ApplicationSettings impleme
 	/**
 	 * @see org.apache.wicket.settings.IApplicationSettings#getPageExpiredErrorPage()
 	 */
+	@Override
 	public Class<? extends Page> getPageExpiredErrorPage()
 	{
 		return pageExpiredErrorPage.get();
@@ -89,6 +94,7 @@ public class ApplicationSettings impleme
 	/**
 	 * @see org.apache.wicket.settings.IApplicationSettings#isUploadProgressUpdatesEnabled()
 	 */
+	@Override
 	public boolean isUploadProgressUpdatesEnabled()
 	{
 		return uploadProgressUpdatesEnabled;
@@ -97,6 +103,7 @@ public class ApplicationSettings impleme
 	/**
 	 * @see org.apache.wicket.settings.IApplicationSettings#setAccessDeniedPage(java.lang.Class)
 	 */
+	@Override
 	public void setAccessDeniedPage(Class<? extends Page> accessDeniedPage)
 	{
 		if (accessDeniedPage == null)
@@ -111,6 +118,7 @@ public class ApplicationSettings impleme
 	/**
 	 * @see org.apache.wicket.settings.IApplicationSettings#setClassResolver(org.apache.wicket.application.IClassResolver)
 	 */
+	@Override
 	public void setClassResolver(final IClassResolver defaultClassResolver)
 	{
 		classResolver = defaultClassResolver;
@@ -119,6 +127,7 @@ public class ApplicationSettings impleme
 	/**
 	 * @see org.apache.wicket.settings.IApplicationSettings#setDefaultMaximumUploadSize(org.apache.wicket.util.lang.Bytes)
 	 */
+	@Override
 	public void setDefaultMaximumUploadSize(Bytes defaultMaximumUploadSize)
 	{
 		this.defaultMaximumUploadSize = defaultMaximumUploadSize;
@@ -127,6 +136,7 @@ public class ApplicationSettings impleme
 	/**
 	 * @see org.apache.wicket.settings.IApplicationSettings#setInternalErrorPage(java.lang.Class)
 	 */
+	@Override
 	public void setInternalErrorPage(final Class<? extends Page> internalErrorPage)
 	{
 		if (internalErrorPage == null)
@@ -141,6 +151,7 @@ public class ApplicationSettings impleme
 	/**
 	 * @see org.apache.wicket.settings.IApplicationSettings#setPageExpiredErrorPage(java.lang.Class)
 	 */
+	@Override
 	public void setPageExpiredErrorPage(final Class<? extends Page> pageExpiredErrorPage)
 	{
 		if (pageExpiredErrorPage == null)
@@ -155,6 +166,7 @@ public class ApplicationSettings impleme
 	/**
 	 * @see org.apache.wicket.settings.IApplicationSettings#setUploadProgressUpdatesEnabled(boolean)
 	 */
+	@Override
 	public void setUploadProgressUpdatesEnabled(boolean uploadProgressUpdatesEnabled)
 	{
 		this.uploadProgressUpdatesEnabled = uploadProgressUpdatesEnabled;

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/DebugSettings.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/DebugSettings.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/DebugSettings.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/DebugSettings.java Wed Nov 16 22:51:59 2011
@@ -60,6 +60,7 @@ public class DebugSettings implements ID
 	/**
 	 * @see org.apache.wicket.settings.IDebugSettings#getComponentUseCheck()
 	 */
+	@Override
 	public boolean getComponentUseCheck()
 	{
 		return componentUseCheck;
@@ -68,6 +69,7 @@ public class DebugSettings implements ID
 	/**
 	 * @see org.apache.wicket.settings.IDebugSettings#isAjaxDebugModeEnabled()
 	 */
+	@Override
 	public boolean isAjaxDebugModeEnabled()
 	{
 		return ajaxDebugModeEnabled;
@@ -77,6 +79,7 @@ public class DebugSettings implements ID
 	 * 
 	 * @see org.apache.wicket.settings.IDebugSettings#isLinePreciseReportingOnAddComponentEnabled()
 	 */
+	@Override
 	public boolean isLinePreciseReportingOnAddComponentEnabled()
 	{
 		return linePreciseReportingOnAddComponentEnabled;
@@ -86,6 +89,7 @@ public class DebugSettings implements ID
 	 * 
 	 * @see org.apache.wicket.settings.IDebugSettings#isLinePreciseReportingOnNewComponentEnabled()
 	 */
+	@Override
 	public boolean isLinePreciseReportingOnNewComponentEnabled()
 	{
 		return linePreciseReportingOnNewComponentEnabled;
@@ -94,6 +98,7 @@ public class DebugSettings implements ID
 	/**
 	 * @see org.apache.wicket.settings.IDebugSettings#isOutputMarkupContainerClassName()
 	 */
+	@Override
 	public boolean isOutputMarkupContainerClassName()
 	{
 		return outputMarkupContainerClassName;
@@ -102,6 +107,7 @@ public class DebugSettings implements ID
 	/**
 	 * @see org.apache.wicket.settings.IDebugSettings#setAjaxDebugModeEnabled(boolean)
 	 */
+	@Override
 	public void setAjaxDebugModeEnabled(boolean enable)
 	{
 		ajaxDebugModeEnabled = enable;
@@ -110,11 +116,13 @@ public class DebugSettings implements ID
 	/**
 	 * @see org.apache.wicket.settings.IDebugSettings#setComponentUseCheck(boolean)
 	 */
+	@Override
 	public void setComponentUseCheck(final boolean componentUseCheck)
 	{
 		this.componentUseCheck = componentUseCheck;
 	}
 
+	@Override
 	public void setLinePreciseReportingOnAddComponentEnabled(boolean enable)
 	{
 		linePreciseReportingOnAddComponentEnabled = enable;
@@ -124,6 +132,7 @@ public class DebugSettings implements ID
 	 * 
 	 * @see org.apache.wicket.settings.IDebugSettings#setLinePreciseReportingOnNewComponentEnabled(boolean)
 	 */
+	@Override
 	public void setLinePreciseReportingOnNewComponentEnabled(boolean enable)
 	{
 		linePreciseReportingOnNewComponentEnabled = enable;
@@ -132,18 +141,21 @@ public class DebugSettings implements ID
 	/**
 	 * @see org.apache.wicket.settings.IDebugSettings#setOutputMarkupContainerClassName(boolean)
 	 */
+	@Override
 	public void setOutputMarkupContainerClassName(boolean enable)
 	{
 		outputMarkupContainerClassName = enable;
 	}
 
 	/** @see IDebugSettings#isOutputComponentPath() */
+	@Override
 	public boolean isOutputComponentPath()
 	{
 		return outputComponentPath;
 	}
 
 	/** @see IDebugSettings#setOutputComponentPath(boolean) */
+	@Override
 	public void setOutputComponentPath(boolean outputComponentPath)
 	{
 		this.outputComponentPath = outputComponentPath;
@@ -152,6 +164,7 @@ public class DebugSettings implements ID
 	/**
 	 * @see org.apache.wicket.settings.IDebugSettings#setDevelopmentUtilitiesEnabled(boolean)
 	 */
+	@Override
 	public void setDevelopmentUtilitiesEnabled(boolean enable)
 	{
 		developmentUtilitiesEnabled = enable;
@@ -160,6 +173,7 @@ public class DebugSettings implements ID
 	/**
 	 * @see org.apache.wicket.settings.IDebugSettings#isDevelopmentUtilitiesEnabled()
 	 */
+	@Override
 	public boolean isDevelopmentUtilitiesEnabled()
 	{
 		return developmentUtilitiesEnabled;

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/ExceptionSettings.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/ExceptionSettings.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/ExceptionSettings.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/ExceptionSettings.java Wed Nov 16 22:51:59 2011
@@ -47,6 +47,7 @@ public class ExceptionSettings implement
 	/**
 	 * @see org.apache.wicket.settings.IRequestCycleSettings#getUnexpectedExceptionDisplay()
 	 */
+	@Override
 	public UnexpectedExceptionDisplay getUnexpectedExceptionDisplay()
 	{
 		return unexpectedExceptionDisplay;
@@ -55,6 +56,7 @@ public class ExceptionSettings implement
 	/**
 	 * @see org.apache.wicket.settings.IRequestCycleSettings#setUnexpectedExceptionDisplay(org.apache.wicket.settings.Settings.UnexpectedExceptionDisplay)
 	 */
+	@Override
 	public void setUnexpectedExceptionDisplay(UnexpectedExceptionDisplay unexpectedExceptionDisplay)
 	{
 		this.unexpectedExceptionDisplay = unexpectedExceptionDisplay;
@@ -63,6 +65,7 @@ public class ExceptionSettings implement
 	/**
 	 * @see org.apache.wicket.settings.IExceptionSettings#getAjaxErrorHandlingStrategy()
 	 */
+	@Override
 	public AjaxErrorStrategy getAjaxErrorHandlingStrategy()
 	{
 		return errorHandlingStrategyDuringAjaxRequests;
@@ -71,17 +74,20 @@ public class ExceptionSettings implement
 	/**
 	 * @see org.apache.wicket.settings.IExceptionSettings#setAjaxErrorHandlingStrategy(org.apache.wicket.settings.IExceptionSettings.AjaxErrorStrategy)
 	 */
+	@Override
 	public void setAjaxErrorHandlingStrategy(
 		AjaxErrorStrategy errorHandlingStrategyDuringAjaxRequests)
 	{
 		this.errorHandlingStrategyDuringAjaxRequests = errorHandlingStrategyDuringAjaxRequests;
 	}
 
+	@Override
 	public void setThreadDumpStrategy(ThreadDumpStrategy strategy)
 	{
 		threadDumpStrategy = Args.notNull(strategy, "strategy");
 	}
 
+	@Override
 	public ThreadDumpStrategy getThreadDumpStrategy()
 	{
 		return threadDumpStrategy;

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/FrameworkSettings.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/FrameworkSettings.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/FrameworkSettings.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/FrameworkSettings.java Wed Nov 16 22:51:59 2011
@@ -66,6 +66,7 @@ public class FrameworkSettings implement
 	/**
 	 * @see org.apache.wicket.settings.IFrameworkSettings#getVersion()
 	 */
+	@Override
 	public String getVersion()
 	{
 		String implVersion = null;
@@ -80,6 +81,7 @@ public class FrameworkSettings implement
 	/**
 	 * @see org.apache.wicket.settings.IFrameworkSettings#getDetachListener()
 	 */
+	@Override
 	public IDetachListener getDetachListener()
 	{
 		return detachListener;
@@ -88,11 +90,13 @@ public class FrameworkSettings implement
 	/**
 	 * @see org.apache.wicket.settings.IFrameworkSettings#setDetachListener(org.apache.wicket.IDetachListener)
 	 */
+	@Override
 	public void setDetachListener(IDetachListener detachListener)
 	{
 		this.detachListener = detachListener;
 	}
 
+	@Override
 	public void add(IEventDispatcher dispatcher)
 	{
 		Args.notNull(dispatcher, "dispatcher");
@@ -115,6 +119,7 @@ public class FrameworkSettings implement
 	 * @param event
 	 * @param component
 	 */
+	@Override
 	public void dispatchEvent(Object sink, IEvent<?> event, Component component)
 	{
 		// direct delivery
@@ -139,11 +144,13 @@ public class FrameworkSettings implement
 	}
 
 
+	@Override
 	public void setSerializer(ISerializer pageSerializer)
 	{
 		this.pageSerializer = Args.notNull(pageSerializer, "pageSerializer");
 	}
 
+	@Override
 	public ISerializer getSerializer()
 	{
 		return pageSerializer;

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/MarkupSettings.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/MarkupSettings.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/MarkupSettings.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/MarkupSettings.java Wed Nov 16 22:51:59 2011
@@ -71,6 +71,7 @@ public class MarkupSettings implements I
 	/**
 	 * @see org.apache.wicket.settings.IMarkupSettings#getAutomaticLinking()
 	 */
+	@Override
 	public boolean getAutomaticLinking()
 	{
 		return automaticLinking;
@@ -79,6 +80,7 @@ public class MarkupSettings implements I
 	/**
 	 * @see org.apache.wicket.settings.IMarkupSettings#getCompressWhitespace()
 	 */
+	@Override
 	public boolean getCompressWhitespace()
 	{
 		return compressWhitespace;
@@ -87,6 +89,7 @@ public class MarkupSettings implements I
 	/**
 	 * @see org.apache.wicket.settings.IMarkupSettings#getDefaultAfterDisabledLink()
 	 */
+	@Override
 	public String getDefaultAfterDisabledLink()
 	{
 		return defaultAfterDisabledLink;
@@ -95,6 +98,7 @@ public class MarkupSettings implements I
 	/**
 	 * @see org.apache.wicket.settings.IMarkupSettings#getDefaultBeforeDisabledLink()
 	 */
+	@Override
 	public String getDefaultBeforeDisabledLink()
 	{
 		return defaultBeforeDisabledLink;
@@ -103,6 +107,7 @@ public class MarkupSettings implements I
 	/**
 	 * @see org.apache.wicket.settings.IMarkupSettings#getDefaultMarkupEncoding()
 	 */
+	@Override
 	public String getDefaultMarkupEncoding()
 	{
 		return defaultMarkupEncoding;
@@ -111,6 +116,7 @@ public class MarkupSettings implements I
 	/**
 	 * @see org.apache.wicket.settings.IMarkupSettings#getMarkupFactory()
 	 */
+	@Override
 	public MarkupFactory getMarkupFactory()
 	{
 		if (markupFactory == null)
@@ -123,6 +129,7 @@ public class MarkupSettings implements I
 	/**
 	 * @see org.apache.wicket.settings.IMarkupSettings#getStripComments()
 	 */
+	@Override
 	public boolean getStripComments()
 	{
 		return stripComments;
@@ -131,6 +138,7 @@ public class MarkupSettings implements I
 	/**
 	 * @see org.apache.wicket.settings.IMarkupSettings#getStripWicketTags()
 	 */
+	@Override
 	public boolean getStripWicketTags()
 	{
 		return stripWicketTags;
@@ -139,6 +147,7 @@ public class MarkupSettings implements I
 	/**
 	 * @see org.apache.wicket.settings.IMarkupSettings#getThrowExceptionOnMissingXmlDeclaration()
 	 */
+	@Override
 	public boolean getThrowExceptionOnMissingXmlDeclaration()
 	{
 		return throwExceptionOnMissingXmlDeclaration;
@@ -147,6 +156,7 @@ public class MarkupSettings implements I
 	/**
 	 * @see org.apache.wicket.settings.IMarkupSettings#setAutomaticLinking(boolean)
 	 */
+	@Override
 	public void setAutomaticLinking(boolean automaticLinking)
 	{
 		this.automaticLinking = automaticLinking;
@@ -155,6 +165,7 @@ public class MarkupSettings implements I
 	/**
 	 * @see org.apache.wicket.settings.IMarkupSettings#setCompressWhitespace(boolean)
 	 */
+	@Override
 	public void setCompressWhitespace(final boolean compressWhitespace)
 	{
 		this.compressWhitespace = compressWhitespace;
@@ -163,6 +174,7 @@ public class MarkupSettings implements I
 	/**
 	 * @see org.apache.wicket.settings.IMarkupSettings#setDefaultAfterDisabledLink(java.lang.String)
 	 */
+	@Override
 	public void setDefaultAfterDisabledLink(final String defaultAfterDisabledLink)
 	{
 		this.defaultAfterDisabledLink = defaultAfterDisabledLink;
@@ -171,6 +183,7 @@ public class MarkupSettings implements I
 	/**
 	 * @see org.apache.wicket.settings.IMarkupSettings#setDefaultBeforeDisabledLink(java.lang.String)
 	 */
+	@Override
 	public void setDefaultBeforeDisabledLink(String defaultBeforeDisabledLink)
 	{
 		this.defaultBeforeDisabledLink = defaultBeforeDisabledLink;
@@ -179,6 +192,7 @@ public class MarkupSettings implements I
 	/**
 	 * @see org.apache.wicket.settings.IMarkupSettings#setDefaultMarkupEncoding(java.lang.String)
 	 */
+	@Override
 	public void setDefaultMarkupEncoding(final String encoding)
 	{
 		defaultMarkupEncoding = encoding;
@@ -187,6 +201,7 @@ public class MarkupSettings implements I
 	/**
 	 * @see org.apache.wicket.settings.IMarkupSettings#setMarkupFactory(org.apache.wicket.markup.MarkupFactory)
 	 */
+	@Override
 	public void setMarkupFactory(final MarkupFactory factory)
 	{
 		Args.notNull(factory, "markup factory");
@@ -196,6 +211,7 @@ public class MarkupSettings implements I
 	/**
 	 * @see org.apache.wicket.settings.IMarkupSettings#setStripComments(boolean)
 	 */
+	@Override
 	public void setStripComments(boolean stripComments)
 	{
 		this.stripComments = stripComments;
@@ -204,6 +220,7 @@ public class MarkupSettings implements I
 	/**
 	 * @see org.apache.wicket.settings.IMarkupSettings#setStripWicketTags(boolean)
 	 */
+	@Override
 	public void setStripWicketTags(boolean stripWicketTags)
 	{
 		this.stripWicketTags = stripWicketTags;
@@ -212,6 +229,7 @@ public class MarkupSettings implements I
 	/**
 	 * @see org.apache.wicket.settings.IMarkupSettings#setThrowExceptionOnMissingXmlDeclaration(boolean)
 	 */
+	@Override
 	public void setThrowExceptionOnMissingXmlDeclaration(boolean throwException)
 	{
 		throwExceptionOnMissingXmlDeclaration = throwException;

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/PageSettings.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/PageSettings.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/PageSettings.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/PageSettings.java Wed Nov 16 22:51:59 2011
@@ -43,6 +43,7 @@ public class PageSettings implements IPa
 	/**
 	 * @see org.apache.wicket.settings.IPageSettings#addComponentResolver(org.apache.wicket.markup.resolver.IComponentResolver)
 	 */
+	@Override
 	public void addComponentResolver(IComponentResolver resolver)
 	{
 		componentResolvers.add(resolver);
@@ -51,6 +52,7 @@ public class PageSettings implements IPa
 	/**
 	 * @see org.apache.wicket.settings.IPageSettings#getComponentResolvers()
 	 */
+	@Override
 	public List<IComponentResolver> getComponentResolvers()
 	{
 		return componentResolvers;
@@ -59,6 +61,7 @@ public class PageSettings implements IPa
 	/**
 	 * @see org.apache.wicket.settings.IPageSettings#getVersionPagesByDefault()
 	 */
+	@Override
 	public boolean getVersionPagesByDefault()
 	{
 		return versionPagesByDefault;
@@ -67,6 +70,7 @@ public class PageSettings implements IPa
 	/**
 	 * @see org.apache.wicket.settings.IPageSettings#setVersionPagesByDefault(boolean)
 	 */
+	@Override
 	public void setVersionPagesByDefault(boolean pagesVersionedByDefault)
 	{
 		versionPagesByDefault = pagesVersionedByDefault;

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/RequestCycleSettings.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/RequestCycleSettings.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/RequestCycleSettings.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/RequestCycleSettings.java Wed Nov 16 22:51:59 2011
@@ -81,6 +81,7 @@ public class RequestCycleSettings implem
 	/**
 	 * @see org.apache.wicket.settings.IRequestCycleSettings#addResponseFilter(org.apache.wicket.IResponseFilter)
 	 */
+	@Override
 	public void addResponseFilter(IResponseFilter responseFilter)
 	{
 		if (responseFilters == null)
@@ -93,6 +94,7 @@ public class RequestCycleSettings implem
 	/**
 	 * @see org.apache.wicket.settings.IRequestCycleSettings#getBufferResponse()
 	 */
+	@Override
 	public boolean getBufferResponse()
 	{
 		return bufferResponse;
@@ -101,6 +103,7 @@ public class RequestCycleSettings implem
 	/**
 	 * @see org.apache.wicket.settings.IRequestCycleSettings#getGatherExtendedBrowserInfo()
 	 */
+	@Override
 	public boolean getGatherExtendedBrowserInfo()
 	{
 		return gatherExtendedBrowserInfo;
@@ -109,6 +112,7 @@ public class RequestCycleSettings implem
 	/**
 	 * @see org.apache.wicket.settings.IRequestCycleSettings#getRenderStrategy()
 	 */
+	@Override
 	public IRequestCycleSettings.RenderStrategy getRenderStrategy()
 	{
 		return renderStrategy;
@@ -117,6 +121,7 @@ public class RequestCycleSettings implem
 	/**
 	 * @see org.apache.wicket.settings.IRequestCycleSettings#getResponseFilters()
 	 */
+	@Override
 	public List<IResponseFilter> getResponseFilters()
 	{
 		if (responseFilters == null)
@@ -132,6 +137,7 @@ public class RequestCycleSettings implem
 	/**
 	 * @see org.apache.wicket.settings.IRequestCycleSettings#getResponseRequestEncoding()
 	 */
+	@Override
 	public String getResponseRequestEncoding()
 	{
 		return responseRequestEncoding;
@@ -140,6 +146,7 @@ public class RequestCycleSettings implem
 	/**
 	 * @see org.apache.wicket.settings.IRequestCycleSettings#getTimeout()
 	 */
+	@Override
 	public Duration getTimeout()
 	{
 		return timeout;
@@ -148,6 +155,7 @@ public class RequestCycleSettings implem
 	/**
 	 * @see org.apache.wicket.settings.IRequestCycleSettings#getUnexpectedExceptionDisplay()
 	 */
+	@Override
 	public IExceptionSettings.UnexpectedExceptionDisplay getUnexpectedExceptionDisplay()
 	{
 		return unexpectedExceptionDisplay;
@@ -156,6 +164,7 @@ public class RequestCycleSettings implem
 	/**
 	 * @see org.apache.wicket.settings.IRequestCycleSettings#setBufferResponse(boolean)
 	 */
+	@Override
 	public void setBufferResponse(boolean bufferResponse)
 	{
 		this.bufferResponse = bufferResponse;
@@ -164,6 +173,7 @@ public class RequestCycleSettings implem
 	/**
 	 * @see org.apache.wicket.settings.IRequestCycleSettings#setGatherExtendedBrowserInfo(boolean)
 	 */
+	@Override
 	public void setGatherExtendedBrowserInfo(boolean gatherExtendedBrowserInfo)
 	{
 		this.gatherExtendedBrowserInfo = gatherExtendedBrowserInfo;
@@ -172,6 +182,7 @@ public class RequestCycleSettings implem
 	/**
 	 * @see org.apache.wicket.settings.IRequestCycleSettings#setRenderStrategy(org.apache.wicket.settings.Settings.RenderStrategy)
 	 */
+	@Override
 	public void setRenderStrategy(IRequestCycleSettings.RenderStrategy renderStrategy)
 	{
 		this.renderStrategy = renderStrategy;
@@ -180,6 +191,7 @@ public class RequestCycleSettings implem
 	/**
 	 * @see org.apache.wicket.settings.IRequestCycleSettings#setResponseRequestEncoding(java.lang.String)
 	 */
+	@Override
 	public void setResponseRequestEncoding(final String encoding)
 	{
 		Args.notNull(encoding, "encoding");
@@ -189,6 +201,7 @@ public class RequestCycleSettings implem
 	/**
 	 * @see org.apache.wicket.settings.IRequestCycleSettings#setTimeout(org.apache.wicket.util.time.Duration)
 	 */
+	@Override
 	public void setTimeout(Duration timeout)
 	{
 		if (timeout == null)
@@ -201,6 +214,7 @@ public class RequestCycleSettings implem
 	/**
 	 * @see org.apache.wicket.settings.IRequestCycleSettings#setUnexpectedExceptionDisplay(org.apache.wicket.settings.Settings.UnexpectedExceptionDisplay)
 	 */
+	@Override
 	public void setUnexpectedExceptionDisplay(
 		final IExceptionSettings.UnexpectedExceptionDisplay unexpectedExceptionDisplay)
 	{

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/RequestLoggerSettings.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/RequestLoggerSettings.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/RequestLoggerSettings.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/RequestLoggerSettings.java Wed Nov 16 22:51:59 2011
@@ -39,6 +39,7 @@ public class RequestLoggerSettings imple
 	/**
 	 * @see org.apache.wicket.settings.IRequestLoggerSettings#getRecordSessionSize()
 	 */
+	@Override
 	public boolean getRecordSessionSize()
 	{
 		return recordSessionSize;
@@ -47,6 +48,7 @@ public class RequestLoggerSettings imple
 	/**
 	 * @see org.apache.wicket.settings.IRequestLoggerSettings#getRequestsWindowSize()
 	 */
+	@Override
 	public int getRequestsWindowSize()
 	{
 		return requestsWindowSize;
@@ -55,6 +57,7 @@ public class RequestLoggerSettings imple
 	/**
 	 * @see org.apache.wicket.settings.IRequestLoggerSettings#isRequestLoggerEnabled()
 	 */
+	@Override
 	public boolean isRequestLoggerEnabled()
 	{
 		return requestLoggerEnabled;
@@ -63,6 +66,7 @@ public class RequestLoggerSettings imple
 	/**
 	 * @see org.apache.wicket.settings.IRequestLoggerSettings#setRecordSessionSize(boolean)
 	 */
+	@Override
 	public void setRecordSessionSize(boolean record)
 	{
 		recordSessionSize = record;
@@ -71,6 +75,7 @@ public class RequestLoggerSettings imple
 	/**
 	 * @see org.apache.wicket.settings.IRequestLoggerSettings#setRequestLoggerEnabled(boolean)
 	 */
+	@Override
 	public void setRequestLoggerEnabled(boolean enable)
 	{
 		requestLoggerEnabled = enable;
@@ -79,6 +84,7 @@ public class RequestLoggerSettings imple
 	/**
 	 * @see org.apache.wicket.settings.IRequestLoggerSettings#setRequestsWindowSize(int)
 	 */
+	@Override
 	public void setRequestsWindowSize(int size)
 	{
 		requestsWindowSize = size;

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/ResourceSettings.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/ResourceSettings.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/ResourceSettings.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/ResourceSettings.java Wed Nov 16 22:51:59 2011
@@ -184,6 +184,7 @@ public class ResourceSettings implements
 	 * @see org.apache.wicket.settings.IResourceSettings#addResourceFactory(java.lang.String,
 	 *      org.apache.wicket.IResourceFactory)
 	 */
+	@Override
 	public void addResourceFactory(final String name, IResourceFactory resourceFactory)
 	{
 		nameToResourceFactory.put(name, resourceFactory);
@@ -192,6 +193,7 @@ public class ResourceSettings implements
 	/**
 	 * @see org.apache.wicket.settings.IResourceSettings#addResourceFolder(java.lang.String)
 	 */
+	@Override
 	public void addResourceFolder(final String resourceFolder)
 	{
 		// Get resource finder
@@ -212,6 +214,7 @@ public class ResourceSettings implements
 	/**
 	 * @see org.apache.wicket.settings.IResourceSettings#getLocalizer()
 	 */
+	@Override
 	public Localizer getLocalizer()
 	{
 		if (localizer == null)
@@ -224,6 +227,7 @@ public class ResourceSettings implements
 	/**
 	 * @see org.apache.wicket.settings.IResourceSettings#getPackageResourceGuard()
 	 */
+	@Override
 	public IPackageResourceGuard getPackageResourceGuard()
 	{
 		return packageResourceGuard;
@@ -232,6 +236,7 @@ public class ResourceSettings implements
 	/**
 	 * @see org.apache.wicket.settings.IResourceSettings#getPropertiesFactory()
 	 */
+	@Override
 	public org.apache.wicket.resource.IPropertiesFactory getPropertiesFactory()
 	{
 		if (propertiesFactory == null)
@@ -244,6 +249,7 @@ public class ResourceSettings implements
 	/**
 	 * @see org.apache.wicket.settings.IResourceSettings#getResourceFactory(java.lang.String)
 	 */
+	@Override
 	public IResourceFactory getResourceFactory(final String name)
 	{
 		return nameToResourceFactory.get(name);
@@ -252,6 +258,7 @@ public class ResourceSettings implements
 	/**
 	 * @see org.apache.wicket.settings.IResourceSettings#getResourceFinder()
 	 */
+	@Override
 	public IResourceFinder getResourceFinder()
 	{
 		return resourceFinder;
@@ -260,6 +267,7 @@ public class ResourceSettings implements
 	/**
 	 * @see org.apache.wicket.settings.IResourceSettings#getResourcePollFrequency()
 	 */
+	@Override
 	public Duration getResourcePollFrequency()
 	{
 		return resourcePollFrequency;
@@ -268,6 +276,7 @@ public class ResourceSettings implements
 	/**
 	 * @see org.apache.wicket.settings.IResourceSettings#getResourceStreamLocator()
 	 */
+	@Override
 	public IResourceStreamLocator getResourceStreamLocator()
 	{
 		if (resourceStreamLocator == null)
@@ -283,6 +292,7 @@ public class ResourceSettings implements
 	/**
 	 * @see org.apache.wicket.settings.IResourceSettings#getResourceWatcher(boolean)
 	 */
+	@Override
 	public IModificationWatcher getResourceWatcher(boolean start)
 	{
 		if (resourceWatcher == null && start)
@@ -299,16 +309,19 @@ public class ResourceSettings implements
 	/**
 	 * @see org.apache.wicket.settings.IResourceSettings#setResourceWatcher(org.apache.wicket.util.watch.IModificationWatcher)
 	 */
+	@Override
 	public void setResourceWatcher(IModificationWatcher watcher)
 	{
 		resourceWatcher = watcher;
 	}
 
+	@Override
 	public IFileCleaner getFileCleaner()
 	{
 		return fileCleaner;
 	}
 
+	@Override
 	public void setFileCleaner(IFileCleaner fileUploadCleaner)
 	{
 		fileCleaner = fileUploadCleaner;
@@ -317,6 +330,7 @@ public class ResourceSettings implements
 	/**
 	 * @see org.apache.wicket.settings.IResourceSettings#getStringResourceLoaders()
 	 */
+	@Override
 	public List<IStringResourceLoader> getStringResourceLoaders()
 	{
 		return stringResourceLoaders;
@@ -325,6 +339,7 @@ public class ResourceSettings implements
 	/**
 	 * @see org.apache.wicket.settings.IResourceSettings#getThrowExceptionOnMissingResource()
 	 */
+	@Override
 	public boolean getThrowExceptionOnMissingResource()
 	{
 		return throwExceptionOnMissingResource;
@@ -333,6 +348,7 @@ public class ResourceSettings implements
 	/**
 	 * @see org.apache.wicket.settings.IResourceSettings#getUseDefaultOnMissingResource()
 	 */
+	@Override
 	public boolean getUseDefaultOnMissingResource()
 	{
 		return useDefaultOnMissingResource;
@@ -341,6 +357,7 @@ public class ResourceSettings implements
 	/**
 	 * @see org.apache.wicket.settings.IResourceSettings#setLocalizer(org.apache.wicket.Localizer)
 	 */
+	@Override
 	public void setLocalizer(final Localizer localizer)
 	{
 		this.localizer = localizer;
@@ -349,6 +366,7 @@ public class ResourceSettings implements
 	/**
 	 * @see org.apache.wicket.settings.IResourceSettings#setPackageResourceGuard(org.apache.wicket.markup.html.IPackageResourceGuard)
 	 */
+	@Override
 	public void setPackageResourceGuard(IPackageResourceGuard packageResourceGuard)
 	{
 		if (packageResourceGuard == null)
@@ -361,6 +379,7 @@ public class ResourceSettings implements
 	/**
 	 * @see IResourceSettings#setPropertiesFactory(org.apache.wicket.resource.IPropertiesFactory)
 	 */
+	@Override
 	public void setPropertiesFactory(org.apache.wicket.resource.IPropertiesFactory factory)
 	{
 		propertiesFactory = factory;
@@ -369,6 +388,7 @@ public class ResourceSettings implements
 	/**
 	 * @see org.apache.wicket.settings.IResourceSettings#setResourceFinder(org.apache.wicket.util.file.IResourceFinder)
 	 */
+	@Override
 	public void setResourceFinder(final IResourceFinder resourceFinder)
 	{
 		this.resourceFinder = resourceFinder;
@@ -380,6 +400,7 @@ public class ResourceSettings implements
 	/**
 	 * @see org.apache.wicket.settings.IResourceSettings#setResourcePollFrequency(org.apache.wicket.util.time.Duration)
 	 */
+	@Override
 	public void setResourcePollFrequency(final Duration resourcePollFrequency)
 	{
 		this.resourcePollFrequency = resourcePollFrequency;
@@ -394,6 +415,7 @@ public class ResourceSettings implements
 	 * 
 	 * @see #getResourceStreamLocator()
 	 */
+	@Override
 	public void setResourceStreamLocator(IResourceStreamLocator resourceStreamLocator)
 	{
 		this.resourceStreamLocator = resourceStreamLocator;
@@ -402,6 +424,7 @@ public class ResourceSettings implements
 	/**
 	 * @see org.apache.wicket.settings.IResourceSettings#setThrowExceptionOnMissingResource(boolean)
 	 */
+	@Override
 	public void setThrowExceptionOnMissingResource(final boolean throwExceptionOnMissingResource)
 	{
 		this.throwExceptionOnMissingResource = throwExceptionOnMissingResource;
@@ -410,6 +433,7 @@ public class ResourceSettings implements
 	/**
 	 * @see org.apache.wicket.settings.IResourceSettings#setUseDefaultOnMissingResource(boolean)
 	 */
+	@Override
 	public void setUseDefaultOnMissingResource(final boolean useDefaultOnMissingResource)
 	{
 		this.useDefaultOnMissingResource = useDefaultOnMissingResource;
@@ -418,6 +442,7 @@ public class ResourceSettings implements
 	/**
 	 * @see org.apache.wicket.settings.IResourceSettings#getDefaultCacheDuration()
 	 */
+	@Override
 	public final Duration getDefaultCacheDuration()
 	{
 		return defaultCacheDuration;
@@ -426,17 +451,20 @@ public class ResourceSettings implements
 	/**
 	 * @see org.apache.wicket.settings.IResourceSettings#setDefaultCacheDuration(org.apache.wicket.util.time.Duration)
 	 */
+	@Override
 	public final void setDefaultCacheDuration(Duration duration)
 	{
 		Args.notNull(duration, "duration");
 		defaultCacheDuration = duration;
 	}
 
+	@Override
 	public IJavaScriptCompressor getJavaScriptCompressor()
 	{
 		return javascriptCompressor;
 	}
 
+	@Override
 	public IJavaScriptCompressor setJavaScriptCompressor(IJavaScriptCompressor compressor)
 	{
 		IJavaScriptCompressor old = javascriptCompressor;
@@ -444,11 +472,13 @@ public class ResourceSettings implements
 		return old;
 	}
 
+	@Override
 	public ICssCompressor getCssCompressor()
 	{
 		return cssCompressor;
 	}
 
+	@Override
 	public ICssCompressor setCssCompressor(ICssCompressor compressor)
 	{
 		ICssCompressor old = cssCompressor;
@@ -460,6 +490,7 @@ public class ResourceSettings implements
 	/**
 	 * @see org.apache.wicket.settings.IResourceSettings#getParentFolderPlaceholder()
 	 */
+	@Override
 	public String getParentFolderPlaceholder()
 	{
 		return parentFolderPlaceholder;
@@ -468,6 +499,7 @@ public class ResourceSettings implements
 	/**
 	 * @see org.apache.wicket.settings.IResourceSettings#setParentFolderPlaceholder(String)
 	 */
+	@Override
 	public void setParentFolderPlaceholder(final String sequence)
 	{
 		parentFolderPlaceholder = sequence;
@@ -476,6 +508,7 @@ public class ResourceSettings implements
 	/**
 	 * @see IResourceSettings#getCachingStrategy()
 	 */
+	@Override
 	public IResourceCachingStrategy getCachingStrategy()
 	{
 		if (resourceCachingStrategy == null)
@@ -507,6 +540,7 @@ public class ResourceSettings implements
 	/**
 	 * @see org.apache.wicket.settings.IResourceSettings#setCachingStrategy(org.apache.wicket.request.resource.caching.IResourceCachingStrategy)
 	 */
+	@Override
 	public void setCachingStrategy(IResourceCachingStrategy strategy)
 	{
 		if (strategy == null)