You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2006/09/17 01:47:26 UTC
svn commit: r446978 - in
/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel:
DuplicateIdException.java WidgetDefinitionList.java
Author: vgritsenko
Date: Sat Sep 16 16:47:26 2006
New Revision: 446978
URL: http://svn.apache.org/viewvc?view=rev&rev=446978
Log:
DuplicateIdException is located exception now.
Modified:
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/DuplicateIdException.java
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/WidgetDefinitionList.java
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/DuplicateIdException.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/DuplicateIdException.java?view=diff&rev=446978&r1=446977&r2=446978
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/DuplicateIdException.java (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/DuplicateIdException.java Sat Sep 16 16:47:26 2006
@@ -15,6 +15,9 @@
*/
package org.apache.cocoon.forms.formmodel;
+import org.apache.cocoon.forms.FormsException;
+import org.apache.cocoon.util.location.Location;
+
/**
* This exception is thrown by WidgetDefinitions that contain other WidgetDefinitions,
* such as the {@link FormDefinition} or the {@link RepeaterDefinition}, in case
@@ -23,9 +26,13 @@
*
* @version $Id$
*/
-public class DuplicateIdException extends Exception {
+public class DuplicateIdException extends FormsException {
public DuplicateIdException(String message) {
super(message);
+ }
+
+ public DuplicateIdException(String message, Location location) {
+ super(message, location);
}
}
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/WidgetDefinitionList.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/WidgetDefinitionList.java?view=diff&rev=446978&r1=446977&r2=446978
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/WidgetDefinitionList.java (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/WidgetDefinitionList.java Sat Sep 16 16:47:26 2006
@@ -60,9 +60,10 @@
Location containerLocation = containerDefinition.getLocation();
Location firstLocation = getWidgetDefinition(id).getLocation();
throw new DuplicateIdException(
- "Duplicate widget id \"" + id + "\" detected at " + duplicateLocation + ".\n" +
- "Container widget \"" + containerDefinition.getId() + "\" at " + containerLocation + "\n" +
- "already contains a widget with id \"" + id + "\" at " + firstLocation + ".");
+ "Detected duplicate widget id '" + id + "'.\n" +
+ "Container widget '" + containerDefinition.getId() + "' at " + containerLocation + "\n" +
+ "already contains a widget with the same id at " + firstLocation + ".",
+ duplicateLocation);
}
widgetDefinitionsById.put(widgetDefinition.getId(), widgetDefinition);
}