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 2011/01/23 10:46:00 UTC
svn commit: r1062353 - in
/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request: ./
flow/ handler/ http/ http/flow/ http/handler/ mapper/ mapper/info/
mapper/mount/ mapper/parameter/ parameter/
Author: jdonnerstag
Date: Sun Jan 23 09:45:59 2011
New Revision: 1062353
URL: http://svn.apache.org/viewvc?rev=1062353&view=rev
Log:
let eclipse do a final cleanup. No functional change
Modified:
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerStack.java
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/Url.java
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlDecoder.java
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlEncoder.java
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/flow/ResetResponseException.java
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/handler/EmptyRequestHandler.java
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/handler/TextRequestHandler.java
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/WebRequest.java
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/WebResponse.java
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/flow/AbortWithHttpErrorCodeException.java
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/handler/ErrorCodeRequestHandler.java
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/handler/RedirectRequestHandler.java
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/AbstractMapper.java
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/CompoundRequestMapper.java
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/ParentPathReferenceRewriter.java
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/ComponentInfo.java
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/PageComponentInfo.java
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/PageInfo.java
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/Mount.java
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/MountMapper.java
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/MountParameters.java
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/UnmountedMapperAdapter.java
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/UnmountedRequestHandlerAdapter.java
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParametersEncoder.java
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/parameter/CombinedRequestParametersAdapter.java
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/parameter/EmptyRequestParameters.java
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/parameter/UrlRequestParametersAdapter.java
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerStack.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerStack.java?rev=1062353&r1=1062352&r2=1062353&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerStack.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerStack.java Sun Jan 23 09:45:59 2011
@@ -48,7 +48,7 @@ public abstract class RequestHandlerStac
*
* @param response
*/
- public RequestHandlerStack(Response response)
+ public RequestHandlerStack(final Response response)
{
this.response = response;
}
@@ -72,7 +72,7 @@ public abstract class RequestHandlerStac
*
* @param handler
*/
- public void executeRequestHandler(IRequestHandler handler)
+ public void executeRequestHandler(final IRequestHandler handler)
{
final boolean first = requestHandlers.isEmpty();
requestHandlers.add(handler);
@@ -129,7 +129,7 @@ public abstract class RequestHandlerStac
* @param handler
* handler to be executed after current request handler finishes
*/
- public void scheduleRequestHandlerAfterCurrent(IRequestHandler handler)
+ public void scheduleRequestHandlerAfterCurrent(final IRequestHandler handler)
{
scheduledAfterCurrent = handler;
}
@@ -151,7 +151,7 @@ public abstract class RequestHandlerStac
*
* @param handler
*/
- public void replaceAllRequestHandlers(IRequestHandler handler)
+ public void replaceAllRequestHandlers(final IRequestHandler handler)
{
if (requestHandlers.isEmpty())
{
@@ -181,7 +181,7 @@ public abstract class RequestHandlerStac
* @param response
* @return Response being replaced.
*/
- public Response setResponse(Response response)
+ public Response setResponse(final Response response)
{
Response current = this.response;
this.response = response;
@@ -234,7 +234,8 @@ public abstract class RequestHandlerStac
* @param replacementRequestHandler
* @param removeAll
*/
- public ReplaceHandlerException(IRequestHandler replacementRequestHandler, boolean removeAll)
+ public ReplaceHandlerException(final IRequestHandler replacementRequestHandler,
+ final boolean removeAll)
{
this.replacementRequestHandler = replacementRequestHandler;
this.removeAll = removeAll;
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/Url.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/Url.java?rev=1062353&r1=1062352&r2=1062353&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/Url.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/Url.java Sun Jan 23 09:45:59 2011
@@ -24,6 +24,7 @@ import java.util.Iterator;
import java.util.List;
import org.apache.wicket.util.lang.Args;
+import org.apache.wicket.util.lang.Generics;
import org.apache.wicket.util.lang.Objects;
import org.apache.wicket.util.string.StringValue;
import org.apache.wicket.util.string.Strings;
@@ -61,9 +62,9 @@ public final class Url implements Serial
private static final String DEFAULT_CHARSET_NAME = "UTF-8";
- private final List<String> segments = new ArrayList<String>();
+ private final List<String> segments = Generics.newArrayList();
- private final List<QueryParameter> parameters = new ArrayList<QueryParameter>();
+ private final List<QueryParameter> parameters = Generics.newArrayList();
private String charsetName;
private transient Charset _charset;
@@ -74,7 +75,7 @@ public final class Url implements Serial
* @param charset
* @return query parameters
*/
- private static QueryParameter parseQueryParameter(final String qp, Charset charset)
+ private static QueryParameter parseQueryParameter(final String qp, final Charset charset)
{
if (qp.indexOf('=') == -1)
{
@@ -96,19 +97,17 @@ public final class Url implements Serial
}
}
-
/**
* Parses the given URL string.
*
* @param url
* @return Url object
*/
- public static Url parse(String url)
+ public static Url parse(final String url)
{
return parse(url, null);
}
-
/**
* Parses the given URL string.
*
@@ -116,7 +115,7 @@ public final class Url implements Serial
* @param charset
* @return Url object
*/
- public static Url parse(String url, Charset charset)
+ public static Url parse(final String url, Charset charset)
{
Args.notNull(url, "url");
@@ -182,28 +181,6 @@ public final class Url implements Serial
return result;
}
- public Charset getCharset()
- {
- if (Strings.isEmpty(charsetName))
- {
- charsetName = DEFAULT_CHARSET_NAME;
- }
- if (_charset == null)
- {
- _charset = Charset.forName(charsetName);
- }
- return _charset;
- }
-
- private void setCharset(Charset charset)
- {
- if (charset == null)
- {
- charsetName = "UTF-8";
- }
- _charset = null;
- }
-
/**
* Construct.
*/
@@ -216,7 +193,7 @@ public final class Url implements Serial
*
* @param charset
*/
- public Url(Charset charset)
+ public Url(final Charset charset)
{
setCharset(charset);
}
@@ -228,7 +205,7 @@ public final class Url implements Serial
* @param url
* url being copied
*/
- public Url(Url url)
+ public Url(final Url url)
{
Args.notNull(url, "url");
@@ -243,7 +220,7 @@ public final class Url implements Serial
* @param segments
* @param parameters
*/
- public Url(List<String> segments, List<QueryParameter> parameters)
+ public Url(final List<String> segments, final List<QueryParameter> parameters)
{
this(segments, parameters, null);
}
@@ -254,7 +231,7 @@ public final class Url implements Serial
* @param segments
* @param charset
*/
- public Url(List<String> segments, Charset charset)
+ public Url(final List<String> segments, final Charset charset)
{
this(segments, Collections.<QueryParameter> emptyList(), charset);
}
@@ -266,7 +243,8 @@ public final class Url implements Serial
* @param parameters
* @param charset
*/
- public Url(List<String> segments, List<QueryParameter> parameters, Charset charset)
+ public Url(final List<String> segments, final List<QueryParameter> parameters,
+ final Charset charset)
{
Args.notNull(segments, "segments");
Args.notNull(parameters, "parameters");
@@ -276,7 +254,41 @@ public final class Url implements Serial
setCharset(charset);
}
- public void resolveRelativeTo(Url base)
+ /**
+ *
+ * @return charset
+ */
+ public Charset getCharset()
+ {
+ if (Strings.isEmpty(charsetName))
+ {
+ charsetName = DEFAULT_CHARSET_NAME;
+ }
+ if (_charset == null)
+ {
+ _charset = Charset.forName(charsetName);
+ }
+ return _charset;
+ }
+
+ /**
+ *
+ * @param charset
+ */
+ private void setCharset(final Charset charset)
+ {
+ if (charset == null)
+ {
+ charsetName = "UTF-8";
+ }
+ _charset = null;
+ }
+
+ /**
+ *
+ * @param base
+ */
+ public void resolveRelativeTo(final Url base)
{
Url url = new Url(base);
@@ -324,7 +336,7 @@ public final class Url implements Serial
* @param name
* query parameter name
*/
- public void removeQueryParameters(String name)
+ public void removeQueryParameters(final String name)
{
for (Iterator<QueryParameter> i = getQueryParameters().iterator(); i.hasNext();)
{
@@ -341,7 +353,7 @@ public final class Url implements Serial
*
* @param count
*/
- public void removeLeadingSegments(int count)
+ public void removeLeadingSegments(final int count)
{
Args.withinRange(0, segments.size(), count, "count");
for (int i = 0; i < count; i++)
@@ -355,7 +367,7 @@ public final class Url implements Serial
*
* @param newSegments
*/
- public void prependLeadingSegments(List<String> newSegments)
+ public void prependLeadingSegments(final List<String> newSegments)
{
Args.notNull(newSegments, "segments");
segments.addAll(0, newSegments);
@@ -368,7 +380,7 @@ public final class Url implements Serial
* @param name
* @param value
*/
- public void setQueryParameter(String name, Object value)
+ public void setQueryParameter(final String name, final Object value)
{
removeQueryParameters(name);
addQueryParameter(name, value);
@@ -380,7 +392,7 @@ public final class Url implements Serial
* @param name
* @param value
*/
- public void addQueryParameter(String name, Object value)
+ public void addQueryParameter(final String name, final Object value)
{
if (value != null)
{
@@ -396,7 +408,7 @@ public final class Url implements Serial
* @param name
* @return query parameter or <code>null</code>
*/
- public QueryParameter getQueryParameter(String name)
+ public QueryParameter getQueryParameter(final String name)
{
for (QueryParameter parameter : parameters)
{
@@ -417,7 +429,7 @@ public final class Url implements Serial
* @param name
* @return {@link StringValue} instance wrapping the parameter value
*/
- public StringValue getQueryParameterValue(String name)
+ public StringValue getQueryParameterValue(final String name)
{
QueryParameter parameter = getQueryParameter(name);
if (parameter == null)
@@ -431,16 +443,16 @@ public final class Url implements Serial
}
/**
- * @see java.lang.Object#equals(java.lang.Object)
+ * {@inheritDoc}
*/
@Override
- public boolean equals(Object obj)
+ public boolean equals(final Object obj)
{
if (this == obj)
{
return true;
}
- if (obj instanceof Url == false)
+ if ((obj instanceof Url) == false)
{
return false;
}
@@ -451,7 +463,7 @@ public final class Url implements Serial
}
/**
- * @see java.lang.Object#hashCode()
+ * {@inheritDoc}
*/
@Override
public int hashCode()
@@ -462,9 +474,10 @@ public final class Url implements Serial
/**
*
* @param string
+ * @param charset
* @return encoded segment
*/
- private static String encodeSegment(String string, Charset charset)
+ private static String encodeSegment(final String string, final Charset charset)
{
return UrlEncoder.PATH_INSTANCE.encode(string, charset);
}
@@ -472,9 +485,10 @@ public final class Url implements Serial
/**
*
* @param string
+ * @param charset
* @return decoded segment
*/
- private static String decodeSegment(String string, Charset charset)
+ private static String decodeSegment(final String string, final Charset charset)
{
return UrlDecoder.PATH_INSTANCE.decode(string, charset);
}
@@ -482,9 +496,10 @@ public final class Url implements Serial
/**
*
* @param string
+ * @param charset
* @return encoded parameter
*/
- private static String encodeParameter(String string, Charset charset)
+ private static String encodeParameter(final String string, final Charset charset)
{
return UrlEncoder.QUERY_INSTANCE.encode(string, charset);
}
@@ -492,16 +507,16 @@ public final class Url implements Serial
/**
*
* @param string
+ * @param charset
* @return decoded parameter
*/
- private static String decodeParameter(String string, Charset charset)
+ private static String decodeParameter(final String string, final Charset charset)
{
return UrlDecoder.QUERY_INSTANCE.decode(string, charset);
}
-
/**
- * @see java.lang.Object#toString()
+ * {@inheritDoc}
*/
@Override
public String toString()
@@ -510,9 +525,10 @@ public final class Url implements Serial
}
/**
- * @see java.lang.Object#toString()
+ * @param charset
+ * @return see toString()
*/
- public String toString(Charset charset)
+ public String toString(final Charset charset)
{
StringBuilder result = new StringBuilder();
boolean first = true;
@@ -556,14 +572,14 @@ public final class Url implements Serial
return false;
}
String last = segments.get(segments.size() - 1);
- return last.length() > 0 && !".".equals(last) && !"..".equals(last);
+ return (last.length() > 0) && !".".equals(last) && !"..".equals(last);
}
/**
* @param segments
* @return true if last segment is empty
*/
- private boolean isLastSegmentEmpty(List<String> segments)
+ private boolean isLastSegmentEmpty(final List<String> segments)
{
if (segments.isEmpty())
{
@@ -573,16 +589,25 @@ public final class Url implements Serial
return last.length() == 0;
}
+ /**
+ *
+ * @return true, if last segement is empty
+ */
private boolean isLastSegmentEmpty()
{
return isLastSegmentEmpty(segments);
}
- private boolean isAtLeastOnSegmentReal(List<String> segments)
+ /**
+ *
+ * @param segments
+ * @return true if at least one segement is real
+ */
+ private boolean isAtLeastOnSegmentReal(final List<String> segments)
{
for (String s : segments)
{
- if (s.length() > 0 && !".".equals(s) && !"..".equals(s))
+ if ((s.length() > 0) && !".".equals(s) && !"..".equals(s))
{
return true;
}
@@ -629,7 +654,7 @@ public final class Url implements Serial
}
}
- if (this.segments.size() == 1 && this.segments.get(0).length() == 0)
+ if ((this.segments.size() == 1) && (this.segments.get(0).length() == 0))
{
this.segments.clear();
}
@@ -656,7 +681,7 @@ public final class Url implements Serial
* @param value
* parameter value
*/
- public QueryParameter(String name, String value)
+ public QueryParameter(final String name, final String value)
{
Args.notNull(name, "name");
Args.notNull(value, "value");
@@ -686,16 +711,16 @@ public final class Url implements Serial
}
/**
- * @see java.lang.Object#equals(java.lang.Object)
+ * {@inheritDoc}
*/
@Override
- public boolean equals(Object obj)
+ public boolean equals(final Object obj)
{
if (this == obj)
{
return true;
}
- if (obj instanceof QueryParameter == false)
+ if ((obj instanceof QueryParameter) == false)
{
return false;
}
@@ -705,7 +730,7 @@ public final class Url implements Serial
}
/**
- * @see java.lang.Object#hashCode()
+ * {@inheritDoc}
*/
@Override
public int hashCode()
@@ -714,15 +739,20 @@ public final class Url implements Serial
}
/**
- * @see java.lang.Object#toString()
+ * {@inheritDoc}
*/
@Override
public String toString()
{
- return toString(Charset.forName("UTF-8"));
+ return toString(Charset.forName(DEFAULT_CHARSET_NAME));
}
- public String toString(Charset charset)
+ /**
+ *
+ * @param charset
+ * @return see toString()
+ */
+ public String toString(final Charset charset)
{
StringBuilder result = new StringBuilder();
result.append(encodeParameter(getName(), charset));
@@ -765,7 +795,7 @@ public final class Url implements Serial
* @param relative
* relative url
*/
- public void resolveRelative(Url relative)
+ public void resolveRelative(final Url relative)
{
// strip the first non-folder segment
getSegments().remove(getSegments().size() - 1);
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlDecoder.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlDecoder.java?rev=1062353&r1=1062352&r2=1062353&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlDecoder.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlDecoder.java Sun Jan 23 09:45:59 2011
@@ -56,38 +56,11 @@ public class UrlDecoder
* @param decodePlus
* - whether to decode + to space
*/
- private UrlDecoder(boolean decodePlus)
+ private UrlDecoder(final boolean decodePlus)
{
this.decodePlus = decodePlus;
}
- // /**
- // * Calls decode with the application response request encoding as returned
- // by
- // *
- // Application.get().getRequestCycleSettings().getResponseRequestEncoding()
- // *
- // * @param s
- // * Value to encode
- // * @return String encoded using default Application request/respose
- // encoding
- // */
- // public String decode(String s)
- // {
- // Application app = null;
- //
- // try
- // {
- // app = Application.get();
- // }
- // catch (WicketRuntimeException ignored)
- // {
- // log.warn("No current Application found - defaulting encoding to UTF-8");
- // }
- // return decode(s, app == null ? "UTF-8" : app.getRequestCycleSettings()
- // .getResponseRequestEncoding());
- // }
-
/**
* @param s
* string to decode
@@ -96,12 +69,11 @@ public class UrlDecoder
* @return decoded string
* @see java.net.URLDecoder#decode(String, String)
*/
- public String decode(String s, Charset enc)
+ public String decode(final String s, final Charset enc)
{
return decode(s, enc.name());
}
-
/**
* @param s
* string to decode
@@ -110,7 +82,7 @@ public class UrlDecoder
* @return decoded string
* @see java.net.URLDecoder#decode(String, String)
*/
- public String decode(String s, String enc)
+ public String decode(final String s, final String enc)
{
if (s == null)
{
@@ -119,7 +91,7 @@ public class UrlDecoder
boolean needToChange = false;
int numChars = s.length();
- StringBuilder sb = new StringBuilder(numChars > 500 ? numChars / 2 : numChars);
+ StringBuilder sb = new StringBuilder(numChars > 500 ? numChars / 2 : numChars);
int i = 0;
if (enc.length() == 0)
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlEncoder.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlEncoder.java?rev=1062353&r1=1062352&r2=1062353&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlEncoder.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlEncoder.java Sun Jan 23 09:45:59 2011
@@ -96,7 +96,7 @@ public class UrlEncoder
* @param stopChar
* stop encoding when stopChar found
*/
- protected UrlEncoder(Type type, char stopChar)
+ protected UrlEncoder(final Type type, final char stopChar)
{
this.stopChar = stopChar;
@@ -262,12 +262,11 @@ public class UrlEncoder
* @return encoded string
* @see java.net.URLEncoder#encode(String, String)
*/
- public String encode(String s, Charset enc)
+ public String encode(final String s, final Charset enc)
{
return encode(s, enc.name());
}
-
/**
* @param s
* string to encode
@@ -276,7 +275,7 @@ public class UrlEncoder
* @return encoded string
* @see java.net.URLEncoder#encode(String, String)
*/
- public String encode(String s, String enc)
+ public String encode(final String s, final String enc)
{
boolean needToChange = false;
StringBuilder out = new StringBuilder(s.length());
@@ -335,7 +334,7 @@ public class UrlEncoder
* the surrogate pairs range occurs outside of a legal surrogate pair. For now,
* just treat it as if it were any other character.
*/
- if (c >= 0xD800 && c <= 0xDBFF)
+ if ((c >= 0xD800) && (c <= 0xDBFF))
{
/*
* System.out.println(Integer.toHexString(c) + " is high surrogate");
@@ -346,7 +345,7 @@ public class UrlEncoder
/*
* System.out.println("\tExamining " + Integer.toHexString(d));
*/
- if (d >= 0xDC00 && d <= 0xDFFF)
+ if ((d >= 0xDC00) && (d <= 0xDFFF))
{
/*
* System.out.println("\t" + Integer.toHexString(d) + " is low
@@ -359,7 +358,7 @@ public class UrlEncoder
}
i++;
}
- while (i < s.length() && !dontNeedEncoding.get((c = s.charAt(i))));
+ while ((i < s.length()) && !dontNeedEncoding.get((c = s.charAt(i))));
charArrayWriter.flush();
String str = new String(charArrayWriter.toCharArray());
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java?rev=1062353&r1=1062352&r2=1062353&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java Sun Jan 23 09:45:59 2011
@@ -118,7 +118,7 @@ public class UrlRenderer
}
// we want the new URL to have at least one segment (other than possible ../)
- if (last != null && (urlSegments.isEmpty() || baseUrlSegments.size() == common))
+ if ((last != null) && (urlSegments.isEmpty() || (baseUrlSegments.size() == common)))
{
--common;
urlSegments.add(0, last);
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/flow/ResetResponseException.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/flow/ResetResponseException.java?rev=1062353&r1=1062352&r2=1062353&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/flow/ResetResponseException.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/flow/ResetResponseException.java Sun Jan 23 09:45:59 2011
@@ -36,7 +36,7 @@ public abstract class ResetResponseExcep
/**
* Construct.
*/
- protected ResetResponseException(IRequestHandler handler)
+ protected ResetResponseException(final IRequestHandler handler)
{
super(new ResponseResettingDecorator(handler), true);
}
@@ -45,21 +45,20 @@ public abstract class ResetResponseExcep
{
private final IRequestHandler delegate;
- public ResponseResettingDecorator(IRequestHandler delegate)
+ public ResponseResettingDecorator(final IRequestHandler delegate)
{
this.delegate = delegate;
}
- public void detach(IRequestCycle requestCycle)
+ public void detach(final IRequestCycle requestCycle)
{
delegate.detach(requestCycle);
}
- public void respond(IRequestCycle requestCycle)
+ public void respond(final IRequestCycle requestCycle)
{
requestCycle.getResponse().reset();
delegate.respond(requestCycle);
}
-
}
}
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/handler/EmptyRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/handler/EmptyRequestHandler.java?rev=1062353&r1=1062352&r2=1062353&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/handler/EmptyRequestHandler.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/handler/EmptyRequestHandler.java Sun Jan 23 09:45:59 2011
@@ -39,12 +39,12 @@ public final class EmptyRequestHandler i
*
* @see org.apache.wicket.request.IRequestHandler#respond(org.apache.wicket.request.IRequestCycle)
*/
- public void respond(IRequestCycle requestCycle)
+ public void respond(final IRequestCycle requestCycle)
{
}
/** {@inheritDoc} */
- public void detach(IRequestCycle requestCycle)
+ public void detach(final IRequestCycle requestCycle)
{
}
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/handler/TextRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/handler/TextRequestHandler.java?rev=1062353&r1=1062352&r2=1062353&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/handler/TextRequestHandler.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/handler/TextRequestHandler.java Sun Jan 23 09:45:59 2011
@@ -50,7 +50,7 @@ public class TextRequestHandler implemen
* @param string
* the string for the response
*/
- public TextRequestHandler(String string)
+ public TextRequestHandler(final String string)
{
this("text/plain", null, string);
}
@@ -66,7 +66,7 @@ public class TextRequestHandler implemen
* @param string
* string for the response
*/
- public TextRequestHandler(String contentType, String encoding, String string)
+ public TextRequestHandler(final String contentType, final String encoding, final String string)
{
if (string == null)
{
@@ -88,7 +88,7 @@ public class TextRequestHandler implemen
*
* @see org.apache.wicket.request.IRequestHandler#respond(org.apache.wicket.request.IRequestCycle)
*/
- public void respond(IRequestCycle requestCycle)
+ public void respond(final IRequestCycle requestCycle)
{
String encoding = getEncoding(requestCycle);
@@ -111,7 +111,7 @@ public class TextRequestHandler implemen
* @param requestCycle
* @return the configured encoding or the request's one as default
*/
- private String getEncoding(IRequestCycle requestCycle)
+ private String getEncoding(final IRequestCycle requestCycle)
{
String encoding = this.encoding;
if (Strings.isEmpty(encoding))
@@ -126,7 +126,7 @@ public class TextRequestHandler implemen
}
/** {@inheritDoc} */
- public void detach(IRequestCycle requestCycle)
+ public void detach(final IRequestCycle requestCycle)
{
}
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/WebRequest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/WebRequest.java?rev=1062353&r1=1062352&r2=1062353&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/WebRequest.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/WebRequest.java Sun Jan 23 09:45:59 2011
@@ -55,7 +55,7 @@ public abstract class WebRequest extends
* @param cookieName
* @return cookie with specified name or <code>null</code> if the cookie does not exist
*/
- public Cookie getCookie(String cookieName)
+ public Cookie getCookie(final String cookieName)
{
for (Cookie cookie : getCookies())
{
@@ -156,7 +156,7 @@ public abstract class WebRequest extends
}
@Override
- public long getDateHeader(String name)
+ public long getDateHeader(final String name)
{
return WebRequest.this.getDateHeader(name);
}
@@ -168,13 +168,13 @@ public abstract class WebRequest extends
}
@Override
- public String getHeader(String name)
+ public String getHeader(final String name)
{
return WebRequest.this.getHeader(name);
}
@Override
- public List<String> getHeaders(String name)
+ public List<String> getHeaders(final String name)
{
return WebRequest.this.getHeaders(name);
}
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/WebResponse.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/WebResponse.java?rev=1062353&r1=1062352&r2=1062353&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/WebResponse.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/WebResponse.java Sun Jan 23 09:45:59 2011
@@ -92,7 +92,7 @@ public abstract class WebResponse extend
* @param time
* The last modified time in milliseconds
*/
- public void setLastModifiedTime(long time)
+ public void setLastModifiedTime(final long time)
{
setDateHeader("Last-Modified", time);
}
@@ -105,7 +105,7 @@ public abstract class WebResponse extend
* @param filename
* file name of the attachment
*/
- public void setAttachmentHeader(String filename)
+ public void setAttachmentHeader(final String filename)
{
setHeader("Content-Disposition", "attachment" +
((!Strings.isEmpty(filename)) ? ("; filename=\"" + filename + "\"") : ""));
@@ -119,7 +119,7 @@ public abstract class WebResponse extend
* @param filename
* file name of the attachment
*/
- public void setInlineHeader(String filename)
+ public void setInlineHeader(final String filename)
{
setHeader("Content-Disposition", "inline" +
((!Strings.isEmpty(filename)) ? ("; filename=\"" + filename + "\"") : ""));
@@ -184,14 +184,16 @@ public abstract class WebResponse extend
*
* @see WebResponse#MAX_CACHE_DURATION
*/
- public void enableCaching(Duration duration, WebResponse.CacheScope scope)
+ public void enableCaching(Duration duration, final WebResponse.CacheScope scope)
{
Args.notNull(duration, "duration");
Args.notNull(scope, "scope");
// do not exceed the maximum recommended value from RFC-2616
if (duration.compareTo(MAX_CACHE_DURATION) > 0)
+ {
duration = MAX_CACHE_DURATION;
+ }
// Get current time
long now = System.currentTimeMillis();
@@ -238,7 +240,7 @@ public abstract class WebResponse extend
// value for Cache-Control header
private final String cacheControl;
- CacheScope(String cacheControl)
+ CacheScope(final String cacheControl)
{
this.cacheControl = cacheControl;
}
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/flow/AbortWithHttpErrorCodeException.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/flow/AbortWithHttpErrorCodeException.java?rev=1062353&r1=1062352&r2=1062353&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/flow/AbortWithHttpErrorCodeException.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/flow/AbortWithHttpErrorCodeException.java Sun Jan 23 09:45:59 2011
@@ -43,7 +43,7 @@ public final class AbortWithHttpErrorCod
* {@link javax.servlet.http.HttpServletResponse} constants
* @see javax.servlet.http.HttpServletResponse
*/
- public AbortWithHttpErrorCodeException(int errorCode, String message)
+ public AbortWithHttpErrorCodeException(final int errorCode, final String message)
{
super(new ErrorCodeRequestHandler(errorCode, message));
this.errorCode = errorCode;
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/handler/ErrorCodeRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/handler/ErrorCodeRequestHandler.java?rev=1062353&r1=1062352&r2=1062353&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/handler/ErrorCodeRequestHandler.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/handler/ErrorCodeRequestHandler.java Sun Jan 23 09:45:59 2011
@@ -44,7 +44,7 @@ public final class ErrorCodeRequestHandl
* {@link javax.servlet.http.HttpServletResponse} constants
* @see javax.servlet.http.HttpServletResponse
*/
- public ErrorCodeRequestHandler(int errorCode)
+ public ErrorCodeRequestHandler(final int errorCode)
{
this(errorCode, null);
}
@@ -59,7 +59,7 @@ public final class ErrorCodeRequestHandl
* the optional message to send to the client
* @see javax.servlet.http.HttpServletResponse
*/
- public ErrorCodeRequestHandler(int errorCode, String message)
+ public ErrorCodeRequestHandler(final int errorCode, final String message)
{
this.errorCode = errorCode;
this.message = message;
@@ -70,7 +70,7 @@ public final class ErrorCodeRequestHandl
*
* @see org.apache.wicket.request.IRequestHandler#respond(org.apache.wicket.request.IRequestCycle)
*/
- public void respond(IRequestCycle requestCycle)
+ public void respond(final IRequestCycle requestCycle)
{
WebResponse webResponse = (WebResponse)requestCycle.getResponse();
webResponse.sendError(errorCode, message);
@@ -97,7 +97,7 @@ public final class ErrorCodeRequestHandl
}
/** {@inheritDoc} */
- public void detach(IRequestCycle requestCycle)
+ public void detach(final IRequestCycle requestCycle)
{
}
}
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/handler/RedirectRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/handler/RedirectRequestHandler.java?rev=1062353&r1=1062352&r2=1062353&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/handler/RedirectRequestHandler.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/handler/RedirectRequestHandler.java Sun Jan 23 09:45:59 2011
@@ -45,7 +45,7 @@ public class RedirectRequestHandler impl
* @param redirectUrl
* URL to redirect to.
*/
- public RedirectRequestHandler(String redirectUrl)
+ public RedirectRequestHandler(final String redirectUrl)
{
this(redirectUrl, HttpServletResponse.SC_MOVED_TEMPORARILY);
}
@@ -56,10 +56,10 @@ public class RedirectRequestHandler impl
* @param status
* 301 (Moved permanently) or 302 (Moved temporarily)
*/
- public RedirectRequestHandler(String redirectUrl, int status)
+ public RedirectRequestHandler(final String redirectUrl, final int status)
{
- if (status != HttpServletResponse.SC_MOVED_PERMANENTLY &&
- status != HttpServletResponse.SC_MOVED_TEMPORARILY)
+ if ((status != HttpServletResponse.SC_MOVED_PERMANENTLY) &&
+ (status != HttpServletResponse.SC_MOVED_TEMPORARILY))
{
throw new IllegalStateException("Status must be either 301 or 302, but was: " + status);
}
@@ -68,12 +68,12 @@ public class RedirectRequestHandler impl
}
/** {@inheritDoc} */
- public void detach(IRequestCycle requestCycle)
+ public void detach(final IRequestCycle requestCycle)
{
}
/** {@inheritDoc} */
- public void respond(IRequestCycle requestCycle)
+ public void respond(final IRequestCycle requestCycle)
{
final String location;
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/AbstractMapper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/AbstractMapper.java?rev=1062353&r1=1062352&r2=1062353&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/AbstractMapper.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/AbstractMapper.java Sun Jan 23 09:45:59 2011
@@ -37,9 +37,9 @@ public abstract class AbstractMapper imp
* @param s
* @return placeholder key or <code>null</code> if string is not in right format
*/
- protected static String getPlaceholder(String s)
+ protected static String getPlaceholder(final String s)
{
- if (s == null || s.length() < 4 || !s.startsWith("${") || !s.endsWith("}"))
+ if ((s == null) || (s.length() < 4) || !s.startsWith("${") || !s.endsWith("}"))
{
return null;
}
@@ -66,7 +66,7 @@ public abstract class AbstractMapper imp
* @return <code>true</code> if the URL starts with the specified segments, <code>false</code>
* otherwise
*/
- protected boolean urlStartsWith(Url url, String... segments)
+ protected boolean urlStartsWith(final Url url, final String... segments)
{
if (url == null)
{
@@ -82,8 +82,8 @@ public abstract class AbstractMapper imp
{
for (int i = 0; i < segments.length; ++i)
{
- if (segments[i].equals(url.getSegments().get(i)) == false &&
- getPlaceholder(segments[i]) == null)
+ if ((segments[i].equals(url.getSegments().get(i)) == false) &&
+ (getPlaceholder(segments[i]) == null))
{
return false;
}
@@ -103,15 +103,15 @@ public abstract class AbstractMapper imp
* @param encoder
* @return PageParameters instance
*/
- protected PageParameters extractPageParameters(Request request, int segmentsToSkip,
- IPageParametersEncoder encoder)
+ protected PageParameters extractPageParameters(final Request request, int segmentsToSkip,
+ final IPageParametersEncoder encoder)
{
Args.notNull(request, "request");
Args.notNull(encoder, "encoder");
// strip the segments and first query parameter from URL
Url urlCopy = new Url(request.getUrl());
- while (segmentsToSkip > 0 && urlCopy.getSegments().isEmpty() == false)
+ while ((segmentsToSkip > 0) && (urlCopy.getSegments().isEmpty() == false))
{
urlCopy.getSegments().remove(0);
--segmentsToSkip;
@@ -150,7 +150,7 @@ public abstract class AbstractMapper imp
* @return URL with encoded parameters
*/
protected Url encodePageParameters(Url url, PageParameters pageParameters,
- IPageParametersEncoder encoder)
+ final IPageParametersEncoder encoder)
{
Args.notNull(url, "url");
Args.notNull(encoder, "encoder");
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/CompoundRequestMapper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/CompoundRequestMapper.java?rev=1062353&r1=1062352&r2=1062353&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/CompoundRequestMapper.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/CompoundRequestMapper.java Sun Jan 23 09:45:59 2011
@@ -46,13 +46,13 @@ public class CompoundRequestMapper imple
private final IRequestMapper mapper;
private final int compatibilityScore;
- public EncoderWithSegmentsCount(IRequestMapper encoder, int compatibilityScore)
+ public EncoderWithSegmentsCount(final IRequestMapper encoder, final int compatibilityScore)
{
mapper = encoder;
this.compatibilityScore = compatibilityScore;
}
- public int compareTo(EncoderWithSegmentsCount o)
+ public int compareTo(final EncoderWithSegmentsCount o)
{
return o.compatibilityScore - compatibilityScore;
}
@@ -84,7 +84,7 @@ public class CompoundRequestMapper imple
/**
* @see org.apache.wicket.request.mapper.ICompoundRequestMapper#add(org.apache.wicket.request.IRequestMapper)
*/
- public CompoundRequestMapper add(IRequestMapper encoder)
+ public CompoundRequestMapper add(final IRequestMapper encoder)
{
mappers.add(0, encoder);
return this;
@@ -93,7 +93,7 @@ public class CompoundRequestMapper imple
/**
* @see org.apache.wicket.request.mapper.ICompoundRequestMapper#remove(org.apache.wicket.request.IRequestMapper)
*/
- public CompoundRequestMapper remove(IRequestMapper encoder)
+ public CompoundRequestMapper remove(final IRequestMapper encoder)
{
mappers.remove(encoder);
return this;
@@ -111,7 +111,7 @@ public class CompoundRequestMapper imple
* @return RequestHandler for the request or <code>null</code> if no encoder for the request is
* found.
*/
- public IRequestHandler mapRequest(Request request)
+ public IRequestHandler mapRequest(final Request request)
{
List<EncoderWithSegmentsCount> list = new ArrayList<EncoderWithSegmentsCount>(
mappers.size());
@@ -148,7 +148,7 @@ public class CompoundRequestMapper imple
* @param handler
* @return Url for the handler or <code>null</code> if no encoder for the handler is found.
*/
- public Url mapHandler(IRequestHandler handler)
+ public Url mapHandler(final IRequestHandler handler)
{
for (IRequestMapper encoder : mappers)
{
@@ -166,7 +166,7 @@ public class CompoundRequestMapper imple
*
* {@inheritDoc}
*/
- public int getCompatibilityScore(Request request)
+ public int getCompatibilityScore(final Request request)
{
int score = Integer.MIN_VALUE;
for (IRequestMapper mapper : mappers)
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/ParentPathReferenceRewriter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/ParentPathReferenceRewriter.java?rev=1062353&r1=1062352&r2=1062353&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/ParentPathReferenceRewriter.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/ParentPathReferenceRewriter.java Sun Jan 23 09:45:59 2011
@@ -42,7 +42,8 @@ public class ParentPathReferenceRewriter
*
* @param escapeSequence
*/
- public ParentPathReferenceRewriter(IRequestMapper chain, IProvider<String> escapeSequence)
+ public ParentPathReferenceRewriter(final IRequestMapper chain,
+ final IProvider<String> escapeSequence)
{
Args.notNull(chain, "chain");
Args.notNull(escapeSequence, "relativePathPartEscapeSequence");
@@ -56,7 +57,7 @@ public class ParentPathReferenceRewriter
* @param chain
* chained request mapper
*/
- public ParentPathReferenceRewriter(IRequestMapper chain)
+ public ParentPathReferenceRewriter(final IRequestMapper chain)
{
this(chain, new NullProvider<String>());
}
@@ -64,7 +65,7 @@ public class ParentPathReferenceRewriter
/**
* @see org.apache.wicket.request.IRequestMapper#mapRequest(org.apache.wicket.request.Request)
*/
- public IRequestHandler mapRequest(Request request)
+ public IRequestHandler mapRequest(final Request request)
{
Url url = request.getUrl();
@@ -83,10 +84,10 @@ public class ParentPathReferenceRewriter
}
/** {@inheritDoc} */
- public Url mapHandler(IRequestHandler requestHandler)
+ public Url mapHandler(final IRequestHandler requestHandler)
{
Url url = chain.mapHandler(requestHandler);
- if (url != null && escapeSequence.get() != null)
+ if ((url != null) && (escapeSequence.get() != null))
{
for (int i = 0; i < url.getSegments().size(); i++)
{
@@ -100,7 +101,7 @@ public class ParentPathReferenceRewriter
}
/** {@inheritDoc} */
- public int getCompatibilityScore(Request request)
+ public int getCompatibilityScore(final Request request)
{
return chain.getCompatibilityScore(request);
}
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/ComponentInfo.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/ComponentInfo.java?rev=1062353&r1=1062352&r2=1062353&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/ComponentInfo.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/ComponentInfo.java Sun Jan 23 09:45:59 2011
@@ -80,8 +80,8 @@ public class ComponentInfo
* @param componentPath
* @param behaviorId
*/
- public ComponentInfo(Integer renderCount, String listenerInterface, String componentPath,
- Integer behaviorId)
+ public ComponentInfo(final Integer renderCount, final String listenerInterface,
+ final String componentPath, final Integer behaviorId)
{
Args.notEmpty(listenerInterface, "listenerInterface");
Args.notNull(componentPath, "componentPath");
@@ -158,9 +158,9 @@ public class ComponentInfo
* @param string
* @return whether the string consists of digits only
*/
- private static boolean isNumber(String string)
+ private static boolean isNumber(final String string)
{
- if (string == null || string.length() == 0)
+ if ((string == null) || (string.length() == 0))
{
return false;
}
@@ -180,7 +180,7 @@ public class ComponentInfo
* @param string
* @return component info or <code>null</code> if the string is not in correct format.
*/
- public static ComponentInfo parse(String string)
+ public static ComponentInfo parse(final String string)
{
if (Strings.isEmpty(string))
{
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/PageComponentInfo.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/PageComponentInfo.java?rev=1062353&r1=1062352&r2=1062353&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/PageComponentInfo.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/PageComponentInfo.java Sun Jan 23 09:45:59 2011
@@ -39,7 +39,7 @@ public class PageComponentInfo
* @param pageInfo
* @param componentInfo
*/
- public PageComponentInfo(PageInfo pageInfo, ComponentInfo componentInfo)
+ public PageComponentInfo(final PageInfo pageInfo, final ComponentInfo componentInfo)
{
Args.notNull(pageInfo, "pageInfo");
@@ -89,7 +89,7 @@ public class PageComponentInfo
* @param s
* @return {@link PageComponentInfo} or <code>null</code> if the string is not in valid format.
*/
- public static PageComponentInfo parse(String s)
+ public static PageComponentInfo parse(final String s)
{
if (Strings.isEmpty(s))
{
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/PageInfo.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/PageInfo.java?rev=1062353&r1=1062352&r2=1062353&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/PageInfo.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/PageInfo.java Sun Jan 23 09:45:59 2011
@@ -35,7 +35,7 @@ public class PageInfo
*
* @param pageId
*/
- public PageInfo(Integer pageId)
+ public PageInfo(final Integer pageId)
{
this.pageId = pageId;
}
@@ -77,7 +77,7 @@ public class PageInfo
* @param src
* @return page info instance or <code>null</code> if the string couldn't have been parsed
*/
- public static PageInfo parse(String src)
+ public static PageInfo parse(final String src)
{
if (Strings.isEmpty(src))
{
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/Mount.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/Mount.java?rev=1062353&r1=1062352&r2=1062353&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/Mount.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/Mount.java Sun Jan 23 09:45:59 2011
@@ -38,7 +38,7 @@ public class Mount
*
* @param url
*/
- public Mount(Url url)
+ public Mount(final Url url)
{
this.url = url;
}
@@ -47,7 +47,7 @@ public class Mount
*
* @param mountParameters
*/
- public void setMountParameters(MountParameters mountParameters)
+ public void setMountParameters(final MountParameters mountParameters)
{
this.mountParameters = mountParameters;
}
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/MountMapper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/MountMapper.java?rev=1062353&r1=1062352&r2=1062353&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/MountMapper.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/MountMapper.java Sun Jan 23 09:45:59 2011
@@ -41,7 +41,7 @@ public class MountMapper extends Abstrac
* @param mountPath
* @param mapper
*/
- public MountMapper(String mountPath, IMountedRequestMapper mapper)
+ public MountMapper(final String mountPath, final IMountedRequestMapper mapper)
{
Args.notEmpty(mountPath, "mountPath");
Args.notNull(mapper, "mapper");
@@ -56,7 +56,7 @@ public class MountMapper extends Abstrac
* @param mountPath
* @param mapper
*/
- public MountMapper(String mountPath, IRequestMapper mapper)
+ public MountMapper(final String mountPath, final IRequestMapper mapper)
{
Args.notEmpty(mountPath, "mountPath");
Args.notNull(mapper, "mapper");
@@ -71,7 +71,7 @@ public class MountMapper extends Abstrac
* @param mountPath
* @param handler
*/
- public MountMapper(String mountPath, IRequestHandler handler)
+ public MountMapper(final String mountPath, final IRequestHandler handler)
{
Args.notEmpty(mountPath, "mountPath");
Args.notNull(handler, "handler");
@@ -83,7 +83,7 @@ public class MountMapper extends Abstrac
/**
* @see org.apache.wicket.request.IRequestMapper#getCompatibilityScore(org.apache.wicket.request.Request)
*/
- public int getCompatibilityScore(Request request)
+ public int getCompatibilityScore(final Request request)
{
if (urlStartsWith(request.getUrl(), mountSegments))
{
@@ -102,7 +102,7 @@ public class MountMapper extends Abstrac
* delegated mapper
* @return a {@link Request} with {@link Url} without the mount segments
*/
- private Request dismountRequest(Request request)
+ private Request dismountRequest(final Request request)
{
Url dismountedUrl = new Url(request.getUrl());
dismountedUrl.removeLeadingSegments(mountSegments.length);
@@ -112,11 +112,11 @@ public class MountMapper extends Abstrac
/**
* @see org.apache.wicket.request.IRequestMapper#mapRequest(org.apache.wicket.request.Request)
*/
- public final IRequestHandler mapRequest(Request request)
+ public final IRequestHandler mapRequest(final Request request)
{
final Url url = request.getUrl();
- if (url.getSegments().size() >= mountSegments.length && urlStartsWith(url, mountSegments))
+ if ((url.getSegments().size() >= mountSegments.length) && urlStartsWith(url, mountSegments))
{
MountParameters params = new MountParameters();
for (int i = 0; i < mountSegments.length; i++)
@@ -137,7 +137,7 @@ public class MountMapper extends Abstrac
/**
* @see org.apache.wicket.request.IRequestMapper#mapHandler(org.apache.org.apache.wicket.request.IRequestHandler)
*/
- public Url mapHandler(IRequestHandler handler)
+ public Url mapHandler(final IRequestHandler handler)
{
Mount mount = mapper.mapHandler(handler);
if (mount == null)
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/MountParameters.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/MountParameters.java?rev=1062353&r1=1062352&r2=1062353&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/MountParameters.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/MountParameters.java Sun Jan 23 09:45:59 2011
@@ -39,7 +39,7 @@ public class MountParameters
* @return a StringValue which contains either the actual value if there is a placeholder with
* name <code>parameterName</code> or <code>null</code> otherwise
*/
- public final StringValue getValue(String parameterName)
+ public final StringValue getValue(final String parameterName)
{
return StringValue.valueOf(map.get(parameterName));
}
@@ -50,7 +50,7 @@ public class MountParameters
* @param parameterName
* @param value
*/
- public final void setValue(String parameterName, StringValue value)
+ public final void setValue(final String parameterName, final StringValue value)
{
map.put(parameterName, value.toString());
}
@@ -79,22 +79,32 @@ public class MountParameters
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
- public boolean equals(Object obj)
+ public boolean equals(final Object obj)
{
if (this == obj)
+ {
return true;
+ }
if (obj == null)
+ {
return false;
+ }
if (getClass() != obj.getClass())
+ {
return false;
+ }
MountParameters other = (MountParameters)obj;
if (map == null)
{
if (other.map != null)
+ {
return false;
+ }
}
else if (!map.equals(other.map))
+ {
return false;
+ }
return true;
}
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/UnmountedMapperAdapter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/UnmountedMapperAdapter.java?rev=1062353&r1=1062352&r2=1062353&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/UnmountedMapperAdapter.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/UnmountedMapperAdapter.java Sun Jan 23 09:45:59 2011
@@ -37,7 +37,7 @@ class UnmountedMapperAdapter implements
*
* @param mapper
*/
- public UnmountedMapperAdapter(IRequestMapper mapper)
+ public UnmountedMapperAdapter(final IRequestMapper mapper)
{
super();
this.mapper = mapper;
@@ -46,7 +46,7 @@ class UnmountedMapperAdapter implements
/**
* @see org.apache.wicket.request.mapper.mount.IMountedRequestMapper#getCompatibilityScore(org.apache.wicket.request.Request)
*/
- public int getCompatibilityScore(Request request)
+ public int getCompatibilityScore(final Request request)
{
return mapper.getCompatibilityScore(request);
}
@@ -54,7 +54,7 @@ class UnmountedMapperAdapter implements
/**
* @see org.apache.wicket.request.mapper.mount.IMountedRequestMapper#mapHandler(org.apache.org.apache.wicket.request.IRequestHandler)
*/
- public Mount mapHandler(IRequestHandler requestHandler)
+ public Mount mapHandler(final IRequestHandler requestHandler)
{
Url url = mapper.mapHandler(requestHandler);
if (url != null)
@@ -68,7 +68,7 @@ class UnmountedMapperAdapter implements
* @see org.apache.wicket.request.mapper.mount.IMountedRequestMapper#mapRequest(org.apache.wicket.request.Request,
* org.apache.wicket.request.mapper.mount.MountParameters)
*/
- public IRequestHandler mapRequest(Request request, MountParameters mountParams)
+ public IRequestHandler mapRequest(final Request request, final MountParameters mountParams)
{
return mapper.mapRequest(request);
}
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/UnmountedRequestHandlerAdapter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/UnmountedRequestHandlerAdapter.java?rev=1062353&r1=1062352&r2=1062353&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/UnmountedRequestHandlerAdapter.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/UnmountedRequestHandlerAdapter.java Sun Jan 23 09:45:59 2011
@@ -36,7 +36,7 @@ class UnmountedRequestHandlerAdapter imp
*
* @param handler
*/
- public UnmountedRequestHandlerAdapter(IRequestHandler handler)
+ public UnmountedRequestHandlerAdapter(final IRequestHandler handler)
{
this.handler = handler;
}
@@ -44,7 +44,7 @@ class UnmountedRequestHandlerAdapter imp
/**
* @see org.apache.wicket.request.mapper.mount.IMountedRequestMapper#getCompatibilityScore(org.apache.wicket.request.Request)
*/
- public int getCompatibilityScore(Request request)
+ public int getCompatibilityScore(final Request request)
{
return 0;
}
@@ -52,7 +52,7 @@ class UnmountedRequestHandlerAdapter imp
/**
* @see org.apache.wicket.request.mapper.mount.IMountedRequestMapper#mapHandler(org.apache.org.apache.wicket.request.IRequestHandler)
*/
- public Mount mapHandler(IRequestHandler requestHandler)
+ public Mount mapHandler(final IRequestHandler requestHandler)
{
if (requestHandler.equals(handler))
{
@@ -65,7 +65,7 @@ class UnmountedRequestHandlerAdapter imp
* @see org.apache.wicket.request.mapper.mount.IMountedRequestMapper#mapRequest(org.apache.wicket.request.Request,
* org.apache.wicket.request.mapper.mount.MountParameters)
*/
- public IRequestHandler mapRequest(Request request, MountParameters mountParams)
+ public IRequestHandler mapRequest(final Request request, final MountParameters mountParams)
{
return handler;
}
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java?rev=1062353&r1=1062352&r2=1062353&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java Sun Jan 23 09:45:59 2011
@@ -176,7 +176,7 @@ public class PageParameters implements S
* @param object
* @return this
*/
- public PageParameters set(int index, Object object)
+ public PageParameters set(final int index, final Object object)
{
if (indexedParameters == null)
{
@@ -196,11 +196,11 @@ public class PageParameters implements S
* @param index
* @return indexed parameter on given index
*/
- public StringValue get(int index)
+ public StringValue get(final int index)
{
if (indexedParameters != null)
{
- if (index >= 0 && index < indexedParameters.size())
+ if ((index >= 0) && (index < indexedParameters.size()))
{
return StringValue.valueOf(indexedParameters.get(index));
}
@@ -214,11 +214,11 @@ public class PageParameters implements S
* @param index
* @return this
*/
- public PageParameters remove(int index)
+ public PageParameters remove(final int index)
{
if (indexedParameters != null)
{
- if (index >= 0 && index < indexedParameters.size())
+ if ((index >= 0) && (index < indexedParameters.size()))
{
indexedParameters.remove(index);
}
@@ -233,7 +233,7 @@ public class PageParameters implements S
*/
public Set<String> getNamedKeys()
{
- if (namedParameters == null || namedParameters.isEmpty())
+ if ((namedParameters == null) || namedParameters.isEmpty())
{
return Collections.emptySet();
}
@@ -307,7 +307,7 @@ public class PageParameters implements S
private final String key;
private final String value;
- private NamedPair(String key, String value)
+ private NamedPair(final String key, final String value)
{
this.key = key;
this.value = value;
@@ -425,7 +425,7 @@ public class PageParameters implements S
* @param index
* @return this
*/
- public PageParameters set(String name, Object value, int index)
+ public PageParameters set(final String name, final Object value, final int index)
{
remove(name);
@@ -443,7 +443,7 @@ public class PageParameters implements S
* @param value
* @return this
*/
- public PageParameters set(String name, Object value)
+ public PageParameters set(final String name, final Object value)
{
set(name, value, -1);
return this;
@@ -477,7 +477,7 @@ public class PageParameters implements S
* @param other
* @return this
*/
- public PageParameters overwriteWith(PageParameters other)
+ public PageParameters overwriteWith(final PageParameters other)
{
if (this != other)
{
@@ -491,14 +491,14 @@ public class PageParameters implements S
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
- public boolean equals(Object obj)
+ public boolean equals(final Object obj)
{
if (this == obj)
{
return true;
}
- if (obj instanceof PageParameters == false)
+ if ((obj instanceof PageParameters) == false)
{
return false;
}
@@ -509,7 +509,7 @@ public class PageParameters implements S
return false;
}
- if (namedParameters == null || rhs.namedParameters == null)
+ if ((namedParameters == null) || (rhs.namedParameters == null))
{
return rhs.namedParameters == namedParameters;
}
@@ -548,17 +548,17 @@ public class PageParameters implements S
* @param p2
* @return <code>true</code> if the objects are equal, <code>false</code> otherwise.
*/
- public static boolean equals(PageParameters p1, PageParameters p2)
+ public static boolean equals(final PageParameters p1, final PageParameters p2)
{
if (Objects.equal(p1, p2))
{
return true;
}
- if (p1 == null && p2.getIndexedCount() == 0 && p2.getNamedKeys().isEmpty())
+ if ((p1 == null) && (p2.getIndexedCount() == 0) && p2.getNamedKeys().isEmpty())
{
return true;
}
- if (p2 == null && p1.getIndexedCount() == 0 && p1.getNamedKeys().isEmpty())
+ if ((p2 == null) && (p1.getIndexedCount() == 0) && p1.getNamedKeys().isEmpty())
{
return true;
}
@@ -570,7 +570,7 @@ public class PageParameters implements S
*/
public boolean isEmpty()
{
- return getIndexedCount() == 0 && getNamedKeys().isEmpty();
+ return (getIndexedCount() == 0) && getNamedKeys().isEmpty();
}
@Override
@@ -583,7 +583,9 @@ public class PageParameters implements S
for (int i = 0; i < indexedParameters.size(); i++)
{
if (i > 0)
+ {
str.append(", ");
+ }
str.append(i);
str.append('=');
@@ -592,7 +594,9 @@ public class PageParameters implements S
}
if (str.length() > 0)
+ {
str.append(", ");
+ }
if (namedParameters != null)
{
@@ -601,7 +605,9 @@ public class PageParameters implements S
Entry entry = namedParameters.get(i);
if (i > 0)
+ {
str.append(", ");
+ }
str.append(entry.key);
str.append('=');
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParametersEncoder.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParametersEncoder.java?rev=1062353&r1=1062352&r2=1062353&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParametersEncoder.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParametersEncoder.java Sun Jan 23 09:45:59 2011
@@ -37,7 +37,7 @@ public class PageParametersEncoder imple
/**
* @see org.apache.wicket.request.mapper.parameter.IPageParametersEncoder#decodePageParameters(org.apache.wicket.request.Request)
*/
- public PageParameters decodePageParameters(Request request)
+ public PageParameters decodePageParameters(final Request request)
{
PageParameters parameters = new PageParameters();
@@ -59,7 +59,7 @@ public class PageParametersEncoder imple
/**
* @see org.apache.wicket.request.mapper.parameter.IPageParametersEncoder#encodePageParameters(org.apache.wicket.request.mapper.parameter.PageParameters)
*/
- public Url encodePageParameters(PageParameters pageParameters)
+ public Url encodePageParameters(final PageParameters pageParameters)
{
Url url = new Url();
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/parameter/CombinedRequestParametersAdapter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/parameter/CombinedRequestParametersAdapter.java?rev=1062353&r1=1062352&r2=1062353&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/parameter/CombinedRequestParametersAdapter.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/parameter/CombinedRequestParametersAdapter.java Sun Jan 23 09:45:59 2011
@@ -39,7 +39,7 @@ public class CombinedRequestParametersAd
*
* @param parameters
*/
- public CombinedRequestParametersAdapter(IRequestParameters... parameters)
+ public CombinedRequestParametersAdapter(final IRequestParameters... parameters)
{
if (parameters == null)
{
@@ -64,7 +64,7 @@ public class CombinedRequestParametersAd
/**
* @see org.apache.wicket.request.IRequestParameters#getParameterValue(java.lang.String)
*/
- public StringValue getParameterValue(String name)
+ public StringValue getParameterValue(final String name)
{
for (IRequestParameters p : parameters)
{
@@ -80,7 +80,7 @@ public class CombinedRequestParametersAd
/**
* @see org.apache.wicket.request.IRequestParameters#getParameterValues(java.lang.String)
*/
- public List<StringValue> getParameterValues(String name)
+ public List<StringValue> getParameterValues(final String name)
{
List<StringValue> result = new ArrayList<StringValue>();
for (IRequestParameters p : parameters)
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/parameter/EmptyRequestParameters.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/parameter/EmptyRequestParameters.java?rev=1062353&r1=1062352&r2=1062353&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/parameter/EmptyRequestParameters.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/parameter/EmptyRequestParameters.java Sun Jan 23 09:45:59 2011
@@ -51,7 +51,7 @@ public class EmptyRequestParameters impl
/**
* @see org.apache.wicket.request.IRequestParameters#getParameterValue(java.lang.String)
*/
- public StringValue getParameterValue(String name)
+ public StringValue getParameterValue(final String name)
{
return StringValue.valueOf((String)null);
}
@@ -59,7 +59,7 @@ public class EmptyRequestParameters impl
/**
* @see org.apache.wicket.request.IRequestParameters#getParameterValues(java.lang.String)
*/
- public List<StringValue> getParameterValues(String name)
+ public List<StringValue> getParameterValues(final String name)
{
return null;
}
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/parameter/UrlRequestParametersAdapter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/parameter/UrlRequestParametersAdapter.java?rev=1062353&r1=1062352&r2=1062353&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/parameter/UrlRequestParametersAdapter.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/parameter/UrlRequestParametersAdapter.java Sun Jan 23 09:45:59 2011
@@ -43,7 +43,7 @@ public class UrlRequestParametersAdapter
*
* @param url
*/
- public UrlRequestParametersAdapter(Url url)
+ public UrlRequestParametersAdapter(final Url url)
{
Args.notNull(url, "url");
@@ -66,7 +66,7 @@ public class UrlRequestParametersAdapter
/**
* @see org.apache.wicket.request.IRequestParameters#getParameterValue(java.lang.String)
*/
- public StringValue getParameterValue(String name)
+ public StringValue getParameterValue(final String name)
{
return url.getQueryParameterValue(name);
}
@@ -74,7 +74,7 @@ public class UrlRequestParametersAdapter
/**
* @see org.apache.wicket.request.IRequestParameters#getParameterValues(java.lang.String)
*/
- public List<StringValue> getParameterValues(String name)
+ public List<StringValue> getParameterValues(final String name)
{
List<StringValue> values = null;
for (QueryParameter parameter : url.getQueryParameters())