Updated Branches:
  refs/heads/markup-driven-component-tree 13d501d98 -> a65869c70


Markup driven tree - remove unused methods


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/a65869c7
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/a65869c7
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/a65869c7

Branch: refs/heads/markup-driven-component-tree
Commit: a65869c70a5f315bddeed19bfd48bfc387c5bda0
Parents: 13d501d
Author: Martin Tzvetanov Grigorov <[email protected]>
Authored: Thu Jan 23 18:05:49 2014 +0200
Committer: Martin Tzvetanov Grigorov <[email protected]>
Committed: Thu Jan 23 18:05:49 2014 +0200

----------------------------------------------------------------------
 .../java/org/apache/wicket/MarkupContainer.java | 72 --------------------
 1 file changed, 72 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/a65869c7/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 3bf8c17..55aba93 100644
--- a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
+++ b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
@@ -472,28 +472,6 @@ public abstract class MarkupContainer extends Component 
implements Iterable<Comp
        }
 
        /**
-        * THIS METHOD IS NOT PART OF THE WICKET PUBLIC API. DO NOT USE IT.
-        * 
-        * Adds a child component to this container.
-        * 
-        * @param child
-        *            The child
-        * @throws IllegalArgumentException
-        *             Thrown if a child with the same id is replaced by the 
add operation.
-        */
-       public void internalAdd(final Component child)
-       {
-               if (log.isDebugEnabled())
-               {
-                       log.debug("internalAdd " + child.getId() + " to " + 
this);
-               }
-
-               // Add to map
-               addedComponent(child);
-               put(child);
-       }
-
-       /**
         * @return Iterator that iterates through children in the order they 
were added
         */
        @Override
@@ -1916,54 +1894,4 @@ public abstract class MarkupContainer extends Component 
implements Iterable<Comp
                }
                return false;
        }
-
-       /**
-        * Automatically create components for <wicket:xxx> tag.
-        */
-       // to use it call it from #onInitialize()
-       private void createAndAddComponentsForWicketTags()
-       {
-               // Markup must be available
-               IMarkupFragment markup = getMarkup();
-               if ((markup != null) && (markup.size() > 1))
-               {
-                       MarkupStream stream = new MarkupStream(markup);
-
-                       // Skip the first component tag which already belongs 
to 'this' container
-                       if (stream.skipUntil(ComponentTag.class))
-                       {
-                               stream.next();
-                       }
-
-                       // Search for <wicket:xxx> in the remaining markup and 
try to resolve the component
-                       while (stream.skipUntil(ComponentTag.class))
-                       {
-                               ComponentTag tag = stream.getTag();
-                               if (tag.isOpen() || tag.isOpenClose())
-                               {
-                                       if (tag instanceof WicketTag)
-                                       {
-                                               Component component = 
ComponentResolvers.resolve(this, stream, tag, null);
-                                               if ((component != null) && 
(component.getParent() == null))
-                                               {
-                                                       if 
(component.getId().equals(tag.getId()) == false)
-                                                       {
-                                                               // make sure we 
are able to get() the component during rendering
-                                                               
tag.setId(component.getId());
-                                                               
tag.setModified(true);
-                                                       }
-                                                       add(component);
-                                               }
-                                       }
-
-                                       if (tag.isOpen())
-                                       {
-                                               
stream.skipToMatchingCloseTag(tag);
-                                       }
-                               }
-                               stream.next();
-                       }
-               }
-       }
-
 }

Reply via email to