You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2012/01/09 18:02:15 UTC
git commit: WICKET-4329 Optimize consequent usages of
MarkupContainer# hasAssociatedMarkup() and #getAssociatedMapkup()
Updated Branches:
refs/heads/master d7c28049e -> 23e81bfa7
WICKET-4329
Optimize consequent usages of MarkupContainer# hasAssociatedMarkup() and #getAssociatedMapkup()
Remove #hasAssociatedMarkup() and use #getAssociatedMarkup() != null
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/23e81bfa
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/23e81bfa
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/23e81bfa
Branch: refs/heads/master
Commit: 23e81bfa7abfae0f2be31aea12c7b38a9b89ff94
Parents: d7c2804
Author: martin-g <mg...@apache.org>
Authored: Mon Jan 9 19:02:07 2012 +0200
Committer: martin-g <mg...@apache.org>
Committed: Mon Jan 9 19:02:07 2012 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/wicket/Component.java | 2 +-
.../java/org/apache/wicket/MarkupContainer.java | 8 --------
2 files changed, 1 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/23e81bfa/wicket-core/src/main/java/org/apache/wicket/Component.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Component.java b/wicket-core/src/main/java/org/apache/wicket/Component.java
index 05c7822..d36afa6 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Component.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Component.java
@@ -1289,7 +1289,7 @@ public abstract class Component
MarkupContainer container = parent;
while (container != null)
{
- if (container.hasAssociatedMarkup())
+ if (container.getAssociatedMarkup() != null)
{
return container;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/23e81bfa/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
index 621ea05..08d2ddb 100644
--- a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
+++ b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
@@ -1790,14 +1790,6 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp
}
/**
- * @return True if this markup container has associated markup
- */
- public boolean hasAssociatedMarkup()
- {
- return getAssociatedMarkup() != null;
- }
-
- /**
*
*/
private static class ChildList extends AbstractList<Object> implements IClusterable