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 2014/05/26 20:55:34 UTC
[2/2] git commit: WICKET-5580 Allow markup to find child fragments
when wicket:child is inside a component tag
WICKET-5580 Allow markup to find child fragments when wicket:child is inside a component tag
Fix method name.
Java 7 diamonds
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/240a4527
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/240a4527
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/240a4527
Branch: refs/heads/master
Commit: 240a45276c56354d29cbf9dd8bc54d26fc827a82
Parents: 2f458d8
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon May 26 20:55:00 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon May 26 20:55:00 2014 +0200
----------------------------------------------------------------------
.../java/org/apache/wicket/markup/AbstractMarkupFragment.java | 4 ++--
.../src/test/java/org/apache/wicket/markup/MarkupTest.java | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/240a4527/wicket-core/src/main/java/org/apache/wicket/markup/AbstractMarkupFragment.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/AbstractMarkupFragment.java b/wicket-core/src/main/java/org/apache/wicket/markup/AbstractMarkupFragment.java
index d990db2..356898d 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/AbstractMarkupFragment.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/AbstractMarkupFragment.java
@@ -42,7 +42,7 @@ public abstract class AbstractMarkupFragment implements IMarkupFragment
Args.notEmpty(id, "id");
Args.withinRange(0, size() - 1, streamOffset, "streamOffset");
- Deque<Boolean> openTagUsability = new LinkedList<Boolean>();
+ Deque<Boolean> openTagUsability = new LinkedList<>();
boolean canFind = true;
MarkupStream stream = new MarkupStream(this);
@@ -73,7 +73,7 @@ public abstract class AbstractMarkupFragment implements IMarkupFragment
{
canFind = true;
}
- else if (wtag.isFragementTag())
+ else if (wtag.isFragmentTag())
{
canFind = false;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/240a4527/wicket-core/src/test/java/org/apache/wicket/markup/MarkupTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupTest.java
index 751be1a..f1a162e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupTest.java
@@ -76,7 +76,7 @@ public class MarkupTest extends WicketTestCase
assertNotNull(childMarkup);
assertTrue(childMarkup.get(0) instanceof WicketTag);
assertEquals("a6", ((ComponentTag)childMarkup.get(0)).getId());
- assertTrue(((WicketTag)childMarkup.get(0)).isFragementTag());
+ assertTrue(((WicketTag)childMarkup.get(0)).isFragmentTag());
/*
* Ensure we cannot find inside fragment
@@ -98,7 +98,7 @@ public class MarkupTest extends WicketTestCase
assertNotNull(childMarkup);
assertTrue(childMarkup.get(0) instanceof WicketTag);
assertEquals("b2", ((ComponentTag)childMarkup.get(0)).getId());
- assertTrue(((WicketTag)childMarkup.get(0)).isFragementTag());
+ assertTrue(((WicketTag)childMarkup.get(0)).isFragmentTag());
/*
* Ensure we cannot find inside fragment in subclass
@@ -138,7 +138,7 @@ public class MarkupTest extends WicketTestCase
assertNotNull(childMarkup);
assertTrue(childMarkup.get(0) instanceof WicketTag);
assertEquals("c2", ((ComponentTag)childMarkup.get(0)).getId());
- assertTrue(((WicketTag)childMarkup.get(0)).isFragementTag());
+ assertTrue(((WicketTag)childMarkup.get(0)).isFragmentTag());
/*
* Ensure we cannot find inside fragment in subclass