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
[6/6] Add @Override to all overridden methods
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/license/VelocityLicenseHeaderHandler.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/VelocityLicenseHeaderHandler.java b/wicket-util/src/main/java/org/apache/wicket/util/license/VelocityLicenseHeaderHandler.java
index 05b8ddb..0521c78 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/license/VelocityLicenseHeaderHandler.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/license/VelocityLicenseHeaderHandler.java
@@ -42,6 +42,7 @@ class VelocityLicenseHeaderHandler extends AbstractLicenseHeaderHandler
return "velocityLicense.txt";
}
+ @Override
public boolean checkLicenseHeader(final File file)
{
Revision revision = null;
@@ -60,6 +61,7 @@ class VelocityLicenseHeaderHandler extends AbstractLicenseHeaderHandler
return revision.size() == 0;
}
+ @Override
public List<String> getSuffixes()
{
return Arrays.asList("vm");
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java b/wicket-util/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java
index 004ccf4..2757d6b 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java
@@ -48,6 +48,7 @@ class XmlLicenseHeaderHandler extends AbstractLicenseHeaderHandler
return "xmlLicense.txt";
}
+ @Override
public boolean checkLicenseHeader(final File file)
{
Revision revision = null;
@@ -87,6 +88,7 @@ class XmlLicenseHeaderHandler extends AbstractLicenseHeaderHandler
return revision.size() == 0;
}
+ @Override
public List<String> getSuffixes()
{
return Arrays.asList("xml", "fml");
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/listener/ChangeListenerSet.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/listener/ChangeListenerSet.java b/wicket-util/src/main/java/org/apache/wicket/util/listener/ChangeListenerSet.java
index b4e85ef..651ec60 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/listener/ChangeListenerSet.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/listener/ChangeListenerSet.java
@@ -39,7 +39,7 @@ public final class ChangeListenerSet extends ListenerCollection<IChangeListener>
{
notify(new INotifier<IChangeListener>()
{
-
+ @Override
public void notify(final IChangeListener object)
{
object.onChange();
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/listener/ListenerCollection.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/listener/ListenerCollection.java b/wicket-util/src/main/java/org/apache/wicket/util/listener/ListenerCollection.java
index bd39e00..582dd0c 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/listener/ListenerCollection.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/listener/ListenerCollection.java
@@ -112,6 +112,7 @@ public abstract class ListenerCollection<T> implements Serializable, Iterable<T>
{
reversedNotify(new INotifier<T>()
{
+ @Override
public void notify(T listener)
{
try
@@ -192,6 +193,7 @@ public abstract class ListenerCollection<T> implements Serializable, Iterable<T>
*
* @return an iterator that can iterate the listeners.
*/
+ @Override
public Iterator<T> iterator()
{
return listeners.iterator();
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTestCase.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTestCase.java b/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTestCase.java
index e25217f..91f332f 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTestCase.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTestCase.java
@@ -102,7 +102,7 @@ public class WellFormedXmlTestCase
private static final FileFilter fileFilter = new FileFilter()
{
-
+ @Override
public boolean accept(File pathname)
{
String path = pathname.getAbsolutePath().replace('\\', '/');
@@ -114,16 +114,19 @@ public class WellFormedXmlTestCase
private static final ErrorHandler errorHandler = new ErrorHandler()
{
+ @Override
public void warning(SAXParseException exception) throws SAXException
{
throw exception;
}
+ @Override
public void error(SAXParseException exception) throws SAXException
{
throw exception;
}
+ @Override
public void fatalError(SAXParseException exception) throws SAXException
{
throw exception;
@@ -149,6 +152,7 @@ public class WellFormedXmlTestCase
systemIdToUri.put("http://www.w3.org/TR/html4/strict.dtd", "xhtml1-strict.dtd");
}
+ @Override
public InputSource resolveEntity(String publicId, String systemId) throws SAXException,
IOException
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/resource/AbstractResourceStream.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/resource/AbstractResourceStream.java b/wicket-util/src/main/java/org/apache/wicket/util/resource/AbstractResourceStream.java
index 86b6ec4..a4ec5d4 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/resource/AbstractResourceStream.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/resource/AbstractResourceStream.java
@@ -35,46 +35,55 @@ public abstract class AbstractResourceStream implements IResourceStream
private String style;
private String variation;
+ @Override
public Locale getLocale()
{
return locale;
}
+ @Override
public void setLocale(final Locale locale)
{
this.locale = locale;
}
+ @Override
public String getStyle()
{
return style;
}
+ @Override
public String getVariation()
{
return variation;
}
+ @Override
public void setStyle(final String style)
{
this.style = style;
}
+ @Override
public void setVariation(final String variation)
{
this.variation = variation;
}
+ @Override
public Bytes length()
{
return null;
}
+ @Override
public String getContentType()
{
return null;
}
+ @Override
public Time lastModifiedTime()
{
return null;
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/resource/AbstractStringResourceStream.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/resource/AbstractStringResourceStream.java b/wicket-util/src/main/java/org/apache/wicket/util/resource/AbstractStringResourceStream.java
index 5d1d38a..a0489ef 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/resource/AbstractStringResourceStream.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/resource/AbstractStringResourceStream.java
@@ -79,6 +79,7 @@ public abstract class AbstractStringResourceStream extends AbstractResourceStrea
/**
* @return This resource as a String.
*/
+ @Override
public String asString()
{
Reader reader = null;
@@ -124,6 +125,7 @@ public abstract class AbstractStringResourceStream extends AbstractResourceStrea
* @param charset
* Charset for component
*/
+ @Override
public void setCharset(final Charset charset)
{
// java.nio.Charset itself is not serializable so we can only store the name
@@ -133,6 +135,7 @@ public abstract class AbstractStringResourceStream extends AbstractResourceStrea
/**
* @see org.apache.wicket.util.resource.IResourceStream#close()
*/
+ @Override
public void close() throws IOException
{
}
@@ -149,6 +152,7 @@ public abstract class AbstractStringResourceStream extends AbstractResourceStrea
/**
* @see org.apache.wicket.util.resource.IResourceStream#getInputStream()
*/
+ @Override
public InputStream getInputStream() throws ResourceStreamNotFoundException
{
final byte[] bytes;
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/resource/FileResourceStream.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/resource/FileResourceStream.java b/wicket-util/src/main/java/org/apache/wicket/util/resource/FileResourceStream.java
index db88980..499df49 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/resource/FileResourceStream.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/resource/FileResourceStream.java
@@ -75,6 +75,7 @@ public class FileResourceStream extends AbstractResourceStream
*
* @throws IOException
*/
+ @Override
public void close() throws IOException
{
if (inputStream != null)
@@ -109,6 +110,7 @@ public class FileResourceStream extends AbstractResourceStream
*
* @throws ResourceStreamNotFoundException
*/
+ @Override
public InputStream getInputStream() throws ResourceStreamNotFoundException
{
if (inputStream == null)
@@ -161,6 +163,7 @@ public class FileResourceStream extends AbstractResourceStream
return null;
}
+ @Override
public String locationAsString()
{
if (file != null)
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/resource/IResourceStream.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/resource/IResourceStream.java b/wicket-util/src/main/java/org/apache/wicket/util/resource/IResourceStream.java
index 2d5b18a..da9e038 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/resource/IResourceStream.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/resource/IResourceStream.java
@@ -71,6 +71,7 @@ public interface IResourceStream extends IModifiable, IClusterable, Closeable
*
* @throws IOException
*/
+ @Override
void close() throws IOException;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/resource/XSLTResourceStream.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/resource/XSLTResourceStream.java b/wicket-util/src/main/java/org/apache/wicket/util/resource/XSLTResourceStream.java
index 28aeab8..9e74cbb 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/resource/XSLTResourceStream.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/resource/XSLTResourceStream.java
@@ -106,6 +106,7 @@ public class XSLTResourceStream extends AbstractResourceStream
/**
* @see org.apache.wicket.util.resource.IResourceStream#close()
*/
+ @Override
public void close() throws IOException
{
}
@@ -124,6 +125,7 @@ public class XSLTResourceStream extends AbstractResourceStream
/**
* @see org.apache.wicket.util.resource.IResourceStream#getInputStream()
*/
+ @Override
public InputStream getInputStream() throws ResourceStreamNotFoundException
{
return new ByteArrayInputStream(out.toByteArray());
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/resource/ZipResourceStream.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/resource/ZipResourceStream.java b/wicket-util/src/main/java/org/apache/wicket/util/resource/ZipResourceStream.java
index dcc648a..0be44ae 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/resource/ZipResourceStream.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/resource/ZipResourceStream.java
@@ -175,6 +175,7 @@ public class ZipResourceStream extends AbstractResourceStream
/**
* @see org.apache.wicket.util.resource.IResourceStream#close()
*/
+ @Override
public void close() throws IOException
{
}
@@ -191,6 +192,7 @@ public class ZipResourceStream extends AbstractResourceStream
/**
* @see org.apache.wicket.util.resource.IResourceStream#getInputStream()
*/
+ @Override
public InputStream getInputStream() throws ResourceStreamNotFoundException
{
return new ByteArrayInputStream(bytearray.toByteArray());
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/string/AbstractStringList.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/string/AbstractStringList.java b/wicket-util/src/main/java/org/apache/wicket/util/string/AbstractStringList.java
index 2df28bf..00762f5 100755
--- a/wicket-util/src/main/java/org/apache/wicket/util/string/AbstractStringList.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/string/AbstractStringList.java
@@ -48,12 +48,14 @@ public abstract class AbstractStringList implements IStringSequence, Serializabl
* @return String iterator
* @see org.apache.wicket.util.string.IStringSequence#iterator()
*/
+ @Override
public abstract IStringIterator iterator();
/**
* @return Number of strings in this string list
* @see org.apache.wicket.util.string.IStringSequence#size()
*/
+ @Override
public abstract int size();
/**
@@ -62,6 +64,7 @@ public abstract class AbstractStringList implements IStringSequence, Serializabl
* @return The string at the given index
* @see org.apache.wicket.util.string.IStringSequence#get(int)
*/
+ @Override
public abstract String get(int index);
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/string/AppendingStringBuffer.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/string/AppendingStringBuffer.java b/wicket-util/src/main/java/org/apache/wicket/util/string/AppendingStringBuffer.java
index 19e69a6..c89e45f 100755
--- a/wicket-util/src/main/java/org/apache/wicket/util/string/AppendingStringBuffer.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/string/AppendingStringBuffer.java
@@ -97,6 +97,7 @@ public final class AppendingStringBuffer implements java.io.Serializable, CharSe
*
* @return the length of the sequence of characters currently represented by this string buffer.
*/
+ @Override
public int length()
{
return count;
@@ -226,6 +227,7 @@ public final class AppendingStringBuffer implements java.io.Serializable, CharSe
* <code>length()</code>.
* @see java.lang.StringBuffer#length()
*/
+ @Override
public char charAt(final int index)
{
if ((index < 0) || (index >= count))
@@ -831,6 +833,7 @@ public final class AppendingStringBuffer implements java.io.Serializable, CharSe
* @since 1.4
* @spec JSR-51
*/
+ @Override
public CharSequence subSequence(final int start, final int end)
{
return this.substring(start, end);
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/string/Entities.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/string/Entities.java b/wicket-util/src/main/java/org/apache/wicket/util/string/Entities.java
index 386a2a4..3f17a86 100755
--- a/wicket-util/src/main/java/org/apache/wicket/util/string/Entities.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/string/Entities.java
@@ -465,17 +465,20 @@ class Entities
private final IntHashMap<String> mapValueToName = new IntHashMap<String>();
// TODO not thread-safe as there is a window between changing the two maps
+ @Override
public void add(String name, int value)
{
mapNameToValue.put(name, Integer.valueOf(value));
mapValueToName.put(value, name);
}
+ @Override
public String name(int value)
{
return mapValueToName.get(value);
}
+ @Override
public int value(String name)
{
Integer value = mapNameToValue.get(name);
@@ -507,12 +510,14 @@ class Entities
mapValueToName = valueToName;
}
+ @Override
public void add(String name, int value)
{
mapNameToValue.put(name, new Integer(value));
mapValueToName.put(Integer.valueOf(value), name);
}
+ @Override
public String name(int value)
{
return mapValueToName.get(Integer.valueOf(value));
@@ -521,6 +526,7 @@ class Entities
/**
* {@inheritDoc}
*/
+ @Override
public int value(String name)
{
Integer value = mapNameToValue.get(name);
@@ -638,6 +644,7 @@ class Entities
/**
* {@inheritDoc}
*/
+ @Override
public void add(String name, int value)
{
ensureCapacity(size + 1);
@@ -669,6 +676,7 @@ class Entities
/**
* {@inheritDoc}
*/
+ @Override
public String name(int value)
{
for (int i = 0; i < size; ++i)
@@ -684,6 +692,7 @@ class Entities
/**
* {@inheritDoc}
*/
+ @Override
public int value(String name)
{
for (int i = 0; i < size; ++i)
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/string/StringList.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/string/StringList.java b/wicket-util/src/main/java/org/apache/wicket/util/string/StringList.java
index 9426007..127f9e8 100755
--- a/wicket-util/src/main/java/org/apache/wicket/util/string/StringList.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/string/StringList.java
@@ -306,11 +306,13 @@ public final class StringList extends AbstractStringList
{
private final Iterator<String> iterator = strings.iterator();
+ @Override
public boolean hasNext()
{
return iterator.hasNext();
}
+ @Override
public String next()
{
return iterator.next();
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java b/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java
index b561eff..fceb499 100755
--- a/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java
@@ -67,6 +67,7 @@ public final class Strings
{
LINE_SEPARATOR = AccessController.doPrivileged(new PrivilegedAction<String>()
{
+ @Override
public String run()
{
return System.getProperty("line.separator");
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/thread/Task.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/thread/Task.java b/wicket-util/src/main/java/org/apache/wicket/util/thread/Task.java
index 4ebbf4a..1d05b22 100755
--- a/wicket-util/src/main/java/org/apache/wicket/util/thread/Task.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/thread/Task.java
@@ -91,6 +91,7 @@ public final class Task
{
final Runnable runnable = new Runnable()
{
+ @Override
public void run()
{
// Sleep until start time
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/time/TimeFrame.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/time/TimeFrame.java b/wicket-util/src/main/java/org/apache/wicket/util/time/TimeFrame.java
index 6d5da67..fab51e7 100755
--- a/wicket-util/src/main/java/org/apache/wicket/util/time/TimeFrame.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/time/TimeFrame.java
@@ -75,6 +75,7 @@ public final class TimeFrame implements ITimeFrameSource
{
private static final long serialVersionUID = 1L;
+ @Override
public TimeFrame getTimeFrame()
{
return new TimeFrame(Time.valueOf(startTimeOfDay), Time.valueOf(endTimeOfDay));
@@ -200,6 +201,7 @@ public final class TimeFrame implements ITimeFrameSource
*
* @return this <code>TimeFrame</code>
*/
+ @Override
public TimeFrame getTimeFrame()
{
return this;
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/upload/DiskFileItem.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/upload/DiskFileItem.java b/wicket-util/src/main/java/org/apache/wicket/util/upload/DiskFileItem.java
index b70371c..cbc23ed 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/upload/DiskFileItem.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/upload/DiskFileItem.java
@@ -212,6 +212,7 @@ public class DiskFileItem implements FileItem, FileItemHeadersSupport
* @throws IOException
* if an error occurs.
*/
+ @Override
public InputStream getInputStream() throws IOException
{
if (!isInMemory())
@@ -231,6 +232,7 @@ public class DiskFileItem implements FileItem, FileItemHeadersSupport
*
* @return The content type passed by the agent or <code>null</code> if not defined.
*/
+ @Override
public String getContentType()
{
return contentType;
@@ -255,6 +257,7 @@ public class DiskFileItem implements FileItem, FileItemHeadersSupport
*
* @return The original filename in the client's filesystem.
*/
+ @Override
public String getName()
{
return fileName;
@@ -266,6 +269,7 @@ public class DiskFileItem implements FileItem, FileItemHeadersSupport
* @return <code>true</code> if the file contents will be read from memory; <code>false</code>
* otherwise.
*/
+ @Override
public boolean isInMemory()
{
if (cachedContent != null)
@@ -280,6 +284,7 @@ public class DiskFileItem implements FileItem, FileItemHeadersSupport
*
* @return The size of the file, in bytes.
*/
+ @Override
public long getSize()
{
if (size >= 0)
@@ -306,6 +311,7 @@ public class DiskFileItem implements FileItem, FileItemHeadersSupport
*
* @return The contents of the file as an array of bytes.
*/
+ @Override
public byte[] get()
{
if (isInMemory())
@@ -343,6 +349,7 @@ public class DiskFileItem implements FileItem, FileItemHeadersSupport
* @throws UnsupportedEncodingException
* if the requested character encoding is not available.
*/
+ @Override
public String getString(final String charset) throws UnsupportedEncodingException
{
return new String(get(), charset);
@@ -356,6 +363,7 @@ public class DiskFileItem implements FileItem, FileItemHeadersSupport
*
* @todo Consider making this method throw UnsupportedEncodingException.
*/
+ @Override
public String getString()
{
byte[] rawdata = get();
@@ -394,6 +402,7 @@ public class DiskFileItem implements FileItem, FileItemHeadersSupport
* @throws Exception
* if an error occurs.
*/
+ @Override
public void write(final File file) throws IOException
{
if (isInMemory())
@@ -446,6 +455,7 @@ public class DiskFileItem implements FileItem, FileItemHeadersSupport
* instance is garbage collected, this method can be used to ensure that this is done at an
* earlier time, thus preserving system resources.
*/
+ @Override
public void delete()
{
cachedContent = null;
@@ -468,6 +478,7 @@ public class DiskFileItem implements FileItem, FileItemHeadersSupport
* @see #setFieldName(java.lang.String)
*
*/
+ @Override
public String getFieldName()
{
return fieldName;
@@ -482,6 +493,7 @@ public class DiskFileItem implements FileItem, FileItemHeadersSupport
* @see #getFieldName()
*
*/
+ @Override
public void setFieldName(final String fieldName)
{
this.fieldName = fieldName;
@@ -496,6 +508,7 @@ public class DiskFileItem implements FileItem, FileItemHeadersSupport
* @see #setFormField(boolean)
*
*/
+ @Override
public boolean isFormField()
{
return isFormField;
@@ -512,6 +525,7 @@ public class DiskFileItem implements FileItem, FileItemHeadersSupport
* @see #isFormField()
*
*/
+ @Override
public void setFormField(final boolean state)
{
isFormField = state;
@@ -528,6 +542,7 @@ public class DiskFileItem implements FileItem, FileItemHeadersSupport
* @throws IOException
* if an error occurs.
*/
+ @Override
public OutputStream getOutputStream() throws IOException
{
if (dfos == null)
@@ -535,6 +550,7 @@ public class DiskFileItem implements FileItem, FileItemHeadersSupport
dfos = new DeferredFileOutputStream(sizeThreshold,
new DeferredFileOutputStream.FileFactory()
{
+ @Override
public File createFile()
{
return getTempFile();
@@ -747,6 +763,7 @@ public class DiskFileItem implements FileItem, FileItemHeadersSupport
*
* @return The file items headers.
*/
+ @Override
public FileItemHeaders getHeaders()
{
return headers;
@@ -758,6 +775,7 @@ public class DiskFileItem implements FileItem, FileItemHeadersSupport
* @param pHeaders
* The file items headers.
*/
+ @Override
public void setHeaders(final FileItemHeaders pHeaders)
{
headers = pHeaders;
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/upload/DiskFileItemFactory.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/upload/DiskFileItemFactory.java b/wicket-util/src/main/java/org/apache/wicket/util/upload/DiskFileItemFactory.java
index 1e580c6..0123e1f 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/upload/DiskFileItemFactory.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/upload/DiskFileItemFactory.java
@@ -194,6 +194,7 @@ public class DiskFileItemFactory implements FileItemFactory
*
* @return The newly created file item.
*/
+ @Override
public FileItem createItem(final String fieldName, final String contentType,
final boolean isFormField, final String fileName)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/upload/FileItemHeadersImpl.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/upload/FileItemHeadersImpl.java b/wicket-util/src/main/java/org/apache/wicket/util/upload/FileItemHeadersImpl.java
index 1d6ac37..8400ed8 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/upload/FileItemHeadersImpl.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/upload/FileItemHeadersImpl.java
@@ -45,6 +45,7 @@ public class FileItemHeadersImpl implements FileItemHeaders, Serializable
*/
private final List<String> headerNameList = Generics.newArrayList();
+ @Override
public String getHeader(final String name)
{
String nameLower = name.toLowerCase();
@@ -56,11 +57,13 @@ public class FileItemHeadersImpl implements FileItemHeaders, Serializable
return headerValueList.get(0);
}
+ @Override
public Iterator<String> getHeaderNames()
{
return headerNameList.iterator();
}
+ @Override
public Iterator<String> getHeaders(final String name)
{
String nameLower = name.toLowerCase();
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/upload/FileUploadBase.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/upload/FileUploadBase.java b/wicket-util/src/main/java/org/apache/wicket/util/upload/FileUploadBase.java
index 6119aed..808fb42 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/upload/FileUploadBase.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/upload/FileUploadBase.java
@@ -668,6 +668,7 @@ public abstract class FileUploadBase
*
* @return Content type, if known, or null.
*/
+ @Override
public String getContentType()
{
return contentType;
@@ -678,6 +679,7 @@ public abstract class FileUploadBase
*
* @return Field name.
*/
+ @Override
public String getFieldName()
{
return fieldName;
@@ -688,6 +690,7 @@ public abstract class FileUploadBase
*
* @return File name, if known, or null.
*/
+ @Override
public String getName()
{
return name;
@@ -698,6 +701,7 @@ public abstract class FileUploadBase
*
* @return True, if the item is a form field, otherwise false.
*/
+ @Override
public boolean isFormField()
{
return formField;
@@ -710,6 +714,7 @@ public abstract class FileUploadBase
* @throws IOException
* An I/O error occurred.
*/
+ @Override
public InputStream openStream() throws IOException
{
if (opened)
@@ -739,6 +744,7 @@ public abstract class FileUploadBase
*
* @return The items header object
*/
+ @Override
public FileItemHeaders getHeaders()
{
return headers;
@@ -750,6 +756,7 @@ public abstract class FileUploadBase
* @param pHeaders
* The items header object
*/
+ @Override
public void setHeaders(final FileItemHeaders pHeaders)
{
headers = pHeaders;
@@ -972,6 +979,7 @@ public abstract class FileUploadBase
* Reading the file item failed.
* @return True, if one or more additional file items are available, otherwise false.
*/
+ @Override
public boolean hasNext() throws FileUploadException, IOException
{
if (eof)
@@ -997,6 +1005,7 @@ public abstract class FileUploadBase
* Reading the file item failed.
* @return FileItemStream instance, which provides access to the next file item.
*/
+ @Override
public FileItemStream next() throws FileUploadException, IOException
{
if (eof || (!itemValid && !hasNext()))
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/upload/LimitedInputStream.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/upload/LimitedInputStream.java b/wicket-util/src/main/java/org/apache/wicket/util/upload/LimitedInputStream.java
index fee56d7..0aa4bb9 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/upload/LimitedInputStream.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/upload/LimitedInputStream.java
@@ -150,6 +150,7 @@ public abstract class LimitedInputStream extends FilterInputStream implements Cl
* @throws IOException
* An I/O error occurred.
*/
+ @Override
public boolean isClosed() throws IOException
{
return closed;
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/upload/MultipartFormInputStream.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/upload/MultipartFormInputStream.java b/wicket-util/src/main/java/org/apache/wicket/util/upload/MultipartFormInputStream.java
index d98406d..337f4eb 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/upload/MultipartFormInputStream.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/upload/MultipartFormInputStream.java
@@ -1120,6 +1120,7 @@ public class MultipartFormInputStream
*
* @return True, if the stream is closed, otherwise false.
*/
+ @Override
public boolean isClosed()
{
return closed;
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/upload/ServletRequestContext.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/upload/ServletRequestContext.java b/wicket-util/src/main/java/org/apache/wicket/util/upload/ServletRequestContext.java
index ca13e6f..10fb6c9 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/upload/ServletRequestContext.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/upload/ServletRequestContext.java
@@ -60,6 +60,7 @@ public class ServletRequestContext implements RequestContext
*
* @return The character encoding for the request.
*/
+ @Override
public String getCharacterEncoding()
{
return request.getCharacterEncoding();
@@ -70,6 +71,7 @@ public class ServletRequestContext implements RequestContext
*
* @return The content type of the request.
*/
+ @Override
public String getContentType()
{
return request.getContentType();
@@ -80,6 +82,7 @@ public class ServletRequestContext implements RequestContext
*
* @return The content length of the request.
*/
+ @Override
public int getContentLength()
{
return request.getContentLength();
@@ -93,6 +96,7 @@ public class ServletRequestContext implements RequestContext
* @throws IOException
* if a problem occurs.
*/
+ @Override
public InputStream getInputStream() throws IOException
{
return request.getInputStream();
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/value/CopyOnWriteValueMap.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/value/CopyOnWriteValueMap.java b/wicket-util/src/main/java/org/apache/wicket/util/value/CopyOnWriteValueMap.java
index d91b429..ebe4c7b 100755
--- a/wicket-util/src/main/java/org/apache/wicket/util/value/CopyOnWriteValueMap.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/value/CopyOnWriteValueMap.java
@@ -57,6 +57,7 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
/**
* @see java.util.Map#clear()
*/
+ @Override
public void clear()
{
checkAndCopy();
@@ -79,6 +80,7 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
/**
* @see java.util.Map#containsKey(Object)
*/
+ @Override
public boolean containsKey(final Object key)
{
return wrapped.containsKey(key);
@@ -87,6 +89,7 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
/**
* @see java.util.Map#containsValue(Object)
*/
+ @Override
public boolean containsValue(final Object value)
{
return wrapped.containsValue(value);
@@ -95,6 +98,7 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
/**
* @see java.util.Map#entrySet()
*/
+ @Override
public Set<Entry<String, Object>> entrySet()
{
checkAndCopy();
@@ -113,6 +117,7 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
/**
* @see java.util.Map#get(Object)
*/
+ @Override
public Object get(final Object key)
{
return wrapped.get(key);
@@ -121,6 +126,7 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
/**
* @see IValueMap#getBoolean(String)
*/
+ @Override
public boolean getBoolean(final String key) throws StringValueConversionException
{
return wrapped.getBoolean(key);
@@ -129,6 +135,7 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
/**
* @see IValueMap#getCharSequence(String)
*/
+ @Override
public CharSequence getCharSequence(final String key)
{
return wrapped.getCharSequence(key);
@@ -137,6 +144,7 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
/**
* @see IValueMap#getDouble(String)
*/
+ @Override
public double getDouble(final String key) throws StringValueConversionException
{
return wrapped.getDouble(key);
@@ -145,6 +153,7 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
/**
* @see IValueMap#getDouble(String, double)
*/
+ @Override
public double getDouble(final String key, final double defaultValue)
{
return wrapped.getDouble(key, defaultValue);
@@ -153,6 +162,7 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
/**
* @see IValueMap#getDuration(String)
*/
+ @Override
public Duration getDuration(final String key) throws StringValueConversionException
{
return wrapped.getDuration(key);
@@ -161,6 +171,7 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
/**
* @see IValueMap#getInt(String, int)
*/
+ @Override
public int getInt(final String key, final int defaultValue)
{
return wrapped.getInt(key, defaultValue);
@@ -169,6 +180,7 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
/**
* @see IValueMap#getInt(String)
*/
+ @Override
public int getInt(final String key) throws StringValueConversionException
{
return wrapped.getInt(key);
@@ -177,6 +189,7 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
/**
* @see IValueMap#getKey(String)
*/
+ @Override
public String getKey(final String key)
{
return wrapped.getKey(key);
@@ -185,6 +198,7 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
/**
* @see IValueMap#getLong(String, long)
*/
+ @Override
public long getLong(final String key, final long defaultValue)
{
return wrapped.getLong(key, defaultValue);
@@ -193,6 +207,7 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
/**
* @see IValueMap#getLong(String)
*/
+ @Override
public long getLong(final String key) throws StringValueConversionException
{
return wrapped.getLong(key);
@@ -201,6 +216,7 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
/**
* @see IValueMap#getString(String, String)
*/
+ @Override
public String getString(final String key, final String defaultValue)
{
return wrapped.getString(key, defaultValue);
@@ -209,6 +225,7 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
/**
* @see IValueMap#getString(String)
*/
+ @Override
public String getString(final String key)
{
return wrapped.getString(key);
@@ -217,6 +234,7 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
/**
* @see IValueMap#getStringArray(String)
*/
+ @Override
public String[] getStringArray(final String key)
{
return wrapped.getStringArray(key);
@@ -225,6 +243,7 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
/**
* @see IValueMap#getStringValue(String)
*/
+ @Override
public StringValue getStringValue(final String key)
{
return wrapped.getStringValue(key);
@@ -233,6 +252,7 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
/**
* @see IValueMap#getTime(String)
*/
+ @Override
public Time getTime(final String key) throws StringValueConversionException
{
return wrapped.getTime(key);
@@ -241,6 +261,7 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
/**
* @see java.util.Map#isEmpty()
*/
+ @Override
public boolean isEmpty()
{
return wrapped.isEmpty();
@@ -249,6 +270,7 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
/**
* @see IValueMap#isImmutable()
*/
+ @Override
public boolean isImmutable()
{
return false;
@@ -257,6 +279,7 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
/**
* @see java.util.Map#keySet()
*/
+ @Override
public Set<String> keySet()
{
checkAndCopy();
@@ -266,6 +289,7 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
/**
* @see IValueMap#makeImmutable()
*/
+ @Override
public IValueMap makeImmutable()
{
return wrapped.makeImmutable();
@@ -274,6 +298,7 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
/**
* @see java.util.Map#put(Object, Object)
*/
+ @Override
public Object put(final String key, final Object value)
{
checkAndCopy();
@@ -283,6 +308,7 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
/**
* @see java.util.Map#putAll(Map)
*/
+ @Override
public void putAll(final Map<? extends String, ?> map)
{
checkAndCopy();
@@ -292,6 +318,7 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
/**
* @see java.util.Map#remove(Object)
*/
+ @Override
public Object remove(final Object key)
{
checkAndCopy();
@@ -301,6 +328,7 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
/**
* @see java.util.Map#size()
*/
+ @Override
public int size()
{
return wrapped.size();
@@ -309,6 +337,7 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
/**
* @see java.util.Map#values()
*/
+ @Override
public Collection<Object> values()
{
return wrapped.values();
@@ -331,6 +360,7 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
* @see IValueMap#getAsBoolean(String)
*
*/
+ @Override
public Boolean getAsBoolean(final String key)
{
return wrapped.getAsBoolean(key);
@@ -340,6 +370,7 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
* @see IValueMap#getAsBoolean(String, boolean)
*
*/
+ @Override
public boolean getAsBoolean(final String key, final boolean defaultValue)
{
return wrapped.getAsBoolean(key, defaultValue);
@@ -348,6 +379,7 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
/**
* @see IValueMap#getAsInteger(String)
*/
+ @Override
public Integer getAsInteger(final String key)
{
return wrapped.getAsInteger(key);
@@ -356,6 +388,7 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
/**
* @see IValueMap#getAsInteger(String, int)
*/
+ @Override
public int getAsInteger(final String key, final int defaultValue)
{
return wrapped.getAsInteger(key, defaultValue);
@@ -364,6 +397,7 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
/**
* @see IValueMap#getAsLong(String)
*/
+ @Override
public Long getAsLong(final String key)
{
return wrapped.getAsLong(key);
@@ -372,6 +406,7 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
/**
* @see IValueMap#getAsLong(String, long)
*/
+ @Override
public long getAsLong(final String key, final long defaultValue)
{
return wrapped.getAsLong(key, defaultValue);
@@ -380,6 +415,7 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
/**
* @see IValueMap#getAsDouble(String)
*/
+ @Override
public Double getAsDouble(final String key)
{
return wrapped.getAsDouble(key);
@@ -388,6 +424,7 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
/**
* @see IValueMap#getAsDouble(String, double)
*/
+ @Override
public double getAsDouble(final String key, final double defaultValue)
{
return wrapped.getAsDouble(key, defaultValue);
@@ -396,6 +433,7 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
/**
* @see IValueMap#getAsDuration(String)
*/
+ @Override
public Duration getAsDuration(final String key)
{
return wrapped.getAsDuration(key);
@@ -404,6 +442,7 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
/**
* @see IValueMap#getAsDuration(String, Duration)
*/
+ @Override
public Duration getAsDuration(final String key, final Duration defaultValue)
{
return wrapped.getAsDuration(key, defaultValue);
@@ -412,6 +451,7 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
/**
* @see IValueMap#getAsTime(String)
*/
+ @Override
public Time getAsTime(final String key)
{
return wrapped.getAsTime(key);
@@ -420,6 +460,7 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
/**
* @see IValueMap#getAsTime(String, Time)
*/
+ @Override
public Time getAsTime(final String key, final Time defaultValue)
{
return wrapped.getAsTime(key, defaultValue);
@@ -428,6 +469,7 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
/**
* @see IValueMap#getAsEnum(String, Class)
*/
+ @Override
public <T extends Enum<T>> T getAsEnum(final String key, final Class<T> eClass)
{
return wrapped.getAsEnum(key, eClass);
@@ -436,6 +478,7 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
/**
* @see IValueMap#getAsEnum
*/
+ @Override
public <T extends Enum<T>> T getAsEnum(final String key, final T defaultValue)
{
return wrapped.getAsEnum(key, defaultValue);
@@ -444,6 +487,7 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
/**
* @see IValueMap#getAsEnum(String, Class, Enum)
*/
+ @Override
public <T extends Enum<T>> T getAsEnum(final String key, final Class<T> eClass,
final T defaultValue)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/value/IntValue.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/value/IntValue.java b/wicket-util/src/main/java/org/apache/wicket/util/value/IntValue.java
index 1191ff6..15e6341 100755
--- a/wicket-util/src/main/java/org/apache/wicket/util/value/IntValue.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/value/IntValue.java
@@ -52,6 +52,7 @@ public class IntValue implements Comparable<IntValue>, Serializable
* The object to compare with
* @return 0 if equal, -1 if less than or 1 if greater than
*/
+ @Override
public final int compareTo(final IntValue that)
{
if (value < that.value)
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/value/LongValue.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/value/LongValue.java b/wicket-util/src/main/java/org/apache/wicket/util/value/LongValue.java
index 83dfa4d..8c96060 100755
--- a/wicket-util/src/main/java/org/apache/wicket/util/value/LongValue.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/value/LongValue.java
@@ -56,6 +56,7 @@ public class LongValue implements Comparable<LongValue>, Serializable
* @return 0 if equal, -1 if less than the given <code>Object</code>'s value, or 1 if greater
* than given <code>Object</code>'s value
*/
+ @Override
public final int compareTo(final LongValue that)
{
if (value < that.value)
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/value/ValueMap.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/value/ValueMap.java b/wicket-util/src/main/java/org/apache/wicket/util/value/ValueMap.java
index 8693ab0..acba07f 100755
--- a/wicket-util/src/main/java/org/apache/wicket/util/value/ValueMap.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/value/ValueMap.java
@@ -228,6 +228,7 @@ public class ValueMap extends LinkedHashMap<String, Object> implements IValueMap
/**
* @see IValueMap#getBoolean(String)
*/
+ @Override
public final boolean getBoolean(final String key) throws StringValueConversionException
{
return getStringValue(key).toBoolean();
@@ -236,6 +237,7 @@ public class ValueMap extends LinkedHashMap<String, Object> implements IValueMap
/**
* @see IValueMap#getDouble(String)
*/
+ @Override
public final double getDouble(final String key) throws StringValueConversionException
{
return getStringValue(key).toDouble();
@@ -244,6 +246,7 @@ public class ValueMap extends LinkedHashMap<String, Object> implements IValueMap
/**
* @see IValueMap#getDouble(String, double)
*/
+ @Override
public final double getDouble(final String key, final double defaultValue)
{
return getStringValue(key).toDouble(defaultValue);
@@ -252,6 +255,7 @@ public class ValueMap extends LinkedHashMap<String, Object> implements IValueMap
/**
* @see IValueMap#getDuration(String)
*/
+ @Override
public final Duration getDuration(final String key) throws StringValueConversionException
{
return getStringValue(key).toDuration();
@@ -260,6 +264,7 @@ public class ValueMap extends LinkedHashMap<String, Object> implements IValueMap
/**
* @see IValueMap#getInt(String)
*/
+ @Override
public final int getInt(final String key) throws StringValueConversionException
{
return getStringValue(key).toInt();
@@ -268,6 +273,7 @@ public class ValueMap extends LinkedHashMap<String, Object> implements IValueMap
/**
* @see IValueMap#getInt(String, int)
*/
+ @Override
public final int getInt(final String key, final int defaultValue)
{
return getStringValue(key).toInt(defaultValue);
@@ -276,6 +282,7 @@ public class ValueMap extends LinkedHashMap<String, Object> implements IValueMap
/**
* @see IValueMap#getLong(String)
*/
+ @Override
public final long getLong(final String key) throws StringValueConversionException
{
return getStringValue(key).toLong();
@@ -284,6 +291,7 @@ public class ValueMap extends LinkedHashMap<String, Object> implements IValueMap
/**
* @see IValueMap#getLong(String, long)
*/
+ @Override
public final long getLong(final String key, final long defaultValue)
{
return getStringValue(key).toLong(defaultValue);
@@ -292,6 +300,7 @@ public class ValueMap extends LinkedHashMap<String, Object> implements IValueMap
/**
* @see IValueMap#getString(String, String)
*/
+ @Override
public final String getString(final String key, final String defaultValue)
{
final String value = getString(key);
@@ -301,6 +310,7 @@ public class ValueMap extends LinkedHashMap<String, Object> implements IValueMap
/**
* @see IValueMap#getString(String)
*/
+ @Override
public final String getString(final String key)
{
final Object o = get(key);
@@ -331,6 +341,7 @@ public class ValueMap extends LinkedHashMap<String, Object> implements IValueMap
/**
* @see IValueMap#getCharSequence(String)
*/
+ @Override
public final CharSequence getCharSequence(final String key)
{
final Object o = get(key);
@@ -369,6 +380,7 @@ public class ValueMap extends LinkedHashMap<String, Object> implements IValueMap
/**
* @see IValueMap#getStringArray(String)
*/
+ @Override
public String[] getStringArray(final String key)
{
final Object o = get(key);
@@ -400,6 +412,7 @@ public class ValueMap extends LinkedHashMap<String, Object> implements IValueMap
/**
* @see IValueMap#getStringValue(String)
*/
+ @Override
public StringValue getStringValue(final String key)
{
return StringValue.valueOf(getString(key));
@@ -408,6 +421,7 @@ public class ValueMap extends LinkedHashMap<String, Object> implements IValueMap
/**
* @see IValueMap#getTime(String)
*/
+ @Override
public final Time getTime(final String key) throws StringValueConversionException
{
return getStringValue(key).toTime();
@@ -416,6 +430,7 @@ public class ValueMap extends LinkedHashMap<String, Object> implements IValueMap
/**
* @see IValueMap#isImmutable()
*/
+ @Override
public final boolean isImmutable()
{
return immutable;
@@ -424,6 +439,7 @@ public class ValueMap extends LinkedHashMap<String, Object> implements IValueMap
/**
* @see IValueMap#makeImmutable()
*/
+ @Override
public final IValueMap makeImmutable()
{
immutable = true;
@@ -505,6 +521,7 @@ public class ValueMap extends LinkedHashMap<String, Object> implements IValueMap
/**
* @see IValueMap#getKey(String)
*/
+ @Override
public String getKey(final String key)
{
for (String other : keySet())
@@ -576,6 +593,7 @@ public class ValueMap extends LinkedHashMap<String, Object> implements IValueMap
* @see IValueMap#getAsBoolean(String)
*
*/
+ @Override
public Boolean getAsBoolean(final String key)
{
if (!containsKey(key))
@@ -597,6 +615,7 @@ public class ValueMap extends LinkedHashMap<String, Object> implements IValueMap
* @see IValueMap#getAsBoolean(String, boolean)
*
*/
+ @Override
public boolean getAsBoolean(final String key, final boolean defaultValue)
{
if (!containsKey(key))
@@ -617,6 +636,7 @@ public class ValueMap extends LinkedHashMap<String, Object> implements IValueMap
/**
* @see IValueMap#getAsInteger(String)
*/
+ @Override
public Integer getAsInteger(final String key)
{
if (!containsKey(key))
@@ -637,6 +657,7 @@ public class ValueMap extends LinkedHashMap<String, Object> implements IValueMap
/**
* @see IValueMap#getAsInteger(String, int)
*/
+ @Override
public int getAsInteger(final String key, final int defaultValue)
{
return getInt(key, defaultValue);
@@ -645,6 +666,7 @@ public class ValueMap extends LinkedHashMap<String, Object> implements IValueMap
/**
* @see IValueMap#getAsLong(String)
*/
+ @Override
public Long getAsLong(final String key)
{
if (!containsKey(key))
@@ -665,6 +687,7 @@ public class ValueMap extends LinkedHashMap<String, Object> implements IValueMap
/**
* @see IValueMap#getAsLong(String, long)
*/
+ @Override
public long getAsLong(final String key, final long defaultValue)
{
return getLong(key, defaultValue);
@@ -673,6 +696,7 @@ public class ValueMap extends LinkedHashMap<String, Object> implements IValueMap
/**
* @see IValueMap#getAsDouble(String)
*/
+ @Override
public Double getAsDouble(final String key)
{
if (!containsKey(key))
@@ -693,6 +717,7 @@ public class ValueMap extends LinkedHashMap<String, Object> implements IValueMap
/**
* @see IValueMap#getAsDouble(String, double)
*/
+ @Override
public double getAsDouble(final String key, final double defaultValue)
{
return getDouble(key, defaultValue);
@@ -701,6 +726,7 @@ public class ValueMap extends LinkedHashMap<String, Object> implements IValueMap
/**
* @see IValueMap#getAsDuration(String)
*/
+ @Override
public Duration getAsDuration(final String key)
{
return getAsDuration(key, null);
@@ -709,6 +735,7 @@ public class ValueMap extends LinkedHashMap<String, Object> implements IValueMap
/**
* @see IValueMap#getAsDuration(String, Duration)
*/
+ @Override
public Duration getAsDuration(final String key, final Duration defaultValue)
{
if (!containsKey(key))
@@ -729,6 +756,7 @@ public class ValueMap extends LinkedHashMap<String, Object> implements IValueMap
/**
* @see IValueMap#getAsTime(String)
*/
+ @Override
public Time getAsTime(final String key)
{
return getAsTime(key, null);
@@ -737,6 +765,7 @@ public class ValueMap extends LinkedHashMap<String, Object> implements IValueMap
/**
* @see IValueMap#getAsTime(String, Time)
*/
+ @Override
public Time getAsTime(final String key, final Time defaultValue)
{
if (!containsKey(key))
@@ -757,6 +786,7 @@ public class ValueMap extends LinkedHashMap<String, Object> implements IValueMap
/**
* @see org.apache.wicket.util.value.IValueMap#getAsEnum(java.lang.String, java.lang.Class)
*/
+ @Override
public <T extends Enum<T>> T getAsEnum(final String key, final Class<T> eClass)
{
return getEnumImpl(key, eClass, null);
@@ -765,6 +795,7 @@ public class ValueMap extends LinkedHashMap<String, Object> implements IValueMap
/**
* @see org.apache.wicket.util.value.IValueMap#getAsEnum(java.lang.String, java.lang.Enum)
*/
+ @Override
public <T extends Enum<T>> T getAsEnum(final String key, final T defaultValue)
{
if (defaultValue == null)
@@ -779,6 +810,7 @@ public class ValueMap extends LinkedHashMap<String, Object> implements IValueMap
* @see org.apache.wicket.util.value.IValueMap#getAsEnum(java.lang.String, java.lang.Class,
* java.lang.Enum)
*/
+ @Override
public <T extends Enum<T>> T getAsEnum(final String key, final Class<T> eClass,
final T defaultValue)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/visit/AllVisitFilter.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/visit/AllVisitFilter.java b/wicket-util/src/main/java/org/apache/wicket/util/visit/AllVisitFilter.java
index 80d6794..75834e3 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/visit/AllVisitFilter.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/visit/AllVisitFilter.java
@@ -24,12 +24,14 @@ package org.apache.wicket.util.visit;
public class AllVisitFilter implements IVisitFilter
{
/** {@inheritDoc} */
+ @Override
public boolean visitChildren(final Object object)
{
return true;
}
/** {@inheritDoc} */
+ @Override
public boolean visitObject(final Object object)
{
return true;
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/visit/ClassVisitFilter.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/visit/ClassVisitFilter.java b/wicket-util/src/main/java/org/apache/wicket/util/visit/ClassVisitFilter.java
index 57f3500..2fe3b4b 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/visit/ClassVisitFilter.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/visit/ClassVisitFilter.java
@@ -41,12 +41,14 @@ public class ClassVisitFilter implements IVisitFilter
}
/** {@inheritDoc} */
+ @Override
public boolean visitChildren(final Object object)
{
return true;
}
/** {@inheritDoc} */
+ @Override
public boolean visitObject(final Object object)
{
return clazz.isAssignableFrom(object.getClass());
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/visit/IVisitFilter.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/visit/IVisitFilter.java b/wicket-util/src/main/java/org/apache/wicket/util/visit/IVisitFilter.java
index 84c60c8..0808230 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/visit/IVisitFilter.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/visit/IVisitFilter.java
@@ -45,12 +45,14 @@ public interface IVisitFilter
public static IVisitFilter ANY = new IVisitFilter()
{
/** {@inheritDoc} */
+ @Override
public boolean visitObject(final Object object)
{
return true;
}
/** {@inheritDoc} */
+ @Override
public boolean visitChildren(final Object object)
{
return true;
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/visit/Visit.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/visit/Visit.java b/wicket-util/src/main/java/org/apache/wicket/util/visit/Visit.java
index 8cc4e31..6cb3e26 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/visit/Visit.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/visit/Visit.java
@@ -34,12 +34,14 @@ public class Visit<R> implements IVisit<R>
private Action action = Action.CONTINUE;
/** {@inheritDoc} */
+ @Override
public void stop()
{
stop(null);
}
/** {@inheritDoc} */
+ @Override
public void stop(final R result)
{
action = Action.STOP;
@@ -47,6 +49,7 @@ public class Visit<R> implements IVisit<R>
}
/** {@inheritDoc} */
+ @Override
public void dontGoDeeper()
{
action = Action.CONTINUE_BUT_DONT_GO_DEEPER;
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/visit/Visits.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/visit/Visits.java b/wicket-util/src/main/java/org/apache/wicket/util/visit/Visits.java
index ca14ca4..474d451 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/visit/Visits.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/visit/Visits.java
@@ -40,6 +40,7 @@ public class Visits
this.singleton = singleton;
}
+ @Override
public Iterator<T> iterator()
{
return Collections.singleton(singleton).iterator();
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/main/java/org/apache/wicket/util/xml/CustomEntityResolver.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/xml/CustomEntityResolver.java b/wicket-util/src/main/java/org/apache/wicket/util/xml/CustomEntityResolver.java
index 85cefb9..1d6b2c4 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/xml/CustomEntityResolver.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/xml/CustomEntityResolver.java
@@ -69,6 +69,7 @@ public class CustomEntityResolver implements EntityResolver
entities.put(key, locator);
}
+ @Override
public InputSource resolveEntity(final String id, final String url) throws SAXException,
IOException
{
@@ -164,6 +165,7 @@ public class CustomEntityResolver implements EntityResolver
*
* @return input source
*/
+ @Override
public InputSource locateInputSource()
{
InputStream stream = Filter.class.getResourceAsStream("resources/" + name);
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-util/src/test/java/org/apache/wicket/util/time/DurationTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/time/DurationTest.java b/wicket-util/src/test/java/org/apache/wicket/util/time/DurationTest.java
index 7f3f671..d9b6392 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/time/DurationTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/time/DurationTest.java
@@ -80,6 +80,7 @@ public final class DurationTest
{
assertTrue(Duration.seconds(0.5).lessThan(Duration.benchmark(new Runnable()
{
+ @Override
public void run()
{
Duration.seconds(1.5).sleep();
@@ -88,6 +89,7 @@ public final class DurationTest
assertTrue(Duration.seconds(1).greaterThan(Duration.benchmark(new Runnable()
{
+ @Override
public void run()
{
Duration.hours(-1).sleep();
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-velocity/src/main/java/org/apache/wicket/velocity/Initializer.java
----------------------------------------------------------------------
diff --git a/wicket-velocity/src/main/java/org/apache/wicket/velocity/Initializer.java b/wicket-velocity/src/main/java/org/apache/wicket/velocity/Initializer.java
index e6f2fe1..682d358 100644
--- a/wicket-velocity/src/main/java/org/apache/wicket/velocity/Initializer.java
+++ b/wicket-velocity/src/main/java/org/apache/wicket/velocity/Initializer.java
@@ -49,6 +49,7 @@ public class Initializer implements IInitializer
/**
* {@inheritDoc}
*/
+ @Override
public void init(final Application application)
{
Properties props = getVelocityProperties(application);
@@ -150,6 +151,7 @@ public class Initializer implements IInitializer
/**
* {@inheritDoc}
*/
+ @Override
public void destroy(final Application application)
{
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/83740b9e/wicket-velocity/src/main/java/org/apache/wicket/velocity/markup/html/VelocityPanel.java
----------------------------------------------------------------------
diff --git a/wicket-velocity/src/main/java/org/apache/wicket/velocity/markup/html/VelocityPanel.java b/wicket-velocity/src/main/java/org/apache/wicket/velocity/markup/html/VelocityPanel.java
index fb9e421..218bafb 100644
--- a/wicket-velocity/src/main/java/org/apache/wicket/velocity/markup/html/VelocityPanel.java
+++ b/wicket-velocity/src/main/java/org/apache/wicket/velocity/markup/html/VelocityPanel.java
@@ -286,6 +286,7 @@ public abstract class VelocityPanel extends Panel
/**
* {@inheritDoc}
*/
+ @Override
public final IResourceStream getMarkupResourceStream(final MarkupContainer container,
final Class<?> containerClass)
{
@@ -306,6 +307,7 @@ public abstract class VelocityPanel extends Panel
/**
* {@inheritDoc}
*/
+ @Override
public final String getCacheKey(final MarkupContainer container, final Class<?> containerClass)
{
// don't cache the evaluated template