cvs commit: cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding RepeaterJXPathBinding.java

[vgritsenko]

vgritsenko    2004/03/31 12:34:12

  Modified:    src/blocks/forms/java/org/apache/cocoon/forms/binding
                        RepeaterJXPathBinding.java
               src/blocks/woody/java/org/apache/cocoon/woody/binding
                        RepeaterJXPathBinding.java
  Log:
  Passed deleteBindings can be null. Unconditional creation of context hides 
warning message.
  
  Revision  Changes    Path
  1.4       +7 -5      
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/RepeaterJXPathBinding.java
  
  Index: RepeaterJXPathBinding.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/RepeaterJXPathBinding.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- RepeaterJXPathBinding.java        15 Mar 2004 21:57:26 -0000      1.3
  +++ RepeaterJXPathBinding.java        31 Mar 2004 20:34:11 -0000      1.4
  @@ -71,11 +71,13 @@
               this.insertRowBinding.setParent(this);
           }
   
  -        this.deleteRowBinding = new ComposedJXPathBindingBase(
  -                                        
JXPathBindingBuilderBase.CommonAttributes.DEFAULT,
  -                                        deleteBindings);
  -        if (this.deleteRowBinding != null) {
  +        if (deleteBindings != null) {
  +            this.deleteRowBinding = new ComposedJXPathBindingBase(
  +                    JXPathBindingBuilderBase.CommonAttributes.DEFAULT,
  +                    deleteBindings);
               this.deleteRowBinding.setParent(this);
  +        } else {
  +            this.deleteRowBinding = null;
           }
   
           this.identityBinding = new ComposedJXPathBindingBase(
  
  
  
  1.27      +9 -5      
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/RepeaterJXPathBinding.java
  
  Index: RepeaterJXPathBinding.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/RepeaterJXPathBinding.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- RepeaterJXPathBinding.java        9 Mar 2004 13:54:08 -0000       1.26
  +++ RepeaterJXPathBinding.java        31 Mar 2004 20:34:12 -0000      1.27
  @@ -86,12 +86,16 @@
           if (this.insertRowBinding != null) {
               this.insertRowBinding.setParent(this);
           }
  -        this.deleteRowBinding = new ComposedJXPathBindingBase(
  -                JXPathBindingBuilderBase.CommonAttributes.DEFAULT,
  -                deleteBindings);
  -        if (this.deleteRowBinding != null) {
  +
  +        if (deleteBindings != null) {
  +            this.deleteRowBinding = new ComposedJXPathBindingBase(
  +                    JXPathBindingBuilderBase.CommonAttributes.DEFAULT,
  +                    deleteBindings);
               this.deleteRowBinding.setParent(this);
  +        } else {
  +            this.deleteRowBinding = null;
           }
  +
           // New unique key management
           uniqueRowBinding = new ArrayList();
           // Create a UniqueFieldJXPathBining for the unique define in 
old-style