You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jd...@apache.org on 2009/04/15 22:22:25 UTC
svn commit: r765341 [3/7] - in /wicket/trunk/wicket/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/application/ main...
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressingWebCodingStrategy.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressingWebCodingStrategy.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressingWebCodingStrategy.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressingWebCodingStrategy.java Wed Apr 15 20:22:01 2009
@@ -59,6 +59,7 @@
* the target to encode
* @return the encoded url
*/
+ @Override
protected CharSequence encode(RequestCycle requestCycle,
IListenerInterfaceRequestTarget requestTarget)
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressingWebRequestProcessor.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressingWebRequestProcessor.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressingWebRequestProcessor.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressingWebRequestProcessor.java Wed Apr 15 20:22:01 2009
@@ -57,6 +57,7 @@
/**
* @see org.apache.wicket.protocol.http.WebRequestCycleProcessor#newRequestCodingStrategy()
*/
+ @Override
protected IRequestCodingStrategy newRequestCodingStrategy()
{
return new UrlCompressingWebCodingStrategy();
@@ -67,17 +68,18 @@
* org.apache.wicket.Page, java.lang.String, java.lang.String,
* org.apache.wicket.request.RequestParameters)
*/
+ @Override
protected IRequestTarget resolveListenerInterfaceTarget(final RequestCycle requestCycle,
- final Page page, final String componentPath, String interfaceName,
- final RequestParameters requestParameters)
+ final Page page, final String componentPath, String interfaceName,
+ final RequestParameters requestParameters)
{
String pageRelativeComponentPath = Strings.afterFirstPathComponent(componentPath,
- Component.PATH_SEPARATOR);
+ Component.PATH_SEPARATOR);
Component component = null;
if (page instanceof WebPage && !"IResourceListener".equals(interfaceName))
{
ComponentAndInterface cai = ((WebPage)page).getUrlCompressor()
- .getComponentAndInterfaceForUID(pageRelativeComponentPath);
+ .getComponentAndInterfaceForUID(pageRelativeComponentPath);
if (cai != null)
{
interfaceName = cai.getInterfaceName();
@@ -94,17 +96,16 @@
else if (interfaceName.equals(INewBrowserWindowListener.INTERFACE.getName()))
{
return INewBrowserWindowListener.INTERFACE.newRequestTarget(page, page,
- INewBrowserWindowListener.INTERFACE, requestParameters);
+ INewBrowserWindowListener.INTERFACE, requestParameters);
}
else
{
// Get the listener interface we need to call
- final RequestListenerInterface listener = RequestListenerInterface
- .forName(interfaceName);
+ final RequestListenerInterface listener = RequestListenerInterface.forName(interfaceName);
if (listener == null)
{
throw new WicketRuntimeException(
- "Attempt to access unknown request listener interface " + interfaceName);
+ "Attempt to access unknown request listener interface " + interfaceName);
}
// Get component
@@ -124,7 +125,7 @@
{
// still null? that's not right
throw new WicketRuntimeException("cannot resolve component with path '" +
- pageRelativeComponentPath + "', listener " + listener + " on page " + page);
+ pageRelativeComponentPath + "', listener " + listener + " on page " + page);
}
if (!component.isEnableAllowed())
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/AbortWithHttpStatusException.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/AbortWithHttpStatusException.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/AbortWithHttpStatusException.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/AbortWithHttpStatusException.java Wed Apr 15 20:22:01 2009
@@ -59,7 +59,7 @@
if (!statusCodeOptional)
{
throw new IllegalStateException(
- "This exception can only be thrown from within request processing cycle");
+ "This exception can only be thrown from within request processing cycle");
}
}
else
@@ -68,7 +68,7 @@
if (!(r instanceof WebResponse))
{
throw new IllegalStateException(
- "This exception can only be thrown when wicket is processing an http request");
+ "This exception can only be thrown when wicket is processing an http request");
}
WebResponse wr = (WebResponse)r;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java Wed Apr 15 20:22:01 2009
@@ -16,11 +16,12 @@
*/
package org.apache.wicket.protocol.http.servlet;
-import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
+
import org.apache.wicket.Application;
import org.apache.wicket.IRedirectListener;
import org.apache.wicket.RequestContext;
@@ -430,7 +431,7 @@
/**
* This will return true if the header "Wicket-Ajax" is set.
- *
+ *
* @see org.apache.wicket.protocol.http.WebRequest#isAjax()
*/
@Override
@@ -441,7 +442,7 @@
/**
* THIS IS FOR WICKET INTERNAL USE ONLY. DO NOT USE IT IN YOUR APPLICATION.
- *
+ *
* @param ajax
* ajax
*/
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/AbstractRequestCycleProcessor.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/AbstractRequestCycleProcessor.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/AbstractRequestCycleProcessor.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/AbstractRequestCycleProcessor.java Wed Apr 15 20:22:01 2009
@@ -191,7 +191,7 @@
*/
private boolean isPageMounted(Class<? extends Page> pageClass)
{
- RequestCycle cycle = RequestCycle.get();
+ RequestCycle.get();
CharSequence path = getRequestCodingStrategy().pathForTarget(
new BookmarkablePageRequestTarget(pageClass));
return path != null;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/IRequestCycleProcessor.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/IRequestCycleProcessor.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/IRequestCycleProcessor.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/IRequestCycleProcessor.java Wed Apr 15 20:22:01 2009
@@ -28,7 +28,7 @@
* <li> {@link #resolve(RequestCycle, RequestParameters)} is called to get the request target. A
* request might refer to e.g. a bookmarkable page, a listener interface call on a component on a
* previously rendered page, a shared resource or e.g. a non-wicket resource that resides in the web
- * application folder. </li>
+ * application folder.</li>
* <li> {@link #processEvents(RequestCycle)} is called after the target is resolved. It is meant to
* handle/ distribute events like e.g. listener interface calls on components. During this
* processing, the request target may be changed (e.g. by calling setResponsePage). What actually
@@ -37,11 +37,11 @@
* after the request is handled.</li>
* <li> {@link #respond(RequestCycle)} is called to create a response to the requesting client.
* Typically, the actual response handling is to be (or delegated) by the request target
- * implementation, but different strategies might do as they seem fit. </li>
+ * implementation, but different strategies might do as they seem fit.</li>
* <li> {@link #respond(RuntimeException, RequestCycle)} is called whenever an uncaught exception
* occurs during the event handling or response phase so that an appropriate exception response can
* be generated. This method is guaranteed to be called whenever such an exception happens, but will
- * never be called otherwise. </li>
+ * never be called otherwise.</li>
* </ul>
* </p>
*
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/EmptyAjaxRequestTarget.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/EmptyAjaxRequestTarget.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/EmptyAjaxRequestTarget.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/EmptyAjaxRequestTarget.java Wed Apr 15 20:22:01 2009
@@ -67,6 +67,7 @@
/**
* @see java.lang.Object#equals(java.lang.Object)
*/
+ @Override
public boolean equals(Object obj)
{
if (obj instanceof EmptyAjaxRequestTarget)
@@ -79,6 +80,7 @@
/**
* @see java.lang.Object#hashCode()
*/
+ @Override
public int hashCode()
{
return HASH;
@@ -87,6 +89,7 @@
/**
* @see java.lang.Object#toString()
*/
+ @Override
public String toString()
{
return "EmptyAjaxRequestTarget";
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/EmptyRequestTarget.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/EmptyRequestTarget.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/EmptyRequestTarget.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/EmptyRequestTarget.java Wed Apr 15 20:22:01 2009
@@ -69,6 +69,7 @@
/**
* @see java.lang.Object#equals(java.lang.Object)
*/
+ @Override
public boolean equals(Object obj)
{
if (obj instanceof EmptyRequestTarget)
@@ -81,6 +82,7 @@
/**
* @see java.lang.Object#hashCode()
*/
+ @Override
public int hashCode()
{
return HASH;
@@ -89,6 +91,7 @@
/**
* @see java.lang.Object#toString()
*/
+ @Override
public String toString()
{
return "EmptyRequestTarget";
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/RedirectRequestTarget.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/RedirectRequestTarget.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/RedirectRequestTarget.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/RedirectRequestTarget.java Wed Apr 15 20:22:01 2009
@@ -78,7 +78,6 @@
// context-absolute url
RequestContext rc = RequestContext.get();
- String continueTo = null;
if (rc.isPortletRequest() && ((PortletRequestContext)rc).isEmbedded())
{
response.redirect(redirectUrl);
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/StringRequestTarget.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/StringRequestTarget.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/StringRequestTarget.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/StringRequestTarget.java Wed Apr 15 20:22:01 2009
@@ -45,8 +45,8 @@
/**
- * Creates a string request target with content type <code>text/plain</code> and default
- * charset (usually UTF-8)
+ * Creates a string request target with content type <code>text/plain</code> and default charset
+ * (usually UTF-8)
*
* @param string
* the string for the response
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/SharedResourceRequestTargetUrlCodingStrategy.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/SharedResourceRequestTargetUrlCodingStrategy.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/SharedResourceRequestTargetUrlCodingStrategy.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/SharedResourceRequestTargetUrlCodingStrategy.java Wed Apr 15 20:22:01 2009
@@ -28,9 +28,8 @@
*
* @author Gili Tzabari
*/
-public class SharedResourceRequestTargetUrlCodingStrategy
- extends
- AbstractRequestTargetUrlCodingStrategy
+public class SharedResourceRequestTargetUrlCodingStrategy extends
+ AbstractRequestTargetUrlCodingStrategy
{
private final String resourceKey;
@@ -42,7 +41,7 @@
* @param resourceKey
*/
public SharedResourceRequestTargetUrlCodingStrategy(final String mountPath,
- final String resourceKey)
+ final String resourceKey)
{
super(mountPath);
this.resourceKey = resourceKey;
@@ -54,9 +53,9 @@
public IRequestTarget decode(RequestParameters requestParameters)
{
final String parametersFragment = requestParameters.getPath().substring(
- getMountPath().length());
- final ValueMap parameters = decodeParameters(parametersFragment, requestParameters
- .getParameters());
+ getMountPath().length());
+ final ValueMap parameters = decodeParameters(parametersFragment,
+ requestParameters.getParameters());
requestParameters.setParameters(parameters);
requestParameters.setResourceKey(resourceKey);
@@ -71,7 +70,7 @@
if (!(requestTarget instanceof ISharedResourceRequestTarget))
{
throw new IllegalArgumentException("This encoder can only be used with " +
- "instances of " + ISharedResourceRequestTarget.class.getName());
+ "instances of " + ISharedResourceRequestTarget.class.getName());
}
final AppendingStringBuffer url = new AppendingStringBuffer(40);
url.append(getMountPath());
@@ -101,6 +100,7 @@
/**
* @see java.lang.Object#toString()
*/
+ @Override
public String toString()
{
return "SharedResourceEncoder[key=" + resourceKey + "]";
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/WebRequestEncoder.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/WebRequestEncoder.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/WebRequestEncoder.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/WebRequestEncoder.java Wed Apr 15 20:22:01 2009
@@ -75,7 +75,7 @@
*/
public void addValue(String key, String value)
{
- if (!firstParameter)
+ if (!firstParameter)
{
url.append('&');
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/BookmarkableListenerInterfaceRequestTarget.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/BookmarkableListenerInterfaceRequestTarget.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/BookmarkableListenerInterfaceRequestTarget.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/BookmarkableListenerInterfaceRequestTarget.java Wed Apr 15 20:22:01 2009
@@ -38,7 +38,6 @@
{
private final String componentPath;
private final String interfaceName;
- private final int versionNumber;
/**
* This constructor is called when a stateless link is clicked on but the page wasn't found in
@@ -59,7 +58,6 @@
super(pageMapName, pageClass, pageParameters);
this.componentPath = componentPath;
this.interfaceName = interfaceName;
- this.versionNumber = versionNumber;
}
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/BookmarkablePageRequestTarget.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/BookmarkablePageRequestTarget.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/BookmarkablePageRequestTarget.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/BookmarkablePageRequestTarget.java Wed Apr 15 20:22:01 2009
@@ -58,9 +58,9 @@
/**
* Construct.
- *
+ *
* @param <C>
- *
+ *
* @param pageClass
* the class of the page
*/
@@ -71,9 +71,9 @@
/**
* Construct.
- *
+ *
* @param <C>
- *
+ *
* @param pageClass
* the class of the page
* @param pageParameters
@@ -87,12 +87,12 @@
/**
* Construct.
- *
+ *
* @param <C>
- *
+ *
* @param pageMapName
* optional page map name
- *
+ *
* @param pageClass
* the class of the page
*/
@@ -103,10 +103,10 @@
/**
* Construct.
- *
+ *
* @param <C>
* type of page
- *
+ *
* @param pageMapName
* optional page map name
* @param pageClass
@@ -114,8 +114,8 @@
* @param pageParameters
* optional page parameters
*/
- public <C extends Page> BookmarkablePageRequestTarget(String pageMapName,
- Class<C> pageClass, PageParameters pageParameters)
+ public <C extends Page> BookmarkablePageRequestTarget(String pageMapName, Class<C> pageClass,
+ PageParameters pageParameters)
{
if (pageClass == null)
{
@@ -276,10 +276,10 @@
/**
* Constructs a new instance of a page given its class name
- *
+ *
* @param <C>
* type of page
- *
+ *
* @param pageClass
* class name of the page to be created
* @param requestCycle
@@ -309,7 +309,7 @@
/**
* Gets a newly constructed page if we are not in a redirect.
- *
+ *
* @param requestCycle
* the request cycle
* @return the page
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/PageRequestTarget.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/PageRequestTarget.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/PageRequestTarget.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/PageRequestTarget.java Wed Apr 15 20:22:01 2009
@@ -83,6 +83,7 @@
/**
* @see java.lang.Object#equals(java.lang.Object)
*/
+ @Override
public boolean equals(Object obj)
{
if (obj instanceof PageRequestTarget)
@@ -96,6 +97,7 @@
/**
* @see java.lang.Object#hashCode()
*/
+ @Override
public int hashCode()
{
int result = "PageRequestTarget".hashCode();
@@ -106,6 +108,7 @@
/**
* @see java.lang.Object#toString()
*/
+ @Override
public String toString()
{
return "[PageRequestTarget@" + hashCode() + " page=" + page + "]";
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/listener/AbstractListenerInterfaceRequestTarget.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/listener/AbstractListenerInterfaceRequestTarget.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/listener/AbstractListenerInterfaceRequestTarget.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/listener/AbstractListenerInterfaceRequestTarget.java Wed Apr 15 20:22:01 2009
@@ -36,9 +36,9 @@
* @author Johan Compagner
*/
public abstract class AbstractListenerInterfaceRequestTarget extends PageRequestTarget
- implements
- IListenerInterfaceRequestTarget,
- IEventProcessor
+ implements
+ IListenerInterfaceRequestTarget,
+ IEventProcessor
{
/** The request parameters. */
private final RequestParameters requestParameters;
@@ -60,7 +60,7 @@
* the listener interface
*/
public AbstractListenerInterfaceRequestTarget(final Page page, final Component component,
- RequestListenerInterface listener)
+ RequestListenerInterface listener)
{
this(page, component, listener, null);
}
@@ -79,7 +79,7 @@
* the request parameter
*/
public AbstractListenerInterfaceRequestTarget(final Page page, final Component component,
- final RequestListenerInterface listener, final RequestParameters requestParameters)
+ final RequestListenerInterface listener, final RequestParameters requestParameters)
{
super(page);
@@ -102,6 +102,7 @@
/**
* @see java.lang.Object#equals(java.lang.Object)
*/
+ @Override
public boolean equals(Object obj)
{
boolean equal = false;
@@ -136,7 +137,7 @@
*/
public final RequestParameters getRequestParameters()
{
- return this.requestParameters;
+ return requestParameters;
}
/**
@@ -150,6 +151,7 @@
/**
* @see java.lang.Object#hashCode()
*/
+ @Override
public int hashCode()
{
int result = getClass().hashCode();
@@ -162,12 +164,18 @@
/**
* @see java.lang.Object#toString()
*/
+ @Override
public String toString()
{
- StringBuffer buf = new StringBuffer(getClass().getName()).append("@").append(hashCode())
- .append(getPage().toString()).append("->").append(getTarget().getId()).append("->")
- .append(getRequestListenerInterface().getMethod().getDeclaringClass()).append(".")
- .append(getRequestListenerInterface().getName());
+ StringBuffer buf = new StringBuffer(getClass().getName()).append("@")
+ .append(hashCode())
+ .append(getPage().toString())
+ .append("->")
+ .append(getTarget().getId())
+ .append("->")
+ .append(getRequestListenerInterface().getMethod().getDeclaringClass())
+ .append(".")
+ .append(getRequestListenerInterface().getName());
if (requestParameters != null)
{
@@ -189,7 +197,7 @@
final Application application = requestCycle.getApplication();
// and see if we have to redirect the render part by default
IRequestCycleSettings.RenderStrategy strategy = application.getRequestCycleSettings()
- .getRenderStrategy();
+ .getRenderStrategy();
boolean issueRedirect = (strategy == IRequestCycleSettings.REDIRECT_TO_RENDER || strategy == IRequestCycleSettings.REDIRECT_TO_BUFFER);
requestCycle.setRedirect(issueRedirect);
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/listener/ListenerInterfaceRequestTarget.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/listener/ListenerInterfaceRequestTarget.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/listener/ListenerInterfaceRequestTarget.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/listener/ListenerInterfaceRequestTarget.java Wed Apr 15 20:22:01 2009
@@ -41,7 +41,7 @@
* the request listener interface
*/
public ListenerInterfaceRequestTarget(final Page page, final Component component,
- final RequestListenerInterface listener)
+ final RequestListenerInterface listener)
{
this(page, component, listener, null);
}
@@ -59,7 +59,7 @@
* the request parameters
*/
public ListenerInterfaceRequestTarget(final Page page, final Component component,
- final RequestListenerInterface listener, final RequestParameters requestParameters)
+ final RequestListenerInterface listener, final RequestParameters requestParameters)
{
super(page, component, listener, requestParameters);
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/resource/ComponentResourceRequestTarget.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/resource/ComponentResourceRequestTarget.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/resource/ComponentResourceRequestTarget.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/resource/ComponentResourceRequestTarget.java Wed Apr 15 20:22:01 2009
@@ -51,7 +51,7 @@
* @param listener
*/
public ComponentResourceRequestTarget(Page page, Component component,
- RequestListenerInterface listener)
+ RequestListenerInterface listener)
{
this.page = page;
this.component = component;
@@ -74,17 +74,17 @@
if (response instanceof WebResponse)
{
((WebResponse)response).getHttpServletResponse().setStatus(
- HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+ HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
log.error("error handling resource request for component " + component +
- ", on page " + page + ", listener " + listener.getName() + " - " +
- e.getMessage(), e);
+ ", on page " + page + ", listener " + listener.getName() + " - " +
+ e.getMessage(), e);
return;
}
else
{
throw new WicketRuntimeException("method " + listener.getName() + " of " +
- listener.getMethod().getDeclaringClass() + " targetted at component " +
- component + " threw an exception", e);
+ listener.getMethod().getDeclaringClass() + " targetted at component " +
+ component + " threw an exception", e);
}
}
}
@@ -100,6 +100,7 @@
/**
* @see java.lang.Object#equals(java.lang.Object)
*/
+ @Override
public boolean equals(Object obj)
{
if (obj instanceof ComponentResourceRequestTarget)
@@ -113,6 +114,7 @@
/**
* @see java.lang.Object#hashCode()
*/
+ @Override
public int hashCode()
{
int result = getClass().hashCode();
@@ -124,10 +126,15 @@
/**
* @see java.lang.Object#toString()
*/
+ @Override
public String toString()
{
- StringBuffer b = new StringBuffer(getClass().getName()).append("@").append(hashCode())
- .append(page).append("->").append(component.getId()).append("->IResourceListener");
+ StringBuffer b = new StringBuffer(getClass().getName()).append("@")
+ .append(hashCode())
+ .append(page)
+ .append("->")
+ .append(component.getId())
+ .append("->IResourceListener");
return b.toString();
}
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/resource/ResourceStreamRequestTarget.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/resource/ResourceStreamRequestTarget.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/resource/ResourceStreamRequestTarget.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/resource/ResourceStreamRequestTarget.java Wed Apr 15 20:22:01 2009
@@ -152,9 +152,13 @@
try
{
if (resourceStream instanceof IResourceStreamWriter)
+ {
((IResourceStreamWriter)resourceStream).write(response.getOutputStream());
+ }
else
+ {
response.write(resourceStream.getInputStream());
+ }
}
catch (ResourceStreamNotFoundException e)
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/ByteArrayResource.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/ByteArrayResource.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/ByteArrayResource.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/ByteArrayResource.java Wed Apr 15 20:22:01 2009
@@ -65,8 +65,8 @@
{
this.contentType = contentType;
this.array = array;
- this.locale = null;
- this.filename = null;
+ locale = null;
+ filename = null;
}
/**
@@ -84,7 +84,7 @@
this.contentType = contentType;
this.array = array;
this.filename = filename;
- this.locale = null;
+ locale = null;
}
/**
@@ -103,7 +103,7 @@
this.contentType = contentType;
this.array = array;
this.locale = locale;
- this.filename = null;
+ filename = null;
}
/**
@@ -130,6 +130,7 @@
/**
* @see org.apache.wicket.markup.html.WebResource#setHeaders(org.apache.wicket.protocol.http.WebResponse)
*/
+ @Override
protected void setHeaders(WebResponse response)
{
super.setHeaders(response);
@@ -142,6 +143,7 @@
/**
* @see org.apache.wicket.Resource#getResourceStream()
*/
+ @Override
public IResourceStream getResourceStream()
{
return new IResourceStream()
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/ContextRelativeResource.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/ContextRelativeResource.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/ContextRelativeResource.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/ContextRelativeResource.java Wed Apr 15 20:22:01 2009
@@ -48,12 +48,13 @@
{
pathRelativeToContextRoot = "/" + pathRelativeToContextRoot;
}
- this.path = pathRelativeToContextRoot;
+ path = pathRelativeToContextRoot;
}
/**
* @see org.apache.wicket.Resource#getResourceStream()
*/
+ @Override
public IResourceStream getResourceStream()
{
return new WebExternalResourceStream(path);
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/DynamicByteArrayResource.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/DynamicByteArrayResource.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/DynamicByteArrayResource.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/DynamicByteArrayResource.java Wed Apr 15 20:22:01 2009
@@ -36,6 +36,7 @@
*
* @deprecated use {@link DynamicWebResource} now
*/
+@Deprecated
public abstract class DynamicByteArrayResource extends WebResource
{
/**
@@ -126,6 +127,7 @@
/**
* @return Gets the image resource to attach to the component.
*/
+ @Override
public final IResourceStream getResourceStream()
{
return new IResourceStream()
@@ -227,6 +229,7 @@
/**
* @see org.apache.wicket.Resource#invalidate()
*/
+ @Override
public void invalidate()
{
super.invalidate();
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/IPropertiesFactory.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/IPropertiesFactory.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/IPropertiesFactory.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/IPropertiesFactory.java Wed Apr 15 20:22:01 2009
@@ -60,5 +60,5 @@
* The path to identify the resource
* @return The properties
*/
- Properties load(final Class< ? > clazz, final String path);
+ Properties load(final Class<?> clazz, final String path);
}
\ No newline at end of file
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/Properties.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/Properties.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/Properties.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/Properties.java Wed Apr 15 20:22:01 2009
@@ -73,8 +73,9 @@
/**
* @see java.lang.Object#toString()
*/
+ @Override
public final String toString()
{
- return this.key;
+ return key;
}
}
\ No newline at end of file
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/loader/ClassStringResourceLoader.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/loader/ClassStringResourceLoader.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/loader/ClassStringResourceLoader.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/loader/ClassStringResourceLoader.java Wed Apr 15 20:22:01 2009
@@ -37,7 +37,7 @@
public class ClassStringResourceLoader extends ComponentStringResourceLoader
{
/** The application we are loading for. */
- private final WeakReference<Class< ? >> clazzRef;
+ private final WeakReference<Class<?>> clazzRef;
/**
* Create and initialize the resource loader.
@@ -45,13 +45,13 @@
* @param clazz
* The class that this resource loader is associated with
*/
- public ClassStringResourceLoader(final Class< ? > clazz)
+ public ClassStringResourceLoader(final Class<?> clazz)
{
if (clazz == null)
{
throw new IllegalArgumentException("Parameter 'clazz' must not be null");
}
- clazzRef = new WeakReference<Class< ? >>(clazz);
+ clazzRef = new WeakReference<Class<?>>(clazz);
}
/**
@@ -59,7 +59,7 @@
* java.lang.String, java.util.Locale, java.lang.String)
*/
@Override
- public String loadStringResource(final Class< ? > clazz, final String key, final Locale locale,
+ public String loadStringResource(final Class<?> clazz, final String key, final Locale locale,
final String style)
{
return super.loadStringResource(clazzRef.get(), key, locale, style);
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/loader/IStringResourceLoader.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/loader/IStringResourceLoader.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/loader/IStringResourceLoader.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/loader/IStringResourceLoader.java Wed Apr 15 20:22:01 2009
@@ -63,7 +63,7 @@
* {@link org.apache.wicket.Session})
* @return The string resource value or null if the resource could not be loaded by this loader
*/
- String loadStringResource(Class< ? > clazz, String key, Locale locale, String style);
+ String loadStringResource(Class<?> clazz, String key, Locale locale, String style);
/**
* Get the string resource for the given combination of component and resource key. The
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/response/ConsoleResponse.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/response/ConsoleResponse.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/response/ConsoleResponse.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/response/ConsoleResponse.java Wed Apr 15 20:22:01 2009
@@ -49,6 +49,7 @@
/**
* @see org.apache.wicket.Response#write(CharSequence)
*/
+ @Override
public void write(CharSequence string)
{
System.out.print(string);
@@ -57,6 +58,7 @@
/**
* @see org.apache.wicket.Response#getOutputStream()
*/
+ @Override
public OutputStream getOutputStream()
{
return System.out;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/response/FileResponse.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/response/FileResponse.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/response/FileResponse.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/response/FileResponse.java Wed Apr 15 20:22:01 2009
@@ -59,6 +59,7 @@
/**
* @see org.apache.wicket.Response#close()
*/
+ @Override
public void close()
{
if (printWriter != null)
@@ -83,6 +84,7 @@
/**
* @see org.apache.wicket.Response#getOutputStream()
*/
+ @Override
public OutputStream getOutputStream()
{
try
@@ -102,6 +104,7 @@
/**
* @see org.apache.wicket.Response#write(CharSequence)
*/
+ @Override
public void write(final CharSequence string)
{
try
@@ -118,7 +121,7 @@
{
if (printWriter == null)
{
- this.printWriter = new PrintWriter(new BufferedWriter(new FileWriter(file)));
+ printWriter = new PrintWriter(new BufferedWriter(new FileWriter(file)));
}
return printWriter;
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/response/NullResponse.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/response/NullResponse.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/response/NullResponse.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/response/NullResponse.java Wed Apr 15 20:22:01 2009
@@ -50,6 +50,7 @@
/**
* @see org.apache.wicket.Response#write(CharSequence)
*/
+ @Override
public void write(CharSequence string)
{
// Does nothing
@@ -58,10 +59,12 @@
/**
* @see org.apache.wicket.Response#getOutputStream()
*/
+ @Override
public OutputStream getOutputStream()
{
return new OutputStream()
{
+ @Override
public void write(int b) throws IOException
{
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/response/StringResponse.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/response/StringResponse.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/response/StringResponse.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/response/StringResponse.java Wed Apr 15 20:22:01 2009
@@ -40,12 +40,13 @@
*/
public StringResponse()
{
- this.out = new AppendingStringBuffer(128);
+ out = new AppendingStringBuffer(128);
}
/**
* @see org.apache.wicket.Response#write(CharSequence)
*/
+ @Override
public void write(final CharSequence string)
{
out.append(string);
@@ -54,6 +55,7 @@
/**
* @see org.apache.wicket.Response#reset()
*/
+ @Override
public void reset()
{
out.clear();
@@ -62,6 +64,7 @@
/**
* @see java.lang.Object#toString()
*/
+ @Override
public String toString()
{
return out.toString();
@@ -78,6 +81,7 @@
/**
* @see org.apache.wicket.Response#getOutputStream()
*/
+ @Override
public OutputStream getOutputStream()
{
throw new UnsupportedOperationException("Cannot get output stream on StringResponse");
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/session/pagemap/LeastRecentlyAccessedEvictionStrategy.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/session/pagemap/LeastRecentlyAccessedEvictionStrategy.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/session/pagemap/LeastRecentlyAccessedEvictionStrategy.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/session/pagemap/LeastRecentlyAccessedEvictionStrategy.java Wed Apr 15 20:22:01 2009
@@ -20,7 +20,6 @@
import org.apache.wicket.IPageMap;
import org.apache.wicket.Page;
import org.apache.wicket.Session;
-import org.apache.wicket.AccessStackPageMap.Access;
/**
* A simple eviction strategy that evicts the least recently accessed page version from the given
@@ -64,7 +63,7 @@
if (accessPM.getVersions() > maxVersions)
{
// Remove oldest entry from access stack
- final AccessStackPageMap.Access oldestAccess = (Access)accessPM.getAccessStack()
+ final AccessStackPageMap.Access oldestAccess = accessPM.getAccessStack()
.remove(0);
final IPageMapEntry oldestEntry = pageMap.getEntry(oldestAccess.getId());
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IExceptionSettings.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IExceptionSettings.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IExceptionSettings.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IExceptionSettings.java Wed Apr 15 20:22:01 2009
@@ -51,24 +51,25 @@
* unexpected exception is thrown.
*/
public static final UnexpectedExceptionDisplay SHOW_EXCEPTION_PAGE = new UnexpectedExceptionDisplay(
- "SHOW_EXCEPTION_PAGE");
+ "SHOW_EXCEPTION_PAGE");
/**
* Indicates a generic internal error page should be shown when an unexpected exception is
* thrown.
*/
public static final UnexpectedExceptionDisplay SHOW_INTERNAL_ERROR_PAGE = new UnexpectedExceptionDisplay(
- "SHOW_INTERNAL_ERROR_PAGE");
+ "SHOW_INTERNAL_ERROR_PAGE");
/**
* Indicates that no exception page should be shown when an unexpected exception is thrown.
*/
public static final UnexpectedExceptionDisplay SHOW_NO_EXCEPTION_PAGE = new UnexpectedExceptionDisplay(
- "SHOW_NO_EXCEPTION_PAGE");
+ "SHOW_NO_EXCEPTION_PAGE");
/**
* @return Whether to throw an exception when a missing resource is requested
* @deprecated use {@link IResourceSettings#getThrowExceptionOnMissingResource()} instead
*/
+ @Deprecated
boolean getThrowExceptionOnMissingResource();
/**
@@ -81,6 +82,7 @@
* Whether to throw an exception when a missing resource is requested
* @deprecated use {@link IResourceSettings#setThrowExceptionOnMissingResource(boolean)} instead
*/
+ @Deprecated
void setThrowExceptionOnMissingResource(final boolean throwExceptionOnMissingResource);
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IRequestCycleSettings.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IRequestCycleSettings.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IRequestCycleSettings.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IRequestCycleSettings.java Wed Apr 15 20:22:01 2009
@@ -144,7 +144,7 @@
* Also, even with this strategy set, it is ignored for
* {@link BookmarkableListenerInterfaceRequestTarget}s, because otherwise they wouldn't be
* bookmarkable.
- * </p>
+ * </p>
*/
public static final IRequestCycleSettings.RenderStrategy REDIRECT_TO_RENDER = new IRequestCycleSettings.RenderStrategy(
"CLIENT_SIDE_REDIRECT");
@@ -164,8 +164,8 @@
/**
* Gets whether Wicket should try to get extensive client info by redirecting to
- * {@link BrowserInfoPage a page that polls for client capabilities}. This method is used by
- * the default implementation of {@link WebRequestCycle#newClientInfo()}, so if that method is
+ * {@link BrowserInfoPage a page that polls for client capabilities}. This method is used by the
+ * default implementation of {@link WebRequestCycle#newClientInfo()}, so if that method is
* overridden, there is no guarantee this method will be taken into account.
*
* @return Whether to gather extensive client info
@@ -216,8 +216,8 @@
/**
* Sets whether Wicket should try to get extensive client info by redirecting to
- * {@link BrowserInfoPage a page that polls for client capabilities}. This method is used by
- * the default implementation of {@link WebRequestCycle#newClientInfo()}, so if that method is
+ * {@link BrowserInfoPage a page that polls for client capabilities}. This method is used by the
+ * default implementation of {@link WebRequestCycle#newClientInfo()}, so if that method is
* overridden, there is no guarantee this method will be taken into account.
*
* <p>
@@ -258,7 +258,7 @@
* is issued to the render part, which does all the rendering of the page and its components.
* <strong>Be aware </strong> that this may mean, depending on whether you access any models in
* the action part of the request, that attachment and detachment of some models is done twice
- * for a request. </li>
+ * for a request.</li>
* <li>ApplicationSettings.REDIRECT_TO_BUFFER. This option handles both the action- and the
* render part of the request in one physical request, but instead of streaming the result to
* the browser directly, it is kept in memory, and a redirect is issue to get this buffered
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/ISecuritySettings.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/ISecuritySettings.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/ISecuritySettings.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/ISecuritySettings.java Wed Apr 15 20:22:01 2009
@@ -106,5 +106,5 @@
* @see IUnauthorizedComponentInstantiationListener
*/
void setUnauthorizedComponentInstantiationListener(
- IUnauthorizedComponentInstantiationListener unauthorizedComponentInstantiationListener);
+ IUnauthorizedComponentInstantiationListener unauthorizedComponentInstantiationListener);
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/collections/IntHashMap.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/collections/IntHashMap.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/collections/IntHashMap.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/collections/IntHashMap.java Wed Apr 15 20:22:01 2009
@@ -132,8 +132,8 @@
}
/**
- * Constructs an empty <tt>HashMap</tt> with the specified initial capacity and the default
- * load factor (0.75).
+ * Constructs an empty <tt>HashMap</tt> with the specified initial capacity and the default load
+ * factor (0.75).
*
* @param initialCapacity
* the initial capacity.
@@ -205,9 +205,9 @@
/**
* Returns the value to which the specified key is mapped in this identity hash map, or
* <tt>null</tt> if the map contains no mapping for this key. A return value of <tt>null</tt>
- * does not <i>necessarily</i> indicate that the map contains no mapping for the key; it is
- * also possible that the map explicitly maps the key to <tt>null</tt>. The
- * <tt>containsKey</tt> method may be used to distinguish these two cases.
+ * does not <i>necessarily</i> indicate that the map contains no mapping for the key; it is also
+ * possible that the map explicitly maps the key to <tt>null</tt>. The <tt>containsKey</tt>
+ * method may be used to distinguish these two cases.
*
* @param key
* the key whose associated value is to be returned.
@@ -282,8 +282,8 @@
* @param value
* value to be associated with the specified key.
* @return previous value associated with specified key, or <tt>null</tt> if there was no
- * mapping for key. A <tt>null</tt> return can also indicate that the HashMap
- * previously associated <tt>null</tt> with the specified key.
+ * mapping for key. A <tt>null</tt> return can also indicate that the HashMap previously
+ * associated <tt>null</tt> with the specified key.
*/
public V put(int key, V value)
{
@@ -607,8 +607,8 @@
}
/**
- * Returns a shallow copy of this <tt>HashMap</tt> instance: the keys and values themselves
- * are not cloned.
+ * Returns a shallow copy of this <tt>HashMap</tt> instance: the keys and values themselves are
+ * not cloned.
*
* @return a shallow copy of this map.
*/
@@ -902,9 +902,9 @@
* Returns a set view of the keys contained in this map. The set is backed by the map, so
* changes to the map are reflected in the set, and vice-versa. The set supports element
* removal, which removes the corresponding mapping from this map, via the
- * <tt>Iterator.remove</tt>, <tt>Set.remove</tt>, <tt>removeAll</tt>,
- * <tt>retainAll</tt>, and <tt>clear</tt> operations. It does not support the <tt>add</tt>
- * or <tt>addAll</tt> operations.
+ * <tt>Iterator.remove</tt>, <tt>Set.remove</tt>, <tt>removeAll</tt>, <tt>retainAll</tt>, and
+ * <tt>clear</tt> operations. It does not support the <tt>add</tt> or <tt>addAll</tt>
+ * operations.
*
* @return a set view of the keys contained in this map.
*/
@@ -975,8 +975,8 @@
* the map, so changes to the map are reflected in the collection, and vice-versa. The
* collection supports element removal, which removes the corresponding mapping from this map,
* via the <tt>Iterator.remove</tt>, <tt>Collection.remove</tt>, <tt>removeAll</tt>,
- * <tt>retainAll</tt>, and <tt>clear</tt> operations. It does not support the <tt>add</tt>
- * or <tt>addAll</tt> operations.
+ * <tt>retainAll</tt>, and <tt>clear</tt> operations. It does not support the <tt>add</tt> or
+ * <tt>addAll</tt> operations.
*
* @return a collection view of the values contained in this map.
*/
@@ -1030,9 +1030,8 @@
* collection is a <tt>Map.Entry</tt>. The collection is backed by the map, so changes to the
* map are reflected in the collection, and vice-versa. The collection supports element removal,
* which removes the corresponding mapping from the map, via the <tt>Iterator.remove</tt>,
- * <tt>Collection.remove</tt>, <tt>removeAll</tt>, <tt>retainAll</tt>, and
- * <tt>clear</tt> operations. It does not support the <tt>add</tt> or <tt>addAll</tt>
- * operations.
+ * <tt>Collection.remove</tt>, <tt>removeAll</tt>, <tt>retainAll</tt>, and <tt>clear</tt>
+ * operations. It does not support the <tt>add</tt> or <tt>addAll</tt> operations.
*
* @return a collection view of the mappings contained in this map.
* @see Map.Entry
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/collections/MicroMap.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/collections/MicroMap.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/collections/MicroMap.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/collections/MicroMap.java Wed Apr 15 20:22:01 2009
@@ -175,11 +175,11 @@
/**
* @see java.util.Map#putAll(java.util.Map)
*/
- public void putAll(final Map< ? extends K, ? extends V> map)
+ public void putAll(final Map<? extends K, ? extends V> map)
{
if (map.size() <= MAX_ENTRIES)
{
- final Entry< ? extends K, ? extends V> e = map.entrySet().iterator().next();
+ final Entry<? extends K, ? extends V> e = map.entrySet().iterator().next();
put(e.getKey(), e.getValue());
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/AbstractDecimalConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/AbstractDecimalConverter.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/AbstractDecimalConverter.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/AbstractDecimalConverter.java Wed Apr 15 20:22:01 2009
@@ -47,7 +47,9 @@
{
numberFormat = newNumberFormat(locale);
if (numberFormat instanceof DecimalFormat)
+ {
((DecimalFormat)numberFormat).setParseBigDecimal(true);
+ }
numberFormats.put(locale, numberFormat);
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/BigDecimalConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/BigDecimalConverter.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/BigDecimalConverter.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/BigDecimalConverter.java Wed Apr 15 20:22:01 2009
@@ -38,7 +38,9 @@
public BigDecimal convertToObject(String value, Locale locale)
{
if (value == null || value.trim().equals(""))
+ {
return null;
+ }
final Number number = parse(value, -Double.MAX_VALUE, Double.MAX_VALUE, locale);
if (number instanceof BigDecimal)
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/SqlTimeConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/SqlTimeConverter.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/SqlTimeConverter.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/converters/SqlTimeConverter.java Wed Apr 15 20:22:01 2009
@@ -36,9 +36,13 @@
public Time convertToObject(String value, Locale locale)
{
if (value == null)
+ {
return null;
+ }
if (locale == null)
+ {
locale = Locale.getDefault();
+ }
DateFormat format = DateFormat.getTimeInstance(DateFormat.SHORT, locale);
try
{
@@ -59,9 +63,13 @@
public String convertToString(final Object value, Locale locale)
{
if (value == null)
+ {
return null;
+ }
if (locale == null)
+ {
locale = Locale.getDefault();
+ }
Time time = (Time)value;
DateFormat format = DateFormat.getTimeInstance(DateFormat.SHORT, locale);
return format.format(time);
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/crypt/Base64.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/crypt/Base64.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/crypt/Base64.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/crypt/Base64.java Wed Apr 15 20:22:01 2009
@@ -17,12 +17,14 @@
package org.apache.wicket.util.crypt;
/**
- * Provides Base64 encoding and decoding as defined by RFC 2045. <p/> This class is taken from the
- * Apache commons-codec, and adjusted to fit the Wicket framework's needs, especially external
- * dependencies have been removed.
+ * Provides Base64 encoding and decoding as defined by RFC 2045.
+ * <p/>
+ * This class is taken from the Apache commons-codec, and adjusted to fit the Wicket framework's
+ * needs, especially external dependencies have been removed.
* </p>
- * <p/> This class implements section <cite>6.8. Base64 Content-Transfer-Encoding</cite> from RFC
- * 2045 <cite>Multipurpose Internet Mail Extensions (MIME) Part One: Format of Internet Message
+ * <p/>
+ * This class implements section <cite>6.8. Base64 Content-Transfer-Encoding</cite> from RFC 2045
+ * <cite>Multipurpose Internet Mail Extensions (MIME) Part One: Format of Internet Message
* Bodies</cite> by Freed and Borenstein.
* </p>
*
@@ -32,7 +34,8 @@
public class Base64
{
/**
- * Chunk size per RFC 2045 section 6.8. <p/>
+ * Chunk size per RFC 2045 section 6.8.
+ * <p/>
* <p>
* The {@value} character limit does not count the trailing CRLF, but counts all other
* characters, including any equal signs.
@@ -90,23 +93,28 @@
static final byte PAD = (byte)'=';
/**
- * Contains the Base64 values <code>0</code> through <code>63</code> accessed by using
- * character encodings as indices. <p/> For example, <code>base64Alphabet['+']</code> returns
- * <code>62</code>.
+ * Contains the Base64 values <code>0</code> through <code>63</code> accessed by using character
+ * encodings as indices.
+ * <p/>
+ * For example, <code>base64Alphabet['+']</code> returns <code>62</code>.
* </p>
- * <p/> The value of undefined encodings is <code>-1</code>.
+ * <p/>
+ * The value of undefined encodings is <code>-1</code>.
* </p>
*/
private static byte[] base64Alphabet = new byte[BASELENGTH];
/**
- * <p/> Contains the Base64 encodings <code>A</code> through <code>Z</code>, followed by
- * <code>a</code> through <code>z</code>, followed by <code>0</code> through
- * <code>9</code>, followed by <code>+</code>, and <code>/</code>.
+ * <p/>
+ * Contains the Base64 encodings <code>A</code> through <code>Z</code>, followed by
+ * <code>a</code> through <code>z</code>, followed by <code>0</code> through <code>9</code>,
+ * followed by <code>+</code>, and <code>/</code>.
* </p>
- * <p/> This array is accessed by using character values as indices.
+ * <p/>
+ * This array is accessed by using character values as indices.
* </p>
- * <p/> For example, <code>lookUpBase64Alphabet[62] </code> returns <code>'+'</code>.
+ * <p/>
+ * For example, <code>lookUpBase64Alphabet[62] </code> returns <code>'+'</code>.
* </p>
*/
private static byte[] lookUpBase64Alphabet = new byte[LOOKUPLENGTH];
@@ -183,8 +191,8 @@
*
* @param arrayOctect
* byte array to test
- * @return <code>true</code> if all bytes are valid characters in the Base64 alphabet or if
- * the byte array is empty; false, otherwise
+ * @return <code>true</code> if all bytes are valid characters in the Base64 alphabet or if the
+ * byte array is empty; false, otherwise
*/
public static boolean isArrayByteBase64(byte[] arrayOctect)
{
@@ -250,7 +258,7 @@
if (!(pObject instanceof byte[]))
{
throw new IllegalArgumentException(
- "Parameter supplied to Base64 decode is not a byte[]");
+ "Parameter supplied to Base64 decode is not a byte[]");
}
return decode((byte[])pObject);
}
@@ -305,7 +313,7 @@
{
nbrChunks = (CHUNK_SEPARATOR.length == 0 ? 0 : (int)Math.ceil((float)encodedDataLength /
- CHUNK_SIZE));
+ CHUNK_SIZE));
encodedDataLength += nbrChunks * CHUNK_SEPARATOR.length;
}
@@ -353,10 +361,10 @@
if (encodedIndex == nextSeparatorIndex)
{
System.arraycopy(CHUNK_SEPARATOR, 0, encodedData, encodedIndex,
- CHUNK_SEPARATOR.length);
+ CHUNK_SEPARATOR.length);
chunksSoFar++;
nextSeparatorIndex = (CHUNK_SIZE * (chunksSoFar + 1)) +
- (chunksSoFar * CHUNK_SEPARATOR.length);
+ (chunksSoFar * CHUNK_SEPARATOR.length);
encodedIndex += CHUNK_SEPARATOR.length;
}
}
@@ -400,7 +408,7 @@
if (chunksSoFar < nbrChunks)
{
System.arraycopy(CHUNK_SEPARATOR, 0, encodedData, encodedDataLength -
- CHUNK_SEPARATOR.length, CHUNK_SEPARATOR.length);
+ CHUNK_SEPARATOR.length, CHUNK_SEPARATOR.length);
}
}
@@ -565,7 +573,7 @@
if (!(pObject instanceof byte[]))
{
throw new IllegalArgumentException(
- "Parameter supplied to Base64 encode is not a byte[]");
+ "Parameter supplied to Base64 encode is not a byte[]");
}
return encode((byte[])pObject);
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/crypt/Base64UrlSafe.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/crypt/Base64UrlSafe.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/crypt/Base64UrlSafe.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/crypt/Base64UrlSafe.java Wed Apr 15 20:22:01 2009
@@ -18,12 +18,18 @@
/**
* Provides Base64 encoding and decoding with URL and filename safe alphabet as defined by RFC 3548,
- * section 4. <p/> This Base64 encoder is modified to meet URL requirements. The changes are: '+' =>
- * '*', '/' => '-', and no padding. <p/> This class is taken from the Apache commons-codec, and
- * adjusted to fit the Wicket framework's needs, especially external dependencies have been removed.
+ * section 4.
+ * <p/>
+ * This Base64 encoder is modified to meet URL requirements. The changes are: '+' => '*', '/' =>
+ * '-', and no padding.
+ * <p/>
+ * This class is taken from the Apache commons-codec, and adjusted to fit the Wicket framework's
+ * needs, especially external dependencies have been removed.
* </p>
- * <p/> This class implements section <cite>4. Base 64 Encoding with URL and Filename Safe Alphabet</cite>
- * from RFC 3548 <cite>The Base16, Base32, and Base64 Data Encodings</cite> by Simon Josefsson.
+ * <p/>
+ * This class implements section <cite>4. Base 64 Encoding with URL and Filename Safe
+ * Alphabet</cite> from RFC 3548 <cite>The Base16, Base32, and Base64 Data Encodings</cite> by Simon
+ * Josefsson.
* </p>
*
* @author Apache Software Foundation
@@ -69,23 +75,28 @@
static final int SIGN = -128;
/**
- * Contains the Base64 values <code>0</code> through <code>63</code> accessed by using
- * character encodings as indices. <p/> For example, <code>base64Alphabet['+']</code> returns
- * <code>62</code>.
+ * Contains the Base64 values <code>0</code> through <code>63</code> accessed by using character
+ * encodings as indices.
+ * <p/>
+ * For example, <code>base64Alphabet['+']</code> returns <code>62</code>.
* </p>
- * <p/> The value of undefined encodings is <code>-1</code>.
+ * <p/>
+ * The value of undefined encodings is <code>-1</code>.
* </p>
*/
private static byte[] base64Alphabet = new byte[BASELENGTH];
/**
- * <p/> Contains the Base64 encodings <code>A</code> through <code>Z</code>, followed by
- * <code>a</code> through <code>z</code>, followed by <code>0</code> through
- * <code>9</code>, followed by <code>+</code>, and <code>/</code>.
+ * <p/>
+ * Contains the Base64 encodings <code>A</code> through <code>Z</code>, followed by
+ * <code>a</code> through <code>z</code>, followed by <code>0</code> through <code>9</code>,
+ * followed by <code>+</code>, and <code>/</code>.
* </p>
- * <p/> This array is accessed by using character values as indices.
+ * <p/>
+ * This array is accessed by using character values as indices.
* </p>
- * <p/> For example, <code>lookUpBase64Alphabet[62] </code> returns <code>'+'</code>.
+ * <p/>
+ * For example, <code>lookUpBase64Alphabet[62] </code> returns <code>'+'</code>.
* </p>
*/
private static byte[] lookUpBase64Alphabet = new byte[LOOKUPLENGTH];
@@ -158,8 +169,8 @@
*
* @param arrayOctect
* byte array to test
- * @return <code>true</code> if all bytes are valid characters in the Base64 alphabet or if
- * the byte array is empty; false, otherwise
+ * @return <code>true</code> if all bytes are valid characters in the Base64 alphabet or if the
+ * byte array is empty; false, otherwise
*/
public static boolean isArrayByteBase64(byte[] arrayOctect)
{
@@ -199,7 +210,7 @@
if (!(pObject instanceof byte[]))
{
throw new IllegalArgumentException(
- "Parameter supplied to Base64 decode is not a byte[]");
+ "Parameter supplied to Base64 decode is not a byte[]");
}
return decode((byte[])pObject);
}
@@ -460,7 +471,7 @@
if (!(pObject instanceof byte[]))
{
throw new IllegalArgumentException(
- "Parameter supplied to Base64 encode is not a byte[]");
+ "Parameter supplied to Base64 encode is not a byte[]");
}
return encode((byte[])pObject);
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/crypt/ClassCryptFactory.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/crypt/ClassCryptFactory.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/crypt/ClassCryptFactory.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/crypt/ClassCryptFactory.java Wed Apr 15 20:22:01 2009
@@ -31,7 +31,7 @@
public class ClassCryptFactory implements ICryptFactory
{
private static final Logger log = LoggerFactory.getLogger(ClassCryptFactory.class);
- private final WeakReference<Class< ? >> cryptClass;
+ private final WeakReference<Class<?>> cryptClass;
private final String encryptionKey;
/**
@@ -42,7 +42,7 @@
* @param encryptionKey
* encryption key
*/
- public ClassCryptFactory(Class< ? > cryptClass, String encryptionKey)
+ public ClassCryptFactory(Class<?> cryptClass, String encryptionKey)
{
if (cryptClass == null)
{
@@ -54,7 +54,7 @@
throw new IllegalArgumentException("cryptClass must implement ICrypt interface");
}
- this.cryptClass = new WeakReference<Class< ? >>(cryptClass);
+ this.cryptClass = new WeakReference<Class<?>>(cryptClass);
this.encryptionKey = encryptionKey;
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/crypt/SunJceCrypt.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/crypt/SunJceCrypt.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/crypt/SunJceCrypt.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/crypt/SunJceCrypt.java Wed Apr 15 20:22:01 2009
@@ -66,7 +66,7 @@
try
{
// Initialize and add a security provider required for encryption
- final Class< ? > clazz = Classes.resolveClass("com.sun.crypto.provider.SunJCE");
+ final Class<?> clazz = Classes.resolveClass("com.sun.crypto.provider.SunJCE");
Security.addProvider((Provider)clazz.newInstance());
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/crypt/TrivialCrypt.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/crypt/TrivialCrypt.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/crypt/TrivialCrypt.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/crypt/TrivialCrypt.java Wed Apr 15 20:22:01 2009
@@ -36,6 +36,7 @@
/**
* @see org.apache.wicket.util.crypt.AbstractCrypt#crypt(byte[], int)
*/
+ @Override
protected byte[] crypt(byte[] input, int mode) throws GeneralSecurityException
{
final byte[] result = new byte[input.length];
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/Delta.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/Delta.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/Delta.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/Delta.java Wed Apr 15 20:22:01 2009
@@ -68,13 +68,11 @@
* @author <a href="mailto:bwm@hplb.hpl.hp.com">Brian McBride</a>
* @see Diff
* @see Chunk
- * @see Revision
+ * @see Revision modifications
*
- * modifications
+ * 27 Apr 2003 bwm
*
- * 27 Apr 2003 bwm
- *
- * Added getOriginal() and getRevised() accessor methods Added visitor pattern accept() method
+ * Added getOriginal() and getRevised() accessor methods Added visitor pattern accept() method
*/
public abstract class Delta extends ToString
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/Diff.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/Diff.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/Diff.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/Diff.java Wed Apr 15 20:22:01 2009
@@ -70,14 +70,13 @@
* Implements a differencing engine that works on arrays of {@link Object Object}.
*
* <p>
- * Within this library, the word <i>text</i> means a unit of information subject to version
- * control.
+ * Within this library, the word <i>text</i> means a unit of information subject to version control.
*
* <p>
- * Text is represented as <code>Object[]</code> because the diff engine is capable of handling
- * more than plain ascci. In fact, arrays of any type that implements
- * {@link java.lang.Object#hashCode hashCode()} and {@link java.lang.Object#equals equals()}
- * correctly can be subject to differencing using this library.
+ * Text is represented as <code>Object[]</code> because the diff engine is capable of handling more
+ * than plain ascci. In fact, arrays of any type that implements {@link java.lang.Object#hashCode
+ * hashCode()} and {@link java.lang.Object#equals equals()} correctly can be subject to differencing
+ * using this library.
* </p>
*
* <p>
@@ -88,18 +87,16 @@
* @version $Revision: 1.1 $ $Date: 2006/03/12 00:24:21 $
* @author <a href="mailto:juanco@suigeneris.org">Juanco Anez</a>
* @see Delta
- * @see DiffAlgorithm
+ * @see DiffAlgorithm modifications:
*
- * modifications:
+ * 27 Apr 2003 bwm
*
- * 27 Apr 2003 bwm
+ * Added some comments whilst trying to figure out the algorithm
*
- * Added some comments whilst trying to figure out the algorithm
+ * 03 May 2003 bwm
*
- * 03 May 2003 bwm
- *
- * Factored out the algorithm implementation into a separate difference algorithm class to allow
- * pluggable algorithms.
+ * Factored out the algorithm implementation into a separate difference algorithm class to
+ * allow pluggable algorithms.
*/
public class Diff extends ToString
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/DiffAlgorithm.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/DiffAlgorithm.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/DiffAlgorithm.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/DiffAlgorithm.java Wed Apr 15 20:22:01 2009
@@ -81,5 +81,5 @@
* if the diff could not be computed.
*/
public abstract Revision diff(Object[] orig, Object[] rev)
- throws DifferentiationFailedException;
+ throws DifferentiationFailedException;
}
\ No newline at end of file
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/Revision.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/Revision.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/Revision.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/Revision.java Wed Apr 15 20:22:01 2009
@@ -75,11 +75,9 @@
* @see Delta
* @see Diff
* @see Chunk
- * @see Revision
+ * @see Revision modifications 27 Apr 2003 bwm
*
- * modifications 27 Apr 2003 bwm
- *
- * Added visitor pattern Visitor interface and accept() method.
+ * Added visitor pattern Visitor interface and accept() method.
*/
public class Revision extends ToString
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/myers/DiffNode.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/myers/DiffNode.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/myers/DiffNode.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/myers/DiffNode.java Wed Apr 15 20:22:01 2009
@@ -114,6 +114,7 @@
*
* @return false, always
*/
+ @Override
public boolean isSnake()
{
return false;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/myers/MyersDiff.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/myers/MyersDiff.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/myers/MyersDiff.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/myers/MyersDiff.java Wed Apr 15 20:22:01 2009
@@ -109,7 +109,7 @@
* if a diff path could not be found.
*/
public static PathNode buildPath(Object[] orig, Object[] rev)
- throws DifferentiationFailedException
+ throws DifferentiationFailedException
{
if (orig == null)
{
@@ -231,7 +231,7 @@
int janchor = path.j;
Delta delta = Delta.newDelta(new Chunk(orig, ianchor, i - ianchor), new Chunk(rev,
- janchor, j - janchor));
+ janchor, j - janchor));
revision.insertDelta(delta);
if (path.isSnake())
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/myers/PathNode.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/myers/PathNode.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/myers/PathNode.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/myers/PathNode.java Wed Apr 15 20:22:01 2009
@@ -135,6 +135,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public String toString()
{
StringBuffer buf = new StringBuffer("[");
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/myers/Snake.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/myers/Snake.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/myers/Snake.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/diff/myers/Snake.java Wed Apr 15 20:22:01 2009
@@ -91,6 +91,7 @@
*
* @return true always
*/
+ @Override
public boolean isSnake()
{
return true;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/file/FileCleaner.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/file/FileCleaner.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/file/FileCleaner.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/file/FileCleaner.java Wed Apr 15 20:22:01 2009
@@ -50,6 +50,7 @@
* Run the reaper thread that will delete files as their associated marker objects are
* reclaimed by the garbage collector.
*/
+ @Override
public void run()
{
// Though q is final, it happens while hot deploying that Wicket runs into an infinite
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/file/IResourceFinder.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/file/IResourceFinder.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/file/IResourceFinder.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/file/IResourceFinder.java Wed Apr 15 20:22:01 2009
@@ -34,5 +34,5 @@
* The filename with possible path
* @return The resource stream
*/
- IResourceStream find(final Class< ? > clazz, final String pathname);
+ IResourceStream find(final Class<?> clazz, final String pathname);
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/file/Path.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/file/Path.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/file/Path.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/file/Path.java Wed Apr 15 20:22:01 2009
@@ -97,7 +97,7 @@
*
* @see org.apache.wicket.util.file.IResourceFinder#find(Class, String)
*/
- public IResourceStream find(final Class< ? > clazz, final String pathname)
+ public IResourceStream find(final Class<?> clazz, final String pathname)
{
for (int i = 0; i < folders.size(); i++)
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/file/WebApplicationPath.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/file/WebApplicationPath.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/file/WebApplicationPath.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/file/WebApplicationPath.java Wed Apr 15 20:22:01 2009
@@ -90,7 +90,7 @@
*
* @see org.apache.wicket.util.file.IResourceFinder#find(Class, String)
*/
- public IResourceStream find(final Class< ? > clazz, final String pathname)
+ public IResourceStream find(final Class<?> clazz, final String pathname)
{
Iterator<Folder> foldersIter = folders.iterator();
while (foldersIter.hasNext())
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/ByteCountingOutputStream.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/ByteCountingOutputStream.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/ByteCountingOutputStream.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/ByteCountingOutputStream.java Wed Apr 15 20:22:01 2009
@@ -31,6 +31,7 @@
/**
* @see java.io.OutputStream#write(int)
*/
+ @Override
public void write(int b) throws IOException
{
size++;
@@ -39,6 +40,7 @@
/**
* @see java.io.OutputStream#write(byte[], int, int)
*/
+ @Override
public void write(byte b[], int off, int len) throws IOException
{
size += len;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/ClassStreamHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/ClassStreamHandler.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/ClassStreamHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/ClassStreamHandler.java Wed Apr 15 20:22:01 2009
@@ -325,7 +325,7 @@
{
FieldAndIndex fai = null;
Class<?> clz = field.getType();
- long offset = unsafe.objectFieldOffset(field);
+ unsafe.objectFieldOffset(field);
if (clz == boolean.class)
{
fai = new BooleanFieldAndIndex(field);
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/DeferredFileOutputStream.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/DeferredFileOutputStream.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/DeferredFileOutputStream.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/DeferredFileOutputStream.java Wed Apr 15 20:22:01 2009
@@ -120,8 +120,7 @@
/**
* Determines whether or not the data for this output stream has been retained in memory.
*
- * @return <code>true</code> if the data is available in memory; <code>false</code>
- * otherwise.
+ * @return <code>true</code> if the data is available in memory; <code>false</code> otherwise.
*/
public boolean isInMemory()
{
@@ -137,6 +136,7 @@
* @exception IOException
* if an error occurs.
*/
+ @Override
protected OutputStream getStream() throws IOException
{
return currentOutputStream;
@@ -151,6 +151,7 @@
* @exception IOException
* if an error occurs.
*/
+ @Override
protected void thresholdReached() throws IOException
{
byte[] data = memoryOutputStream.toByteArray();
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/FullyBufferedReader.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/FullyBufferedReader.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/FullyBufferedReader.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/FullyBufferedReader.java Wed Apr 15 20:22:01 2009
@@ -125,6 +125,7 @@
/**
* @return The markup to be parsed
*/
+ @Override
public String toString()
{
return input;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/HandleArrayListStack.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/HandleArrayListStack.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/HandleArrayListStack.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/HandleArrayListStack.java Wed Apr 15 20:22:01 2009
@@ -177,8 +177,8 @@
* Returns the 1-based position where an object is on this stack. If the object <tt>o</tt>
* occurs as an item in this stack, this method returns the distance from the top of the stack
* of the occurrence nearest the top of the stack; the topmost item on the stack is considered
- * to be at distance <tt>1</tt>. The <tt>equals</tt> method is used to compare <tt>o</tt>
- * to the items in this stack.
+ * to be at distance <tt>1</tt>. The <tt>equals</tt> method is used to compare <tt>o</tt> to the
+ * items in this stack.
*
* @param o
* the desired object.