cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mpfingsth...@apache.org
Subject svn commit: r372234 - /cocoon/trunk/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/AbstractWidgetDefinitionBuilder.java
Date Wed, 25 Jan 2006 15:08:09 GMT
Author: mpfingsthorn
Date: Wed Jan 25 07:07:59 2006
New Revision: 372234

URL: http://svn.apache.org/viewcvs?rev=372234&view=rev
Log:
Fixes COCOON-1688, allow NewDefinitions to have a ":" in their ID because they may reference
classes in libraries directly

Modified:
    cocoon/trunk/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/AbstractWidgetDefinitionBuilder.java

Modified: cocoon/trunk/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/AbstractWidgetDefinitionBuilder.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/AbstractWidgetDefinitionBuilder.java?rev=372234&r1=372233&r2=372234&view=diff
==============================================================================
--- cocoon/trunk/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/AbstractWidgetDefinitionBuilder.java
(original)
+++ cocoon/trunk/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/AbstractWidgetDefinitionBuilder.java
Wed Jan 25 07:07:59 2006
@@ -112,7 +112,9 @@
                 throw new Exception("A widget name cannot contain '.' or '/' as this conflicts
with widget paths, at " +
                         DomHelper.getLocation(widgetElement));
             }
-            if (id.indexOf(':') != -1) {
+            // NewDefinitions are allowed to have a : in their id because they can look up
+            // class widgets from the library directly
+            if (id.indexOf(':') != -1 && !(widgetDefinition instanceof NewDefinition))
{
                 throw new Exception("A widget name cannot contain ':' as this conflicts with
library prefixes, at " +
                         DomHelper.getLocation(widgetElement));
             }



Mime
View raw message