mpo 2004/05/11 02:30:24
Modified: src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript
Form.js
src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/v2
Form.js ScriptableWidget.java
src/blocks/forms/java/org/apache/cocoon/forms/formmodel
AbstractWidget.java Widget.java
Log:
Re-introducing deprecated version of getWidget (throwing RTE)
to guide users through transition of upcoming 2.1.5.
Revision Changes Path
1.11 +6 -2
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/Form.js
Index: Form.js
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/Form.js,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Form.js 7 May 2004 20:54:20 -0000 1.10
+++ Form.js 11 May 2004 09:30:24 -0000 1.11
@@ -56,7 +56,11 @@
/**
* Get the actual Form-Widget (the Java object)
*/
-Form.prototype.getWidget = function() {
+Form.prototype.getWidget = function(name) {
+ if (name != undefined) {
+ throw "getWidget(id) has been deprecated.\n" +
+ "Consider using getChild(id) or lookupWidget(path) in stead."
+ }
return this.form;
}
1.10 +12 -14
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/v2/Form.js
Index: Form.js
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/v2/Form.js,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Form.js 8 May 2004 12:52:10 -0000 1.9
+++ Form.js 11 May 2004 09:30:24 -0000 1.10
@@ -55,18 +55,16 @@
}
/**
- * Get a Widget from the form.
- * If <code>name</code> is undefined, the form widget itself is returned.
- * Otherwise, the form's child widget of name <code>name</code> is returned.
+ * Get the actual Form-Widget
+ * (which for the v2 API means that it is still
+ * wrapped in a ScriptableWidget)
*/
Form.prototype.getWidget = function(name) {
- var result;
- if (name == undefined) {
- result = this.formWidget_;
- } else {
- result = this.formWidget_.getChild(name);
- }
- return result;
+ if (name != undefined) {
+ throw "getWidget(id) has been deprecated.\n" +
+ "Consider using getChild(id) or lookupWidget(path) in stead."
+ }
+ return this.formWidget_;
}
/**
@@ -76,10 +74,10 @@
*/
Form.prototype.lookupWidget = function(path) {
var result;
- if (name == undefined) {
+ if (path == undefined) {
result = this.formWidget_;
} else {
- result = this.formWidget_.lookupWidget(name);
+ result = this.formWidget_.lookupWidget(path);
}
return result;
}
@@ -165,14 +163,14 @@
Form.prototype.load = function(object) {
if (this.binding_ == null) {
- throw new Error("Binding not configured for this form.");
+ throw "Binding not configured for this form.";
}
this.binding_.loadFormFromModel(this.formWidget_.unwrap(), object);
}
Form.prototype.save = function(object) {
if (this.binding_ == null) {
- throw new Error("Binding not configured for this form.");
+ throw "Binding not configured for this form.";
}
this.binding_.saveFormToModel(this.formWidget_.unwrap(), object);
}
1.12 +1 -5
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ScriptableWidget.java 8 May 2004 12:51:29 -0000 1.11
+++ ScriptableWidget.java 11 May 2004 09:30:24 -0000 1.12
@@ -469,10 +469,6 @@
return delegate.getRequestParameterName();
}
-// public String jsFunction_getNamespace() {
-// return delegate.getNamespace();
-// }
-
public Scriptable jsFunction_getParent() {
if (delegate != null) {
return wrap(delegate.getParent());
1.20 +6 -2
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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- AbstractWidget.java 7 May 2004 22:31:05 -0000 1.19
+++ AbstractWidget.java 11 May 2004 09:30:24 -0000 1.20
@@ -168,7 +168,6 @@
}
/**
- *
* Concrete widgets that contain actual child widgets should override to
* return the actual child-widget.
*
@@ -177,6 +176,11 @@
*/
protected Widget getChild(String id) {
return null;
+ }
+
+ public Widget getWidget(String id) {
+ throw new UnsupportedOperationException("getWidget(id) got
deprecated from the API. \n" +
+ "Considering using getChild(id) or even lookupWidget(path)
in stead.");
}
public Object getValue() {
1.14 +8 -1
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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Widget.java 7 May 2004 16:43:43 -0000 1.13
+++ Widget.java 11 May 2004 09:30:24 -0000 1.14
@@ -96,6 +96,13 @@
public String getRequestParameterName();
/**
+ * @deprecated getWidget got removed, use lookupWidget or getChild in
stead.
+ * @throws UnsupportedOperationException indicating this method has been
+ * deprecated from the API, and will be removed from future releases.
+ */
+ public Widget getWidget(String id);
+
+ /**
* Finds a widget relative to this one based on a path-like
* string (/-delimted) into the widget-tree structure.
* This supports '../' and '/' to point to
