From 2b319e2434041a8bc17a1c566f9ae2af45398720 Mon Sep 17 00:00:00 2001 From: jensp Date: Sat, 29 Apr 2017 14:52:45 +0000 Subject: [PATCH] CCM NG/ccm-core: Fixed several things in Bebop git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4694 8810af33-2d31-482b-a856-94f89814c4df Former-commit-id: f2664dabb2b09bbbbc9f1810e71ace9bf815d3f5 --- .../main/java/com/arsdigita/bebop/SimpleContainer.java | 1 - .../main/java/com/arsdigita/bebop/util/Traversal.java | 10 +++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ccm-core/src/main/java/com/arsdigita/bebop/SimpleContainer.java b/ccm-core/src/main/java/com/arsdigita/bebop/SimpleContainer.java index aa2278bc3..8aa3c1c50 100755 --- a/ccm-core/src/main/java/com/arsdigita/bebop/SimpleContainer.java +++ b/ccm-core/src/main/java/com/arsdigita/bebop/SimpleContainer.java @@ -93,7 +93,6 @@ public class SimpleContainer extends SimpleComponent implements Container { */ public void add(Component pc) { Assert.isUnlocked(this); - Assert.exists(pc); m_components.add(pc); } diff --git a/ccm-core/src/main/java/com/arsdigita/bebop/util/Traversal.java b/ccm-core/src/main/java/com/arsdigita/bebop/util/Traversal.java index 98132bcba..915e98d8a 100755 --- a/ccm-core/src/main/java/com/arsdigita/bebop/util/Traversal.java +++ b/ccm-core/src/main/java/com/arsdigita/bebop/util/Traversal.java @@ -93,6 +93,10 @@ public abstract class Traversal { throw new IllegalStateException ("Component " + c + " is part of a cycle"); } + + LOGGER.debug("---"); + LOGGER.debug("Current component: '{}'", c); + LOGGER.debug("Visiting: {}", m_visiting); //s_log.debug("preorder called for component " + c.toString()); @@ -108,7 +112,11 @@ public abstract class Traversal { } for (Iterator i = c.children(); i.hasNext(); ) { - preorder ((Component) i.next()); + final Component component = (Component) i.next(); + LOGGER.debug("Calling preorder for component '{}'...", + component); + LOGGER.debug("---"); + preorder (component); } }