Repository: wicket Updated Branches: refs/heads/wicket-7.x 582115773 -> 0eb634809
Make use of the fact that CompoundRequestMapper implements Iterable Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/0eb63480 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/0eb63480 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/0eb63480 Branch: refs/heads/wicket-7.x Commit: 0eb634809a6ef02358ec98dde70ca87bf7479c34 Parents: 5821157 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Mon Mar 13 21:33:18 2017 +0100 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Mon Mar 13 21:33:18 2017 +0100 ---------------------------------------------------------------------- .../apache/wicket/request/mapper/CompoundRequestMapper.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/0eb63480/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 c4007e8..68a4b38 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 @@ -128,7 +128,7 @@ public class CompoundRequestMapper implements ICompoundRequestMapper { List<MapperWithScore> list = new ArrayList<>(mappers.size()); - for (IRequestMapper mapper : mappers) + for (IRequestMapper mapper : this) { int score = mapper.getCompatibilityScore(request); list.add(new MapperWithScore(mapper, score)); @@ -205,7 +205,7 @@ public class CompoundRequestMapper implements ICompoundRequestMapper @Override public Url mapHandler(final IRequestHandler handler) { - for (IRequestMapper mapper : mappers) + for (IRequestMapper mapper : this) { Url url = mapper.mapHandler(handler); if (url != null) @@ -225,7 +225,7 @@ public class CompoundRequestMapper implements ICompoundRequestMapper public int getCompatibilityScore(final Request request) { int score = Integer.MIN_VALUE; - for (IRequestMapper mapper : mappers) + for (IRequestMapper mapper : this) { score = Math.max(score, mapper.getCompatibilityScore(request)); }
