mpo 2004/05/07 06:42:11
Modified: src/blocks/forms/java/org/apache/cocoon/forms/binding
TempRepeaterJXPathBinding.java
JXPathBindingBase.java ValueJXPathBinding.java
src/blocks/forms/java/org/apache/cocoon/forms/validation/impl
ValidationRuleValidator.java
src/blocks/forms/java/org/apache/cocoon/forms/formmodel
Repeater.java MultiValueField.java Output.java
Upload.java Action.java AbstractWidget.java
Field.java BooleanField.java AggregateField.java
Widget.java
src/blocks/forms/java/org/apache/cocoon/forms/transformation
WidgetReplacingPipe.java
EffectWidgetReplacingPipe.java
src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/v2
ScriptableWidget.java
src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/v3
ScriptableWidget.java
Log:
Renaming getFullyQaulifiedId() to getRequestParameterName() as suggested here:
http://marc.theaimsgroup.com/?l=xml-cocoon-dev&m=108387991326272&w=2
Revision Changes Path
1.5 +2 -2
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/TempRepeaterJXPathBinding.java
Index: TempRepeaterJXPathBinding.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/TempRepeaterJXPathBinding.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TempRepeaterJXPathBinding.java 23 Apr 2004 11:42:58 -0000 1.4
+++ TempRepeaterJXPathBinding.java 7 May 2004 13:42:09 -0000 1.5
@@ -73,7 +73,7 @@
// of the wrong type or null.)
Repeater repeater = (Repeater) selectWidget(frmModel,
this.repeaterId);
if (repeater == null) {
- String fullId = frmModel.getFullyQualifiedId();
+ String fullId = frmModel.getRequestParameterName();
if (fullId == null || fullId.length() == 0) {
fullId = "";
} else {
1.4 +2 -2
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/JXPathBindingBase.java
Index: JXPathBindingBase.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/JXPathBindingBase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JXPathBindingBase.java 23 Apr 2004 23:34:57 -0000 1.3
+++ JXPathBindingBase.java 7 May 2004 13:42:09 -0000 1.4
@@ -123,7 +123,7 @@
if (childWidget == null) {
throw new RuntimeException(getClass().getName() + ": Widget \"" +
id + "\" does not exist in container \"" +
- parent.getFullyQualifiedId() + "\" (" +
+ parent.getRequestParameterName() + "\" (" +
parent.getLocation() + ").");
}
1.6 +2 -2
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/ValueJXPathBinding.java
Index: ValueJXPathBinding.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/ValueJXPathBinding.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ValueJXPathBinding.java 6 May 2004 14:59:44 -0000 1.5
+++ ValueJXPathBinding.java 7 May 2004 13:42:09 -0000 1.6
@@ -134,7 +134,7 @@
// if the value has been set to null and the underlying
model is a bean, then
// JXPath will not be able to create a relative context
if (getLogger().isDebugEnabled()) {
- getLogger().debug("(Ignorable) problem binding field " +
widget.getFullyQualifiedId(), e);
+ getLogger().debug("(Ignorable) problem binding field " +
widget.getRequestParameterName(), e);
}
}
if (subContext != null) {
1.4 +2 -2
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/validation/impl/ValidationRuleValidator.java
Index: ValidationRuleValidator.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/validation/impl/ValidationRuleValidator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ValidationRuleValidator.java 28 Apr 2004 16:34:13 -0000 1.3
+++ ValidationRuleValidator.java 7 May 2004 13:42:09 -0000 1.4
@@ -41,7 +41,7 @@
{
if (! (widget instanceof ValidationErrorAware)) {
// Invalid widget type
- throw new IllegalArgumentException("Widget '" +
widget.getFullyQualifiedId() + "' is not ValidationErrorAware");
+ throw new IllegalArgumentException("Widget '" +
widget.getRequestParameterName() + "' is not ValidationErrorAware");
}
Object value = widget.getValue();
1.12 +4 -4
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Repeater.java
Index: Repeater.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Repeater.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Repeater.java 30 Apr 2004 12:19:01 -0000 1.11
+++ Repeater.java 7 May 2004 13:42:09 -0000 1.12
@@ -190,7 +190,7 @@
public void readFromRequest(FormContext formContext) {
// read number of rows from request, and make an according number of
rows
- String sizeParameter =
formContext.getRequest().getParameter(getFullyQualifiedId() + ".size");
+ String sizeParameter =
formContext.getRequest().getParameter(getRequestParameterName() + ".size");
if (sizeParameter != null) {
int size = 0;
try {
@@ -296,7 +296,7 @@
public void generateWidgetLabel(String widgetId, ContentHandler
contentHandler) throws SAXException {
WidgetDefinition widgetDefinition =
definition.getWidgetDefinition(widgetId);
if (widgetDefinition == null)
- throw new SAXException("Repeater \"" + getFullyQualifiedId() +
"\" at " + this.getLocation()
+ throw new SAXException("Repeater \"" + getRequestParameterName()
+ "\" at " + this.getLocation()
+ " contains no widget with id \"" +
widgetId + "\".");
widgetDefinition.generateLabel(contentHandler);
}
@@ -387,7 +387,7 @@
// }
public void broadcastEvent(WidgetEvent event) {
- throw new UnsupportedOperationException("Widget " +
this.getFullyQualifiedId() + " doesn't handle events.");
+ throw new UnsupportedOperationException("Widget " +
this.getRequestParameterName() + " doesn't handle events.");
}
}
}
1.11 +4 -4
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/MultiValueField.java
Index: MultiValueField.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/MultiValueField.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- MultiValueField.java 6 May 2004 14:59:44 -0000 1.10
+++ MultiValueField.java 7 May 2004 13:42:09 -0000 1.11
@@ -64,7 +64,7 @@
}
public void readFromRequest(FormContext formContext) {
- enteredValues =
formContext.getRequest().getParameterValues(getFullyQualifiedId());
+ enteredValues =
formContext.getRequest().getParameterValues(getRequestParameterName());
validationError = null;
values = null;
@@ -163,7 +163,7 @@
} else if (value.getClass().isArray()) {
setValues((Object[])value);
} else {
- throw new RuntimeException("Cannot set value of field \"" +
getFullyQualifiedId() + "\" with an object of type " +
value.getClass().getName());
+ throw new RuntimeException("Cannot set value of field \"" +
getRequestParameterName() + "\" with an object of type " +
value.getClass().getName());
}
}
@@ -171,7 +171,7 @@
// check that all the objects in the array correspond to the datatype
for (int i = 0; i < values.length; i++) {
if
(!definition.getDatatype().getTypeClass().isAssignableFrom(values[i].getClass()))
- throw new RuntimeException("Cannot set value of field \"" +
getFullyQualifiedId() + "\" with an object of type " +
values[i].getClass().getName());
+ throw new RuntimeException("Cannot set value of field \"" +
getRequestParameterName() + "\" with an object of type " +
values[i].getClass().getName());
}
this.values = values;
}
1.9 +2 -2
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Output.java
Index: Output.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Output.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Output.java 30 Apr 2004 12:19:01 -0000 1.8
+++ Output.java 7 May 2004 13:42:09 -0000 1.9
@@ -91,7 +91,7 @@
public void setValue(Object object) {
if (object != null &&
!definition.getDatatype().getTypeClass().isAssignableFrom(object.getClass())) {
throw new RuntimeException("Tried to set value of output widget
\""
- + getFullyQualifiedId()
+ + getRequestParameterName()
+ "\" with an object of an incorrect
type: "
+ "expected " +
definition.getDatatype().getTypeClass()
+ ", received " + object.getClass() +
".");
1.12 +3 -3
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Upload.java
Index: Upload.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Upload.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Upload.java 7 May 2004 13:08:24 -0000 1.11
+++ Upload.java 7 May 2004 13:42:09 -0000 1.12
@@ -59,11 +59,11 @@
}
public void setValue(Object object) {
- throw new RuntimeException("Cannot manually set the value of an
upload widget for field \"" + getFullyQualifiedId() + "\"");
+ throw new RuntimeException("Cannot manually set the value of an
upload widget for field \"" + getRequestParameterName() + "\"");
}
public void readFromRequest(FormContext formContext) {
- Object obj = formContext.getRequest().get(getFullyQualifiedId());
+ Object obj = formContext.getRequest().get(getRequestParameterName());
// If the request object is a Part, keep it
if (obj instanceof Part) {
@@ -153,7 +153,7 @@
*/
public AttributesImpl getXMLElementAttributes() {
AttributesImpl attrs = super.getXMLElementAttributes();
- attrs.addCDATAAttribute("id", getFullyQualifiedId());
+ attrs.addCDATAAttribute("id", getRequestParameterName());
attrs.addCDATAAttribute("required",
String.valueOf(uploadDefinition.isRequired()));
if (uploadDefinition.getMimeTypes() != null) {
attrs.addCDATAAttribute("mime-types",
uploadDefinition.getMimeTypes());
1.10 +2 -2
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Action.java
Index: Action.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Action.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Action.java 30 Apr 2004 12:19:01 -0000 1.9
+++ Action.java 7 May 2004 13:42:09 -0000 1.10
@@ -47,7 +47,7 @@
Form form = getForm();
// Set the submit widget if we can determine it from the request
- String fullId = getFullyQualifiedId();
+ String fullId = getRequestParameterName();
Request request = formContext.getRequest();
String value = request.getParameter(fullId);
1.17 +8 -8
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AbstractWidget.java
Index: AbstractWidget.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AbstractWidget.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- AbstractWidget.java 1 May 2004 00:05:44 -0000 1.16
+++ AbstractWidget.java 7 May 2004 13:42:09 -0000 1.17
@@ -104,7 +104,7 @@
* @throws IllegalStateException when the parent had already been set.
*/
public void setParent(Widget widget) {
- if (this.parent != null) throw new IllegalStateException("The parent
of widget " + getFullyQualifiedId() + " should only be set once.");
+ if (this.parent != null) throw new IllegalStateException("The parent
of widget " + getRequestParameterName() + " should only be set once.");
this.parent = widget;
}
@@ -135,10 +135,10 @@
// }
// }
- public String getFullyQualifiedId() {
+ public String getRequestParameterName() {
Widget myParent = getParent();
if (myParent != null) {
- String parentFullId = myParent.getFullyQualifiedId();
+ String parentFullId = myParent.getRequestParameterName();
// the top level form returns an id == ""
if (parentFullId.length() > 0) {
return parentFullId + "." + getId();
@@ -152,7 +152,7 @@
}
public void setValue(Object object) {
- throw new RuntimeException("Cannot set the value of widget " +
getFullyQualifiedId());
+ throw new RuntimeException("Cannot set the value of widget " +
getRequestParameterName());
}
public boolean isRequired() {
@@ -166,7 +166,7 @@
* Concrete subclass widgets need to override when supporting event
broadcasting.
*/
public void broadcastEvent(WidgetEvent event) {
- throw new UnsupportedOperationException("Widget " +
this.getFullyQualifiedId() + " doesn't handle events.");
+ throw new UnsupportedOperationException("Widget " +
this.getRequestParameterName() + " doesn't handle events.");
}
/**
@@ -265,7 +265,7 @@
* The XML attributes used in [EMAIL PROTECTED]
#generateSaxFragment(ContentHandler, Locale)}
* to be placed on the wrapping element for all the XML-instance-content
of this Widget.
*
- * This automatically adds @[EMAIL PROTECTED] #getFullyQualifiedId()} to
that element.
+ * This automatically adds @[EMAIL PROTECTED]
#getRequestParameterName()} to that element.
* Concrete subclasses should call super.getXMLElementAttributes and
possibly
* add additional attributes.
*
@@ -280,7 +280,7 @@
// top-level widget-containers like forms will have their id set to
""
// for those the @id should not be included.
if (getId().length() != 0) {
- attrs.addCDATAAttribute("id", getFullyQualifiedId());
+ attrs.addCDATAAttribute("id", getRequestParameterName());
}
return attrs;
}
1.16 +3 -3
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Field.java
Index: Field.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Field.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Field.java 6 May 2004 14:59:44 -0000 1.15
+++ Field.java 7 May 2004 13:42:09 -0000 1.16
@@ -129,7 +129,7 @@
public void setValue(Object newValue) {
if (newValue != null &&
!getDatatype().getTypeClass().isAssignableFrom(newValue.getClass())) {
- throw new RuntimeException("Incorrect value type for \"" +
getFullyQualifiedId() +
+ throw new RuntimeException("Incorrect value type for \"" +
getRequestParameterName() +
"\" (expected " + getDatatype().getTypeClass() +
", got " + newValue.getClass() + ".");
}
@@ -155,7 +155,7 @@
}
public void readFromRequest(FormContext formContext) {
- String newEnteredValue =
formContext.getRequest().getParameter(getFullyQualifiedId());
+ String newEnteredValue =
formContext.getRequest().getParameter(getRequestParameterName());
readFromRequest(newEnteredValue);
}
1.10 +3 -3
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/BooleanField.java
Index: BooleanField.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/BooleanField.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- BooleanField.java 30 Apr 2004 12:19:01 -0000 1.9
+++ BooleanField.java 7 May 2004 13:42:10 -0000 1.10
@@ -55,7 +55,7 @@
public void readFromRequest(FormContext formContext) {
Object oldValue = value;
- String param =
formContext.getRequest().getParameter(getFullyQualifiedId());
+ String param =
formContext.getRequest().getParameter(getRequestParameterName());
if (param != null && param.equalsIgnoreCase("true"))
value = Boolean.TRUE;
else
@@ -109,7 +109,7 @@
}
if (!(object instanceof Boolean)) {
- throw new RuntimeException("Cannot set value of boolean field
\"" + getFullyQualifiedId() + "\" to a non-Boolean value.");
+ throw new RuntimeException("Cannot set value of boolean field
\"" + getRequestParameterName() + "\" to a non-Boolean value.");
}
Object oldValue = value;
1.9 +2 -2
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AggregateField.java
Index: AggregateField.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AggregateField.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AggregateField.java 30 Apr 2004 12:19:01 -0000 1.8
+++ AggregateField.java 7 May 2004 13:42:10 -0000 1.9
@@ -94,7 +94,7 @@
}
public void readFromRequest(FormContext formContext) {
- String newEnteredValue =
formContext.getRequest().getParameter(getFullyQualifiedId());
+ String newEnteredValue =
formContext.getRequest().getParameter(getRequestParameterName());
if (newEnteredValue != null) {
// There is one aggregated entered value. Read it and split it.
super.readFromRequest(formContext);
1.12 +2 -10
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Widget.java
Index: Widget.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Widget.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Widget.java 30 Apr 2004 12:22:40 -0000 1.11
+++ Widget.java 7 May 2004 13:42:10 -0000 1.12
@@ -83,19 +83,11 @@
*/
public Form getForm();
-// /**
-// * Gets the namespace of this widget. The combination of a widget's
namespace
-// * with its id (see [EMAIL PROTECTED] #getId()} gives the widget a
form-wide unique name.
-// * In practice, the namespace consists of the id's of the widget's
parent widgets,
-// * separated by dots.
-// */
-// public String getNamespace();
-
/**
* @return the id prefixed with the namespace, this name should be unique
* accross all widgets on the form.
*/
- public String getFullyQualifiedId();
+ public String getRequestParameterName();
/**
* Lets this widget read its data from a request. At this point the
Widget
1.7 +2 -2
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/transformation/WidgetReplacingPipe.java
Index: WidgetReplacingPipe.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/transformation/WidgetReplacingPipe.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- WidgetReplacingPipe.java 23 Apr 2004 13:02:31 -0000 1.6
+++ WidgetReplacingPipe.java 7 May 2004 13:42:10 -0000 1.7
@@ -252,7 +252,7 @@
}
Widget widget = ((ContainerWidget)contextWidget).getWidget(widgetId);
if (widget == null) {
- throw new SAXException("FormsTemplateTransformer: widget with id
\"" + widgetId + "\" does not exist in the container " +
contextWidget.getFullyQualifiedId());
+ throw new SAXException("FormsTemplateTransformer: widget with id
\"" + widgetId + "\" does not exist in the container " +
contextWidget.getRequestParameterName());
}
return widget;
}
1.12 +3 -3
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/transformation/EffectWidgetReplacingPipe.java
Index: EffectWidgetReplacingPipe.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/transformation/EffectWidgetReplacingPipe.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- EffectWidgetReplacingPipe.java 23 Apr 2004 13:02:31 -0000 1.11
+++ EffectWidgetReplacingPipe.java 7 May 2004 13:42:10 -0000 1.12
@@ -170,11 +170,11 @@
protected Widget getWidget(String widgetId) throws SAXException {
Widget widget = ((ContainerWidget)contextWidget).getWidget(widgetId);
if (widget == null) {
- if (contextWidget.getFullyQualifiedId().equals("")) {
+ if (contextWidget.getRequestParameterName().equals("")) {
throwSAXException("Widget with id \"" + widgetId + "\" does
not exist in the form container.");
} else {
throwSAXException("Widget with id \"" + widgetId + "\" does
not exist in the container \"" +
- contextWidget.getFullyQualifiedId() +
"\"");
+ contextWidget.getRequestParameterName() +
"\"");
}
}
return widget;
1.9 +3 -3
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/v2/ScriptableWidget.java
Index: ScriptableWidget.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/v2/ScriptableWidget.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ScriptableWidget.java 24 Apr 2004 10:42:18 -0000 1.8
+++ ScriptableWidget.java 7 May 2004 13:42:11 -0000 1.9
@@ -467,8 +467,8 @@
return wrap(delegate.getForm().getSubmitWidget());
}
- public String jsFunction_getFullyQualifiedId() {
- return delegate.getFullyQualifiedId();
+ public String jsFunction_getRequestParameterName() {
+ return delegate.getRequestParameterName();
}
// public String jsFunction_getNamespace() {
1.2 +3 -3
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/v3/ScriptableWidget.java
Index: ScriptableWidget.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/v3/ScriptableWidget.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ScriptableWidget.java 29 Apr 2004 10:35:30 -0000 1.1
+++ ScriptableWidget.java 7 May 2004 13:42:11 -0000 1.2
@@ -458,8 +458,8 @@
return wrap(delegate.getForm().getSubmitWidget());
}
- public String jsFunction_getFullyQualifiedId() {
- return delegate.getFullyQualifiedId();
+ public String jsFunction_getRequestParameterName() {
+ return delegate.getRequestParameterName();
}
// public String jsFunction_getNamespace() {
