cvs commit: cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel FieldDefinitionBuilder.java OutputDefinitionBuilder.java MultiValueFieldDefinitionBuilder.java

[joerg]

joerg       2004/03/17 07:37:58

  Modified:    src/blocks/forms/java/org/apache/cocoon/forms/formmodel
                        FieldDefinitionBuilder.java
                        OutputDefinitionBuilder.java
                        MultiValueFieldDefinitionBuilder.java
  Log:
  error message with more details
  
  Revision  Changes    Path
  1.3       +4 -3      
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/FieldDefinitionBuilder.java
  
  Index: FieldDefinitionBuilder.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/FieldDefinitionBuilder.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- FieldDefinitionBuilder.java       9 Mar 2004 13:08:45 -0000       1.2
  +++ FieldDefinitionBuilder.java       17 Mar 2004 15:37:58 -0000      1.3
  @@ -42,8 +42,9 @@
   
           Element datatypeElement = DomHelper.getChildElement(widgetElement, 
Constants.DEFINITION_NS, "datatype");
           if (datatypeElement == null) {
  -            throw new Exception("A nested datatype element is required for 
the widget at " +
  -                                DomHelper.getLocation(widgetElement));
  +            throw new Exception("A nested datatype element is required for 
the widget " 
  +                                + widgetElement.getTagName() + " with id \"" 
+ fieldDefinition.getId()
  +                                + "\" at " + 
DomHelper.getLocation(widgetElement));
           }
   
           Datatype datatype = datatypeManager.createDatatype(datatypeElement, 
false);
  
  
  
  1.3       +6 -3      
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/OutputDefinitionBuilder.java
  
  Index: OutputDefinitionBuilder.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/OutputDefinitionBuilder.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- OutputDefinitionBuilder.java      9 Mar 2004 13:08:45 -0000       1.2
  +++ OutputDefinitionBuilder.java      17 Mar 2004 15:37:58 -0000      1.3
  @@ -33,8 +33,11 @@
           setId(widgetElement, definition);
   
           Element datatypeElement = DomHelper.getChildElement(widgetElement, 
Constants.DEFINITION_NS, "datatype");
  -        if (datatypeElement == null)
  -            throw new Exception("A nested datatype element is required for 
the widget specified at " + DomHelper.getLocation(widgetElement));
  +        if (datatypeElement == null) {
  +            throw new Exception("A nested datatype element is required for 
the widget " 
  +                                + widgetElement.getTagName() + " with id \"" 
+ definition.getId()
  +                                + "\" at " + 
DomHelper.getLocation(widgetElement));
  +        }
   
           Datatype datatype = datatypeManager.createDatatype(datatypeElement, 
false);
           definition.setDatatype(datatype);
  
  
  
  1.3       +6 -3      
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/MultiValueFieldDefinitionBuilder.java
  
  Index: MultiValueFieldDefinitionBuilder.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/MultiValueFieldDefinitionBuilder.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MultiValueFieldDefinitionBuilder.java     9 Mar 2004 13:08:45 -0000       
1.2
  +++ MultiValueFieldDefinitionBuilder.java     17 Mar 2004 15:37:58 -0000      
1.3
  @@ -37,8 +37,11 @@
           setValidators(widgetElement, definition);
   
           Element datatypeElement = DomHelper.getChildElement(widgetElement, 
Constants.DEFINITION_NS, "datatype");
  -        if (datatypeElement == null)
  -            throw new Exception("A nested datatype element is required for 
the widget specified at " + DomHelper.getLocation(widgetElement));
  +        if (datatypeElement == null) {
  +            throw new Exception("A nested datatype element is required for 
the widget "
  +                                + widgetElement.getTagName() + " with id \"" 
+ definition.getId()
  +                                + "\" at " + 
DomHelper.getLocation(widgetElement));
  +        }
   
           Datatype datatype = datatypeManager.createDatatype(datatypeElement, 
true);
           definition.setDatatype(datatype);