You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by pe...@apache.org on 2012/02/08 22:13:24 UTC
git commit: non-functional: removed unnecessary (since inherited)
javadoc, added @Override annotation, inlined variable,
added equals/hashCode which is required when implementing Comparable,
used java 5 style foreach statement
Updated Branches:
refs/heads/master 46559c63f -> f5fadb6ea
non-functional: removed unnecessary (since inherited) javadoc, added @Override annotation, inlined variable, added equals/hashCode which is required when implementing Comparable, used java 5 style foreach statement
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/f5fadb6e
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/f5fadb6e
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/f5fadb6e
Branch: refs/heads/master
Commit: f5fadb6eae1ce32817e7baaae41e7c983685f6bf
Parents: 46559c6
Author: Peter Ertl <pe...@apache.org>
Authored: Wed Feb 8 22:12:41 2012 +0100
Committer: Peter Ertl <pe...@apache.org>
Committed: Wed Feb 8 22:12:41 2012 +0100
----------------------------------------------------------------------
.../request/mapper/CompoundRequestMapper.java | 53 +++++++++------
1 files changed, 33 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/f5fadb6e/wicket-request/src/main/java/org/apache/wicket/request/mapper/CompoundRequestMapper.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/mapper/CompoundRequestMapper.java b/wicket-request/src/main/java/org/apache/wicket/request/mapper/CompoundRequestMapper.java
index 66bc61c..58e4423 100644
--- a/wicket-request/src/main/java/org/apache/wicket/request/mapper/CompoundRequestMapper.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/mapper/CompoundRequestMapper.java
@@ -54,6 +54,7 @@ public class CompoundRequestMapper implements ICompoundRequestMapper
this.compatibilityScore = compatibilityScore;
}
+ @Override
public int compareTo(final MapperWithScore o)
{
return (compatibilityScore < o.compatibilityScore ? 1
@@ -65,9 +66,29 @@ public class CompoundRequestMapper implements ICompoundRequestMapper
return mapper;
}
- /**
- * @see java.lang.Object#toString()
- */
+ @Override
+ public boolean equals(Object o)
+ {
+ if (this == o)
+ return true;
+ if (!(o instanceof MapperWithScore))
+ return false;
+
+ MapperWithScore that = (MapperWithScore)o;
+
+ if (compatibilityScore != that.compatibilityScore)
+ return false;
+ return mapper.equals(that.mapper);
+ }
+
+ @Override
+ public int hashCode()
+ {
+ int result = mapper.hashCode();
+ result = 31 * result + compatibilityScore;
+ return result;
+ }
+
@Override
public String toString()
{
@@ -77,25 +98,14 @@ public class CompoundRequestMapper implements ICompoundRequestMapper
private final List<IRequestMapper> mappers = new CopyOnWriteArrayList<IRequestMapper>();
- /**
- * Construct.
- */
- public CompoundRequestMapper()
- {
- }
-
- /**
- * @see org.apache.wicket.request.mapper.ICompoundRequestMapper#add(org.apache.wicket.request.IRequestMapper)
- */
+ @Override
public CompoundRequestMapper add(final IRequestMapper mapper)
{
mappers.add(0, mapper);
return this;
}
- /**
- * @see org.apache.wicket.request.mapper.ICompoundRequestMapper#remove(org.apache.wicket.request.IRequestMapper)
- */
+ @Override
public CompoundRequestMapper remove(final IRequestMapper mapper)
{
mappers.remove(mapper);
@@ -114,6 +124,7 @@ public class CompoundRequestMapper implements ICompoundRequestMapper
* @return RequestHandler for the request or <code>null</code> if no mapper for the request is
* found.
*/
+ @Override
public IRequestHandler mapRequest(final Request request)
{
List<MapperWithScore> list = new ArrayList<MapperWithScore>(mappers.size());
@@ -150,6 +161,7 @@ public class CompoundRequestMapper implements ICompoundRequestMapper
* @param handler
* @return Url for the handler or <code>null</code> if no mapper for the handler is found.
*/
+ @Override
public Url mapHandler(final IRequestHandler handler)
{
for (IRequestMapper mapper : mappers)
@@ -168,6 +180,7 @@ public class CompoundRequestMapper implements ICompoundRequestMapper
*
* {@inheritDoc}
*/
+ @Override
public int getCompatibilityScore(final Request request)
{
int score = Integer.MIN_VALUE;
@@ -178,19 +191,20 @@ public class CompoundRequestMapper implements ICompoundRequestMapper
return score;
}
+ @Override
public Iterator<IRequestMapper> iterator()
{
return mappers.iterator();
}
+ @Override
public void unmount(String path)
{
final Url url = Url.parse(path);
final Request request = createRequest(url);
- for (Iterator<IRequestMapper> itor = iterator(); itor.hasNext();)
+ for (IRequestMapper mapper : this)
{
- IRequestMapper mapper = itor.next();
if (mapper.mapRequest(request) != null)
{
remove(mapper);
@@ -205,7 +219,7 @@ public class CompoundRequestMapper implements ICompoundRequestMapper
Request createRequest(final Url url)
{
- Request request = new Request()
+ return new Request()
{
@Override
public Url getUrl()
@@ -237,6 +251,5 @@ public class CompoundRequestMapper implements ICompoundRequestMapper
return null;
}
};
- return request;
}
}