You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2011/11/16 23:52:10 UTC
svn commit: r1202919 [4/7] - in /wicket/trunk/wicket-core/src:
main/java/org/apache/wicket/ main/java/org/apache/wicket/ajax/
main/java/org/apache/wicket/ajax/calldecorator/
main/java/org/apache/wicket/ajax/form/
main/java/org/apache/wicket/ajax/markup...
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/DiskDataStore.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/DiskDataStore.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/DiskDataStore.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/DiskDataStore.java Wed Nov 16 22:51:59 2011
@@ -100,6 +100,7 @@ public class DiskDataStore implements ID
/**
* @see org.apache.wicket.pageStore.IDataStore#destroy()
*/
+ @Override
public void destroy()
{
log.debug("Destroying...");
@@ -110,6 +111,7 @@ public class DiskDataStore implements ID
/**
* @see org.apache.wicket.pageStore.IDataStore#getData(java.lang.String, int)
*/
+ @Override
public byte[] getData(final String sessionId, final int id)
{
byte[] pageData = null;
@@ -127,6 +129,7 @@ public class DiskDataStore implements ID
/**
* @see org.apache.wicket.pageStore.IDataStore#isReplicated()
*/
+ @Override
public boolean isReplicated()
{
return false;
@@ -135,6 +138,7 @@ public class DiskDataStore implements ID
/**
* @see org.apache.wicket.pageStore.IDataStore#removeData(java.lang.String, int)
*/
+ @Override
public void removeData(final String sessionId, final int id)
{
SessionEntry sessionEntry = getSessionEntry(sessionId, false);
@@ -149,6 +153,7 @@ public class DiskDataStore implements ID
/**
* @see org.apache.wicket.pageStore.IDataStore#removeData(java.lang.String)
*/
+ @Override
public void removeData(final String sessionId)
{
SessionEntry sessionEntry = getSessionEntry(sessionId, false);
@@ -166,6 +171,7 @@ public class DiskDataStore implements ID
/**
* @see org.apache.wicket.pageStore.IDataStore#storeData(java.lang.String, int, byte[])
*/
+ @Override
public void storeData(final String sessionId, final int id, final byte[] data)
{
SessionEntry sessionEntry = getSessionEntry(sessionId, true);
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/HttpSessionDataStore.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/HttpSessionDataStore.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/HttpSessionDataStore.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/HttpSessionDataStore.java Wed Nov 16 22:51:59 2011
@@ -76,6 +76,7 @@ public class HttpSessionDataStore implem
* Ignored. Only pages from the current http session can be read
* @see org.apache.wicket.pageStore.IDataStore#getData(java.lang.String, int)
*/
+ @Override
public byte[] getData(String sessionId, int pageId)
{
PageTable pageTable = getPageTable(false);
@@ -87,6 +88,7 @@ public class HttpSessionDataStore implem
return pageAsBytes;
}
+ @Override
public void removeData(String sessionId, int pageId)
{
PageTable pageTable = getPageTable(false);
@@ -96,6 +98,7 @@ public class HttpSessionDataStore implem
}
}
+ @Override
public void removeData(String sessionId)
{
PageTable pageTable = getPageTable(false);
@@ -105,6 +108,7 @@ public class HttpSessionDataStore implem
}
}
+ @Override
public void storeData(String sessionId, int pageId, byte[] pageAsBytes)
{
PageTable pageTable = getPageTable(true);
@@ -120,6 +124,7 @@ public class HttpSessionDataStore implem
}
}
+ @Override
public void destroy()
{
// do nothing
@@ -127,6 +132,7 @@ public class HttpSessionDataStore implem
// so there is no reachable http session
}
+ @Override
public boolean isReplicated()
{
return true;
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/MemorySizeEvictionStrategy.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/MemorySizeEvictionStrategy.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/MemorySizeEvictionStrategy.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/MemorySizeEvictionStrategy.java Wed Nov 16 22:51:59 2011
@@ -45,6 +45,7 @@ public class MemorySizeEvictionStrategy
*
* @see org.apache.wicket.pageStore.memory.DataStoreEvictionStrategy#evict(org.apache.wicket.pageStore.memory.PageTable)
*/
+ @Override
public void evict(PageTable pageTable)
{
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/PageNumberEvictionStrategy.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/PageNumberEvictionStrategy.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/PageNumberEvictionStrategy.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/PageNumberEvictionStrategy.java Wed Nov 16 22:51:59 2011
@@ -46,6 +46,7 @@ public class PageNumberEvictionStrategy
*
* @see org.apache.wicket.pageStore.memory.DataStoreEvictionStrategy#evict(org.apache.wicket.pageStore.memory.PageTable)
*/
+ @Override
public void evict(PageTable pageTable)
{
int size = pageTable.size();
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/AbstractRequestLogger.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/AbstractRequestLogger.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/AbstractRequestLogger.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/AbstractRequestLogger.java Wed Nov 16 22:51:59 2011
@@ -115,16 +115,19 @@ public abstract class AbstractRequestLog
liveSessions = new ConcurrentHashMap<String, SessionData>();
}
+ @Override
public int getCurrentActiveRequestCount()
{
return activeRequests.get();
}
+ @Override
public int getPeakActiveRequestCount()
{
return peakActiveRequests.get();
}
+ @Override
public SessionData[] getLiveSessions()
{
final SessionData[] sessions = liveSessions.values().toArray(
@@ -133,11 +136,13 @@ public abstract class AbstractRequestLog
return sessions;
}
+ @Override
public int getPeakSessions()
{
return peakSessions.get();
}
+ @Override
public List<RequestData> getRequests()
{
synchronized (requestWindow)
@@ -182,23 +187,28 @@ public abstract class AbstractRequestLog
return requestWindow[requestWindow.length - 1] != null;
}
+ @Override
public int getTotalCreatedSessions()
{
return totalCreatedSessions.get();
}
+ @Override
public void objectCreated(Object value)
{
}
+ @Override
public void objectRemoved(Object value)
{
}
+ @Override
public void objectUpdated(Object value)
{
}
+ @Override
public void requestTime(long timeTaken)
{
RequestData requestdata = RequestCycle.get().getMetaData(REQUEST_DATA);
@@ -264,6 +274,7 @@ public abstract class AbstractRequestLog
}
}
+ @Override
public void sessionCreated(String sessionId)
{
liveSessions.put(sessionId, new SessionData(sessionId));
@@ -274,6 +285,7 @@ public abstract class AbstractRequestLog
totalCreatedSessions.incrementAndGet();
}
+ @Override
public void sessionDestroyed(String sessionId)
{
RequestCycle requestCycle = RequestCycle.get();
@@ -300,6 +312,7 @@ public abstract class AbstractRequestLog
return rd;
}
+ @Override
public void performLogging()
{
RequestData requestdata = RequestCycle.get().getMetaData(REQUEST_DATA);
@@ -367,6 +380,7 @@ public abstract class AbstractRequestLog
}
}
+ @Override
public long getAverageRequestTime()
{
synchronized (requestWindow)
@@ -378,6 +392,7 @@ public abstract class AbstractRequestLog
}
}
+ @Override
public long getRequestsPerMinute()
{
synchronized (requestWindow)
@@ -392,6 +407,7 @@ public abstract class AbstractRequestLog
}
}
+ @Override
public void logEventTarget(IRequestHandler requestHandler)
{
RequestData requestData = getCurrentRequest();
@@ -401,11 +417,13 @@ public abstract class AbstractRequestLog
}
}
+ @Override
public void logRequestedUrl(String url)
{
getCurrentRequest().setRequestedUrl(url);
}
+ @Override
public void logResponseTarget(IRequestHandler requestHandler)
{
RequestData requestData = getCurrentRequest();
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/AjaxEnclosureListener.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/AjaxEnclosureListener.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/AjaxEnclosureListener.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/AjaxEnclosureListener.java Wed Nov 16 22:51:59 2011
@@ -69,6 +69,7 @@ public class AjaxEnclosureListener imple
/**
* Try to find Enclosures that have their controllers added already, and add them to the target.
*/
+ @Override
public void onBeforeRespond(final Map<String, Component> map, final AjaxRequestTarget target)
{
// We need to iterate over the map, but the map changes if we add an
@@ -78,6 +79,7 @@ public class AjaxEnclosureListener imple
target.getPage().visitChildren(InlineEnclosure.class, new IVisitor<InlineEnclosure, Void>()
{
+ @Override
public void component(final InlineEnclosure enclosure, final IVisit<Void> visit)
{
for (Component component : originalComponents)
@@ -108,6 +110,7 @@ public class AjaxEnclosureListener imple
return enclosure.getParent().get(enclosure.getChildId()) == component;
}
+ @Override
public void onAfterRespond(final Map<String, Component> map, final IJavaScriptResponse response)
{
}
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/BufferedHttpServletResponse.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/BufferedHttpServletResponse.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/BufferedHttpServletResponse.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/BufferedHttpServletResponse.java Wed Nov 16 22:51:59 2011
@@ -83,6 +83,7 @@ class BufferedHttpServletResponse implem
/**
* @see javax.servlet.http.HttpServletResponse#addCookie(javax.servlet.http.Cookie)
*/
+ @Override
public void addCookie(Cookie cookie)
{
isOpen();
@@ -96,6 +97,7 @@ class BufferedHttpServletResponse implem
/**
* @see javax.servlet.http.HttpServletResponse#containsHeader(java.lang.String)
*/
+ @Override
public boolean containsHeader(String name)
{
isOpen();
@@ -109,6 +111,7 @@ class BufferedHttpServletResponse implem
/**
* @see javax.servlet.http.HttpServletResponse#encodeURL(java.lang.String)
*/
+ @Override
public String encodeURL(String url)
{
isOpen();
@@ -118,6 +121,7 @@ class BufferedHttpServletResponse implem
/**
* @see javax.servlet.http.HttpServletResponse#encodeRedirectURL(java.lang.String)
*/
+ @Override
public String encodeRedirectURL(String url)
{
isOpen();
@@ -128,6 +132,7 @@ class BufferedHttpServletResponse implem
* @see javax.servlet.http.HttpServletResponse#encodeUrl(java.lang.String)
* @deprecated
*/
+ @Override
@Deprecated
public String encodeUrl(String url)
{
@@ -139,6 +144,7 @@ class BufferedHttpServletResponse implem
* @see javax.servlet.http.HttpServletResponse#encodeRedirectUrl(java.lang.String)
* @deprecated
*/
+ @Override
@Deprecated
public String encodeRedirectUrl(String url)
{
@@ -149,6 +155,7 @@ class BufferedHttpServletResponse implem
/**
* @see javax.servlet.http.HttpServletResponse#sendError(int, java.lang.String)
*/
+ @Override
public void sendError(int sc, String msg) throws IOException
{
isOpen();
@@ -158,6 +165,7 @@ class BufferedHttpServletResponse implem
/**
* @see javax.servlet.http.HttpServletResponse#sendError(int)
*/
+ @Override
public void sendError(int sc) throws IOException
{
isOpen();
@@ -167,6 +175,7 @@ class BufferedHttpServletResponse implem
/**
* @see javax.servlet.http.HttpServletResponse#sendRedirect(java.lang.String)
*/
+ @Override
public void sendRedirect(String location) throws IOException
{
isOpen();
@@ -203,6 +212,7 @@ class BufferedHttpServletResponse implem
/**
* @see javax.servlet.http.HttpServletResponse#setDateHeader(java.lang.String, long)
*/
+ @Override
public void setDateHeader(String name, long date)
{
testAndCreateHeaders();
@@ -212,6 +222,7 @@ class BufferedHttpServletResponse implem
/**
* @see javax.servlet.http.HttpServletResponse#addDateHeader(java.lang.String, long)
*/
+ @Override
public void addDateHeader(String name, long date)
{
testAndCreateHeaders();
@@ -221,6 +232,7 @@ class BufferedHttpServletResponse implem
/**
* @see javax.servlet.http.HttpServletResponse#setHeader(java.lang.String, java.lang.String)
*/
+ @Override
public void setHeader(String name, String value)
{
testAndCreateHeaders();
@@ -230,6 +242,7 @@ class BufferedHttpServletResponse implem
/**
* @see javax.servlet.http.HttpServletResponse#addHeader(java.lang.String, java.lang.String)
*/
+ @Override
public void addHeader(String name, String value)
{
testAndCreateHeaders();
@@ -239,6 +252,7 @@ class BufferedHttpServletResponse implem
/**
* @see javax.servlet.http.HttpServletResponse#setIntHeader(java.lang.String, int)
*/
+ @Override
public void setIntHeader(String name, int value)
{
testAndCreateHeaders();
@@ -248,6 +262,7 @@ class BufferedHttpServletResponse implem
/**
* @see javax.servlet.http.HttpServletResponse#addIntHeader(java.lang.String, int)
*/
+ @Override
public void addIntHeader(String name, int value)
{
testAndCreateHeaders();
@@ -257,6 +272,7 @@ class BufferedHttpServletResponse implem
/**
* @see javax.servlet.http.HttpServletResponse#setStatus(int)
*/
+ @Override
public void setStatus(int statusCode)
{
status = statusCode;
@@ -266,6 +282,7 @@ class BufferedHttpServletResponse implem
* @see javax.servlet.http.HttpServletResponse#setStatus(int, java.lang.String)
* @deprecated use setStatus(int) instead
*/
+ @Override
@Deprecated
public void setStatus(int sc, String sm)
{
@@ -276,6 +293,7 @@ class BufferedHttpServletResponse implem
/**
* @see javax.servlet.ServletResponse#getCharacterEncoding()
*/
+ @Override
public String getCharacterEncoding()
{
isOpen();
@@ -287,6 +305,7 @@ class BufferedHttpServletResponse implem
*
* @param encoding
*/
+ @Override
public void setCharacterEncoding(String encoding)
{
this.encoding = encoding;
@@ -295,6 +314,7 @@ class BufferedHttpServletResponse implem
/**
* @see javax.servlet.ServletResponse#getOutputStream()
*/
+ @Override
public ServletOutputStream getOutputStream() throws IOException
{
throw new UnsupportedOperationException("Cannot get output stream on BufferedResponse");
@@ -303,6 +323,7 @@ class BufferedHttpServletResponse implem
/**
* @see javax.servlet.ServletResponse#getWriter()
*/
+ @Override
public PrintWriter getWriter() throws IOException
{
isOpen();
@@ -312,6 +333,7 @@ class BufferedHttpServletResponse implem
/**
* @see javax.servlet.ServletResponse#setContentLength(int)
*/
+ @Override
public void setContentLength(int len)
{
isOpen();
@@ -321,6 +343,7 @@ class BufferedHttpServletResponse implem
/**
* @see javax.servlet.ServletResponse#setContentType(java.lang.String)
*/
+ @Override
public void setContentType(String type)
{
isOpen();
@@ -330,6 +353,7 @@ class BufferedHttpServletResponse implem
/**
* @return The content type
*/
+ @Override
public String getContentType()
{
return contentType;
@@ -338,6 +362,7 @@ class BufferedHttpServletResponse implem
/**
* @see javax.servlet.ServletResponse#setBufferSize(int)
*/
+ @Override
public void setBufferSize(int size)
{
isOpen();
@@ -347,6 +372,7 @@ class BufferedHttpServletResponse implem
/**
* @see javax.servlet.ServletResponse#getBufferSize()
*/
+ @Override
public int getBufferSize()
{
isOpen();
@@ -356,6 +382,7 @@ class BufferedHttpServletResponse implem
/**
* @see javax.servlet.ServletResponse#flushBuffer()
*/
+ @Override
public void flushBuffer() throws IOException
{
isOpen();
@@ -364,6 +391,7 @@ class BufferedHttpServletResponse implem
/**
* @see javax.servlet.ServletResponse#resetBuffer()
*/
+ @Override
public void resetBuffer()
{
isOpen();
@@ -373,6 +401,7 @@ class BufferedHttpServletResponse implem
/**
* @see javax.servlet.ServletResponse#isCommitted()
*/
+ @Override
public boolean isCommitted()
{
return pw == null;
@@ -381,6 +410,7 @@ class BufferedHttpServletResponse implem
/**
* @see javax.servlet.ServletResponse#reset()
*/
+ @Override
public void reset()
{
resetBuffer();
@@ -391,6 +421,7 @@ class BufferedHttpServletResponse implem
/**
* @see javax.servlet.ServletResponse#setLocale(java.util.Locale)
*/
+ @Override
public void setLocale(Locale loc)
{
isOpen();
@@ -400,6 +431,7 @@ class BufferedHttpServletResponse implem
/**
* @see javax.servlet.ServletResponse#getLocale()
*/
+ @Override
public Locale getLocale()
{
isOpen();
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/BufferedWebResponse.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/BufferedWebResponse.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/BufferedWebResponse.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/BufferedWebResponse.java Wed Nov 16 22:51:59 2011
@@ -67,6 +67,7 @@ public class BufferedWebResponse extends
* @param response
* web response that should receive the current cookie operation
*/
+ @Override
public void writeMetaData(WebResponse response)
{
for (Action action : actions)
@@ -107,6 +108,7 @@ public class BufferedWebResponse extends
{
protected abstract void invoke(WebResponse response);
+ @Override
public int compareTo(Action o)
{
return 0;
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/ContextParamWebApplicationFactory.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/ContextParamWebApplicationFactory.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/ContextParamWebApplicationFactory.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/ContextParamWebApplicationFactory.java Wed Nov 16 22:51:59 2011
@@ -32,6 +32,7 @@ public class ContextParamWebApplicationF
public static final String APP_CLASS_PARAM = "applicationClassName";
/* @see IWebApplicationFactory#createApplication(WicketFilter) */
+ @Override
public WebApplication createApplication(WicketFilter filter)
{
final String applicationClassName = filter.getFilterConfig().getInitParameter(
@@ -103,6 +104,7 @@ public class ContextParamWebApplicationF
}
/** {@inheritDoc} */
+ @Override
public void destroy(WicketFilter filter)
{
}
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/HeaderBufferingWebResponse.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/HeaderBufferingWebResponse.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/HeaderBufferingWebResponse.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/HeaderBufferingWebResponse.java Wed Nov 16 22:51:59 2011
@@ -200,6 +200,7 @@ class HeaderBufferingWebResponse extends
bufferedWritten = false;
}
+ @Override
public void writeMetaData(WebResponse webResponse)
{
bufferedResponse.writeMetaData(webResponse);
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/IRequestLogger.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/IRequestLogger.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/IRequestLogger.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/IRequestLogger.java Wed Nov 16 22:51:59 2011
@@ -271,6 +271,7 @@ public interface IRequestLogger
sessionSize = size;
}
+ @Override
public int compareTo(SessionData sd)
{
return (int)(sd.lastActive - lastActive);
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/ReloadingWicketFilter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/ReloadingWicketFilter.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/ReloadingWicketFilter.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/ReloadingWicketFilter.java Wed Nov 16 22:51:59 2011
@@ -151,6 +151,7 @@ public class ReloadingWicketFilter exten
{
reloadingClassLoader.setListener(new IChangeListener()
{
+ @Override
public void onChange()
{
// Remove the ModificationWatcher from the current reloading class loader
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java Wed Nov 16 22:51:59 2011
@@ -850,6 +850,7 @@ public abstract class WebApplication ext
private static class WebPageRendererProvider implements IPageRendererProvider
{
+ @Override
public PageRenderer get(RenderPageRequestHandler handler)
{
return new WebPageRenderer(handler);
@@ -858,6 +859,7 @@ public abstract class WebApplication ext
private static class WebSessionStoreProvider implements IProvider<ISessionStore>
{
+ @Override
public ISessionStore get()
{
return new HttpSessionStore();
@@ -900,6 +902,7 @@ public abstract class WebApplication ext
implements
IContextProvider<AjaxRequestTarget, Page>
{
+ @Override
public AjaxRequestTarget get(Page context)
{
return new AjaxRequestTarget(context);
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebSession.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebSession.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebSession.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebSession.java Wed Nov 16 22:51:59 2011
@@ -60,6 +60,7 @@ public class WebSession extends Session
{
private static final long serialVersionUID = 1L;
+ @Override
public boolean accept(FeedbackMessage message)
{
return message.getReporter() != null;
@@ -74,6 +75,7 @@ public class WebSession extends Session
{
private static final long serialVersionUID = 1L;
+ @Override
public boolean accept(FeedbackMessage message)
{
return message.getReporter() == null && message.isRendered();
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java Wed Nov 16 22:51:59 2011
@@ -212,6 +212,7 @@ public class WicketFilter implements Fil
* @see javax.servlet.Filter#doFilter(javax.servlet.ServletRequest,
* javax.servlet.ServletResponse, javax.servlet.FilterChain)
*/
+ @Override
public void doFilter(final ServletRequest request, final ServletResponse response,
final FilterChain chain) throws IOException, ServletException
{
@@ -281,6 +282,7 @@ public class WicketFilter implements Fil
*
* @see javax.servlet.Filter#init(javax.servlet.FilterConfig)
*/
+ @Override
public final void init(final FilterConfig filterConfig) throws ServletException
{
init(false, filterConfig);
@@ -468,6 +470,7 @@ public class WicketFilter implements Fil
/**
* @see javax.servlet.Filter#destroy()
*/
+ @Override
public void destroy()
{
if (application != null)
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/WicketServlet.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/WicketServlet.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/WicketServlet.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/WicketServlet.java Wed Nov 16 22:51:59 2011
@@ -273,6 +273,7 @@ public class WicketServlet extends HttpS
/**
* @see javax.servlet.FilterConfig#getServletContext()
*/
+ @Override
public ServletContext getServletContext()
{
return WicketServlet.this.getServletContext();
@@ -281,6 +282,7 @@ public class WicketServlet extends HttpS
/**
* @see javax.servlet.FilterConfig#getInitParameterNames()
*/
+ @Override
@SuppressWarnings("unchecked")
public Enumeration<String> getInitParameterNames()
{
@@ -290,6 +292,7 @@ public class WicketServlet extends HttpS
/**
* @see javax.servlet.FilterConfig#getInitParameter(java.lang.String)
*/
+ @Override
public String getInitParameter(final String name)
{
return WicketServlet.this.getInitParameter(name);
@@ -298,6 +301,7 @@ public class WicketServlet extends HttpS
/**
* @see javax.servlet.FilterConfig#getFilterName()
*/
+ @Override
public String getFilterName()
{
return WicketServlet.this.getServletName();
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java Wed Nov 16 22:51:59 2011
@@ -310,6 +310,7 @@ public class MockHttpServletRequest impl
* The attribute name
* @return The value, or null
*/
+ @Override
public Object getAttribute(final String name)
{
return attributes.get(name);
@@ -320,6 +321,7 @@ public class MockHttpServletRequest impl
*
* @return The names
*/
+ @Override
public Enumeration<String> getAttributeNames()
{
return Collections.enumeration(attributes.keySet());
@@ -332,6 +334,7 @@ public class MockHttpServletRequest impl
*
* @return The auth type
*/
+ @Override
public String getAuthType()
{
return authType;
@@ -342,6 +345,7 @@ public class MockHttpServletRequest impl
*
* @return The character encoding
*/
+ @Override
public String getCharacterEncoding()
{
return characterEncoding;
@@ -374,6 +378,7 @@ public class MockHttpServletRequest impl
*
* @return -1 if useMultiPartContentType is false. Else the length of the generated request.
*/
+ @Override
public int getContentLength()
{
if (useMultiPartContentType)
@@ -390,6 +395,7 @@ public class MockHttpServletRequest impl
*
* @return The correct multipart content-type if useMultiPartContentType is true. Else null.
*/
+ @Override
public String getContentType()
{
if (useMultiPartContentType)
@@ -406,6 +412,7 @@ public class MockHttpServletRequest impl
*
* @return The context path
*/
+ @Override
public String getContextPath()
{
// return "/" + application.getName();
@@ -438,6 +445,7 @@ public class MockHttpServletRequest impl
*
* @return The cookies
*/
+ @Override
public Cookie[] getCookies()
{
if (cookies.size() == 0)
@@ -457,6 +465,7 @@ public class MockHttpServletRequest impl
* @throws IllegalArgumentException
* If the header cannot be converted
*/
+ @Override
public long getDateHeader(final String name) throws IllegalArgumentException
{
String value = getHeader(name);
@@ -484,6 +493,7 @@ public class MockHttpServletRequest impl
* The header name
* @return The header value or null
*/
+ @Override
public String getHeader(final String name)
{
@SuppressWarnings("unchecked")
@@ -503,6 +513,7 @@ public class MockHttpServletRequest impl
*
* @return The header names
*/
+ @Override
public Enumeration<String> getHeaderNames()
{
return Collections.enumeration(headers.keySet());
@@ -515,6 +526,7 @@ public class MockHttpServletRequest impl
* The name
* @return The header values
*/
+ @Override
public Enumeration<String> getHeaders(final String name)
{
@SuppressWarnings("unchecked")
@@ -534,6 +546,7 @@ public class MockHttpServletRequest impl
* @throws IOException
* If an I/O related problem occurs
*/
+ @Override
public ServletInputStream getInputStream() throws IOException
{
byte[] request = buildRequest();
@@ -560,6 +573,7 @@ public class MockHttpServletRequest impl
* @throws NumberFormatException
* If the header is not formatted correctly
*/
+ @Override
public int getIntHeader(final String name)
{
String value = getHeader(name);
@@ -576,6 +590,7 @@ public class MockHttpServletRequest impl
*
* @return The locale
*/
+ @Override
public Locale getLocale()
{
return getLocales().nextElement();
@@ -611,6 +626,7 @@ public class MockHttpServletRequest impl
*
* @return The locales
*/
+ @Override
public Enumeration<Locale> getLocales()
{
List<Locale> list = new ArrayList<Locale>();
@@ -641,6 +657,7 @@ public class MockHttpServletRequest impl
*
* @return The method
*/
+ @Override
public String getMethod()
{
return method;
@@ -653,6 +670,7 @@ public class MockHttpServletRequest impl
* The parameter name
* @return The parameter value, or null
*/
+ @Override
public String getParameter(final String name)
{
String[] param = getParameterMap().get(name);
@@ -671,6 +689,7 @@ public class MockHttpServletRequest impl
*
* @return The parameters
*/
+ @Override
public Map<String, String[]> getParameterMap()
{
Map<String, String[]> params = new HashMap<String, String[]>(parameters);
@@ -703,6 +722,7 @@ public class MockHttpServletRequest impl
*
* @return The parameter names
*/
+ @Override
public Enumeration<String> getParameterNames()
{
return Collections.enumeration(getParameterMap().keySet());
@@ -715,6 +735,7 @@ public class MockHttpServletRequest impl
* The name of the parameter
* @return The return values
*/
+ @Override
public String[] getParameterValues(final String name)
{
Object value = getParameterMap().get(name);
@@ -740,6 +761,7 @@ public class MockHttpServletRequest impl
*
* @return The path info
*/
+ @Override
public String getPathInfo()
{
return path;
@@ -750,6 +772,7 @@ public class MockHttpServletRequest impl
*
* @return null
*/
+ @Override
public String getPathTranslated()
{
return null;
@@ -760,6 +783,7 @@ public class MockHttpServletRequest impl
*
* @return Always HTTP/1.1
*/
+ @Override
public String getProtocol()
{
return "HTTP/1.1";
@@ -770,6 +794,7 @@ public class MockHttpServletRequest impl
*
* @return The query string
*/
+ @Override
public String getQueryString()
{
if (parameters.size() == 0)
@@ -816,6 +841,7 @@ public class MockHttpServletRequest impl
* @throws IOException
* If an I/O related problem occurs
*/
+ @Override
public BufferedReader getReader() throws IOException
{
return new BufferedReader(new InputStreamReader(getInputStream()));
@@ -829,6 +855,7 @@ public class MockHttpServletRequest impl
* @return The path
* @deprecated Use ServletContext.getRealPath(String) instead.
*/
+ @Override
@Deprecated
public String getRealPath(String name)
{
@@ -838,6 +865,7 @@ public class MockHttpServletRequest impl
/**
* @return the remote address of the client
*/
+ @Override
public String getRemoteAddr()
{
return remoteAddr;
@@ -858,6 +886,7 @@ public class MockHttpServletRequest impl
*
* @return Return 'localhost' by default
*/
+ @Override
public String getRemoteHost()
{
return "localhost";
@@ -868,6 +897,7 @@ public class MockHttpServletRequest impl
*
* @return The name of the remote user
*/
+ @Override
public String getRemoteUser()
{
return getHeader("REMOTE_USER");
@@ -881,6 +911,7 @@ public class MockHttpServletRequest impl
* The name to dispatch to
* @return The dispatcher
*/
+ @Override
public RequestDispatcher getRequestDispatcher(String name)
{
return context.getRequestDispatcher(name);
@@ -891,6 +922,7 @@ public class MockHttpServletRequest impl
*
* @return The session id
*/
+ @Override
public String getRequestedSessionId()
{
if (session instanceof MockHttpSession && ((MockHttpSession)session).isTemporary())
@@ -907,6 +939,7 @@ public class MockHttpServletRequest impl
* @return The path value
* @see javax.servlet.http.HttpServletRequest#getRequestURI()
*/
+ @Override
public String getRequestURI()
{
if (url == null)
@@ -930,6 +963,7 @@ public class MockHttpServletRequest impl
* @return The url
* @see javax.servlet.http.HttpServletRequest#getRequestURL()
*/
+ @Override
public StringBuffer getRequestURL()
{
StringBuffer buf = new StringBuffer();
@@ -950,6 +984,7 @@ public class MockHttpServletRequest impl
*
* @return the scheme of this request
*/
+ @Override
public String getScheme()
{
return scheme;
@@ -977,6 +1012,7 @@ public class MockHttpServletRequest impl
*
* @return by default returns 'localhost'
*/
+ @Override
public String getServerName()
{
return serverName;
@@ -996,6 +1032,7 @@ public class MockHttpServletRequest impl
/**
* @return the server port of this request
*/
+ @Override
public int getServerPort()
{
return serverPort;
@@ -1017,6 +1054,7 @@ public class MockHttpServletRequest impl
*
* @return The servlet path
*/
+ @Override
public String getServletPath()
{
return "/servlet";
@@ -1027,6 +1065,7 @@ public class MockHttpServletRequest impl
*
* @return The session
*/
+ @Override
public HttpSession getSession()
{
if (session instanceof MockHttpSession && ((MockHttpSession)session).isTemporary())
@@ -1043,6 +1082,7 @@ public class MockHttpServletRequest impl
* Ignored, there is always a session
* @return The session
*/
+ @Override
public HttpSession getSession(boolean b)
{
if (b && session instanceof MockHttpSession)
@@ -1057,6 +1097,7 @@ public class MockHttpServletRequest impl
*
* @return A user principal
*/
+ @Override
public Principal getUserPrincipal()
{
final String user = getRemoteUser();
@@ -1068,6 +1109,7 @@ public class MockHttpServletRequest impl
{
return new Principal()
{
+ @Override
public String getName()
{
return user;
@@ -1107,6 +1149,7 @@ public class MockHttpServletRequest impl
*
* @return Always true
*/
+ @Override
public boolean isRequestedSessionIdFromCookie()
{
return true;
@@ -1117,6 +1160,7 @@ public class MockHttpServletRequest impl
*
* @return Always false
*/
+ @Override
public boolean isRequestedSessionIdFromUrl()
{
return false;
@@ -1127,6 +1171,7 @@ public class MockHttpServletRequest impl
*
* @return Always false
*/
+ @Override
public boolean isRequestedSessionIdFromURL()
{
return false;
@@ -1137,6 +1182,7 @@ public class MockHttpServletRequest impl
*
* @return Always true
*/
+ @Override
public boolean isRequestedSessionIdValid()
{
return true;
@@ -1145,6 +1191,7 @@ public class MockHttpServletRequest impl
/**
* @return <code>true</code> if this request's scheme is 'https', <code>false</code> - otherwise
*/
+ @Override
public boolean isSecure()
{
return secure;
@@ -1166,6 +1213,7 @@ public class MockHttpServletRequest impl
* The role name
* @return Always false
*/
+ @Override
public boolean isUserInRole(String name)
{
return false;
@@ -1177,6 +1225,7 @@ public class MockHttpServletRequest impl
* @param name
* The name of the attribute
*/
+ @Override
public void removeAttribute(final String name)
{
attributes.remove(name);
@@ -1190,6 +1239,7 @@ public class MockHttpServletRequest impl
* @param o
* The value to set
*/
+ @Override
public void setAttribute(final String name, final Object o)
{
attributes.put(name, o);
@@ -1214,6 +1264,7 @@ public class MockHttpServletRequest impl
* @throws UnsupportedEncodingException
* If encoding not supported
*/
+ @Override
public void setCharacterEncoding(final String encoding) throws UnsupportedEncodingException
{
characterEncoding = encoding;
@@ -1602,6 +1653,7 @@ public class MockHttpServletRequest impl
/**
* @return local address
*/
+ @Override
public String getLocalAddr()
{
return "127.0.0.1";
@@ -1610,6 +1662,7 @@ public class MockHttpServletRequest impl
/**
* @return local host name
*/
+ @Override
public String getLocalName()
{
return "127.0.0.1";
@@ -1618,6 +1671,7 @@ public class MockHttpServletRequest impl
/**
* @return local port
*/
+ @Override
public int getLocalPort()
{
return 80;
@@ -1626,6 +1680,7 @@ public class MockHttpServletRequest impl
/**
* @return remote port
*/
+ @Override
public int getRemotePort()
{
return 80;
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletResponse.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletResponse.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletResponse.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletResponse.java Wed Nov 16 22:51:59 2011
@@ -98,6 +98,7 @@ public class MockHttpServletResponse imp
* @param cookie
* The cookie to add
*/
+ @Override
public void addCookie(final Cookie cookie)
{
// remove any potential duplicates
@@ -113,6 +114,7 @@ public class MockHttpServletResponse imp
* @param l
* The long value
*/
+ @Override
public void addDateHeader(String name, long l)
{
DateFormat df = DateFormat.getDateInstance(DateFormat.FULL);
@@ -127,6 +129,7 @@ public class MockHttpServletResponse imp
* @param value
* The value for the header
*/
+ @Override
@SuppressWarnings("unchecked")
public void addHeader(final String name, final String value)
{
@@ -147,6 +150,7 @@ public class MockHttpServletResponse imp
* @param i
* The value
*/
+ @Override
public void addIntHeader(final String name, final int i)
{
addHeader(name, "" + i);
@@ -159,6 +163,7 @@ public class MockHttpServletResponse imp
* The name to check
* @return Whether header in response or not
*/
+ @Override
public boolean containsHeader(final String name)
{
return headers.containsKey(name);
@@ -172,6 +177,7 @@ public class MockHttpServletResponse imp
* The url to encode
* @return The encoded url
*/
+ @Override
public String encodeRedirectUrl(final String url)
{
return url;
@@ -185,6 +191,7 @@ public class MockHttpServletResponse imp
* The url to encode
* @return The encoded url
*/
+ @Override
public String encodeRedirectURL(final String url)
{
return url;
@@ -197,6 +204,7 @@ public class MockHttpServletResponse imp
* The url to encode
* @return The encoded url
*/
+ @Override
public String encodeUrl(final String url)
{
return url;
@@ -209,6 +217,7 @@ public class MockHttpServletResponse imp
* The url to encode
* @return The encoded url
*/
+ @Override
public String encodeURL(final String url)
{
return url;
@@ -219,6 +228,7 @@ public class MockHttpServletResponse imp
*
* @throws IOException
*/
+ @Override
public void flushBuffer() throws IOException
{
}
@@ -238,6 +248,7 @@ public class MockHttpServletResponse imp
*
* @return The buffer size
*/
+ @Override
public int getBufferSize()
{
if (mode == MODE_NONE)
@@ -259,6 +270,7 @@ public class MockHttpServletResponse imp
*
* @return The character encoding
*/
+ @Override
public String getCharacterEncoding()
{
return characterEncoding;
@@ -338,6 +350,7 @@ public class MockHttpServletResponse imp
*
* @return The locale
*/
+ @Override
public Locale getLocale()
{
return locale;
@@ -348,6 +361,7 @@ public class MockHttpServletResponse imp
*
* @return The binary output stream.
*/
+ @Override
public ServletOutputStream getOutputStream()
{
if (mode == MODE_TEXT)
@@ -385,6 +399,7 @@ public class MockHttpServletResponse imp
* @throws IOException
* Not used
*/
+ @Override
public PrintWriter getWriter() throws IOException
{
if (mode == MODE_BINARY)
@@ -440,6 +455,7 @@ public class MockHttpServletResponse imp
*
* @return Always false
*/
+ @Override
public boolean isCommitted()
{
return false;
@@ -468,6 +484,7 @@ public class MockHttpServletResponse imp
/**
* Delegate to initialize method.
*/
+ @Override
public void reset()
{
initialize();
@@ -476,6 +493,7 @@ public class MockHttpServletResponse imp
/**
* Clears the buffer.
*/
+ @Override
public void resetBuffer()
{
if (mode == MODE_BINARY)
@@ -496,6 +514,7 @@ public class MockHttpServletResponse imp
* @throws IOException
* Not used
*/
+ @Override
public void sendError(final int code) throws IOException
{
status = code;
@@ -512,6 +531,7 @@ public class MockHttpServletResponse imp
* @throws IOException
* Not used
*/
+ @Override
public void sendError(final int code, final String msg) throws IOException
{
status = code;
@@ -568,6 +588,7 @@ public class MockHttpServletResponse imp
* @throws IOException
* Not used
*/
+ @Override
public void sendRedirect(String location) throws IOException
{
redirectLocation = location;
@@ -579,6 +600,7 @@ public class MockHttpServletResponse imp
* @param size
* The size
*/
+ @Override
public void setBufferSize(final int size)
{
}
@@ -589,6 +611,7 @@ public class MockHttpServletResponse imp
* @param characterEncoding
* The character encoding
*/
+ @Override
public void setCharacterEncoding(final String characterEncoding)
{
this.characterEncoding = characterEncoding;
@@ -600,6 +623,7 @@ public class MockHttpServletResponse imp
* @param length
* The length
*/
+ @Override
public void setContentLength(final int length)
{
setIntHeader("Content-Length", length);
@@ -611,6 +635,7 @@ public class MockHttpServletResponse imp
* @param type
* The content type
*/
+ @Override
public void setContentType(final String type)
{
setHeader("Content-Type", type);
@@ -619,6 +644,7 @@ public class MockHttpServletResponse imp
/**
* @return value of content-type header
*/
+ @Override
public String getContentType()
{
return getHeader("Content-Type");
@@ -632,6 +658,7 @@ public class MockHttpServletResponse imp
* @param l
* The long value
*/
+ @Override
public void setDateHeader(final String name, final long l)
{
setHeader(name, formatDate(l));
@@ -733,6 +760,7 @@ public class MockHttpServletResponse imp
* @param value
* The value for the header
*/
+ @Override
public void setHeader(final String name, final String value)
{
List<String> l = new ArrayList<String>(1);
@@ -748,6 +776,7 @@ public class MockHttpServletResponse imp
* @param i
* The value
*/
+ @Override
public void setIntHeader(final String name, final int i)
{
setHeader(name, "" + i);
@@ -759,6 +788,7 @@ public class MockHttpServletResponse imp
* @param locale
* The locale
*/
+ @Override
public void setLocale(final Locale locale)
{
this.locale = locale;
@@ -770,6 +800,7 @@ public class MockHttpServletResponse imp
* @param status
* The status
*/
+ @Override
public void setStatus(final int status)
{
this.status = status;
@@ -784,6 +815,7 @@ public class MockHttpServletResponse imp
* The message
* @deprecated
*/
+ @Override
@Deprecated
public void setStatus(final int status, final String msg)
{
@@ -825,6 +857,7 @@ public class MockHttpServletResponse imp
return Collections.singletonList(headers.get(name).toString());
}
+ @Override
public void writeMetaData(WebResponse webResponse)
{
for (Cookie cookie : cookies)
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpSession.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpSession.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpSession.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpSession.java Wed Nov 16 22:51:59 2011
@@ -65,6 +65,7 @@ public class MockHttpSession implements
* The attribute name
* @return The value or null
*/
+ @Override
public Object getAttribute(final String name)
{
return attributes.get(name);
@@ -75,6 +76,7 @@ public class MockHttpSession implements
*
* @return The attribute names
*/
+ @Override
public Enumeration<String> getAttributeNames()
{
return Collections.enumeration(attributes.keySet());
@@ -86,6 +88,7 @@ public class MockHttpSession implements
*
* @return The creation time
*/
+ @Override
public long getCreationTime()
{
return creationTime;
@@ -96,6 +99,7 @@ public class MockHttpSession implements
*
* @return The id
*/
+ @Override
public String getId()
{
return id;
@@ -106,6 +110,7 @@ public class MockHttpSession implements
*
* @return The last accessed time
*/
+ @Override
public long getLastAccessedTime()
{
return lastAccessedTime;
@@ -116,6 +121,7 @@ public class MockHttpSession implements
*
* @return Always returns 0
*/
+ @Override
public int getMaxInactiveInterval()
{
return 0;
@@ -126,6 +132,7 @@ public class MockHttpSession implements
*
* @return The servlet context
*/
+ @Override
public ServletContext getServletContext()
{
return context;
@@ -137,6 +144,7 @@ public class MockHttpSession implements
* @return Always null
* @deprecated
*/
+ @Override
@Deprecated
public javax.servlet.http.HttpSessionContext getSessionContext()
{
@@ -151,6 +159,7 @@ public class MockHttpSession implements
* @return The value or null
* @deprecated use getAttribute(String) instead
*/
+ @Override
@Deprecated
public Object getValue(final String name)
{
@@ -163,6 +172,7 @@ public class MockHttpSession implements
* @return The names of the attributes
* @deprecated use getAttributeNames() instead
*/
+ @Override
@Deprecated
public String[] getValueNames()
{
@@ -173,6 +183,7 @@ public class MockHttpSession implements
/**
* Invalidate the session.
*/
+ @Override
public void invalidate()
{
attributes.clear();
@@ -183,6 +194,7 @@ public class MockHttpSession implements
*
* @return Always false
*/
+ @Override
public boolean isNew()
{
return false;
@@ -197,6 +209,7 @@ public class MockHttpSession implements
* The value
* @deprecated Use setAttribute(String, Object) instead
*/
+ @Override
@Deprecated
public void putValue(final String name, final Object o)
{
@@ -209,6 +222,7 @@ public class MockHttpSession implements
* @param name
* The name of the attribute
*/
+ @Override
public void removeAttribute(final String name)
{
attributes.remove(name);
@@ -221,6 +235,7 @@ public class MockHttpSession implements
* The name of the value
* @deprecated Use removeAttribute(String) instead
*/
+ @Override
@Deprecated
public void removeValue(String name)
{
@@ -235,6 +250,7 @@ public class MockHttpSession implements
* @param o
* The value to set
*/
+ @Override
public void setAttribute(final String name, final Object o)
{
attributes.put(name, o);
@@ -246,6 +262,7 @@ public class MockHttpSession implements
* @param i
* The value
*/
+ @Override
public void setMaxInactiveInterval(final int i)
{
}
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockServletContext.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockServletContext.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockServletContext.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockServletContext.java Wed Nov 16 22:51:59 2011
@@ -148,6 +148,7 @@ public class MockServletContext implemen
* The attribute name
* @return The value, or null
*/
+ @Override
public Object getAttribute(final String name)
{
return attributes.get(name);
@@ -158,6 +159,7 @@ public class MockServletContext implemen
*
* @return The attribute names
*/
+ @Override
public Enumeration<String> getAttributeNames()
{
return Collections.enumeration(attributes.keySet());
@@ -172,6 +174,7 @@ public class MockServletContext implemen
* The url path
* @return Always returns this
*/
+ @Override
public ServletContext getContext(String name)
{
return this;
@@ -184,6 +187,7 @@ public class MockServletContext implemen
* The name
* @return The parameter, or null if no such parameter
*/
+ @Override
public String getInitParameter(final String name)
{
return initParameters.getString(name);
@@ -194,6 +198,7 @@ public class MockServletContext implemen
*
* @return The init parameter names
*/
+ @Override
public Enumeration<String> getInitParameterNames()
{
return Collections.enumeration(initParameters.keySet());
@@ -202,6 +207,7 @@ public class MockServletContext implemen
/**
* @return Always 2
*/
+ @Override
public int getMajorVersion()
{
return 2;
@@ -215,6 +221,7 @@ public class MockServletContext implemen
* The name to get the mime type for
* @return The mime type
*/
+ @Override
public String getMimeType(final String name)
{
int index = name.lastIndexOf('.');
@@ -231,6 +238,7 @@ public class MockServletContext implemen
/**
* @return Always 5
*/
+ @Override
public int getMinorVersion()
{
return 5;
@@ -243,6 +251,7 @@ public class MockServletContext implemen
* The name of the servlet or JSP
* @return The dispatcher
*/
+ @Override
public RequestDispatcher getNamedDispatcher(final String name)
{
return getRequestDispatcher(name);
@@ -255,6 +264,7 @@ public class MockServletContext implemen
* The name
* @return The real path or null
*/
+ @Override
public String getRealPath(String name)
{
if (webappRoot == null)
@@ -285,16 +295,19 @@ public class MockServletContext implemen
* The name of the resource to get the dispatcher for
* @return The dispatcher
*/
+ @Override
public RequestDispatcher getRequestDispatcher(final String name)
{
return new RequestDispatcher()
{
+ @Override
public void forward(ServletRequest servletRequest, ServletResponse servletResponse)
throws IOException
{
servletResponse.getWriter().write("FORWARD TO RESOURCE: " + name);
}
+ @Override
public void include(ServletRequest servletRequest, ServletResponse servletResponse)
throws IOException
{
@@ -312,6 +325,7 @@ public class MockServletContext implemen
* @throws MalformedURLException
* If the URL is invalid
*/
+ @Override
public URL getResource(String name) throws MalformedURLException
{
if (webappRoot == null)
@@ -342,6 +356,7 @@ public class MockServletContext implemen
* The name of the resource to get
* @return The input stream for the resource, or null of resource is not found
*/
+ @Override
public InputStream getResourceAsStream(String name)
{
if (webappRoot == null)
@@ -381,6 +396,7 @@ public class MockServletContext implemen
* The starting name
* @return The set of resource paths at this location
*/
+ @Override
public Set<String> getResourcePaths(String name)
{
if (webappRoot == null)
@@ -446,6 +462,7 @@ public class MockServletContext implemen
*
* @return The server info
*/
+ @Override
public String getServerInfo()
{
return "Wicket Mock Test Environment v1.0";
@@ -460,6 +477,7 @@ public class MockServletContext implemen
* @throws ServletException
* Not used
*/
+ @Override
public Servlet getServlet(String name) throws ServletException
{
return null;
@@ -470,6 +488,7 @@ public class MockServletContext implemen
*
* @return The name
*/
+ @Override
public String getServletContextName()
{
return application.getName();
@@ -480,6 +499,7 @@ public class MockServletContext implemen
*
* @return null
*/
+ @Override
public Enumeration<String> getServletNames()
{
return null;
@@ -490,6 +510,7 @@ public class MockServletContext implemen
*
* @return null
*/
+ @Override
public Enumeration<Servlet> getServlets()
{
return null;
@@ -503,6 +524,7 @@ public class MockServletContext implemen
* @param msg
* The message to log
*/
+ @Override
public void log(Exception e, String msg)
{
log.error(msg, e);
@@ -514,6 +536,7 @@ public class MockServletContext implemen
* @param msg
* The message to log
*/
+ @Override
public void log(String msg)
{
log.info(msg);
@@ -527,6 +550,7 @@ public class MockServletContext implemen
* @param cause
* The cause exception
*/
+ @Override
public void log(String msg, Throwable cause)
{
log.error(msg, cause);
@@ -538,6 +562,7 @@ public class MockServletContext implemen
* @param name
* The name
*/
+ @Override
public void removeAttribute(final String name)
{
attributes.remove(name);
@@ -551,6 +576,7 @@ public class MockServletContext implemen
* @param o
* The value
*/
+ @Override
public void setAttribute(final String name, final Object o)
{
attributes.put(name, o);
@@ -559,6 +585,7 @@ public class MockServletContext implemen
/**
* @return context path
*/
+ @Override
public String getContextPath()
{
return "";
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/FilterFactoryManager.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/FilterFactoryManager.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/FilterFactoryManager.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/FilterFactoryManager.java Wed Nov 16 22:51:59 2011
@@ -107,6 +107,7 @@ public class FilterFactoryManager implem
/**
* @see java.lang.Iterable#iterator()
*/
+ @Override
public Iterator<AbstractRequestWrapperFactory> iterator()
{
return filters.iterator();
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequest.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequest.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequest.java Wed Nov 16 22:51:59 2011
@@ -65,11 +65,13 @@ public abstract class MultipartServletWe
{
return new MultipartServletWebRequest(getContainerRequest(), getFilterPrefix(), url)
{
+ @Override
public List<FileItem> getFile(String fieldName)
{
return MultipartServletWebRequest.this.getFile(fieldName);
}
+ @Override
public Map<String, List<FileItem>> getFiles()
{
return MultipartServletWebRequest.this.getFiles();
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequestImpl.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequestImpl.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequestImpl.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequestImpl.java Wed Nov 16 22:51:59 2011
@@ -249,6 +249,7 @@ public class MultipartServletWebRequestI
/**
* @return Returns the files.
*/
+ @Override
public Map<String, List<FileItem>> getFiles()
{
return files;
@@ -261,6 +262,7 @@ public class MultipartServletWebRequestI
* the field name that was used for the upload
* @return the upload with the given field name
*/
+ @Override
public List<FileItem> getFile(final String fieldName)
{
return files.get(fieldName);
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java Wed Nov 16 22:51:59 2011
@@ -327,21 +327,25 @@ public class ServletWebRequest extends W
private final IRequestParameters postRequestParameters = new IWritableRequestParameters()
{
+ @Override
public void reset()
{
getPostRequestParameters().clear();
}
+ @Override
public void setParameterValues(String key, List<StringValue> values)
{
getPostRequestParameters().put(key, values);
}
+ @Override
public Set<String> getParameterNames()
{
return Collections.unmodifiableSet(getPostRequestParameters().keySet());
}
+ @Override
public StringValue getParameterValue(String name)
{
List<StringValue> values = getPostRequestParameters().get(name);
@@ -355,6 +359,7 @@ public class ServletWebRequest extends W
}
}
+ @Override
public List<StringValue> getParameterValues(String name)
{
List<StringValue> values = getPostRequestParameters().get(name);
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilter.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilter.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilter.java Wed Nov 16 22:51:59 2011
@@ -123,6 +123,7 @@ public class WicketSessionFilter impleme
/**
* @see javax.servlet.Filter#init(javax.servlet.FilterConfig)
*/
+ @Override
public void init(FilterConfig filterConfig) throws ServletException
{
filterName = filterConfig.getInitParameter("filterName");
@@ -141,6 +142,7 @@ public class WicketSessionFilter impleme
* @see javax.servlet.Filter#doFilter(javax.servlet.ServletRequest,
* javax.servlet.ServletResponse, javax.servlet.FilterChain)
*/
+ @Override
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
throws IOException, ServletException
{
@@ -219,6 +221,7 @@ public class WicketSessionFilter impleme
/**
* @see javax.servlet.Filter#destroy()
*/
+ @Override
public void destroy()
{
}
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/https/HttpsMapper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/https/HttpsMapper.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/https/HttpsMapper.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/https/HttpsMapper.java Wed Nov 16 22:51:59 2011
@@ -86,6 +86,7 @@ public class HttpsMapper implements IReq
/**
* {@inheritDoc}
*/
+ @Override
public IRequestHandler mapRequest(final Request request)
{
IRequestHandler requestHandler = delegate.mapRequest(request);
@@ -112,6 +113,7 @@ public class HttpsMapper implements IReq
/**
* {@inheritDoc}
*/
+ @Override
public int getCompatibilityScore(final Request request)
{
return delegate.getCompatibilityScore(request);
@@ -120,6 +122,7 @@ public class HttpsMapper implements IReq
/**
* {@inheritDoc}
*/
+ @Override
public Url mapHandler(IRequestHandler requestHandler)
{
Url url = delegate.mapHandler(requestHandler);
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/https/SwitchProtocolRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/https/SwitchProtocolRequestHandler.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/https/SwitchProtocolRequestHandler.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/https/SwitchProtocolRequestHandler.java Wed Nov 16 22:51:59 2011
@@ -90,6 +90,7 @@ class SwitchProtocolRequestHandler imple
/**
* {@inheritDoc}
*/
+ @Override
public void respond(IRequestCycle requestCycle)
{
WebRequest webRequest = (WebRequest)requestCycle.getRequest();
@@ -145,6 +146,7 @@ class SwitchProtocolRequestHandler imple
}
/** {@inheritDoc} */
+ @Override
public void detach(IRequestCycle requestCycle)
{
}
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/cycle/AbstractRequestCycleListener.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/cycle/AbstractRequestCycleListener.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/cycle/AbstractRequestCycleListener.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/cycle/AbstractRequestCycleListener.java Wed Nov 16 22:51:59 2011
@@ -25,40 +25,49 @@ import org.apache.wicket.request.Url;
*/
public abstract class AbstractRequestCycleListener implements IRequestCycleListener
{
+ @Override
public void onBeginRequest(RequestCycle cycle)
{
}
+ @Override
public void onEndRequest(RequestCycle cycle)
{
}
+ @Override
public void onDetach(RequestCycle cycle)
{
}
+ @Override
public void onRequestHandlerScheduled(RequestCycle cycle, IRequestHandler handler)
{
}
+ @Override
public void onRequestHandlerResolved(RequestCycle cycle, IRequestHandler handler)
{
}
+ @Override
public IRequestHandler onException(RequestCycle cycle, Exception ex)
{
return null;
}
+ @Override
public void onExceptionRequestHandlerResolved(RequestCycle cycle, IRequestHandler handler,
Exception exception)
{
}
+ @Override
public void onRequestHandlerExecuted(RequestCycle cycle, IRequestHandler handler)
{
}
+ @Override
public void onUrlMapped(RequestCycle cycle, IRequestHandler handler, Url url)
{
}
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java Wed Nov 16 22:51:59 2011
@@ -162,6 +162,7 @@ public class RequestCycle implements IRe
*
* @return UrlRenderer instance.
*/
+ @Override
public final UrlRenderer getUrlRenderer()
{
if (urlRenderer == null)
@@ -334,6 +335,7 @@ public class RequestCycle implements IRe
/**
* @return current request
*/
+ @Override
public Request getRequest()
{
return request;
@@ -649,6 +651,7 @@ public class RequestCycle implements IRe
}
/** {@inheritDoc} */
+ @Override
public void onEvent(IEvent<?> event)
{
}
@@ -678,6 +681,7 @@ public class RequestCycle implements IRe
/**
* {@inheritDoc}
*/
+ @Override
public Response getResponse()
{
return activeResponse;
@@ -686,6 +690,7 @@ public class RequestCycle implements IRe
/**
* {@inheritDoc}
*/
+ @Override
public Response setResponse(final Response response)
{
Response current = activeResponse;
@@ -696,6 +701,7 @@ public class RequestCycle implements IRe
/**
* {@inheritDoc}
*/
+ @Override
public void scheduleRequestHandlerAfterCurrent(IRequestHandler handler)
{
// just delegating the call to {@link IRequestHandlerExecutor} and invoking listeners
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycleListenerCollection.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycleListenerCollection.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycleListenerCollection.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycleListenerCollection.java Wed Nov 16 22:51:59 2011
@@ -54,10 +54,12 @@ public class RequestCycleListenerCollect
* i.e. the listener that is the first element of this collection is the first listener to be
* notified of {@code onBeginRequest}.
*/
+ @Override
public void onBeginRequest(final RequestCycle cycle)
{
notify(new INotifier<IRequestCycleListener>()
{
+ @Override
public void notify(IRequestCycleListener listener)
{
listener.onBeginRequest(cycle);
@@ -72,10 +74,12 @@ public class RequestCycleListenerCollect
*
* @see IRequestCycleListener#onEndRequest(RequestCycle)
*/
+ @Override
public void onEndRequest(final RequestCycle cycle)
{
reversedNotify(new INotifier<IRequestCycleListener>()
{
+ @Override
public void notify(IRequestCycleListener listener)
{
listener.onEndRequest(cycle);
@@ -90,10 +94,12 @@ public class RequestCycleListenerCollect
*
* @see IRequestCycleListener#onDetach(RequestCycle)
*/
+ @Override
public void onDetach(final RequestCycle cycle)
{
reversedNotifyIgnoringExceptions(new INotifier<IRequestCycleListener>()
{
+ @Override
public void notify(IRequestCycleListener listener)
{
listener.onDetach(cycle);
@@ -107,12 +113,14 @@ public class RequestCycleListenerCollect
*
* @see IRequestCycleListener#onException(RequestCycle, Exception)
*/
+ @Override
public IRequestHandler onException(final RequestCycle cycle, final Exception ex)
{
final List<IRequestHandler> handlers = new ArrayList<IRequestHandler>();
notify(new INotifier<IRequestCycleListener>()
{
+ @Override
public void notify(IRequestCycleListener listener)
{
IRequestHandler handler = listener.onException(cycle, ex);
@@ -136,10 +144,12 @@ public class RequestCycleListenerCollect
return handlers.get(0);
}
+ @Override
public void onRequestHandlerResolved(final RequestCycle cycle, final IRequestHandler handler)
{
notify(new INotifier<IRequestCycleListener>()
{
+ @Override
public void notify(IRequestCycleListener listener)
{
listener.onRequestHandlerResolved(cycle, handler);
@@ -147,11 +157,13 @@ public class RequestCycleListenerCollect
});
}
+ @Override
public void onExceptionRequestHandlerResolved(final RequestCycle cycle,
final IRequestHandler handler, final Exception exception)
{
notify(new INotifier<IRequestCycleListener>()
{
+ @Override
public void notify(IRequestCycleListener listener)
{
listener.onExceptionRequestHandlerResolved(cycle, handler, exception);
@@ -159,10 +171,12 @@ public class RequestCycleListenerCollect
});
}
+ @Override
public void onRequestHandlerScheduled(final RequestCycle cycle, final IRequestHandler handler)
{
notify(new INotifier<IRequestCycleListener>()
{
+ @Override
public void notify(IRequestCycleListener listener)
{
listener.onRequestHandlerScheduled(cycle, handler);
@@ -170,10 +184,12 @@ public class RequestCycleListenerCollect
});
}
+ @Override
public void onRequestHandlerExecuted(final RequestCycle cycle, final IRequestHandler handler)
{
notify(new INotifier<IRequestCycleListener>()
{
+ @Override
public void notify(IRequestCycleListener listener)
{
listener.onRequestHandlerExecuted(cycle, handler);
@@ -181,10 +197,12 @@ public class RequestCycleListenerCollect
});
}
+ @Override
public void onUrlMapped(final RequestCycle cycle, final IRequestHandler handler, final Url url)
{
notify(new INotifier<IRequestCycleListener>()
{
+ @Override
public void notify(IRequestCycleListener listener)
{
listener.onUrlMapped(cycle, handler, url);
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/BookmarkableListenerInterfaceRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/BookmarkableListenerInterfaceRequestHandler.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/BookmarkableListenerInterfaceRequestHandler.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/BookmarkableListenerInterfaceRequestHandler.java Wed Nov 16 22:51:59 2011
@@ -79,11 +79,13 @@ public class BookmarkableListenerInterfa
/**
* @see org.apache.wicket.request.handler.IComponentRequestHandler#getComponent()
*/
+ @Override
public IRequestableComponent getComponent()
{
return pageComponentProvider.getComponent();
}
+ @Override
public final String getComponentPath()
{
return pageComponentProvider.getComponentPath();
@@ -92,6 +94,7 @@ public class BookmarkableListenerInterfa
/**
* @see org.apache.wicket.request.handler.IPageRequestHandler#getPage()
*/
+ @Override
public IRequestablePage getPage()
{
return pageComponentProvider.getPageInstance();
@@ -100,6 +103,7 @@ public class BookmarkableListenerInterfa
/**
* @see org.apache.wicket.request.handler.IPageClassRequestHandler#getPageClass()
*/
+ @Override
public Class<? extends IRequestablePage> getPageClass()
{
return pageComponentProvider.getPageClass();
@@ -108,6 +112,7 @@ public class BookmarkableListenerInterfa
/**
* @see org.apache.wicket.request.handler.IPageRequestHandler#getPageId()
*/
+ @Override
public Integer getPageId()
{
return pageComponentProvider.getPageId();
@@ -116,6 +121,7 @@ public class BookmarkableListenerInterfa
/**
* @see org.apache.wicket.request.handler.IPageClassRequestHandler#getPageParameters()
*/
+ @Override
public PageParameters getPageParameters()
{
return pageComponentProvider.getPageParameters();
@@ -124,6 +130,7 @@ public class BookmarkableListenerInterfa
/**
* @see org.apache.org.apache.wicket.request.IRequestHandler#detach(org.apache.wicket.request.cycle.RequestCycle)
*/
+ @Override
public void detach(IRequestCycle requestCycle)
{
pageComponentProvider.detach();
@@ -153,11 +160,13 @@ public class BookmarkableListenerInterfa
/**
* @see org.apache.org.apache.wicket.request.IRequestHandler#respond(org.apache.wicket.request.cycle.RequestCycle)
*/
+ @Override
public void respond(IRequestCycle requestCycle)
{
// nothing to do here, this handler is only used to generate URLs
}
+ @Override
public final boolean isPageInstanceCreated()
{
// this request handler always operates on a created page instance
@@ -167,6 +176,7 @@ public class BookmarkableListenerInterfa
/**
* @return the render count of the page
*/
+ @Override
public final Integer getRenderCount()
{
return pageComponentProvider.getRenderCount();
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/BookmarkablePageRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/BookmarkablePageRequestHandler.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/BookmarkablePageRequestHandler.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/BookmarkablePageRequestHandler.java Wed Nov 16 22:51:59 2011
@@ -54,6 +54,7 @@ public class BookmarkablePageRequestHand
/**
* @see org.apache.wicket.request.handler.IPageClassRequestHandler#getPageClass()
*/
+ @Override
public Class<? extends IRequestablePage> getPageClass()
{
return pageProvider.getPageClass();
@@ -62,6 +63,7 @@ public class BookmarkablePageRequestHand
/**
* @see org.apache.wicket.request.handler.IPageClassRequestHandler#getPageParameters()
*/
+ @Override
public PageParameters getPageParameters()
{
return pageProvider.getPageParameters();
@@ -70,6 +72,7 @@ public class BookmarkablePageRequestHand
/**
* @see org.apache.org.apache.wicket.request.IRequestHandler#respond(org.apache.wicket.request.cycle.RequestCycle)
*/
+ @Override
public void respond(IRequestCycle requestCycle)
{
// not used as BookmarkablePageRequestHandler is only used when generating URLs.
@@ -79,6 +82,7 @@ public class BookmarkablePageRequestHand
/**
* @see org.apache.org.apache.wicket.request.IRequestHandler#detach(org.apache.wicket.request.cycle.RequestCycle)
*/
+ @Override
public void detach(IRequestCycle requestCycle)
{
if (logData == null)
@@ -86,6 +90,7 @@ public class BookmarkablePageRequestHand
}
/** {@inheritDoc} */
+ @Override
public PageLogData getLogData()
{
return logData;
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/BufferedResponseRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/BufferedResponseRequestHandler.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/BufferedResponseRequestHandler.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/BufferedResponseRequestHandler.java Wed Nov 16 22:51:59 2011
@@ -41,11 +41,13 @@ public class BufferedResponseRequestHand
}
/** {@inheritDoc} */
+ @Override
public void detach(IRequestCycle requestCycle)
{
}
/** {@inheritDoc} */
+ @Override
public void respond(IRequestCycle requestCycle)
{
bufferedWebResponse.writeTo((WebResponse)requestCycle.getResponse());
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/ComponentRenderingRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/ComponentRenderingRequestHandler.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/ComponentRenderingRequestHandler.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/ComponentRenderingRequestHandler.java Wed Nov 16 22:51:59 2011
@@ -40,16 +40,19 @@ public class ComponentRenderingRequestHa
this.component = component;
}
+ @Override
public IRequestableComponent getComponent()
{
return component;
}
+ @Override
public void detach(IRequestCycle requestCycle)
{
component.getPage().detach();
}
+ @Override
public void respond(IRequestCycle requestCycle)
{
// preventing the response to component from being cached
@@ -61,6 +64,7 @@ public class ComponentRenderingRequestHa
component.render();
}
+ @Override
public final String getComponentPath()
{
return component.getPageRelativePath();
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/EmptyAjaxRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/EmptyAjaxRequestHandler.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/EmptyAjaxRequestHandler.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/EmptyAjaxRequestHandler.java Wed Nov 16 22:51:59 2011
@@ -52,6 +52,7 @@ public final class EmptyAjaxRequestHandl
}
/** {@inheritDoc} */
+ @Override
public void respond(IRequestCycle requestCycle)
{
WebResponse response = (WebResponse)requestCycle.getResponse();
@@ -71,6 +72,7 @@ public final class EmptyAjaxRequestHandl
}
/** {@inheritDoc} */
+ @Override
public void detach(IRequestCycle requestCycle)
{
}
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/ListenerInterfaceRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/ListenerInterfaceRequestHandler.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/ListenerInterfaceRequestHandler.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/ListenerInterfaceRequestHandler.java Wed Nov 16 22:51:59 2011
@@ -87,6 +87,7 @@ public class ListenerInterfaceRequestHan
/**
* @see org.apache.wicket.request.handler.IComponentRequestHandler#getComponent()
*/
+ @Override
public IRequestableComponent getComponent()
{
return pageComponentProvider.getComponent();
@@ -95,6 +96,7 @@ public class ListenerInterfaceRequestHan
/**
* @see org.apache.wicket.request.handler.IPageRequestHandler#getPage()
*/
+ @Override
public IRequestablePage getPage()
{
return pageComponentProvider.getPageInstance();
@@ -103,6 +105,7 @@ public class ListenerInterfaceRequestHan
/**
* @see org.apache.wicket.request.handler.IPageClassRequestHandler#getPageClass()
*/
+ @Override
public Class<? extends IRequestablePage> getPageClass()
{
return pageComponentProvider.getPageClass();
@@ -111,6 +114,7 @@ public class ListenerInterfaceRequestHan
/**
* @see org.apache.wicket.request.handler.IPageRequestHandler#getPageId()
*/
+ @Override
public Integer getPageId()
{
return pageComponentProvider.getPageId();
@@ -119,6 +123,7 @@ public class ListenerInterfaceRequestHan
/**
* @see org.apache.wicket.request.handler.IPageClassRequestHandler#getPageParameters()
*/
+ @Override
public PageParameters getPageParameters()
{
return pageComponentProvider.getPageParameters();
@@ -127,6 +132,7 @@ public class ListenerInterfaceRequestHan
/**
* @see org.apache.wicket.request.IRequestHandler#detach(org.apache.wicket.request.IRequestCycle)
*/
+ @Override
public void detach(IRequestCycle requestCycle)
{
if (logData == null)
@@ -160,6 +166,7 @@ public class ListenerInterfaceRequestHan
/**
* @see org.apache.wicket.request.IRequestHandler#respond(org.apache.wicket.request.IRequestCycle)
*/
+ @Override
public void respond(final IRequestCycle requestCycle)
{
final IRequestablePage page = getPage();
@@ -262,22 +269,26 @@ public class ListenerInterfaceRequestHan
}
}
+ @Override
public final boolean isPageInstanceCreated()
{
return pageComponentProvider.hasPageInstance();
}
+ @Override
public final String getComponentPath()
{
return pageComponentProvider.getComponentPath();
}
+ @Override
public final Integer getRenderCount()
{
return pageComponentProvider.getRenderCount();
}
/** {@inheritDoc} */
+ @Override
public ListenerInterfaceLogData getLogData()
{
return logData;
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/PageAndComponentProvider.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/PageAndComponentProvider.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/PageAndComponentProvider.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/PageAndComponentProvider.java Wed Nov 16 22:51:59 2011
@@ -137,6 +137,7 @@ public class PageAndComponentProvider ex
/**
* @see org.apache.wicket.request.handler.IPageAndComponentProvider#getComponent()
*/
+ @Override
public IRequestableComponent getComponent()
{
if (component == null)
@@ -173,6 +174,7 @@ public class PageAndComponentProvider ex
/**
* @see org.apache.wicket.request.handler.IPageAndComponentProvider#getComponentPath()
*/
+ @Override
public String getComponentPath()
{
if (componentPath != null)
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/PageProvider.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/PageProvider.java?rev=1202919&r1=1202918&r2=1202919&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/PageProvider.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/PageProvider.java Wed Nov 16 22:51:59 2011
@@ -158,6 +158,7 @@ public class PageProvider implements IPa
/**
* @see org.apache.wicket.request.handler.IPageProvider#getPageInstance()
*/
+ @Override
public IRequestablePage getPageInstance()
{
if (pageInstance == null)
@@ -175,6 +176,7 @@ public class PageProvider implements IPa
/**
* @see org.apache.wicket.request.handler.IPageProvider#getPageParameters()
*/
+ @Override
public PageParameters getPageParameters()
{
if (pageParameters != null)
@@ -197,6 +199,7 @@ public class PageProvider implements IPa
*
* @see org.apache.wicket.request.handler.IPageProvider#isNewPageInstance()
*/
+ @Override
public boolean isNewPageInstance()
{
boolean isNew = pageInstance == null;
@@ -216,6 +219,7 @@ public class PageProvider implements IPa
/**
* @see org.apache.wicket.request.handler.IPageProvider#getPageClass()
*/
+ @Override
public Class<? extends IRequestablePage> getPageClass()
{
if (pageClass != null)
@@ -311,6 +315,7 @@ public class PageProvider implements IPa
* {@link #PageProvider(IRequestablePage)} constructor has been used or
* {@link #getPageInstance()} has been called).
*/
+ @Override
public void detach()
{
if (pageInstance != null)
@@ -355,11 +360,13 @@ public class PageProvider implements IPa
*
* @return page id
*/
+ @Override
public Integer getPageId()
{
return pageId;
}
+ @Override
public Integer getRenderCount()
{
return renderCount;