Repository: wicket Updated Branches: refs/heads/WICKET-6219-no-fragment-resolver fe1dd3c7c -> 0b06fb15f
code cleanup and reverting the WicketTagIdentifier change sent by mistake Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/0b06fb15 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/0b06fb15 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/0b06fb15 Branch: refs/heads/WICKET-6219-no-fragment-resolver Commit: 0b06fb15f9f4fa107a89df7b86b36fd05a725873 Parents: fe1dd3c Author: Pedro Henrique Oliveira dos Santos <pe...@apache.org> Authored: Fri Aug 19 23:54:48 2016 -0300 Committer: Pedro Henrique Oliveira dos Santos <pe...@apache.org> Committed: Fri Aug 19 23:54:48 2016 -0300 ---------------------------------------------------------------------- .../src/main/java/org/apache/wicket/Application.java | 2 -- .../wicket/markup/parser/filter/WicketTagIdentifier.java | 11 +++++------ 2 files changed, 5 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/0b06fb15/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 e1fb1a9..0df8caf 100644 --- a/wicket-core/src/main/java/org/apache/wicket/Application.java +++ b/wicket-core/src/main/java/org/apache/wicket/Application.java @@ -61,7 +61,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.WicketContainerResolver; import org.apache.wicket.markup.resolver.WicketMessageResolver; @@ -816,7 +815,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/0b06fb15/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 23f4160..301321f 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 @@ -127,17 +127,16 @@ public final class WicketTagIdentifier extends AbstractMarkupFilter tag.setUserData(MARKUP_CACHE_KEY, getMarkupResourceStream().getCacheKey()); tag.setModified(true); - if (!isRaw(tag) && tag.isClose() == false) + if (isRaw(tag)) + { + tag.setFlag(ComponentTag.RENDER_RAW, true); + } + else if (tag.isClose() == false) { tag.setAutoComponentTag(true); } } - if (isRaw(tag)) - { - tag.setFlag(ComponentTag.RENDER_RAW, true); - } - // If the tag is not a well-known wicket namespace tag if (!isWellKnown(tag)) {
