bruno 2004/05/08 05:51:29
Modified: src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/v2
ScriptableWidget.java
Log:
Added getChild, fixed has and get
Revision Changes Path
1.11 +12 -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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ScriptableWidget.java 7 May 2004 16:43:43 -0000 1.10
+++ ScriptableWidget.java 8 May 2004 12:51:29 -0000 1.11
@@ -127,8 +127,8 @@
}
public boolean has(String id, Scriptable start) {
- if (delegate != null) {
- Widget sub = delegate.lookupWidget(id);
+ if (delegate != null && delegate instanceof ContainerWidget) {
+ Widget sub = ((ContainerWidget)delegate).getChild(id);
if (sub != null) {
return true;
}
@@ -156,8 +156,8 @@
if (result != NOT_FOUND) {
return result;
}
- if (delegate != null ) {
- Widget sub = delegate.lookupWidget(id);
+ if (delegate != null && delegate instanceof ContainerWidget) {
+ Widget sub = ((ContainerWidget)delegate).getChild(id);
if (sub != null) {
return wrap(sub);
}
@@ -494,6 +494,13 @@
return delegate.equals(otherWidget.delegate);
}
return false;
+ }
+
+ public ScriptableWidget jsFunction_getChild(String id) {
+ Widget sub = null;
+ if (delegate instanceof ContainerWidget)
+ sub = ((ContainerWidget)delegate).getChild(id);
+ return wrap(sub);
}
public ScriptableWidget jsFunction_lookupWidget(String id) {
