You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jr...@apache.org on 2012/07/09 06:14:16 UTC
[5/6] Add @Override to all overridden methods
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-request/src/main/java/org/apache/wicket/request/mapper/ParentPathReferenceRewriter.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/mapper/ParentPathReferenceRewriter.java b/wicket-request/src/main/java/org/apache/wicket/request/mapper/ParentPathReferenceRewriter.java
index d99708e..c786685 100755
--- a/wicket-request/src/main/java/org/apache/wicket/request/mapper/ParentPathReferenceRewriter.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/mapper/ParentPathReferenceRewriter.java
@@ -65,6 +65,7 @@ public class ParentPathReferenceRewriter implements IRequestMapper
/**
* @see org.apache.wicket.request.IRequestMapper#mapRequest(org.apache.wicket.request.Request)
*/
+ @Override
public IRequestHandler mapRequest(final Request request)
{
Url url = request.getUrl();
@@ -84,6 +85,7 @@ public class ParentPathReferenceRewriter implements IRequestMapper
}
/** {@inheritDoc} */
+ @Override
public Url mapHandler(final IRequestHandler requestHandler)
{
Url url = chain.mapHandler(requestHandler);
@@ -101,6 +103,7 @@ public class ParentPathReferenceRewriter implements IRequestMapper
}
/** {@inheritDoc} */
+ @Override
public int getCompatibilityScore(final Request request)
{
return chain.getCompatibilityScore(request);
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/MountMapper.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/MountMapper.java b/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/MountMapper.java
index 16c8a56..2bc619e 100644
--- a/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/MountMapper.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/MountMapper.java
@@ -83,6 +83,7 @@ public class MountMapper extends AbstractMapper
/**
* @see org.apache.wicket.request.IRequestMapper#getCompatibilityScore(org.apache.wicket.request.Request)
*/
+ @Override
public int getCompatibilityScore(final Request request)
{
if (urlStartsWith(request.getUrl(), mountSegments))
@@ -112,6 +113,7 @@ public class MountMapper extends AbstractMapper
/**
* @see org.apache.wicket.request.IRequestMapper#mapRequest(org.apache.wicket.request.Request)
*/
+ @Override
public final IRequestHandler mapRequest(final Request request)
{
final Url url = request.getUrl();
@@ -137,6 +139,7 @@ public class MountMapper extends AbstractMapper
/**
* @see org.apache.wicket.request.IRequestMapper#mapHandler(org.apache.wicket.request.IRequestHandler)
*/
+ @Override
public Url mapHandler(final IRequestHandler handler)
{
Mount mount = mapper.mapHandler(handler);
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/UnmountedMapperAdapter.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/UnmountedMapperAdapter.java b/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/UnmountedMapperAdapter.java
index bc88655..397495c 100644
--- a/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/UnmountedMapperAdapter.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/UnmountedMapperAdapter.java
@@ -46,6 +46,7 @@ class UnmountedMapperAdapter implements IMountedRequestMapper
/**
* @see org.apache.wicket.request.mapper.mount.IMountedRequestMapper#getCompatibilityScore(org.apache.wicket.request.Request)
*/
+ @Override
public int getCompatibilityScore(final Request request)
{
return mapper.getCompatibilityScore(request);
@@ -54,6 +55,7 @@ class UnmountedMapperAdapter implements IMountedRequestMapper
/**
* @see org.apache.wicket.request.mapper.mount.IMountedRequestMapper#mapHandler(org.apache.org.apache.wicket.request.IRequestHandler)
*/
+ @Override
public Mount mapHandler(final IRequestHandler requestHandler)
{
Url url = mapper.mapHandler(requestHandler);
@@ -68,6 +70,7 @@ class UnmountedMapperAdapter implements IMountedRequestMapper
* @see org.apache.wicket.request.mapper.mount.IMountedRequestMapper#mapRequest(org.apache.wicket.request.Request,
* org.apache.wicket.request.mapper.mount.MountParameters)
*/
+ @Override
public IRequestHandler mapRequest(final Request request, final MountParameters mountParams)
{
return mapper.mapRequest(request);
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/UnmountedRequestHandlerAdapter.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/UnmountedRequestHandlerAdapter.java b/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/UnmountedRequestHandlerAdapter.java
index 6aabc95..932edbc 100644
--- a/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/UnmountedRequestHandlerAdapter.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/UnmountedRequestHandlerAdapter.java
@@ -44,6 +44,7 @@ class UnmountedRequestHandlerAdapter implements IMountedRequestMapper
/**
* @see org.apache.wicket.request.mapper.mount.IMountedRequestMapper#getCompatibilityScore(org.apache.wicket.request.Request)
*/
+ @Override
public int getCompatibilityScore(final Request request)
{
return 0;
@@ -52,6 +53,7 @@ class UnmountedRequestHandlerAdapter implements IMountedRequestMapper
/**
* @see org.apache.wicket.request.mapper.mount.IMountedRequestMapper#mapHandler(org.apache.org.apache.wicket.request.IRequestHandler)
*/
+ @Override
public Mount mapHandler(final IRequestHandler requestHandler)
{
if (requestHandler.equals(handler))
@@ -65,6 +67,7 @@ class UnmountedRequestHandlerAdapter implements IMountedRequestMapper
* @see org.apache.wicket.request.mapper.mount.IMountedRequestMapper#mapRequest(org.apache.wicket.request.Request,
* org.apache.wicket.request.mapper.mount.MountParameters)
*/
+ @Override
public IRequestHandler mapRequest(final Request request, final MountParameters mountParams)
{
return handler;
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java b/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java
index 9c55d1c..5c5391f 100644
--- a/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java
@@ -137,6 +137,7 @@ public class PageParameters implements IClusterable, IIndexedParameters, INamedP
/**
* @see org.apache.wicket.request.mapper.parameter.IIndexedParameters#set(int, java.lang.Object)
*/
+ @Override
public PageParameters set(final int index, final Object object)
{
if (indexedParameters == null)
@@ -156,6 +157,7 @@ public class PageParameters implements IClusterable, IIndexedParameters, INamedP
/**
* @see org.apache.wicket.request.mapper.parameter.IIndexedParameters#get(int)
*/
+ @Override
public StringValue get(final int index)
{
if (indexedParameters != null)
@@ -171,6 +173,7 @@ public class PageParameters implements IClusterable, IIndexedParameters, INamedP
/**
* @see org.apache.wicket.request.mapper.parameter.IIndexedParameters#remove(int)
*/
+ @Override
public PageParameters remove(final int index)
{
if (indexedParameters != null)
@@ -186,6 +189,7 @@ public class PageParameters implements IClusterable, IIndexedParameters, INamedP
/**
* @see org.apache.wicket.request.mapper.parameter.INamedParameters#getNamedKeys()
*/
+ @Override
public Set<String> getNamedKeys()
{
if ((namedParameters == null) || namedParameters.isEmpty())
@@ -203,6 +207,7 @@ public class PageParameters implements IClusterable, IIndexedParameters, INamedP
/**
* @see org.apache.wicket.request.mapper.parameter.INamedParameters#get(java.lang.String)
*/
+ @Override
public StringValue get(final String name)
{
Args.notNull(name, "name");
@@ -223,6 +228,7 @@ public class PageParameters implements IClusterable, IIndexedParameters, INamedP
/**
* @see org.apache.wicket.request.mapper.parameter.INamedParameters#getValues(java.lang.String)
*/
+ @Override
public List<StringValue> getValues(final String name)
{
Args.notNull(name, "name");
@@ -248,6 +254,7 @@ public class PageParameters implements IClusterable, IIndexedParameters, INamedP
/**
* @see org.apache.wicket.request.mapper.parameter.INamedParameters#getAllNamed()
*/
+ @Override
public List<NamedPair> getAllNamed()
{
List<NamedPair> res = new ArrayList<NamedPair>();
@@ -264,6 +271,7 @@ public class PageParameters implements IClusterable, IIndexedParameters, INamedP
/**
* @see org.apache.wicket.request.mapper.parameter.INamedParameters#getPosition(String)
*/
+ @Override
public int getPosition(final String name)
{
int index = -1;
@@ -286,6 +294,7 @@ public class PageParameters implements IClusterable, IIndexedParameters, INamedP
* @see org.apache.wicket.request.mapper.parameter.INamedParameters#remove(java.lang.String,
* java.lang.String...)
*/
+ @Override
public PageParameters remove(final String name, final String... values)
{
Args.notNull(name, "name");
@@ -322,6 +331,7 @@ public class PageParameters implements IClusterable, IIndexedParameters, INamedP
* @see org.apache.wicket.request.mapper.parameter.INamedParameters#add(java.lang.String,
* java.lang.Object)
*/
+ @Override
public PageParameters add(final String name, final Object value)
{
add(name, value, -1);
@@ -332,6 +342,7 @@ public class PageParameters implements IClusterable, IIndexedParameters, INamedP
* @see org.apache.wicket.request.mapper.parameter.INamedParameters#add(java.lang.String,
* java.lang.Object, int)
*/
+ @Override
public PageParameters add(final String name, final Object value, final int index)
{
Args.notNull(name, "name");
@@ -374,6 +385,7 @@ public class PageParameters implements IClusterable, IIndexedParameters, INamedP
* @see org.apache.wicket.request.mapper.parameter.INamedParameters#set(java.lang.String,
* java.lang.Object, int)
*/
+ @Override
public PageParameters set(final String name, final Object value, final int index)
{
remove(name);
@@ -389,6 +401,7 @@ public class PageParameters implements IClusterable, IIndexedParameters, INamedP
* @see org.apache.wicket.request.mapper.parameter.INamedParameters#set(java.lang.String,
* java.lang.Object)
*/
+ @Override
public PageParameters set(final String name, final Object value)
{
int position = getPosition(name);
@@ -399,6 +412,7 @@ public class PageParameters implements IClusterable, IIndexedParameters, INamedP
/**
* @see org.apache.wicket.request.mapper.parameter.IIndexedParameters#clearIndexed()
*/
+ @Override
public PageParameters clearIndexed()
{
indexedParameters = null;
@@ -408,6 +422,7 @@ public class PageParameters implements IClusterable, IIndexedParameters, INamedP
/**
* @see org.apache.wicket.request.mapper.parameter.INamedParameters#clearNamed()
*/
+ @Override
public PageParameters clearNamed()
{
namedParameters = null;
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParametersEncoder.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParametersEncoder.java b/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParametersEncoder.java
index 5b32009..8139460 100644
--- a/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParametersEncoder.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParametersEncoder.java
@@ -36,6 +36,7 @@ public class PageParametersEncoder implements IPageParametersEncoder
/**
* @see IPageParametersEncoder#decodePageParameters(org.apache.wicket.request.Url)
*/
+ @Override
public PageParameters decodePageParameters(final Url url)
{
PageParameters parameters = new PageParameters();
@@ -58,6 +59,7 @@ public class PageParametersEncoder implements IPageParametersEncoder
/**
* @see org.apache.wicket.request.mapper.parameter.IPageParametersEncoder#encodePageParameters(org.apache.wicket.request.mapper.parameter.PageParameters)
*/
+ @Override
public Url encodePageParameters(final PageParameters pageParameters)
{
Url url = new Url();
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/UrlPathPageParametersEncoder.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/UrlPathPageParametersEncoder.java b/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/UrlPathPageParametersEncoder.java
index 5ac4628..03740d7 100644
--- a/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/UrlPathPageParametersEncoder.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/UrlPathPageParametersEncoder.java
@@ -45,7 +45,7 @@ import org.apache.wicket.util.string.Strings;
*/
public class UrlPathPageParametersEncoder implements IPageParametersEncoder
{
-
+ @Override
public Url encodePageParameters(PageParameters params)
{
Args.notNull(params, "params");
@@ -64,6 +64,7 @@ public class UrlPathPageParametersEncoder implements IPageParametersEncoder
return url;
}
+ @Override
public PageParameters decodePageParameters(Url url)
{
PageParameters params = new PageParameters();
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-request/src/main/java/org/apache/wicket/request/parameter/CombinedRequestParametersAdapter.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/parameter/CombinedRequestParametersAdapter.java b/wicket-request/src/main/java/org/apache/wicket/request/parameter/CombinedRequestParametersAdapter.java
index 2c84d30..34e55d6 100755
--- a/wicket-request/src/main/java/org/apache/wicket/request/parameter/CombinedRequestParametersAdapter.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/parameter/CombinedRequestParametersAdapter.java
@@ -48,6 +48,7 @@ public class CombinedRequestParametersAdapter implements IRequestParameters
/**
* @see org.apache.wicket.request.IRequestParameters#getParameterNames()
*/
+ @Override
public Set<String> getParameterNames()
{
Set<String> result = new LinkedHashSet<String>();
@@ -61,6 +62,7 @@ public class CombinedRequestParametersAdapter implements IRequestParameters
/**
* @see org.apache.wicket.request.IRequestParameters#getParameterValue(java.lang.String)
*/
+ @Override
public StringValue getParameterValue(final String name)
{
for (IRequestParameters p : parameters)
@@ -77,6 +79,7 @@ public class CombinedRequestParametersAdapter implements IRequestParameters
/**
* @see org.apache.wicket.request.IRequestParameters#getParameterValues(java.lang.String)
*/
+ @Override
public List<StringValue> getParameterValues(final String name)
{
List<StringValue> result = new ArrayList<StringValue>();
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-request/src/main/java/org/apache/wicket/request/parameter/EmptyRequestParameters.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/parameter/EmptyRequestParameters.java b/wicket-request/src/main/java/org/apache/wicket/request/parameter/EmptyRequestParameters.java
index 9c38fe3..bb83edb 100755
--- a/wicket-request/src/main/java/org/apache/wicket/request/parameter/EmptyRequestParameters.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/parameter/EmptyRequestParameters.java
@@ -43,6 +43,7 @@ public class EmptyRequestParameters implements IRequestParameters
/**
* @see org.apache.wicket.request.IRequestParameters#getParameterNames()
*/
+ @Override
public Set<String> getParameterNames()
{
return Collections.emptySet();
@@ -51,6 +52,7 @@ public class EmptyRequestParameters implements IRequestParameters
/**
* @see org.apache.wicket.request.IRequestParameters#getParameterValue(java.lang.String)
*/
+ @Override
public StringValue getParameterValue(final String name)
{
return StringValue.valueOf((String)null);
@@ -59,6 +61,7 @@ public class EmptyRequestParameters implements IRequestParameters
/**
* @see org.apache.wicket.request.IRequestParameters#getParameterValues(java.lang.String)
*/
+ @Override
public List<StringValue> getParameterValues(final String name)
{
return null;
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-request/src/main/java/org/apache/wicket/request/parameter/UrlRequestParametersAdapter.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/parameter/UrlRequestParametersAdapter.java b/wicket-request/src/main/java/org/apache/wicket/request/parameter/UrlRequestParametersAdapter.java
index bbdd1da..d40becc 100755
--- a/wicket-request/src/main/java/org/apache/wicket/request/parameter/UrlRequestParametersAdapter.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/parameter/UrlRequestParametersAdapter.java
@@ -53,6 +53,7 @@ public class UrlRequestParametersAdapter implements IRequestParameters
/**
* @see org.apache.wicket.request.IRequestParameters#getParameterNames()
*/
+ @Override
public Set<String> getParameterNames()
{
Set<String> result = new LinkedHashSet<String>();
@@ -66,6 +67,7 @@ public class UrlRequestParametersAdapter implements IRequestParameters
/**
* @see org.apache.wicket.request.IRequestParameters#getParameterValue(java.lang.String)
*/
+ @Override
public StringValue getParameterValue(final String name)
{
return url.getQueryParameterValue(name);
@@ -74,6 +76,7 @@ public class UrlRequestParametersAdapter implements IRequestParameters
/**
* @see org.apache.wicket.request.IRequestParameters#getParameterValues(java.lang.String)
*/
+ @Override
public List<StringValue> getParameterValues(final String name)
{
List<StringValue> values = null;
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java
----------------------------------------------------------------------
diff --git a/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java b/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java
index 2a479e5..a022792 100644
--- a/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java
+++ b/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java
@@ -125,6 +125,7 @@ public class SpringBeanLocator implements IProxyTargetLocator
/**
* @see org.apache.wicket.proxy.IProxyTargetLocator#locateProxyTarget()
*/
+ @Override
public Object locateProxyTarget()
{
final ApplicationContext context = getSpringContext();
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplicationFactory.java
----------------------------------------------------------------------
diff --git a/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplicationFactory.java b/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplicationFactory.java
index 06eef87..2e385df 100644
--- a/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplicationFactory.java
+++ b/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplicationFactory.java
@@ -124,6 +124,7 @@ public class SpringWebApplicationFactory implements IWebApplicationFactory
/**
* @see IWebApplicationFactory#createApplication(WicketFilter)
*/
+ @Override
public WebApplication createApplication(final WicketFilter filter)
{
ServletContext sc = filter.getFilterConfig().getServletContext();
@@ -210,6 +211,7 @@ public class SpringWebApplicationFactory implements IWebApplicationFactory
}
/** {@inheritDoc} */
+ @Override
public void destroy(final WicketFilter filter)
{
if (additionalContext != null)
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java
----------------------------------------------------------------------
diff --git a/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java b/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java
index 7324c8b..4d0a958 100644
--- a/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java
+++ b/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java
@@ -105,6 +105,7 @@ public class AnnotProxyFieldValueFactory implements IFieldValueFactory
this.wrapInProxies = wrapInProxies;
}
+ @Override
public Object getFieldValue(final Field field, final Object fieldOwner)
{
if (supportsField(field))
@@ -289,6 +290,7 @@ public class AnnotProxyFieldValueFactory implements IFieldValueFactory
/**
* @see org.apache.wicket.injection.IFieldValueFactory#supportsField(java.lang.reflect.Field)
*/
+ @Override
public boolean supportsField(final Field field)
{
return field.isAnnotationPresent(SpringBean.class) || field.isAnnotationPresent(Inject.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/SpringComponentInjector.java
----------------------------------------------------------------------
diff --git a/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/SpringComponentInjector.java b/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/SpringComponentInjector.java
index 08f71e1..125590c 100644
--- a/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/SpringComponentInjector.java
+++ b/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/SpringComponentInjector.java
@@ -151,6 +151,7 @@ public class SpringComponentInjector extends Injector
private static final long serialVersionUID = 1L;
+ @Override
public ApplicationContext getSpringContext()
{
if (context == null)
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java
----------------------------------------------------------------------
diff --git a/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java b/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java
index fa60311..526a24e 100644
--- a/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java
+++ b/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java
@@ -84,6 +84,7 @@ public class ApplicationContextMock implements ApplicationContext, Serializable
/**
* @see org.springframework.beans.factory.BeanFactory#getBean(java.lang.String)
*/
+ @Override
public Object getBean(final String name) throws BeansException
{
Object bean = beans.get(name);
@@ -97,6 +98,7 @@ public class ApplicationContextMock implements ApplicationContext, Serializable
/**
* @see org.springframework.beans.factory.BeanFactory#getBean(java.lang.String, java.lang.Class)
*/
+ @Override
@SuppressWarnings({ "unchecked" })
public <T> T getBean(String name, Class<T> requiredType) throws BeansException
{
@@ -111,6 +113,7 @@ public class ApplicationContextMock implements ApplicationContext, Serializable
/**
* @see org.springframework.beans.factory.ListableBeanFactory#getBeansOfType(java.lang.Class)
*/
+ @Override
@SuppressWarnings({ "unchecked" })
public <T> Map<String, T> getBeansOfType(Class<T> type) throws BeansException
{
@@ -127,6 +130,7 @@ public class ApplicationContextMock implements ApplicationContext, Serializable
return found;
}
+ @Override
public <T> T getBean(Class<T> requiredType) throws BeansException
{
Iterator<T> beans = getBeansOfType(requiredType).values().iterator();
@@ -146,6 +150,7 @@ public class ApplicationContextMock implements ApplicationContext, Serializable
return bean;
}
+ @Override
public Map<String, Object> getBeansWithAnnotation(Class<? extends Annotation> annotationType)
throws BeansException
{
@@ -161,6 +166,7 @@ public class ApplicationContextMock implements ApplicationContext, Serializable
return found;
}
+ @Override
public <A extends Annotation> A findAnnotationOnBean(String beanName, Class<A> annotationType)
{
return findAnnotationOnClass(getBean(beanName).getClass(), annotationType);
@@ -197,6 +203,7 @@ public class ApplicationContextMock implements ApplicationContext, Serializable
/**
* @see org.springframework.context.ApplicationContext#getParent()
*/
+ @Override
public ApplicationContext getParent()
{
throw new UnsupportedOperationException();
@@ -205,6 +212,7 @@ public class ApplicationContextMock implements ApplicationContext, Serializable
/**
* @see org.springframework.context.ApplicationContext#getDisplayName()
*/
+ @Override
public String getDisplayName()
{
throw new UnsupportedOperationException();
@@ -213,6 +221,7 @@ public class ApplicationContextMock implements ApplicationContext, Serializable
/**
* @see org.springframework.context.ApplicationContext#getStartupDate()
*/
+ @Override
public long getStartupDate()
{
throw new UnsupportedOperationException();
@@ -221,6 +230,7 @@ public class ApplicationContextMock implements ApplicationContext, Serializable
/**
* @see org.springframework.context.ApplicationContext#publishEvent(org.springframework.context.ApplicationEvent)
*/
+ @Override
public void publishEvent(final ApplicationEvent event)
{
throw new UnsupportedOperationException();
@@ -230,6 +240,7 @@ public class ApplicationContextMock implements ApplicationContext, Serializable
* @see org.springframework.beans.factory.ListableBeanFactory#
* containsBeanDefinition(java.lang.String)
*/
+ @Override
public boolean containsBeanDefinition(final String beanName)
{
throw new UnsupportedOperationException();
@@ -238,6 +249,7 @@ public class ApplicationContextMock implements ApplicationContext, Serializable
/**
* @see org.springframework.beans.factory.ListableBeanFactory# getBeanDefinitionCount()
*/
+ @Override
public int getBeanDefinitionCount()
{
throw new UnsupportedOperationException();
@@ -246,6 +258,7 @@ public class ApplicationContextMock implements ApplicationContext, Serializable
/**
* @see org.springframework.beans.factory.ListableBeanFactory# getBeanDefinitionNames()
*/
+ @Override
public String[] getBeanDefinitionNames()
{
throw new UnsupportedOperationException();
@@ -255,6 +268,7 @@ public class ApplicationContextMock implements ApplicationContext, Serializable
* @see org.springframework.beans.factory.ListableBeanFactory#
* getBeanNamesForType(java.lang.Class)
*/
+ @Override
@SuppressWarnings({ "unchecked" })
public String[] getBeanNamesForType(final Class type)
{
@@ -275,6 +289,7 @@ public class ApplicationContextMock implements ApplicationContext, Serializable
* @see org.springframework.beans.factory.ListableBeanFactory#
* getBeanNamesForType(java.lang.Class, boolean, boolean)
*/
+ @Override
@SuppressWarnings({ "unchecked" })
public String[] getBeanNamesForType(Class type, boolean includeNonSingletons,
boolean allowEagerInit)
@@ -286,6 +301,7 @@ public class ApplicationContextMock implements ApplicationContext, Serializable
* @see org.springframework.beans.factory.ListableBeanFactory#getBeansOfType(java.lang.Class,
* boolean, boolean)
*/
+ @Override
public <T> Map<String, T> getBeansOfType(Class<T> type, boolean includeNonSingletons,
boolean allowEagerInit) throws BeansException
{
@@ -295,6 +311,7 @@ public class ApplicationContextMock implements ApplicationContext, Serializable
/**
* @see org.springframework.beans.factory.BeanFactory#containsBean(java.lang.String)
*/
+ @Override
public boolean containsBean(final String name)
{
return beans.containsKey(name);
@@ -303,6 +320,7 @@ public class ApplicationContextMock implements ApplicationContext, Serializable
/**
* @see org.springframework.beans.factory.BeanFactory#isSingleton(java.lang.String)
*/
+ @Override
public boolean isSingleton(final String name) throws NoSuchBeanDefinitionException
{
return true;
@@ -311,6 +329,7 @@ public class ApplicationContextMock implements ApplicationContext, Serializable
/**
* @see org.springframework.beans.factory.BeanFactory#getType(java.lang.String)
*/
+ @Override
public Class<?> getType(final String name) throws NoSuchBeanDefinitionException
{
throw new UnsupportedOperationException();
@@ -319,6 +338,7 @@ public class ApplicationContextMock implements ApplicationContext, Serializable
/**
* @see org.springframework.beans.factory.BeanFactory#getAliases(java.lang.String)
*/
+ @Override
public String[] getAliases(final String name) throws NoSuchBeanDefinitionException
{
throw new UnsupportedOperationException();
@@ -327,6 +347,7 @@ public class ApplicationContextMock implements ApplicationContext, Serializable
/**
* @see org.springframework.beans.factory.HierarchicalBeanFactory# getParentBeanFactory()
*/
+ @Override
public BeanFactory getParentBeanFactory()
{
return null;
@@ -336,6 +357,7 @@ public class ApplicationContextMock implements ApplicationContext, Serializable
* @see org.springframework.context.MessageSource#getMessage(java.lang.String,
* java.lang.Object[], java.lang.String, java.util.Locale)
*/
+ @Override
public String getMessage(final String code, final Object[] args, final String defaultMessage,
final Locale locale)
{
@@ -346,6 +368,7 @@ public class ApplicationContextMock implements ApplicationContext, Serializable
* @see org.springframework.context.MessageSource#getMessage(java.lang.String,
* java.lang.Object[], java.util.Locale)
*/
+ @Override
public String getMessage(final String code, final Object[] args, final Locale locale)
throws NoSuchMessageException
{
@@ -356,6 +379,7 @@ public class ApplicationContextMock implements ApplicationContext, Serializable
/**
* @see org.springframework.context.MessageSource#getMessage(org.springframework.context.MessageSourceResolvable, java.util.Locale)
*/
+ @Override
public String getMessage(final MessageSourceResolvable resolvable, final Locale locale)
throws NoSuchMessageException
{
@@ -366,6 +390,7 @@ public class ApplicationContextMock implements ApplicationContext, Serializable
* @see org.springframework.core.io.support.ResourcePatternResolver#getResources
* (java.lang.String)
*/
+ @Override
public Resource[] getResources(final String locationPattern) throws IOException
{
throw new UnsupportedOperationException();
@@ -374,6 +399,7 @@ public class ApplicationContextMock implements ApplicationContext, Serializable
/**
* @see org.springframework.core.io.ResourceLoader#getResource(java.lang.String)
*/
+ @Override
public Resource getResource(final String location)
{
throw new UnsupportedOperationException();
@@ -382,6 +408,7 @@ public class ApplicationContextMock implements ApplicationContext, Serializable
/**
* @see org.springframework.context.ApplicationContext# getAutowireCapableBeanFactory()
*/
+ @Override
public AutowireCapableBeanFactory getAutowireCapableBeanFactory() throws IllegalStateException
{
throw new UnsupportedOperationException();
@@ -391,6 +418,7 @@ public class ApplicationContextMock implements ApplicationContext, Serializable
* @see org.springframework.beans.factory.HierarchicalBeanFactory#
* containsLocalBean(java.lang.String)
*/
+ @Override
public boolean containsLocalBean(final String arg0)
{
throw new UnsupportedOperationException();
@@ -399,6 +427,7 @@ public class ApplicationContextMock implements ApplicationContext, Serializable
/**
* @see org.springframework.core.io.ResourceLoader#getClassLoader()
*/
+ @Override
public ClassLoader getClassLoader()
{
throw new UnsupportedOperationException();
@@ -407,6 +436,7 @@ public class ApplicationContextMock implements ApplicationContext, Serializable
/**
* @see org.springframework.context.ApplicationContext#getId()
*/
+ @Override
public String getId()
{
throw new UnsupportedOperationException();
@@ -417,6 +447,7 @@ public class ApplicationContextMock implements ApplicationContext, Serializable
* @see org.springframework.beans.factory.BeanFactory#getBean(java.lang.String,
* java.lang.Object[])
*/
+ @Override
public Object getBean(final String name, final Object... args) throws BeansException
{
throw new UnsupportedOperationException();
@@ -426,6 +457,7 @@ public class ApplicationContextMock implements ApplicationContext, Serializable
/**
* @see org.springframework.beans.factory.BeanFactory#isPrototype(java.lang.String)
*/
+ @Override
public boolean isPrototype(final String name) throws NoSuchBeanDefinitionException
{
throw new UnsupportedOperationException();
@@ -435,6 +467,7 @@ public class ApplicationContextMock implements ApplicationContext, Serializable
* @see org.springframework.beans.factory.BeanFactory#isTypeMatch(java.lang.String,
* java.lang.Class)
*/
+ @Override
@SuppressWarnings({ "unchecked" })
public boolean isTypeMatch(final String name, final Class targetType)
throws NoSuchBeanDefinitionException
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-spring/src/main/java/org/apache/wicket/spring/test/SpringContextLocatorMock.java
----------------------------------------------------------------------
diff --git a/wicket-spring/src/main/java/org/apache/wicket/spring/test/SpringContextLocatorMock.java b/wicket-spring/src/main/java/org/apache/wicket/spring/test/SpringContextLocatorMock.java
index 07c0fff..6ab1f79 100644
--- a/wicket-spring/src/main/java/org/apache/wicket/spring/test/SpringContextLocatorMock.java
+++ b/wicket-spring/src/main/java/org/apache/wicket/spring/test/SpringContextLocatorMock.java
@@ -45,6 +45,7 @@ public class SpringContextLocatorMock implements ISpringContextLocator
/**
* @see org.apache.wicket.spring.ISpringContextLocator#getSpringContext()
*/
+ @Override
public ApplicationContext getSpringContext()
{
return context;
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactoryTest.java
----------------------------------------------------------------------
diff --git a/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactoryTest.java b/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactoryTest.java
index b0e195c..a8b9122 100644
--- a/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactoryTest.java
+++ b/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactoryTest.java
@@ -42,6 +42,7 @@ public class AnnotProxyFieldValueFactoryTest extends Assert
{
private static final long serialVersionUID = 1L;
+ @Override
public ApplicationContext getSpringContext()
{
ApplicationContextMock mock = new ApplicationContextMock();
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-spring/src/test/java/org/apache/wicket/spring/injection/util/Injectable.java
----------------------------------------------------------------------
diff --git a/wicket-spring/src/test/java/org/apache/wicket/spring/injection/util/Injectable.java b/wicket-spring/src/test/java/org/apache/wicket/spring/injection/util/Injectable.java
index 2fbc08f..7f5c61d 100644
--- a/wicket-spring/src/test/java/org/apache/wicket/spring/injection/util/Injectable.java
+++ b/wicket-spring/src/test/java/org/apache/wicket/spring/injection/util/Injectable.java
@@ -37,6 +37,7 @@ public class Injectable implements InjectableInterface
/**
* @return test bean
*/
+ @Override
public Bean getBeanByClass()
{
return beanByClass;
@@ -45,6 +46,7 @@ public class Injectable implements InjectableInterface
/**
* @return test bean
*/
+ @Override
public Bean2 getBeanByName()
{
return beanByName;
@@ -53,6 +55,7 @@ public class Injectable implements InjectableInterface
/**
* @return test bean
*/
+ @Override
public Bean getNobean()
{
return nobean;
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-spring/src/test/java/org/apache/wicket/spring/injection/util/JavaxInjectable.java
----------------------------------------------------------------------
diff --git a/wicket-spring/src/test/java/org/apache/wicket/spring/injection/util/JavaxInjectable.java b/wicket-spring/src/test/java/org/apache/wicket/spring/injection/util/JavaxInjectable.java
index 141eda9..2ac5767 100644
--- a/wicket-spring/src/test/java/org/apache/wicket/spring/injection/util/JavaxInjectable.java
+++ b/wicket-spring/src/test/java/org/apache/wicket/spring/injection/util/JavaxInjectable.java
@@ -39,6 +39,7 @@ public class JavaxInjectable implements InjectableInterface
/**
* @return test bean
*/
+ @Override
public Bean getBeanByClass()
{
return beanByClass;
@@ -47,6 +48,7 @@ public class JavaxInjectable implements InjectableInterface
/**
* @return test bean
*/
+ @Override
public Bean2 getBeanByName()
{
return beanByName;
@@ -55,6 +57,7 @@ public class JavaxInjectable implements InjectableInterface
/**
* @return test bean
*/
+ @Override
public Bean getNobean()
{
return nobean;
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/ClassProvider.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/ClassProvider.java b/wicket-util/src/main/java/org/apache/wicket/util/ClassProvider.java
index 384ee6a..284403a 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/ClassProvider.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/ClassProvider.java
@@ -42,6 +42,7 @@ public class ClassProvider<T> implements IProvider<Class<T>>
/**
* {@inheritDoc}
*/
+ @Override
public Class<T> get()
{
return classRef.get();
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/LazyInitializer.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/LazyInitializer.java b/wicket-util/src/main/java/org/apache/wicket/util/LazyInitializer.java
index bbff91b..716eff0 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/LazyInitializer.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/LazyInitializer.java
@@ -35,6 +35,7 @@ public abstract class LazyInitializer<T> implements IProvider<T>, IClusterable
private transient volatile T instance = null;
+ @Override
public T get()
{
if (instance == null)
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/NullProvider.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/NullProvider.java b/wicket-util/src/main/java/org/apache/wicket/util/NullProvider.java
index 55b6b05..7820a53 100755
--- a/wicket-util/src/main/java/org/apache/wicket/util/NullProvider.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/NullProvider.java
@@ -25,6 +25,7 @@ package org.apache.wicket.util;
*/
public class NullProvider<T> implements IProvider<T>
{
+ @Override
public T get()
{
return null;
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/ValueProvider.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/ValueProvider.java b/wicket-util/src/main/java/org/apache/wicket/util/ValueProvider.java
index 5bad6ad..cefd47a 100755
--- a/wicket-util/src/main/java/org/apache/wicket/util/ValueProvider.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/ValueProvider.java
@@ -38,6 +38,7 @@ public class ValueProvider<T> implements IProvider<T>
this.value = value;
}
+ @Override
public T get()
{
return value;
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/collections/IntHashMap.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/collections/IntHashMap.java b/wicket-util/src/main/java/org/apache/wicket/util/collections/IntHashMap.java
index 4fb190d..299936a 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/collections/IntHashMap.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/collections/IntHashMap.java
@@ -791,6 +791,7 @@ public class IntHashMap<V> implements Cloneable, Serializable
/**
* @see java.util.Iterator#hasNext()
*/
+ @Override
public boolean hasNext()
{
return next != null;
@@ -823,6 +824,7 @@ public class IntHashMap<V> implements Cloneable, Serializable
/**
* @see java.util.Iterator#remove()
*/
+ @Override
public void remove()
{
if (current == null)
@@ -846,6 +848,7 @@ public class IntHashMap<V> implements Cloneable, Serializable
/**
* @see java.util.Iterator#next()
*/
+ @Override
public V next()
{
return nextEntry().value;
@@ -857,6 +860,7 @@ public class IntHashMap<V> implements Cloneable, Serializable
/**
* @see java.util.Iterator#next()
*/
+ @Override
public Integer next()
{
return nextEntry().getKey();
@@ -868,6 +872,7 @@ public class IntHashMap<V> implements Cloneable, Serializable
/**
* @see java.util.Iterator#next()
*/
+ @Override
public Entry<V> next()
{
return nextEntry();
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/collections/MicroMap.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/collections/MicroMap.java b/wicket-util/src/main/java/org/apache/wicket/util/collections/MicroMap.java
index b3fcab2..e468f3b 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/collections/MicroMap.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/collections/MicroMap.java
@@ -80,6 +80,7 @@ public final class MicroMap<K, V> implements Map<K, V>, Serializable
/**
* @see java.util.Map#size()
*/
+ @Override
public int size()
{
return (key != null) ? 1 : 0;
@@ -88,6 +89,7 @@ public final class MicroMap<K, V> implements Map<K, V>, Serializable
/**
* @see java.util.Map#isEmpty()
*/
+ @Override
public boolean isEmpty()
{
return size() == 0;
@@ -96,6 +98,7 @@ public final class MicroMap<K, V> implements Map<K, V>, Serializable
/**
* @see java.util.Map#containsKey(java.lang.Object)
*/
+ @Override
public boolean containsKey(final Object key)
{
return key.equals(this.key);
@@ -104,6 +107,7 @@ public final class MicroMap<K, V> implements Map<K, V>, Serializable
/**
* @see java.util.Map#containsValue(java.lang.Object)
*/
+ @Override
public boolean containsValue(final Object value)
{
return value.equals(this.value);
@@ -112,6 +116,7 @@ public final class MicroMap<K, V> implements Map<K, V>, Serializable
/**
* @see java.util.Map#get(java.lang.Object)
*/
+ @Override
public V get(final Object key)
{
if (key.equals(this.key))
@@ -125,6 +130,7 @@ public final class MicroMap<K, V> implements Map<K, V>, Serializable
/**
* @see java.util.Map#put(java.lang.Object, java.lang.Object)
*/
+ @Override
public V put(final K key, final V value)
{
// Replace?
@@ -157,6 +163,7 @@ public final class MicroMap<K, V> implements Map<K, V>, Serializable
/**
* @see java.util.Map#remove(java.lang.Object)
*/
+ @Override
public V remove(final Object key)
{
if (key.equals(this.key))
@@ -175,6 +182,7 @@ public final class MicroMap<K, V> implements Map<K, V>, Serializable
/**
* @see java.util.Map#putAll(java.util.Map)
*/
+ @Override
public void putAll(final Map<? extends K, ? extends V> map)
{
if (map.size() <= MAX_ENTRIES)
@@ -192,6 +200,7 @@ public final class MicroMap<K, V> implements Map<K, V>, Serializable
/**
* @see java.util.Map#clear()
*/
+ @Override
public void clear()
{
key = null;
@@ -201,6 +210,7 @@ public final class MicroMap<K, V> implements Map<K, V>, Serializable
/**
* @see java.util.Map#keySet()
*/
+ @Override
public Set<K> keySet()
{
return new AbstractSet<K>()
@@ -210,11 +220,13 @@ public final class MicroMap<K, V> implements Map<K, V>, Serializable
{
return new Iterator<K>()
{
+ @Override
public boolean hasNext()
{
return index < MicroMap.this.size();
}
+ @Override
public K next()
{
if (!hasNext())
@@ -226,6 +238,7 @@ public final class MicroMap<K, V> implements Map<K, V>, Serializable
return key;
}
+ @Override
public void remove()
{
MicroMap.this.clear();
@@ -246,6 +259,7 @@ public final class MicroMap<K, V> implements Map<K, V>, Serializable
/**
* @see java.util.Map#values()
*/
+ @Override
public Collection<V> values()
{
return new AbstractList<V>()
@@ -271,6 +285,7 @@ public final class MicroMap<K, V> implements Map<K, V>, Serializable
/**
* @see java.util.Map#entrySet()
*/
+ @Override
public Set<Entry<K, V>> entrySet()
{
return new AbstractSet<Entry<K, V>>()
@@ -280,11 +295,13 @@ public final class MicroMap<K, V> implements Map<K, V>, Serializable
{
return new Iterator<Entry<K, V>>()
{
+ @Override
public boolean hasNext()
{
return index < MicroMap.this.size();
}
+ @Override
public Entry<K, V> next()
{
if (!hasNext())
@@ -295,16 +312,19 @@ public final class MicroMap<K, V> implements Map<K, V>, Serializable
return new Map.Entry<K, V>()
{
+ @Override
public K getKey()
{
return key;
}
+ @Override
public V getValue()
{
return value;
}
+ @Override
public V setValue(final V value)
{
final V oldValue = MicroMap.this.value;
@@ -316,6 +336,7 @@ public final class MicroMap<K, V> implements Map<K, V>, Serializable
};
}
+ @Override
public void remove()
{
clear();
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/collections/MiniMap.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/collections/MiniMap.java b/wicket-util/src/main/java/org/apache/wicket/util/collections/MiniMap.java
index 997e3ee..c931466 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/collections/MiniMap.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/collections/MiniMap.java
@@ -89,6 +89,7 @@ public class MiniMap<K, V> implements Map<K, V>, Serializable
/**
* @see java.util.Map#size()
*/
+ @Override
public int size()
{
return size;
@@ -97,6 +98,7 @@ public class MiniMap<K, V> implements Map<K, V>, Serializable
/**
* @see java.util.Map#isEmpty()
*/
+ @Override
public boolean isEmpty()
{
return size == 0;
@@ -105,6 +107,7 @@ public class MiniMap<K, V> implements Map<K, V>, Serializable
/**
* @see java.util.Map#containsKey(java.lang.Object)
*/
+ @Override
public boolean containsKey(final Object key)
{
return findKey(0, key) != -1;
@@ -113,6 +116,7 @@ public class MiniMap<K, V> implements Map<K, V>, Serializable
/**
* @see java.util.Map#containsValue(java.lang.Object)
*/
+ @Override
public boolean containsValue(final Object value)
{
return findValue(0, value) != -1;
@@ -121,6 +125,7 @@ public class MiniMap<K, V> implements Map<K, V>, Serializable
/**
* @see java.util.Map#get(java.lang.Object)
*/
+ @Override
public V get(final Object key)
{
// Search for key
@@ -139,6 +144,7 @@ public class MiniMap<K, V> implements Map<K, V>, Serializable
/**
* @see java.util.Map#put(java.lang.Object, java.lang.Object)
*/
+ @Override
public V put(final K key, final V value)
{
// Search for key
@@ -174,6 +180,7 @@ public class MiniMap<K, V> implements Map<K, V>, Serializable
/**
* @see java.util.Map#remove(java.lang.Object)
*/
+ @Override
public V remove(final Object key)
{
// Search for key
@@ -197,6 +204,7 @@ public class MiniMap<K, V> implements Map<K, V>, Serializable
/**
* @see java.util.Map#putAll(java.util.Map)
*/
+ @Override
public void putAll(final Map<? extends K, ? extends V> map)
{
for (final Entry<? extends K, ? extends V> entry : map.entrySet())
@@ -208,6 +216,7 @@ public class MiniMap<K, V> implements Map<K, V>, Serializable
/**
* @see java.util.Map#clear()
*/
+ @Override
public void clear()
{
for (int i = 0; i < keys.length; i++)
@@ -222,6 +231,7 @@ public class MiniMap<K, V> implements Map<K, V>, Serializable
/**
* @see java.util.Map#keySet()
*/
+ @Override
public Set<K> keySet()
{
return new AbstractSet<K>()
@@ -231,11 +241,13 @@ public class MiniMap<K, V> implements Map<K, V>, Serializable
{
return new Iterator<K>()
{
+ @Override
public boolean hasNext()
{
return i < size - 1;
}
+ @Override
public K next()
{
// Just in case... (WICKET-428)
@@ -251,6 +263,7 @@ public class MiniMap<K, V> implements Map<K, V>, Serializable
return keys[i];
}
+ @Override
public void remove()
{
keys[i] = null;
@@ -273,6 +286,7 @@ public class MiniMap<K, V> implements Map<K, V>, Serializable
/**
* @see java.util.Map#values()
*/
+ @Override
public Collection<V> values()
{
return new AbstractList<V>()
@@ -305,6 +319,7 @@ public class MiniMap<K, V> implements Map<K, V>, Serializable
/**
* @see java.util.Map#entrySet()
*/
+ @Override
public Set<Entry<K, V>> entrySet()
{
return new AbstractSet<Entry<K, V>>()
@@ -314,11 +329,13 @@ public class MiniMap<K, V> implements Map<K, V>, Serializable
{
return new Iterator<Entry<K, V>>()
{
+ @Override
public boolean hasNext()
{
return index < size;
}
+ @Override
public Entry<K, V> next()
{
if (!hasNext())
@@ -332,16 +349,19 @@ public class MiniMap<K, V> implements Map<K, V>, Serializable
return new Map.Entry<K, V>()
{
+ @Override
public K getKey()
{
return keys[keyIndex];
}
+ @Override
public V getValue()
{
return values[keyIndex];
}
+ @Override
public V setValue(final V value)
{
final V oldValue = values[keyIndex];
@@ -353,6 +373,7 @@ public class MiniMap<K, V> implements Map<K, V>, Serializable
};
}
+ @Override
public void remove()
{
keys[keyIndex] = null;
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/collections/ReadOnlyIterator.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/collections/ReadOnlyIterator.java b/wicket-util/src/main/java/org/apache/wicket/util/collections/ReadOnlyIterator.java
index ac00f67..72cbe31 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/collections/ReadOnlyIterator.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/collections/ReadOnlyIterator.java
@@ -27,6 +27,7 @@ import java.util.Iterator;
*/
public abstract class ReadOnlyIterator<T> implements Iterator<T>
{
+ @Override
public final void remove()
{
throw new UnsupportedOperationException("Iterator " + getClass().getName() +
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/collections/ReverseListIterator.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/collections/ReverseListIterator.java b/wicket-util/src/main/java/org/apache/wicket/util/collections/ReverseListIterator.java
index 4de456c..f6e75c9 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/collections/ReverseListIterator.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/collections/ReverseListIterator.java
@@ -41,21 +41,25 @@ public class ReverseListIterator<E> implements Iterator<E>, Iterable<E>
this.delegateIterator = list.listIterator(start);
}
+ @Override
public boolean hasNext()
{
return delegateIterator.hasPrevious();
}
+ @Override
public E next()
{
return delegateIterator.previous();
}
+ @Override
public void remove()
{
throw new UnsupportedOperationException();
}
+ @Override
public Iterator<E> iterator()
{
return this;
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/collections/UrlExternalFormComparator.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/collections/UrlExternalFormComparator.java b/wicket-util/src/main/java/org/apache/wicket/util/collections/UrlExternalFormComparator.java
index a973ce5..6d15848 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/collections/UrlExternalFormComparator.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/collections/UrlExternalFormComparator.java
@@ -32,6 +32,7 @@ import java.util.Comparator;
*/
public class UrlExternalFormComparator implements Comparator<URL>, Serializable
{
+ @Override
public int compare(URL url1, URL url2)
{
return url1.toExternalForm().compareTo(url2.toExternalForm());
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/convert/MaskConverter.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/convert/MaskConverter.java b/wicket-util/src/main/java/org/apache/wicket/util/convert/MaskConverter.java
index 3560353..2cae4c3 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/convert/MaskConverter.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/convert/MaskConverter.java
@@ -147,6 +147,7 @@ public class MaskConverter<C> implements IConverter<C>
/**
* Converts a string to an object using {@link MaskFormatter#stringToValue(String)}.
*/
+ @Override
@SuppressWarnings("unchecked")
public C convertToObject(final String value, final Locale locale)
{
@@ -163,6 +164,7 @@ public class MaskConverter<C> implements IConverter<C>
/**
* Converts the value to a string using {@link MaskFormatter#valueToString(Object)}.
*/
+ @Override
public String convertToString(final C value, final Locale locale)
{
try
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractConverter.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractConverter.java b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractConverter.java
index d92968f..2d59b52 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractConverter.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractConverter.java
@@ -91,6 +91,7 @@ public abstract class AbstractConverter<C> implements IConverter<C>
/**
* @see org.apache.wicket.util.convert.IConverter#convertToString(java.lang.Object, Locale)
*/
+ @Override
public String convertToString(final C value, final Locale locale)
{
if (value == null)
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/BigDecimalConverter.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/BigDecimalConverter.java b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/BigDecimalConverter.java
index e40bb31..dd6e0ba 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/BigDecimalConverter.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/BigDecimalConverter.java
@@ -36,6 +36,7 @@ public class BigDecimalConverter extends AbstractDecimalConverter<BigDecimal>
return BigDecimal.class;
}
+ @Override
public BigDecimal convertToObject(final String value, final Locale locale)
{
if (Strings.isEmpty(value))
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/BooleanConverter.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/BooleanConverter.java b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/BooleanConverter.java
index bf468ad..82f746f 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/BooleanConverter.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/BooleanConverter.java
@@ -41,6 +41,7 @@ public class BooleanConverter extends AbstractConverter<Boolean>
/**
* @see org.apache.wicket.util.convert.IConverter#convertToObject(java.lang.String,Locale)
*/
+ @Override
public Boolean convertToObject(final String value, final Locale locale)
{
try
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/ByteConverter.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/ByteConverter.java b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/ByteConverter.java
index fe2d53e..8c351e4 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/ByteConverter.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/ByteConverter.java
@@ -39,6 +39,7 @@ public class ByteConverter extends AbstractIntegerConverter<Byte>
/**
* @see org.apache.wicket.util.convert.IConverter#convertToObject(java.lang.String,Locale)
*/
+ @Override
public Byte convertToObject(final String value, final Locale locale)
{
final Number number = parse(value, Byte.MIN_VALUE, Byte.MAX_VALUE, locale);
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/CalendarConverter.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/CalendarConverter.java b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/CalendarConverter.java
index 01c585a..162acf7 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/CalendarConverter.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/CalendarConverter.java
@@ -57,6 +57,7 @@ public class CalendarConverter implements IConverter<Calendar>
* @see org.apache.wicket.util.convert.IConverter#convertToObject(java.lang.String,
* java.util.Locale)
*/
+ @Override
public Calendar convertToObject(final String value, final Locale locale)
{
Date date = dateConverter.convertToObject(value, locale);
@@ -74,6 +75,7 @@ public class CalendarConverter implements IConverter<Calendar>
* @see org.apache.wicket.util.convert.IConverter#convertToString(java.lang.Object,
* java.util.Locale)
*/
+ @Override
public String convertToString(final Calendar value, final Locale locale)
{
if (value == null)
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/CharacterConverter.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/CharacterConverter.java b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/CharacterConverter.java
index 5629d6c..1a3607e 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/CharacterConverter.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/CharacterConverter.java
@@ -39,6 +39,7 @@ public class CharacterConverter extends AbstractConverter<Character>
/**
* @see org.apache.wicket.util.convert.IConverter#convertToObject(java.lang.String,Locale)
*/
+ @Override
public Character convertToObject(final String value, final Locale locale)
{
int length = value.length();
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/DateConverter.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/DateConverter.java b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/DateConverter.java
index 1248b20..c2f16a1 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/DateConverter.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/DateConverter.java
@@ -34,6 +34,7 @@ public class DateConverter extends AbstractConverter<Date>
/**
* @see org.apache.wicket.util.convert.IConverter#convertToObject(java.lang.String,Locale)
*/
+ @Override
public Date convertToObject(final String value, final Locale locale)
{
if ((value == null) || Strings.isEmpty(value))
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/DoubleConverter.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/DoubleConverter.java b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/DoubleConverter.java
index d2eb7ce..fbf5862 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/DoubleConverter.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/DoubleConverter.java
@@ -39,6 +39,7 @@ public class DoubleConverter extends AbstractDecimalConverter<Double>
/**
* @see org.apache.wicket.util.convert.IConverter#convertToObject(String, java.util.Locale)
*/
+ @Override
public Double convertToObject(final String value, final Locale locale)
{
final Number number = parse(value, -Double.MAX_VALUE, Double.MAX_VALUE, locale);
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/FloatConverter.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/FloatConverter.java b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/FloatConverter.java
index 6e75546..bc1562a 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/FloatConverter.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/FloatConverter.java
@@ -39,6 +39,7 @@ public class FloatConverter extends AbstractDecimalConverter<Float>
/**
* @see org.apache.wicket.util.convert.IConverter#convertToObject(java.lang.String,Locale)
*/
+ @Override
public Float convertToObject(final String value, final Locale locale)
{
final Number number = parse(value, -Float.MAX_VALUE, Float.MAX_VALUE, locale);
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/IntegerConverter.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/IntegerConverter.java b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/IntegerConverter.java
index 2f68212..8fd1edf 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/IntegerConverter.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/IntegerConverter.java
@@ -39,6 +39,7 @@ public class IntegerConverter extends AbstractIntegerConverter<Integer>
/**
* @see org.apache.wicket.util.convert.IConverter#convertToObject(java.lang.String,Locale)
*/
+ @Override
public Integer convertToObject(final String value, final Locale locale)
{
final Number number = parse(value, Integer.MIN_VALUE, Integer.MAX_VALUE, locale);
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/LongConverter.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/LongConverter.java b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/LongConverter.java
index c3c5b48..67401b2 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/LongConverter.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/LongConverter.java
@@ -39,6 +39,7 @@ public class LongConverter extends AbstractIntegerConverter<Long>
/**
* @see org.apache.wicket.util.convert.IConverter#convertToObject(java.lang.String,Locale)
*/
+ @Override
public Long convertToObject(final String value, final Locale locale)
{
final Number number = parse(value, Long.MIN_VALUE, Long.MAX_VALUE, locale);
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/ShortConverter.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/ShortConverter.java b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/ShortConverter.java
index 53066ce..4d2a2fa 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/ShortConverter.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/ShortConverter.java
@@ -39,6 +39,7 @@ public class ShortConverter extends AbstractIntegerConverter<Short>
/**
* @see org.apache.wicket.util.convert.IConverter#convertToObject(java.lang.String,Locale)
*/
+ @Override
public Short convertToObject(final String value, final Locale locale)
{
final Number number = parse(value, Short.MIN_VALUE, Short.MAX_VALUE, locale);
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlDateConverter.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlDateConverter.java b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlDateConverter.java
index e2d4ae6..99340cd 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlDateConverter.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlDateConverter.java
@@ -32,6 +32,7 @@ public class SqlDateConverter extends AbstractConverter<Date>
/**
* @see org.apache.wicket.util.convert.IConverter#convertToObject(java.lang.String,Locale)
*/
+ @Override
public Date convertToObject(final String value, final Locale locale)
{
if ((value == null) || Strings.isEmpty(value))
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlTimeConverter.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlTimeConverter.java b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlTimeConverter.java
index fb9e6bd..43433f3 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlTimeConverter.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlTimeConverter.java
@@ -33,6 +33,7 @@ public class SqlTimeConverter extends AbstractConverter<Time>
private static final long serialVersionUID = 1L;
/** @see org.apache.wicket.util.convert.converter.DateConverter#convertToObject(java.lang.String,java.util.Locale) */
+ @Override
public Time convertToObject(final String value, Locale locale)
{
if (value == null)
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlTimestampConverter.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlTimestampConverter.java b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlTimestampConverter.java
index cfeb181..432c1ac 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlTimestampConverter.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlTimestampConverter.java
@@ -75,6 +75,7 @@ public class SqlTimestampConverter extends AbstractConverter<Timestamp>
* @see org.apache.wicket.util.convert.IConverter#convertToObject(java.lang.String,
* java.util.Locale)
*/
+ @Override
public Timestamp convertToObject(final String value, Locale locale)
{
if (value == null)
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/ZeroPaddingIntegerConverter.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/ZeroPaddingIntegerConverter.java b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/ZeroPaddingIntegerConverter.java
index 2c9b4a3..84c4f62 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/ZeroPaddingIntegerConverter.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/ZeroPaddingIntegerConverter.java
@@ -62,6 +62,7 @@ public class ZeroPaddingIntegerConverter extends AbstractIntegerConverter<Intege
/**
* @see org.apache.wicket.util.convert.IConverter#convertToObject(java.lang.String,Locale)
*/
+ @Override
public Integer convertToObject(final String value, final Locale locale)
{
final Number number = parse(value, Integer.MIN_VALUE, Integer.MAX_VALUE, locale);
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/crypt/AbstractCrypt.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/crypt/AbstractCrypt.java b/wicket-util/src/main/java/org/apache/wicket/util/crypt/AbstractCrypt.java
index 2edf603..4d2c7e2 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/crypt/AbstractCrypt.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/crypt/AbstractCrypt.java
@@ -58,6 +58,7 @@ public abstract class AbstractCrypt implements ICrypt
* text to decrypt
* @return the decrypted text
*/
+ @Override
public final String decryptUrlSafe(final String text)
{
try
@@ -79,6 +80,7 @@ public abstract class AbstractCrypt implements ICrypt
* text to encrypt
* @return encrypted string
*/
+ @Override
public final String encryptUrlSafe(final String plainText)
{
try
@@ -114,6 +116,7 @@ public abstract class AbstractCrypt implements ICrypt
* @param key
* private key to make de-/encryption unique
*/
+ @Override
public void setKey(final String key)
{
encryptionKey = key;
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/crypt/ClassCryptFactory.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/crypt/ClassCryptFactory.java b/wicket-util/src/main/java/org/apache/wicket/util/crypt/ClassCryptFactory.java
index a7274f6..a144ecc 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/crypt/ClassCryptFactory.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/crypt/ClassCryptFactory.java
@@ -60,6 +60,7 @@ public class ClassCryptFactory implements ICryptFactory
/**
* @see org.apache.wicket.util.crypt.ICryptFactory#newCrypt()
*/
+ @Override
public ICrypt newCrypt()
{
try
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/crypt/CryptFactoryCachingDecorator.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/crypt/CryptFactoryCachingDecorator.java b/wicket-util/src/main/java/org/apache/wicket/util/crypt/CryptFactoryCachingDecorator.java
index f18b322..3a8be90 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/crypt/CryptFactoryCachingDecorator.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/crypt/CryptFactoryCachingDecorator.java
@@ -45,6 +45,7 @@ public class CryptFactoryCachingDecorator implements ICryptFactory
/**
* @see org.apache.wicket.util.crypt.ICryptFactory#newCrypt()
*/
+ @Override
public final ICrypt newCrypt()
{
if (cache == null)
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/crypt/NoCrypt.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/crypt/NoCrypt.java b/wicket-util/src/main/java/org/apache/wicket/util/crypt/NoCrypt.java
index 2c8b16c..be16986 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/crypt/NoCrypt.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/crypt/NoCrypt.java
@@ -41,6 +41,7 @@ public class NoCrypt implements ICrypt
* text to decrypt
* @return the decrypted text
*/
+ @Override
public final String decryptUrlSafe(final String text)
{
return text;
@@ -53,6 +54,7 @@ public class NoCrypt implements ICrypt
* text to encrypt
* @return encrypted string
*/
+ @Override
public final String encryptUrlSafe(final String plainText)
{
return plainText;
@@ -64,6 +66,7 @@ public class NoCrypt implements ICrypt
* @param key
* private key to make de-/encryption unique
*/
+ @Override
public void setKey(final String key)
{
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/crypt/NoCryptFactory.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/crypt/NoCryptFactory.java b/wicket-util/src/main/java/org/apache/wicket/util/crypt/NoCryptFactory.java
index 4235441..a7baba5 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/crypt/NoCryptFactory.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/crypt/NoCryptFactory.java
@@ -34,6 +34,7 @@ public class NoCryptFactory implements ICryptFactory
}
+ @Override
public ICrypt newCrypt()
{
return crypt;
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/diff/myers/MyersDiff.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/diff/myers/MyersDiff.java b/wicket-util/src/main/java/org/apache/wicket/util/diff/myers/MyersDiff.java
index 063c1aa..a07928c 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/diff/myers/MyersDiff.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/diff/myers/MyersDiff.java
@@ -90,6 +90,7 @@ public class MyersDiff implements DiffAlgorithm
/**
* {@inheritDoc}
*/
+ @Override
public Revision diff(final Object[] orig, final Object[] rev)
throws DifferentiationFailedException
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/file/File.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/file/File.java b/wicket-util/src/main/java/org/apache/wicket/util/file/File.java
index 7d77f26..b48bbde 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/file/File.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/file/File.java
@@ -166,6 +166,7 @@ public class File extends java.io.File implements IModifiable
* @return This file's lastModified() value as a Time object or <code>null</code> if
* that information is not available
*/
+ @Override
public Time lastModifiedTime()
{
final long time = lastModified();
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/file/FileCleaner.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/file/FileCleaner.java b/wicket-util/src/main/java/org/apache/wicket/util/file/FileCleaner.java
index e5c35c0..3835192 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/file/FileCleaner.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/file/FileCleaner.java
@@ -37,16 +37,19 @@ public class FileCleaner implements IFileCleaner
cleaner = new FileCleaningTracker();
}
+ @Override
public void track(final File file, final Object marker)
{
cleaner.track(file, marker);
}
+ @Override
public void track(final File file, final Object marker, FileDeleteStrategy deleteStrategy)
{
cleaner.track(file, marker, deleteStrategy);
}
+ @Override
public void destroy()
{
cleaner.exitWhenFinished();
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/file/Folder.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/file/Folder.java b/wicket-util/src/main/java/org/apache/wicket/util/file/Folder.java
index 4e77727..fccfac0 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/file/Folder.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/file/Folder.java
@@ -44,6 +44,7 @@ public class Folder extends File
*/
public static FileFilter ALL_FILES = new FileFilter()
{
+ @Override
public boolean accept(final File file)
{
return true;
@@ -215,6 +216,7 @@ public class Folder extends File
/**
* @see java.io.FileFilter#accept(java.io.File)
*/
+ @Override
public boolean accept(final java.io.File file)
{
return file.isFile() && filter.accept(new File(file));
@@ -243,6 +245,7 @@ public class Folder extends File
{
return getFolders(new FolderFilter()
{
+ @Override
public boolean accept(final Folder folder)
{
final String name = folder.getName();
@@ -264,6 +267,7 @@ public class Folder extends File
/**
* @see java.io.FileFilter#accept(java.io.File)
*/
+ @Override
public boolean accept(final java.io.File file)
{
return file.isDirectory() && filter.accept(new Folder(file.getPath()));
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/lang/Exceptions.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/lang/Exceptions.java b/wicket-util/src/main/java/org/apache/wicket/util/lang/Exceptions.java
index b9479de..76c2235 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/lang/Exceptions.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/lang/Exceptions.java
@@ -55,6 +55,7 @@ public class Exceptions
{
return visit(throwable, new IThrowableVisitor<T>()
{
+ @Override
@SuppressWarnings("unchecked")
public void visit(final Throwable throwable, final Visit<T> visit)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java b/wicket-util/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java
index b511272..958fe6c 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java
@@ -45,17 +45,20 @@ abstract class AbstractLicenseHeaderHandler implements ILicenseHeaderHandler
this.ignoreFiles = ignoreFiles;
}
+ @Override
public List<String> getIgnoreFiles()
{
return ignoreFiles;
}
+ @Override
public boolean addLicenseHeader(final File file)
{
System.out.println("Not supported yet.");
return false;
}
+ @Override
public String getLicenseType(final File file)
{
return null;
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java b/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java
index dc6cee3..5d2c37d 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java
@@ -70,6 +70,7 @@ public abstract class ApacheLicenseHeaderTestCase extends Assert
this.ignoreFiles = ignoreFiles;
}
+ @Override
public boolean accept(final File pathname)
{
boolean accept = false;
@@ -152,6 +153,7 @@ public abstract class ApacheLicenseHeaderTestCase extends Assert
{
private final String[] ignoreDirectory = new String[] { ".svn" };
+ @Override
public boolean accept(final File pathname)
{
boolean accept = false;
@@ -273,6 +275,7 @@ public abstract class ApacheLicenseHeaderTestCase extends Assert
visitFiles(licenseHeaderHandler.getSuffixes(), licenseHeaderHandler.getIgnoreFiles(),
new FileVisitor()
{
+ @Override
public void visitFile(final File file)
{
if (licenseHeaderHandler.checkLicenseHeader(file) == false)
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/license/CssLicenseHeaderHandler.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/CssLicenseHeaderHandler.java b/wicket-util/src/main/java/org/apache/wicket/util/license/CssLicenseHeaderHandler.java
index 0f630dd..c078fe7 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/license/CssLicenseHeaderHandler.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/license/CssLicenseHeaderHandler.java
@@ -42,6 +42,7 @@ class CssLicenseHeaderHandler extends AbstractLicenseHeaderHandler
return "cssLicense.txt";
}
+ @Override
public boolean checkLicenseHeader(final File file)
{
Revision revision = null;
@@ -60,6 +61,7 @@ class CssLicenseHeaderHandler extends AbstractLicenseHeaderHandler
return revision.size() == 0;
}
+ @Override
public List<String> getSuffixes()
{
return Arrays.asList("css");
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java b/wicket-util/src/main/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java
index 9f79d46..77b58b5 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java
@@ -76,6 +76,7 @@ class JavaLicenseHeaderHandler extends AbstractLicenseHeaderHandler
return added;
}
+ @Override
public boolean checkLicenseHeader(final File file)
{
String header = extractLicenseHeader(file, 0, 16);
@@ -83,6 +84,7 @@ class JavaLicenseHeaderHandler extends AbstractLicenseHeaderHandler
return getLicenseHeader().equals(header);
}
+ @Override
public List<String> getSuffixes()
{
return Arrays.asList("java");
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/license/JavaScriptLicenseHeaderHandler.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/JavaScriptLicenseHeaderHandler.java b/wicket-util/src/main/java/org/apache/wicket/util/license/JavaScriptLicenseHeaderHandler.java
index f9fbd0f..ded0529 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/license/JavaScriptLicenseHeaderHandler.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/license/JavaScriptLicenseHeaderHandler.java
@@ -38,6 +38,7 @@ class JavaScriptLicenseHeaderHandler extends AbstractLicenseHeaderHandler
return "javaScriptLicense.txt";
}
+ @Override
public boolean checkLicenseHeader(final File file)
{
String header = extractLicenseHeader(file, 0, 16);
@@ -45,6 +46,7 @@ class JavaScriptLicenseHeaderHandler extends AbstractLicenseHeaderHandler
return getLicenseHeader().equals(header);
}
+ @Override
public List<String> getSuffixes()
{
return Arrays.asList("js", "json");
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/license/PropertiesLicenseHeaderHandler.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/PropertiesLicenseHeaderHandler.java b/wicket-util/src/main/java/org/apache/wicket/util/license/PropertiesLicenseHeaderHandler.java
index 80be4eb..116c88e 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/license/PropertiesLicenseHeaderHandler.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/license/PropertiesLicenseHeaderHandler.java
@@ -42,6 +42,7 @@ class PropertiesLicenseHeaderHandler extends AbstractLicenseHeaderHandler
return "propertiesLicense.txt";
}
+ @Override
public boolean checkLicenseHeader(final File file)
{
Revision revision = null;
@@ -60,6 +61,7 @@ class PropertiesLicenseHeaderHandler extends AbstractLicenseHeaderHandler
return revision.size() == 0;
}
+ @Override
public List<String> getSuffixes()
{
return Arrays.asList("properties");