Update of 
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/resources
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20089/modules/ejb/src/xdoclet/modules/ejb/entity/resources

Modified Files:
        entity-value.xdt entity-value-instantiation.xdt 
        valueobject.xdt 
Log Message:
added parameter for controlling the plural form of aggregate-name and 
compose-name (XDT-139)

Index: entity-value.xdt
===================================================================
RCS file: 
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/resources/entity-value.xdt,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** entity-value.xdt    3 Apr 2005 10:49:35 -0000       1.17
--- entity-value.xdt    4 Apr 2005 18:20:15 -0000       1.18
***************
*** 194,198 ****
  them abstract with a ejb:interface tag to give them access from the outside.
  </XDtComment:comment>
!                java.util.Iterator i<XDtEjbValueObj:currentAggregateName/> = 
valueHolder.getAdded<XDtEjbValueObj:currentAggregateName/>s().iterator();
                 while (i<XDtEjbValueObj:currentAggregateName/>.hasNext())
                 {
--- 194,198 ----
  them abstract with a ejb:interface tag to give them access from the outside.
  </XDtComment:comment>
!                java.util.Iterator i<XDtEjbValueObj:currentAggregateName/> = 
valueHolder.getAdded<XDtEjbValueObj:currentAggregateName 
plural="true"/>().iterator();
                 while (i<XDtEjbValueObj:currentAggregateName/>.hasNext())
                 {
***************
*** 200,204 ****
                        add<XDtMethod:methodTagValue tagName="ejb:value-object" 
paramName="members-name"/>(o);
                 }
!                i<XDtEjbValueObj:currentAggregateName/> = 
valueHolder.getRemoved<XDtEjbValueObj:currentAggregateName/>s().iterator();
                 while (i<XDtEjbValueObj:currentAggregateName/>.hasNext())
                 {
--- 200,204 ----
                        add<XDtMethod:methodTagValue tagName="ejb:value-object" 
paramName="members-name"/>(o);
                 }
!                i<XDtEjbValueObj:currentAggregateName/> = 
valueHolder.getRemoved<XDtEjbValueObj:currentAggregateName 
plural="true"/>().iterator();
                 while (i<XDtEjbValueObj:currentAggregateName/>.hasNext())
                 {
***************
*** 238,242 ****
  them abstract with a ejb:interface tag to give them access from the outside.
  </XDtComment:comment>
!                java.util.Iterator i<XDtEjbValueObj:currentAggregateName/> = 
valueHolder.getUpdated<XDtEjbValueObj:currentAggregateName/>s().iterator();
                 while (i<XDtEjbValueObj:currentAggregateName/>.hasNext())
                 {
--- 238,242 ----
  them abstract with a ejb:interface tag to give them access from the outside.
  </XDtComment:comment>
!                java.util.Iterator i<XDtEjbValueObj:currentAggregateName/> = 
valueHolder.getUpdated<XDtEjbValueObj:currentAggregateName 
plural="true"/>().iterator();
                 while (i<XDtEjbValueObj:currentAggregateName/>.hasNext())
                 {
***************
*** 244,248 ****
                        update<XDtMethod:methodTagValue 
tagName="ejb:value-object" paramName="members-name"/>(o);
                 }
!                i<XDtEjbValueObj:currentAggregateName/> = 
valueHolder.getAdded<XDtEjbValueObj:currentAggregateName/>s().iterator();
                 while (i<XDtEjbValueObj:currentAggregateName/>.hasNext())
                 {
--- 244,248 ----
                        update<XDtMethod:methodTagValue 
tagName="ejb:value-object" paramName="members-name"/>(o);
                 }
!                i<XDtEjbValueObj:currentAggregateName/> = 
valueHolder.getAdded<XDtEjbValueObj:currentAggregateName 
plural="true"/>().iterator();
                 while (i<XDtEjbValueObj:currentAggregateName/>.hasNext())
                 {
***************
*** 250,254 ****
                        add<XDtMethod:methodTagValue tagName="ejb:value-object" 
paramName="members-name"/>(o);
                 }
!                i<XDtEjbValueObj:currentAggregateName/> = 
valueHolder.getRemoved<XDtEjbValueObj:currentAggregateName/>s().iterator();
                 while (i<XDtEjbValueObj:currentAggregateName/>.hasNext())
                 {
--- 250,254 ----
                        add<XDtMethod:methodTagValue tagName="ejb:value-object" 
paramName="members-name"/>(o);
                 }
!                i<XDtEjbValueObj:currentAggregateName/> = 
valueHolder.getRemoved<XDtEjbValueObj:currentAggregateName 
plural="true"/>().iterator();
                 while (i<XDtEjbValueObj:currentAggregateName/>.hasNext())
                 {

Index: entity-value-instantiation.xdt
===================================================================
RCS file: 
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/resources/entity-value-instantiation.xdt,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** entity-value-instantiation.xdt      3 Apr 2005 10:48:16 -0000       1.6
--- entity-value-instantiation.xdt      4 Apr 2005 18:20:17 -0000       1.7
***************
*** 12,16 ****
            </XDtEjbValueObj:ifIsNotCollection>
            <XDtEjbValueObj:ifIsCollection>
!             
<XDtEjbValueObj:currentValueObjectAttribute/>.clear<XDtEjbValueObj:currentAggregateName/>s();
              java.util.Iterator i<XDtEjbValueObj:currentAggregateName/> = 
<XDtMethod:getterMethod/>().iterator();
              while (i<XDtEjbValueObj:currentAggregateName/>.hasNext()){
--- 12,16 ----
            </XDtEjbValueObj:ifIsNotCollection>
            <XDtEjbValueObj:ifIsCollection>
!             
<XDtEjbValueObj:currentValueObjectAttribute/>.clear<XDtEjbValueObj:currentAggregateName
 plural="true"/>();
              java.util.Iterator i<XDtEjbValueObj:currentAggregateName/> = 
<XDtMethod:getterMethod/>().iterator();
              while (i<XDtEjbValueObj:currentAggregateName/>.hasNext()){

Index: valueobject.xdt
===================================================================
RCS file: 
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/resources/valueobject.xdt,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** valueobject.xdt     3 Apr 2005 10:52:29 -0000       1.28
--- valueobject.xdt     4 Apr 2005 18:20:17 -0000       1.29
***************
*** 54,58 ****
    <XDtEjbValueObj:ifIsCollection>

   

!    private <XDtEjbValueObj:collectionType/> 
<XDtEjbValueObj:currentAggregateName/>s = wrapCollection(new 
<XDtEjbValueObj:concreteCollectionType/>() );

  

    </XDtEjbValueObj:ifIsCollection>

--- 54,58 ----
    <XDtEjbValueObj:ifIsCollection>

   

!    private <XDtEjbValueObj:collectionType/> 
<XDtEjbValueObj:currentAggregateName plural="true"/> = wrapCollection(new 
<XDtEjbValueObj:concreteCollectionType/>() );

  

    </XDtEjbValueObj:ifIsCollection>

***************
*** 107,111 ****
         </XDtEjbValueObj:ifIsNotCollection>

       <XDtEjbValueObj:ifIsCollection>

!         
this.<XDtEjbValueObj:currentAggregateName/>s.addAll(otherValue.<XDtEjbValueObj:currentAggregateName/>s);

         </XDtEjbValueObj:ifIsCollection>

        </XDtEjbValueObj:forAllRelations>

--- 107,111 ----
         </XDtEjbValueObj:ifIsNotCollection>

       <XDtEjbValueObj:ifIsCollection>

!         this.<XDtEjbValueObj:currentAggregateName 
plural="true"/>.addAll(otherValue.<XDtEjbValueObj:currentAggregateName 
plural="true"/>);

         </XDtEjbValueObj:ifIsCollection>

        </XDtEjbValueObj:forAllRelations>

***************
*** 188,220 ****
    </XDtEjbValueObj:ifIsNotCollection>

    <XDtEjbValueObj:ifIsCollection>

!    protected <XDtEjbValueObj:collectionType/> 
added<XDtEjbValueObj:currentAggregateName/>s = wrapCollection(new 
<XDtEjbValueObj:concreteCollectionType/>());

!    protected <XDtEjbValueObj:collectionType/> 
onceAdded<XDtEjbValueObj:currentAggregateName/>s = wrapCollection(new 
<XDtEjbValueObj:concreteCollectionType/>());

!    protected <XDtEjbValueObj:collectionType/> 
removed<XDtEjbValueObj:currentAggregateName/>s = wrapCollection(new 
<XDtEjbValueObj:concreteCollectionType/>());

!    protected <XDtEjbValueObj:collectionType/> 
updated<XDtEjbValueObj:currentAggregateName/>s = wrapCollection(new 
<XDtEjbValueObj:concreteCollectionType/>());

  

     /**

      * Important: This method returns an unmodifiable collection.

      */

!    public <XDtEjbValueObj:collectionType/> 
getAdded<XDtEjbValueObj:currentAggregateName/>s() { return 
wrapReadOnly(added<XDtEjbValueObj:currentAggregateName/>s); }

  

     /**

      * Important: This method returns an unmodifiable collection.

      */

!     public <XDtEjbValueObj:collectionType/> 
getOnceAdded<XDtEjbValueObj:currentAggregateName/>s() { return 
wrapReadOnly(onceAdded<XDtEjbValueObj:currentAggregateName/>s); }

     

     /**

      * Important: This method returns an unmodifiable collection.

      */

!     public <XDtEjbValueObj:collectionType/> 
getRemoved<XDtEjbValueObj:currentAggregateName/>s() { return 
wrapReadOnly(removed<XDtEjbValueObj:currentAggregateName/>s); }

     

     /**

      * Important: This method returns an unmodifiable collection.

      */

!     public <XDtEjbValueObj:collectionType/> 
getUpdated<XDtEjbValueObj:currentAggregateName/>s() { return 
wrapReadOnly(updated<XDtEjbValueObj:currentAggregateName/>s); }

     

     /**

      * Important: This method returns an unmodifiable collection.

      */

!     public <XDtEjbValueObj:collectionType/> 
get<XDtEjbValueObj:currentAggregateName/>Collection() { return 
wrapReadOnly(<XDtEjbValueObj:currentAggregateName/>s); }

  

     /**

--- 188,220 ----
    </XDtEjbValueObj:ifIsNotCollection>

    <XDtEjbValueObj:ifIsCollection>

!    protected <XDtEjbValueObj:collectionType/> 
added<XDtEjbValueObj:currentAggregateName plural="true"/> = wrapCollection(new 
<XDtEjbValueObj:concreteCollectionType/>());

!    protected <XDtEjbValueObj:collectionType/> 
onceAdded<XDtEjbValueObj:currentAggregateName plural="true"/> = 
wrapCollection(new <XDtEjbValueObj:concreteCollectionType/>());

!    protected <XDtEjbValueObj:collectionType/> 
removed<XDtEjbValueObj:currentAggregateName plural="true"/> = 
wrapCollection(new <XDtEjbValueObj:concreteCollectionType/>());

!    protected <XDtEjbValueObj:collectionType/> 
updated<XDtEjbValueObj:currentAggregateName plural="true"/> = 
wrapCollection(new <XDtEjbValueObj:concreteCollectionType/>());

  

     /**

      * Important: This method returns an unmodifiable collection.

      */

!    public <XDtEjbValueObj:collectionType/> 
getAdded<XDtEjbValueObj:currentAggregateName plural="true"/>() { return 
wrapReadOnly(added<XDtEjbValueObj:currentAggregateName plural="true"/>); }

  

     /**

      * Important: This method returns an unmodifiable collection.

      */

!     public <XDtEjbValueObj:collectionType/> 
getOnceAdded<XDtEjbValueObj:currentAggregateName plural="true"/>() { return 
wrapReadOnly(onceAdded<XDtEjbValueObj:currentAggregateName plural="true"/>); }

     

     /**

      * Important: This method returns an unmodifiable collection.

      */

!     public <XDtEjbValueObj:collectionType/> 
getRemoved<XDtEjbValueObj:currentAggregateName plural="true"/>() { return 
wrapReadOnly(removed<XDtEjbValueObj:currentAggregateName plural="true"/>); }

     

     /**

      * Important: This method returns an unmodifiable collection.

      */

!     public <XDtEjbValueObj:collectionType/> 
getUpdated<XDtEjbValueObj:currentAggregateName plural="true"/>() { return 
wrapReadOnly(updated<XDtEjbValueObj:currentAggregateName plural="true"/>); }

     

     /**

      * Important: This method returns an unmodifiable collection.

      */

!     public <XDtEjbValueObj:collectionType/> 
get<XDtEjbValueObj:currentAggregateName/>Collection() { return 
wrapReadOnly(<XDtEjbValueObj:currentAggregateName plural="true"/>); }

  

     /**

***************
*** 233,242 ****
      * @deprecated

      */

!    public <XDtClass:ifClassTagValueEquals tagName="ejb:value-object" 
paramName="synchronization" value="full">synchronized 
</XDtClass:ifClassTagValueEquals>void 
setAdded<XDtEjbValueObj:currentAggregateName/>s(<XDtEjbValueObj:collectionType/>
 added<XDtEjbValueObj:currentAggregateName/>s)

     {

        //This operation is atomic if the input collection is synchronized.

!       java.util.List tempList = 
java.util.Arrays.asList(added<XDtEjbValueObj:currentAggregateName/>s.toArray());

!       this.added<XDtEjbValueObj:currentAggregateName/>s.clear();

!       this.added<XDtEjbValueObj:currentAggregateName/>s.addAll(tempList);

     }

  

--- 233,242 ----
      * @deprecated

      */

!    public <XDtClass:ifClassTagValueEquals tagName="ejb:value-object" 
paramName="synchronization" value="full">synchronized 
</XDtClass:ifClassTagValueEquals>void 
setAdded<XDtEjbValueObj:currentAggregateName 
plural="true"/>(<XDtEjbValueObj:collectionType/> 
added<XDtEjbValueObj:currentAggregateName plural="true"/>)

     {

        //This operation is atomic if the input collection is synchronized.

!       java.util.List tempList = 
java.util.Arrays.asList(added<XDtEjbValueObj:currentAggregateName 
plural="true"/>.toArray());

!       this.added<XDtEjbValueObj:currentAggregateName plural="true"/>.clear();

!       this.added<XDtEjbValueObj:currentAggregateName 
plural="true"/>.addAll(tempList);

     }

  

***************
*** 256,265 ****
      * @deprecated

      */

!    public <XDtClass:ifClassTagValueEquals tagName="ejb:value-object" 
paramName="synchronization" value="full">synchronized 
</XDtClass:ifClassTagValueEquals>void 
setOnceAdded<XDtEjbValueObj:currentAggregateName/>s(<XDtEjbValueObj:collectionType/>
 onceAdded<XDtEjbValueObj:currentAggregateName/>s)

     {

        //This operation is atomic if the input collection is synchronized.

!       java.util.List tempList = 
java.util.Arrays.asList(onceAdded<XDtEjbValueObj:currentAggregateName/>s.toArray());

!       this.onceAdded<XDtEjbValueObj:currentAggregateName/>s.clear();

!       this.onceAdded<XDtEjbValueObj:currentAggregateName/>s.addAll(tempList);

      }

  

--- 256,265 ----
      * @deprecated

      */

!    public <XDtClass:ifClassTagValueEquals tagName="ejb:value-object" 
paramName="synchronization" value="full">synchronized 
</XDtClass:ifClassTagValueEquals>void 
setOnceAdded<XDtEjbValueObj:currentAggregateName 
plural="true"/>(<XDtEjbValueObj:collectionType/> 
onceAdded<XDtEjbValueObj:currentAggregateName plural="true"/>)

     {

        //This operation is atomic if the input collection is synchronized.

!       java.util.List tempList = 
java.util.Arrays.asList(onceAdded<XDtEjbValueObj:currentAggregateName 
plural="true"/>.toArray());

!       this.onceAdded<XDtEjbValueObj:currentAggregateName 
plural="true"/>.clear();

!       this.onceAdded<XDtEjbValueObj:currentAggregateName 
plural="true"/>.addAll(tempList);

      }

  

***************
*** 279,288 ****
      * @deprecated

      */

!    public <XDtClass:ifClassTagValueEquals tagName="ejb:value-object" 
paramName="synchronization" value="full">synchronized 
</XDtClass:ifClassTagValueEquals>void 
setRemoved<XDtEjbValueObj:currentAggregateName/>s(<XDtEjbValueObj:collectionType/>
 removed<XDtEjbValueObj:currentAggregateName/>s)

     {

        //This operation is atomic if the input collection is synchronized.

!       java.util.List tempList = 
java.util.Arrays.asList(removed<XDtEjbValueObj:currentAggregateName/>s.toArray());

!       this.removed<XDtEjbValueObj:currentAggregateName/>s.clear();

!       this.removed<XDtEjbValueObj:currentAggregateName/>s.addAll(tempList);

     }

  

--- 279,288 ----
      * @deprecated

      */

!    public <XDtClass:ifClassTagValueEquals tagName="ejb:value-object" 
paramName="synchronization" value="full">synchronized 
</XDtClass:ifClassTagValueEquals>void 
setRemoved<XDtEjbValueObj:currentAggregateName 
plural="true"/>(<XDtEjbValueObj:collectionType/> 
removed<XDtEjbValueObj:currentAggregateName plural="true"/>)

     {

        //This operation is atomic if the input collection is synchronized.

!       java.util.List tempList = 
java.util.Arrays.asList(removed<XDtEjbValueObj:currentAggregateName 
plural="true"/>.toArray());

!       this.removed<XDtEjbValueObj:currentAggregateName 
plural="true"/>.clear();

!       this.removed<XDtEjbValueObj:currentAggregateName 
plural="true"/>.addAll(tempList);

     }

  

***************
*** 302,311 ****
      * @deprecated

      */

!    public <XDtClass:ifClassTagValueEquals tagName="ejb:value-object" 
paramName="synchronization" value="full">synchronized 
</XDtClass:ifClassTagValueEquals>void 
setUpdated<XDtEjbValueObj:currentAggregateName/>s(<XDtEjbValueObj:collectionType/>
 updated<XDtEjbValueObj:currentAggregateName/>s)

     {

        //This operation is atomic if the input collection is synchronized.

!       java.util.List tempList = 
java.util.Arrays.asList(updated<XDtEjbValueObj:currentAggregateName/>s.toArray());

!       this.updated<XDtEjbValueObj:currentAggregateName/>s.clear();

!       this.updated<XDtEjbValueObj:currentAggregateName/>s.addAll(tempList);

     }

  

--- 302,311 ----
      * @deprecated

      */

!    public <XDtClass:ifClassTagValueEquals tagName="ejb:value-object" 
paramName="synchronization" value="full">synchronized 
</XDtClass:ifClassTagValueEquals>void 
setUpdated<XDtEjbValueObj:currentAggregateName 
plural="true"/>(<XDtEjbValueObj:collectionType/> 
updated<XDtEjbValueObj:currentAggregateName plural="true"/>)

     {

        //This operation is atomic if the input collection is synchronized.

!       java.util.List tempList = 
java.util.Arrays.asList(updated<XDtEjbValueObj:currentAggregateName 
plural="true"/>.toArray());

!       this.updated<XDtEjbValueObj:currentAggregateName 
plural="true"/>.clear();

!       this.updated<XDtEjbValueObj:currentAggregateName 
plural="true"/>.addAll(tempList);

     }

  

***************
*** 320,326 ****
      * @deprecated

      */

!    public <XDtClass:ifClassTagValueEquals tagName="ejb:value-object" 
paramName="synchronization" value="full">synchronized 
</XDtClass:ifClassTagValueEquals><XDtEjbValueObj:currentAggregateType/>[] 
get<XDtEjbValueObj:currentAggregateName/>s()

     {

!       return 
(<XDtEjbValueObj:currentAggregateType/>[])this.<XDtEjbValueObj:currentAggregateName/>s.toArray(new
 
<XDtEjbValueObj:currentAggregateType/>[<XDtEjbValueObj:currentAggregateName/>s.size()]);

     }

  

--- 320,326 ----
      * @deprecated

      */

!    public <XDtClass:ifClassTagValueEquals tagName="ejb:value-object" 
paramName="synchronization" value="full">synchronized 
</XDtClass:ifClassTagValueEquals><XDtEjbValueObj:currentAggregateType/>[] 
get<XDtEjbValueObj:currentAggregateName plural="true"/>()

     {

!       return 
(<XDtEjbValueObj:currentAggregateType/>[])this.<XDtEjbValueObj:currentAggregateName
 plural="true"/>.toArray(new 
<XDtEjbValueObj:currentAggregateType/>[<XDtEjbValueObj:currentAggregateName 
plural="true"/>.size()]);

     }

  

***************
*** 335,349 ****
      * @deprecated

      */

!    public <XDtClass:ifClassTagValueEquals tagName="ejb:value-object" 
paramName="synchronization" value="full">synchronized 
</XDtClass:ifClassTagValueEquals>void 
set<XDtEjbValueObj:currentAggregateName/>s(<XDtEjbValueObj:currentAggregateType/>[]
 <XDtEjbValueObj:currentAggregateName/>s)

     {

!       this.<XDtEjbValueObj:currentAggregateName/>s.clear();

!       for (int i=0; i < <XDtEjbValueObj:currentAggregateName/>s.length; i++) {

!         
this.<XDtEjbValueObj:currentAggregateName/>s.add(<XDtEjbValueObj:currentAggregateName/>s[i]);

        }

     }

  

!    public <XDtClass:ifClassTagValueEquals tagName="ejb:value-object" 
paramName="synchronization" value="full">synchronized 
</XDtClass:ifClassTagValueEquals>void 
clear<XDtEjbValueObj:currentAggregateName/>s()

     {

!         this.<XDtEjbValueObj:currentAggregateName/>s.clear();

     }

  

--- 335,349 ----
      * @deprecated

      */

!    public <XDtClass:ifClassTagValueEquals tagName="ejb:value-object" 
paramName="synchronization" value="full">synchronized 
</XDtClass:ifClassTagValueEquals>void set<XDtEjbValueObj:currentAggregateName 
plural="true"/>(<XDtEjbValueObj:currentAggregateType/>[] 
<XDtEjbValueObj:currentAggregateName plural="true"/>)

     {

!       this.<XDtEjbValueObj:currentAggregateName plural="true"/>.clear();

!       for (int i=0; i < <XDtEjbValueObj:currentAggregateName 
plural="true"/>.length; i++) {

!         this.<XDtEjbValueObj:currentAggregateName 
plural="true"/>.add(<XDtEjbValueObj:currentAggregateName plural="true"/>[i]);

        }

     }

  

!    public <XDtClass:ifClassTagValueEquals tagName="ejb:value-object" 
paramName="synchronization" value="full">synchronized 
</XDtClass:ifClassTagValueEquals>void clear<XDtEjbValueObj:currentAggregateName 
plural="true"/>()

     {

!         this.<XDtEjbValueObj:currentAggregateName plural="true"/>.clear();

     }

  

***************
*** 358,382 ****
     public <XDtClass:ifClassTagValueEquals tagName="ejb:value-object" 
paramName="synchronization" value="full">synchronized 
</XDtClass:ifClassTagValueEquals>void 
add<XDtEjbValueObj:currentAggregateName/>(<XDtEjbValueObj:currentAggregateType/>
 added)

     {

!         this.<XDtEjbValueObj:currentAggregateName/>s.add(added);

  

!       if (this.removed<XDtEjbValueObj:currentAggregateName/>s.contains(added))

        {

!         this.removed<XDtEjbValueObj:currentAggregateName/>s.remove(added);

!         if 
(this.onceAdded<XDtEjbValueObj:currentAggregateName/>s.contains(added))

          {

!           if (! 
this.added<XDtEjbValueObj:currentAggregateName/>s.contains(added))

!             this.added<XDtEjbValueObj:currentAggregateName/>s.add(added);

          }

!         else if (! 
this.updated<XDtEjbValueObj:currentAggregateName/>s.contains(added))

          {

!             this.updated<XDtEjbValueObj:currentAggregateName/>s.add(added);

          }

        }

        else

        {

!         if (! 
this.onceAdded<XDtEjbValueObj:currentAggregateName/>s.contains(added))

!           this.onceAdded<XDtEjbValueObj:currentAggregateName/>s.add(added);

!         if (! 
this.added<XDtEjbValueObj:currentAggregateName/>s.contains(added))

!           this.added<XDtEjbValueObj:currentAggregateName/>s.add(added);

        }

     }

--- 358,382 ----
     public <XDtClass:ifClassTagValueEquals tagName="ejb:value-object" 
paramName="synchronization" value="full">synchronized 
</XDtClass:ifClassTagValueEquals>void 
add<XDtEjbValueObj:currentAggregateName/>(<XDtEjbValueObj:currentAggregateType/>
 added)

     {

!         this.<XDtEjbValueObj:currentAggregateName plural="true"/>.add(added);

  

!       if (this.removed<XDtEjbValueObj:currentAggregateName 
plural="true"/>.contains(added))

        {

!         this.removed<XDtEjbValueObj:currentAggregateName 
plural="true"/>.remove(added);

!         if (this.onceAdded<XDtEjbValueObj:currentAggregateName 
plural="true"/>.contains(added))

          {

!           if (! this.added<XDtEjbValueObj:currentAggregateName 
plural="true"/>.contains(added))

!             this.added<XDtEjbValueObj:currentAggregateName 
plural="true"/>.add(added);

          }

!         else if (! this.updated<XDtEjbValueObj:currentAggregateName 
plural="true"/>.contains(added))

          {

!             this.updated<XDtEjbValueObj:currentAggregateName 
plural="true"/>.add(added);

          }

        }

        else

        {

!         if (! this.onceAdded<XDtEjbValueObj:currentAggregateName 
plural="true"/>.contains(added))

!           this.onceAdded<XDtEjbValueObj:currentAggregateName 
plural="true"/>.add(added);

!         if (! this.added<XDtEjbValueObj:currentAggregateName 
plural="true"/>.contains(added))

!           this.added<XDtEjbValueObj:currentAggregateName 
plural="true"/>.add(added);

        }

     }

***************
*** 391,425 ****
     public <XDtClass:ifClassTagValueEquals tagName="ejb:value-object" 
paramName="synchronization" value="full">synchronized 
</XDtClass:ifClassTagValueEquals>void 
remove<XDtEjbValueObj:currentAggregateName/>(<XDtEjbValueObj:currentAggregateType/>
 removed)

     {

!       this.<XDtEjbValueObj:currentAggregateName/>s.remove(removed);

  

!       if (this.added<XDtEjbValueObj:currentAggregateName/>s.contains(removed))

!         this.added<XDtEjbValueObj:currentAggregateName/>s.remove(removed);

!       else if (! 
this.removed<XDtEjbValueObj:currentAggregateName/>s.contains(removed))

!         this.removed<XDtEjbValueObj:currentAggregateName/>s.add(removed);

  

!       if 
(this.updated<XDtEjbValueObj:currentAggregateName/>s.contains(removed))

!         this.updated<XDtEjbValueObj:currentAggregateName/>s.remove(removed);

     }

  

     public <XDtClass:ifClassTagValueEquals tagName="ejb:value-object" 
paramName="synchronization" value="full">synchronized 
</XDtClass:ifClassTagValueEquals>void 
update<XDtEjbValueObj:currentAggregateName/>(<XDtEjbValueObj:currentAggregateType/>
 updated)

     {

!       if ( 
!this.updated<XDtEjbValueObj:currentAggregateName/>s.contains(updated) && 
!this.added<XDtEjbValueObj:currentAggregateName/>s.contains(updated))

!              this.updated<XDtEjbValueObj:currentAggregateName/>s.add(updated);

  

!       if 
(this.removed<XDtEjbValueObj:currentAggregateName/>s.contains(updated))

!          this.removed<XDtEjbValueObj:currentAggregateName/>s.remove(updated);

     }

  

     public <XDtClass:ifClassTagValueEquals tagName="ejb:value-object" 
paramName="synchronization" value="full">synchronized 
</XDtClass:ifClassTagValueEquals>void 
clean<XDtEjbValueObj:currentAggregateName/>(){

!       this.added<XDtEjbValueObj:currentAggregateName/>s.clear();

!         this.onceAdded<XDtEjbValueObj:currentAggregateName/>s.clear();

!       this.removed<XDtEjbValueObj:currentAggregateName/>s.clear();

!       this.updated<XDtEjbValueObj:currentAggregateName/>s.clear();

     }

  

!    public <XDtClass:ifClassTagValueEquals tagName="ejb:value-object" 
paramName="synchronization" value="full">synchronized 
</XDtClass:ifClassTagValueEquals>void 
copy<XDtEjbValueObj:currentAggregateName/>sFrom(<XDtEjbValueObj:valueObjectClass/>
 from)

     {

!         this.<XDtEjbValueObj:currentAggregateName/>s.clear();

!         
this.<XDtEjbValueObj:currentAggregateName/>s.addAll(from.<XDtEjbValueObj:currentAggregateName/>s);

     }

    </XDtEjbValueObj:ifIsCollection>

--- 391,425 ----
     public <XDtClass:ifClassTagValueEquals tagName="ejb:value-object" 
paramName="synchronization" value="full">synchronized 
</XDtClass:ifClassTagValueEquals>void 
remove<XDtEjbValueObj:currentAggregateName/>(<XDtEjbValueObj:currentAggregateType/>
 removed)

     {

!       this.<XDtEjbValueObj:currentAggregateName 
plural="true"/>.remove(removed);

  

!       if (this.added<XDtEjbValueObj:currentAggregateName 
plural="true"/>.contains(removed))

!         this.added<XDtEjbValueObj:currentAggregateName 
plural="true"/>.remove(removed);

!       else if (! this.removed<XDtEjbValueObj:currentAggregateName 
plural="true"/>.contains(removed))

!         this.removed<XDtEjbValueObj:currentAggregateName 
plural="true"/>.add(removed);

  

!       if (this.updated<XDtEjbValueObj:currentAggregateName 
plural="true"/>.contains(removed))

!         this.updated<XDtEjbValueObj:currentAggregateName 
plural="true"/>.remove(removed);

     }

  

     public <XDtClass:ifClassTagValueEquals tagName="ejb:value-object" 
paramName="synchronization" value="full">synchronized 
</XDtClass:ifClassTagValueEquals>void 
update<XDtEjbValueObj:currentAggregateName/>(<XDtEjbValueObj:currentAggregateType/>
 updated)

     {

!       if ( !this.updated<XDtEjbValueObj:currentAggregateName 
plural="true"/>.contains(updated) && 
!this.added<XDtEjbValueObj:currentAggregateName 
plural="true"/>.contains(updated))

!              this.updated<XDtEjbValueObj:currentAggregateName 
plural="true"/>.add(updated);

  

!       if (this.removed<XDtEjbValueObj:currentAggregateName 
plural="true"/>.contains(updated))

!          this.removed<XDtEjbValueObj:currentAggregateName 
plural="true"/>.remove(updated);

     }

  

     public <XDtClass:ifClassTagValueEquals tagName="ejb:value-object" 
paramName="synchronization" value="full">synchronized 
</XDtClass:ifClassTagValueEquals>void 
clean<XDtEjbValueObj:currentAggregateName/>(){

!       this.added<XDtEjbValueObj:currentAggregateName plural="true"/>.clear();

!         this.onceAdded<XDtEjbValueObj:currentAggregateName 
plural="true"/>.clear();

!       this.removed<XDtEjbValueObj:currentAggregateName 
plural="true"/>.clear();

!       this.updated<XDtEjbValueObj:currentAggregateName 
plural="true"/>.clear();

     }

  

!    public <XDtClass:ifClassTagValueEquals tagName="ejb:value-object" 
paramName="synchronization" value="full">synchronized 
</XDtClass:ifClassTagValueEquals>void copy<XDtEjbValueObj:currentAggregateName 
plural="true"/>From(<XDtEjbValueObj:valueObjectClass/> from)

     {

!         this.<XDtEjbValueObj:currentAggregateName plural="true"/>.clear();

!         this.<XDtEjbValueObj:currentAggregateName 
plural="true"/>.addAll(from.<XDtEjbValueObj:currentAggregateName 
plural="true"/>);

     }

    </XDtEjbValueObj:ifIsCollection>

***************
*** 777,798 ****
          

          tempData = wrapCollection(new 
<XDtEjbValueObj:concreteCollectionType/>());

!         tempData.addAll(this.<XDtEjbValueObj:currentAggregateName/>s);

!         this.<XDtEjbValueObj:currentAggregateName/>s = tempData;

          

          tempData = wrapCollection(new 
<XDtEjbValueObj:concreteCollectionType/>());

!         tempData.addAll(this.added<XDtEjbValueObj:currentAggregateName/>s);

!         this.added<XDtEjbValueObj:currentAggregateName/>s = tempData;

          

          tempData = wrapCollection(new 
<XDtEjbValueObj:concreteCollectionType/>());

!         
tempData.addAll(this.onceAdded<XDtEjbValueObj:currentAggregateName/>s);

!         this.onceAdded<XDtEjbValueObj:currentAggregateName/>s = tempData;

          

          tempData = wrapCollection(new 
<XDtEjbValueObj:concreteCollectionType/>());

!         tempData.addAll(this.removed<XDtEjbValueObj:currentAggregateName/>s);

!         this.removed<XDtEjbValueObj:currentAggregateName/>s = tempData;

          

          tempData = wrapCollection(new 
<XDtEjbValueObj:concreteCollectionType/>());

!         tempData.addAll(this.updated<XDtEjbValueObj:currentAggregateName/>s);

!         this.updated<XDtEjbValueObj:currentAggregateName/>s = tempData;

          

          }

--- 777,798 ----
          

          tempData = wrapCollection(new 
<XDtEjbValueObj:concreteCollectionType/>());

!         tempData.addAll(this.<XDtEjbValueObj:currentAggregateName 
plural="true"/>);

!         this.<XDtEjbValueObj:currentAggregateName plural="true"/> = tempData;

          

          tempData = wrapCollection(new 
<XDtEjbValueObj:concreteCollectionType/>());

!         tempData.addAll(this.added<XDtEjbValueObj:currentAggregateName 
plural="true"/>);

!         this.added<XDtEjbValueObj:currentAggregateName plural="true"/> = 
tempData;

          

          tempData = wrapCollection(new 
<XDtEjbValueObj:concreteCollectionType/>());

!         tempData.addAll(this.onceAdded<XDtEjbValueObj:currentAggregateName 
plural="true"/>);

!         this.onceAdded<XDtEjbValueObj:currentAggregateName plural="true"/> = 
tempData;

          

          tempData = wrapCollection(new 
<XDtEjbValueObj:concreteCollectionType/>());

!         tempData.addAll(this.removed<XDtEjbValueObj:currentAggregateName 
plural="true"/>);

!         this.removed<XDtEjbValueObj:currentAggregateName plural="true"/> = 
tempData;

          

          tempData = wrapCollection(new 
<XDtEjbValueObj:concreteCollectionType/>());

!         tempData.addAll(this.updated<XDtEjbValueObj:currentAggregateName 
plural="true"/>);

!         this.updated<XDtEjbValueObj:currentAggregateName plural="true"/> = 
tempData;

          

          }

***************
*** 905,919 ****
           </XDtEjbValueObj:ifIsNotCollection>

           <XDtEjbValueObj:ifIsCollection>

!        public <XDtEjbValueObj:collectionType/> 
getAdded<XDtEjbValueObj:currentAggregateName/>s() {

!             return 
getUnderlying().getAdded<XDtEjbValueObj:currentAggregateName/>s(); 

         }

!        public <XDtEjbValueObj:collectionType/> 
getOnceAdded<XDtEjbValueObj:currentAggregateName/>s() {

!             return 
getUnderlying().getOnceAdded<XDtEjbValueObj:currentAggregateName/>s(); 

         }

!        public <XDtEjbValueObj:collectionType/> 
getRemoved<XDtEjbValueObj:currentAggregateName/>s() {

!             return 
getUnderlying().getRemoved<XDtEjbValueObj:currentAggregateName/>s(); 

         }

!        public <XDtEjbValueObj:collectionType/> 
getUpdated<XDtEjbValueObj:currentAggregateName/>s() {

!             return 
getUnderlying().getUpdated<XDtEjbValueObj:currentAggregateName/>s(); 

         }

         public <XDtEjbValueObj:collectionType/> 
get<XDtEjbValueObj:currentAggregateName/>Collection()  {

--- 905,919 ----
           </XDtEjbValueObj:ifIsNotCollection>

           <XDtEjbValueObj:ifIsCollection>

!        public <XDtEjbValueObj:collectionType/> 
getAdded<XDtEjbValueObj:currentAggregateName plural="true"/>() {

!             return 
getUnderlying().getAdded<XDtEjbValueObj:currentAggregateName plural="true"/>(); 

         }

!        public <XDtEjbValueObj:collectionType/> 
getOnceAdded<XDtEjbValueObj:currentAggregateName plural="true"/>() {

!             return 
getUnderlying().getOnceAdded<XDtEjbValueObj:currentAggregateName 
plural="true"/>(); 

         }

!        public <XDtEjbValueObj:collectionType/> 
getRemoved<XDtEjbValueObj:currentAggregateName plural="true"/>() {

!             return 
getUnderlying().getRemoved<XDtEjbValueObj:currentAggregateName 
plural="true"/>(); 

         }

!        public <XDtEjbValueObj:collectionType/> 
getUpdated<XDtEjbValueObj:currentAggregateName plural="true"/>() {

!             return 
getUnderlying().getUpdated<XDtEjbValueObj:currentAggregateName 
plural="true"/>(); 

         }

         public <XDtEjbValueObj:collectionType/> 
get<XDtEjbValueObj:currentAggregateName/>Collection()  {




-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
xdoclet-devel mailing list
xdoclet-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel

Reply via email to