You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mo...@apache.org on 2015/11/29 17:05:51 UTC
[25/33] wicket git commit: WICKET-6028 Detach called on enclosure
component while it had a non-empty queue
WICKET-6028 Detach called on enclosure component while it had a non-empty queue
Remove MarkupInheritanceResolver since it is no more used.
Copy its constants to WicketTagIdentifier
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ce8b31c5
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ce8b31c5
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ce8b31c5
Branch: refs/heads/lambdas
Commit: ce8b31c5c45a786a97bae6061049187c6a8264d4
Parents: 47ae79c
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Nov 19 21:41:33 2015 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Nov 19 21:44:51 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/wicket/Application.java | 1 -
.../org/apache/wicket/markup/WicketTag.java | 6 +-
.../parser/filter/WicketTagIdentifier.java | 13 ++--
.../resolver/MarkupInheritanceResolver.java | 66 --------------------
4 files changed, 11 insertions(+), 75 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/ce8b31c5/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 bc5734c..d23bb84 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Application.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Application.java
@@ -63,7 +63,6 @@ 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;
import org.apache.wicket.markup.resolver.WicketMessageResolver;
import org.apache.wicket.page.DefaultPageManagerContext;
http://git-wip-us.apache.org/repos/asf/wicket/blob/ce8b31c5/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 8cb9cf1..01ac4fa 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,9 +22,9 @@ 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.parser.filter.WicketTagIdentifier;
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;
import org.apache.wicket.markup.resolver.WicketMessageResolver;
@@ -115,7 +115,7 @@ public class WicketTag extends ComponentTag
*/
public final boolean isChildTag()
{
- return MarkupInheritanceResolver.CHILD.equalsIgnoreCase(getName());
+ return WicketTagIdentifier.CHILD.equalsIgnoreCase(getName());
}
/**
@@ -123,7 +123,7 @@ public class WicketTag extends ComponentTag
*/
public final boolean isExtendTag()
{
- return MarkupInheritanceResolver.EXTEND.equalsIgnoreCase(getName());
+ return WicketTagIdentifier.EXTEND.equalsIgnoreCase(getName());
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/ce8b31c5/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 4834973..2694508 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
@@ -32,7 +32,6 @@ 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;
import org.apache.wicket.markup.resolver.WicketMessageResolver;
import org.apache.wicket.util.string.Strings;
@@ -56,6 +55,10 @@ public final class WicketTagIdentifier extends AbstractMarkupFilter
/** List of raw wicket tag names */
private static final Set<String> RAW_TAG_NAMES = new HashSet<>();
+ public static final String CHILD = "child";
+
+ public static final String EXTEND = "extend";
+
static {
WELL_KNOWN_TAG_NAMES.add(Border.BORDER);
WELL_KNOWN_TAG_NAMES.add(Border.BODY);
@@ -67,15 +70,15 @@ public final class WicketTagIdentifier extends AbstractMarkupFilter
WELL_KNOWN_TAG_NAMES.add(FragmentResolver.FRAGMENT);
WELL_KNOWN_TAG_NAMES.add(HtmlHeaderResolver.HEAD);
WELL_KNOWN_TAG_NAMES.add(HtmlHeaderResolver.HEADER_ITEMS);
- WELL_KNOWN_TAG_NAMES.add(MarkupInheritanceResolver.CHILD);
- WELL_KNOWN_TAG_NAMES.add(MarkupInheritanceResolver.EXTEND);
+ WELL_KNOWN_TAG_NAMES.add(WicketTagIdentifier.CHILD);
+ WELL_KNOWN_TAG_NAMES.add(WicketTagIdentifier.EXTEND);
WELL_KNOWN_TAG_NAMES.add(WicketContainerResolver.CONTAINER);
WELL_KNOWN_TAG_NAMES.add(WicketMessageResolver.MESSAGE);
}
static {
- RAW_TAG_NAMES.add(MarkupInheritanceResolver.CHILD);
- RAW_TAG_NAMES.add(MarkupInheritanceResolver.EXTEND);
+ RAW_TAG_NAMES.add(WicketTagIdentifier.CHILD);
+ RAW_TAG_NAMES.add(WicketTagIdentifier.EXTEND);
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/ce8b31c5/wicket-core/src/main/java/org/apache/wicket/markup/resolver/MarkupInheritanceResolver.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/resolver/MarkupInheritanceResolver.java b/wicket-core/src/main/java/org/apache/wicket/markup/resolver/MarkupInheritanceResolver.java
deleted file mode 100644
index fe39acc..0000000
--- a/wicket-core/src/main/java/org/apache/wicket/markup/resolver/MarkupInheritanceResolver.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.markup.resolver;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.MarkupStream;
-import org.apache.wicket.markup.WicketTag;
-import org.apache.wicket.markup.html.TransparentWebMarkupContainer;
-
-/**
- * Detect <wicket:extend> and <wicket:child> tags, which are silently ignored, because
- * they have already been processed.
- *
- * @author Juergen Donnerstag
- */
-public class MarkupInheritanceResolver implements IComponentResolver
-{
- private static final long serialVersionUID = 1L;
-
- /** */
- public static final String CHILD = "child";
-
- /** */
- public static final String EXTEND = "extend";
-
- /**
- * @see org.apache.wicket.markup.resolver.IComponentResolver#resolve(org.apache.wicket.MarkupContainer,
- * org.apache.wicket.markup.MarkupStream, org.apache.wicket.markup.ComponentTag)
- */
- @Override
- public Component resolve(final MarkupContainer container, final MarkupStream markupStream,
- final ComponentTag tag)
- {
- // It must be <wicket:...>
- if (tag instanceof WicketTag)
- {
- final WicketTag wicketTag = (WicketTag)tag;
-
- // It must be <wicket:extend...>
- if (wicketTag.isExtendTag() || wicketTag.isChildTag())
- {
- String id = wicketTag.getId();
- return new TransparentWebMarkupContainer(id);
- }
- }
-
- // We were not able to handle the componentId
- return null;
- }
-}
\ No newline at end of file