cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript ScriptablePropertyHandler.java ScriptablePointer.java ScriptablePropertyPointer.java
Date Fri, 10 Oct 2003 10:48:25 GMT
cziegeler    2003/10/10 03:48:25

  Modified:    src/java/org/apache/cocoon/components/flow/javascript
                        ScriptablePropertyHandler.java
                        ScriptablePointer.java
                        ScriptablePropertyPointer.java
  Log:
  Cleaning up code
  
  Revision  Changes    Path
  1.5       +3 -3      cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/ScriptablePropertyHandler.java
  
  Index: ScriptablePropertyHandler.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/ScriptablePropertyHandler.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ScriptablePropertyHandler.java	1 May 2003 09:32:34 -0000	1.4
  +++ ScriptablePropertyHandler.java	10 Oct 2003 10:48:25 -0000	1.5
  @@ -60,9 +60,9 @@
               cx = Context.enter();
               Scriptable s = (Scriptable)obj;
               Object result = ScriptableObject.getProperty(s, propertyName);
  -            if (result == ScriptableObject.NOT_FOUND) {
  +            if (result == Scriptable.NOT_FOUND) {
                   result = ScriptableObject.getProperty(s, "get" + propertyName.substring(0,
1).toUpperCase() + (propertyName.length() > 1 ? propertyName.substring(1) : ""));
  -                if (result != ScriptableObject.NOT_FOUND &&
  +                if (result != Scriptable.NOT_FOUND &&
                       result instanceof Function) {
                       try {
                           result = ((Function)result).call(cx, 
  
  
  
  1.5       +2 -2      cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/ScriptablePointer.java
  
  Index: ScriptablePointer.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/ScriptablePointer.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ScriptablePointer.java	4 May 2003 20:24:47 -0000	1.4
  +++ ScriptablePointer.java	10 Oct 2003 10:48:25 -0000	1.5
  @@ -108,7 +108,7 @@
               value = node;
           } else {
               value = ScriptableObject.getProperty(node, index);
  -            if (value == ScriptableObject.NOT_FOUND) {
  +            if (value == Scriptable.NOT_FOUND) {
                   value = node; // hack: same behavior as ValueUtils.getValue()
               } 
           }
  
  
  
  1.4       +2 -2      cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/ScriptablePropertyPointer.java
  
  Index: ScriptablePropertyPointer.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/ScriptablePropertyPointer.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ScriptablePropertyPointer.java	1 May 2003 09:32:34 -0000	1.3
  +++ ScriptablePropertyPointer.java	10 Oct 2003 10:48:25 -0000	1.4
  @@ -98,7 +98,7 @@
               if (value instanceof Scriptable) {
                   Object property = 
                       ScriptableObject.getProperty((Scriptable)value, index);
  -                if (property != ScriptableObject.NOT_FOUND) { 
  +                if (property != Scriptable.NOT_FOUND) { 
                       value = property; // hack?
                   } 
               } else {
  
  
  

Mime
View raw message