svn commit: rev 46126 - cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel

[ti...@apache.org]

Author: tim
Date: Wed Sep 15 11:42:28 2004
New Revision: 46126

Modified:
   cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/NewDefinition.java
Log:
Allow "new" widgets to be direct children of "class" widgets.


Modified: cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/NewDefinition.java
==============================================================================
--- cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/NewDefinition.java	(original)
+++ cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/NewDefinition.java	Wed Sep 15 11:42:28 2004
@@ -25,7 +25,7 @@
  * {@link ClassDefinition}. The resolve step replaces this definition with
  * the definitions contained in the referenced {@link ClassDefinition}.
  *
- * @version $Id: NewDefinition.java,v 1.2 2004/04/12 14:05:09 tim Exp $
+ * @version $Id$
  */
 public class NewDefinition extends AbstractWidgetDefinition {
     private boolean resolving;
@@ -72,7 +72,9 @@
             if (definition instanceof ContainerDefinition) {
                 ((ContainerDefinition)definition).resolve(parents, parent);
             }
-            if (!(definition instanceof NewDefinition)) {
+            if (definition instanceof NewDefinition) {
+                ((NewDefinition)definition).resolve(parents, parent);
+            } else {
                 ((ContainerDefinition)parent).addWidgetDefinition(definition);
             }
         }