Repository: wicket Updated Branches: refs/heads/wicket-6.x f35fd8cec -> 76678a429
WICKET-6219 removing FragmentResolver Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/76678a42 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/76678a42 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/76678a42 Branch: refs/heads/wicket-6.x Commit: 76678a429049af320cd5a79824cf1e172811290f Parents: f35fd8c Author: Pedro Henrique Oliveira dos Santos <[email protected]> Authored: Sat Aug 27 23:13:18 2016 -0300 Committer: Pedro Henrique Oliveira dos Santos <[email protected]> Committed: Sat Aug 27 23:13:18 2016 -0300 ---------------------------------------------------------------------- .../src/main/java/org/apache/wicket/Application.java | 4 +--- .../main/java/org/apache/wicket/MarkupContainer.java | 5 ++++- .../main/java/org/apache/wicket/markup/TagUtils.java | 2 +- .../main/java/org/apache/wicket/markup/WicketTag.java | 4 ++-- .../markup/html/TransparentWebMarkupContainer.java | 2 +- .../markup/parser/filter/WicketTagIdentifier.java | 4 ++-- .../wicket/markup/resolver/FragmentResolver.java | 1 + .../markup/resolver/WicketContainerResolver.java | 2 +- .../wicket/markup/html/panel/FragmentTestCase.java | 14 +++++--------- .../wicket/markup/html/panel/FragmentTestPanel_2.html | 1 + 10 files changed, 19 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/76678a42/wicket-core/src/main/java/org/apache/wicket/Application.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/Application.java b/wicket-core/src/main/java/org/apache/wicket/Application.java index b1d254a..645cb80 100644 --- a/wicket-core/src/main/java/org/apache/wicket/Application.java +++ b/wicket-core/src/main/java/org/apache/wicket/Application.java @@ -28,11 +28,11 @@ import java.util.Properties; import java.util.ServiceLoader; import java.util.Set; -import org.apache.wicket.application.ComponentOnConfigureListenerCollection; import org.apache.wicket.application.ComponentInitializationListenerCollection; import org.apache.wicket.application.ComponentInstantiationListenerCollection; import org.apache.wicket.application.ComponentOnAfterRenderListenerCollection; import org.apache.wicket.application.ComponentOnBeforeRenderListenerCollection; +import org.apache.wicket.application.ComponentOnConfigureListenerCollection; import org.apache.wicket.application.HeaderContributorListenerCollection; import org.apache.wicket.application.IComponentInitializationListener; import org.apache.wicket.application.IComponentInstantiationListener; @@ -54,7 +54,6 @@ import org.apache.wicket.markup.parser.filter.InlineEnclosureHandler; import org.apache.wicket.markup.parser.filter.RelativePathPrefixHandler; import org.apache.wicket.markup.parser.filter.WicketLinkTagHandler; import org.apache.wicket.markup.parser.filter.WicketMessageTagHandler; -import org.apache.wicket.markup.resolver.FragmentResolver; import org.apache.wicket.markup.resolver.HtmlHeaderResolver; import org.apache.wicket.markup.resolver.MarkupInheritanceResolver; import org.apache.wicket.markup.resolver.WicketContainerResolver; @@ -698,7 +697,6 @@ public abstract class Application implements UnboundListener, IEventSink pageSettings.addComponentResolver(new HtmlHeaderResolver()); pageSettings.addComponentResolver(new WicketLinkTagHandler()); pageSettings.addComponentResolver(new WicketMessageResolver()); - pageSettings.addComponentResolver(new FragmentResolver()); pageSettings.addComponentResolver(new RelativePathPrefixHandler()); pageSettings.addComponentResolver(new EnclosureHandler()); pageSettings.addComponentResolver(new InlineEnclosureHandler()); http://git-wip-us.apache.org/repos/asf/wicket/blob/76678a42/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 d15368d..d101fed 100644 --- a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java +++ b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java @@ -1367,7 +1367,10 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp { // Get element as tag final ComponentTag tag = (ComponentTag)element; - + if (tag instanceof WicketTag && ((WicketTag)tag).isFragmentTag()) + { + return false; + } // Get component id final String id = tag.getId(); http://git-wip-us.apache.org/repos/asf/wicket/blob/76678a42/wicket-core/src/main/java/org/apache/wicket/markup/TagUtils.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/TagUtils.java b/wicket-core/src/main/java/org/apache/wicket/markup/TagUtils.java index 6cac731..740303e 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/TagUtils.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/TagUtils.java @@ -268,7 +268,7 @@ public class TagUtils { canFind = true; } - else if (wtag.isFragementTag() || wtag.isContainerTag()) + else if (wtag.isFragmentTag() || wtag.isContainerTag()) { canFind = false; } http://git-wip-us.apache.org/repos/asf/wicket/blob/76678a42/wicket-core/src/main/java/org/apache/wicket/markup/WicketTag.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/WicketTag.java b/wicket-core/src/main/java/org/apache/wicket/markup/WicketTag.java index adc42b6..261639c 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/WicketTag.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/WicketTag.java @@ -22,7 +22,7 @@ import org.apache.wicket.markup.parser.XmlTag; import org.apache.wicket.markup.parser.filter.EnclosureHandler; import org.apache.wicket.markup.parser.filter.WicketLinkTagHandler; import org.apache.wicket.markup.parser.filter.WicketRemoveTagHandler; -import org.apache.wicket.markup.resolver.FragmentResolver; +import org.apache.wicket.markup.parser.filter.WicketTagIdentifier; import org.apache.wicket.markup.resolver.HtmlHeaderResolver; import org.apache.wicket.markup.resolver.MarkupInheritanceResolver; import org.apache.wicket.markup.resolver.WicketContainerResolver; @@ -181,7 +181,7 @@ public class WicketTag extends ComponentTag */ public final boolean isFragmentTag() { - return FragmentResolver.FRAGMENT.equalsIgnoreCase(getName()); + return WicketTagIdentifier.FRAGMENT.equalsIgnoreCase(getName()); } /** http://git-wip-us.apache.org/repos/asf/wicket/blob/76678a42/wicket-core/src/main/java/org/apache/wicket/markup/html/TransparentWebMarkupContainer.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/TransparentWebMarkupContainer.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/TransparentWebMarkupContainer.java index 8b07eb6..97998eb 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/TransparentWebMarkupContainer.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/TransparentWebMarkupContainer.java @@ -55,7 +55,7 @@ public class TransparentWebMarkupContainer extends WebMarkupContainer implements @Override public Component resolve(MarkupContainer container, MarkupStream markupStream, ComponentTag tag) { - if (tag instanceof WicketTag && ((WicketTag)tag).isFragementTag()) + if (tag instanceof WicketTag && ((WicketTag)tag).isFragmentTag()) { // even having a wicket:id it isn't a component's markup return null; http://git-wip-us.apache.org/repos/asf/wicket/blob/76678a42/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java b/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java index 1eac945..35d6de6 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java @@ -30,7 +30,6 @@ import org.apache.wicket.markup.html.border.Border; import org.apache.wicket.markup.html.form.AutoLabelTextResolver; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.markup.parser.AbstractMarkupFilter; -import org.apache.wicket.markup.resolver.FragmentResolver; import org.apache.wicket.markup.resolver.HtmlHeaderResolver; import org.apache.wicket.markup.resolver.MarkupInheritanceResolver; import org.apache.wicket.markup.resolver.WicketContainerResolver; @@ -53,6 +52,7 @@ public final class WicketTagIdentifier extends AbstractMarkupFilter { /** List of well known wicket tag names */ private static final Set<String> WELL_KNOWN_TAG_NAMES = new HashSet<String>(); + public static final String FRAGMENT = "fragment"; static { WELL_KNOWN_TAG_NAMES.add(Border.BORDER); @@ -62,7 +62,7 @@ public final class WicketTagIdentifier extends AbstractMarkupFilter WELL_KNOWN_TAG_NAMES.add(EnclosureHandler.ENCLOSURE); WELL_KNOWN_TAG_NAMES.add(WicketLinkTagHandler.LINK); WELL_KNOWN_TAG_NAMES.add(WicketRemoveTagHandler.REMOVE); - WELL_KNOWN_TAG_NAMES.add(FragmentResolver.FRAGMENT); + WELL_KNOWN_TAG_NAMES.add(WicketTagIdentifier.FRAGMENT); WELL_KNOWN_TAG_NAMES.add(HtmlHeaderResolver.HEAD); WELL_KNOWN_TAG_NAMES.add(HtmlHeaderResolver.HEADER_ITEMS); WELL_KNOWN_TAG_NAMES.add(MarkupInheritanceResolver.CHILD); http://git-wip-us.apache.org/repos/asf/wicket/blob/76678a42/wicket-core/src/main/java/org/apache/wicket/markup/resolver/FragmentResolver.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/resolver/FragmentResolver.java b/wicket-core/src/main/java/org/apache/wicket/markup/resolver/FragmentResolver.java index 974fdf8..de2efd9 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/resolver/FragmentResolver.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/resolver/FragmentResolver.java @@ -34,6 +34,7 @@ import org.apache.wicket.markup.html.WebComponent; * must be ignored. It is only indirectly referenced by component. * * @author Juergen Donnerstag + * @deprecated no auto component is needed for a fragment tag */ public class FragmentResolver implements IComponentResolver { http://git-wip-us.apache.org/repos/asf/wicket/blob/76678a42/wicket-core/src/main/java/org/apache/wicket/markup/resolver/WicketContainerResolver.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/resolver/WicketContainerResolver.java b/wicket-core/src/main/java/org/apache/wicket/markup/resolver/WicketContainerResolver.java index 562843d..28adcf1 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/resolver/WicketContainerResolver.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/resolver/WicketContainerResolver.java @@ -71,7 +71,7 @@ public class WicketContainerResolver implements IComponentResolver public Component resolve(final MarkupContainer container, final MarkupStream markupStream, final ComponentTag tag) { - if (tag instanceof WicketTag) + if (tag instanceof WicketTag && ((WicketTag)tag).isContainerTag()) { return container.get(tag.getId()); } http://git-wip-us.apache.org/repos/asf/wicket/blob/76678a42/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FragmentTestCase.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FragmentTestCase.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FragmentTestCase.java index d25475d..7ece137 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FragmentTestCase.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FragmentTestCase.java @@ -16,8 +16,11 @@ */ package org.apache.wicket.markup.html.panel; +import static org.hamcrest.Matchers.containsString; + import org.apache.wicket.WicketTestCase; import org.apache.wicket.markup.MarkupNotFoundException; +import org.hamcrest.Matchers; /** * @@ -37,14 +40,7 @@ public class FragmentTestCase extends WicketTestCase */ public void testComponentAndFragmentWithSameId() { - try - { - tester.startComponentInPage(FragmentTestPanel_2.class); - fail(); - } - catch (MarkupNotFoundException ex) - { - assertTrue(ex.getMessage().contains("is not a fragment tag")); - } + tester.startComponentInPage(FragmentTestPanel_2.class); + assertThat(tester.getLastResponseAsString(), containsString("fragment body")); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/76678a42/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FragmentTestPanel_2.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FragmentTestPanel_2.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FragmentTestPanel_2.html index 6d21336..5a17df2 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FragmentTestPanel_2.html +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FragmentTestPanel_2.html @@ -6,6 +6,7 @@ <div wicket:id="test">[test fragment goes here]</div> <wicket:fragment wicket:id="testFrag"> + fragment body </wicket:fragment> </wicket:panel>
