Update of
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/resources
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13478/modules/ejb/src/xdoclet/modules/ejb/entity/resources
Modified Files:
valueobject.xdt
Log Message:
removed the type attribute for ejb.value-object (using the method's return
type) (XDT-670)
Index: valueobject.xdt
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/resources/valueobject.xdt,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** valueobject.xdt 3 Apr 2005 08:40:45 -0000 1.27
--- valueobject.xdt 3 Apr 2005 10:52:29 -0000 1.28
***************
*** 48,60 ****
</XDtEjbPersistent:forAllPersistentFields>
<XDtEjbValueObj:forAllRelations superclasses="false"
valueobject="<XDtEjbValueObj:valueObjectMatch/>">
! <XDtMethod:ifDoesntHaveMethodTag tagName="ejb:value-object"
paramName="type">
private <XDtEjbValueObj:currentAggregateType/>
<XDtEjbValueObj:currentAggregateName/>;
private boolean <XDtEjbValueObj:currentAggregateName/>HasBeenSet = false;
! </XDtMethod:ifDoesntHaveMethodTag>
! <XDtMethod:ifHasMethodTag tagName="ejb:value-object" paramName="type">
! private <XDtMethod:methodTagValue tagName="ejb:value-object"
paramName="type"/> <XDtEjbValueObj:currentAggregateName/>s = wrapCollection(new
<XDtEjbValueObj:concreteCollectionType/>() );
! </XDtMethod:ifHasMethodTag>
</XDtEjbValueObj:forAllRelations>
--- 48,60 ----
</XDtEjbPersistent:forAllPersistentFields>
<XDtEjbValueObj:forAllRelations superclasses="false"
valueobject="<XDtEjbValueObj:valueObjectMatch/>">
! <XDtEjbValueObj:ifIsNotCollection>
private <XDtEjbValueObj:currentAggregateType/>
<XDtEjbValueObj:currentAggregateName/>;
private boolean <XDtEjbValueObj:currentAggregateName/>HasBeenSet = false;
! </XDtEjbValueObj:ifIsNotCollection>
! <XDtEjbValueObj:ifIsCollection>
! private <XDtEjbValueObj:collectionType/>
<XDtEjbValueObj:currentAggregateName/>s = wrapCollection(new
<XDtEjbValueObj:concreteCollectionType/>() );
! </XDtEjbValueObj:ifIsCollection>
</XDtEjbValueObj:forAllRelations>
***************
*** 102,112 ****
</XDtEjbPersistent:forAllPersistentFields>
<XDtEjbValueObj:forAllRelations superclasses="false"
valueobject="<XDtEjbValueObj:valueObjectMatch/>">
! <XDtMethod:ifDoesntHaveMethodTag tagName="ejb:value-object"
paramName="type">
this.<XDtEjbValueObj:currentAggregateName/> =
otherValue.<XDtEjbValueObj:currentAggregateName/>;
<XDtEjbValueObj:currentAggregateName/>HasBeenSet = true;
! </XDtMethod:ifDoesntHaveMethodTag>
! <XDtMethod:ifHasMethodTag tagName="ejb:value-object" paramName="type">
this.<XDtEjbValueObj:currentAggregateName/>s.addAll(otherValue.<XDtEjbValueObj:currentAggregateName/>s);
! </XDtMethod:ifHasMethodTag>
</XDtEjbValueObj:forAllRelations>
--- 102,112 ----
</XDtEjbPersistent:forAllPersistentFields>
<XDtEjbValueObj:forAllRelations superclasses="false"
valueobject="<XDtEjbValueObj:valueObjectMatch/>">
! <XDtEjbValueObj:ifIsNotCollection>
this.<XDtEjbValueObj:currentAggregateName/> =
otherValue.<XDtEjbValueObj:currentAggregateName/>;
<XDtEjbValueObj:currentAggregateName/>HasBeenSet = true;
! </XDtEjbValueObj:ifIsNotCollection>
! <XDtEjbValueObj:ifIsCollection>
this.<XDtEjbValueObj:currentAggregateName/>s.addAll(otherValue.<XDtEjbValueObj:currentAggregateName/>s);
! </XDtEjbValueObj:ifIsCollection>
</XDtEjbValueObj:forAllRelations>
***************
*** 176,180 ****
<XDtEjbValueObj:forAllRelations superclasses="false"
valueobject="<XDtEjbValueObj:valueObjectMatch/>">
! <XDtMethod:ifDoesntHaveMethodTag tagName="ejb:value-object"
paramName="type">
public <XDtClass:ifClassTagValueEquals tagName="ejb:value-object"
paramName="synchronization" value="full">synchronized
</XDtClass:ifClassTagValueEquals><XDtEjbValueObj:currentAggregateType/>
get<XDtEjbValueObj:currentAggregateName/>()
{
--- 176,180 ----
<XDtEjbValueObj:forAllRelations superclasses="false"
valueobject="<XDtEjbValueObj:valueObjectMatch/>">
! <XDtEjbValueObj:ifIsNotCollection>
public <XDtClass:ifClassTagValueEquals tagName="ejb:value-object"
paramName="synchronization" value="full">synchronized
</XDtClass:ifClassTagValueEquals><XDtEjbValueObj:currentAggregateType/>
get<XDtEjbValueObj:currentAggregateName/>()
{
***************
*** 186,220 ****
<XDtEjbValueObj:currentAggregateName/>HasBeenSet = true;
}
! </XDtMethod:ifDoesntHaveMethodTag>
! <XDtMethod:ifHasMethodTag tagName="ejb:value-object" paramName="type">
! protected <XDtMethod:methodTagValue tagName="ejb:value-object"
paramName="type"/> added<XDtEjbValueObj:currentAggregateName/>s =
wrapCollection(new <XDtEjbValueObj:concreteCollectionType/>());
! protected <XDtMethod:methodTagValue tagName="ejb:value-object"
paramName="type"/> onceAdded<XDtEjbValueObj:currentAggregateName/>s =
wrapCollection(new <XDtEjbValueObj:concreteCollectionType/>());
! protected <XDtMethod:methodTagValue tagName="ejb:value-object"
paramName="type"/> removed<XDtEjbValueObj:currentAggregateName/>s =
wrapCollection(new <XDtEjbValueObj:concreteCollectionType/>());
! protected <XDtMethod:methodTagValue tagName="ejb:value-object"
paramName="type"/> updated<XDtEjbValueObj:currentAggregateName/>s =
wrapCollection(new <XDtEjbValueObj:concreteCollectionType/>());
/**
* Important: This method returns an unmodifiable collection.
*/
! public <XDtMethod:methodTagValue tagName="ejb:value-object"
paramName="type"/> getAdded<XDtEjbValueObj:currentAggregateName/>s() { return
wrapReadOnly(added<XDtEjbValueObj:currentAggregateName/>s); }
/**
* Important: This method returns an unmodifiable collection.
*/
! public <XDtMethod:methodTagValue tagName="ejb:value-object"
paramName="type"/> getOnceAdded<XDtEjbValueObj:currentAggregateName/>s() {
return wrapReadOnly(onceAdded<XDtEjbValueObj:currentAggregateName/>s); }
/**
* Important: This method returns an unmodifiable collection.
*/
! public <XDtMethod:methodTagValue tagName="ejb:value-object"
paramName="type"/> getRemoved<XDtEjbValueObj:currentAggregateName/>s() { return
wrapReadOnly(removed<XDtEjbValueObj:currentAggregateName/>s); }
/**
* Important: This method returns an unmodifiable collection.
*/
! public <XDtMethod:methodTagValue tagName="ejb:value-object"
paramName="type"/> getUpdated<XDtEjbValueObj:currentAggregateName/>s() { return
wrapReadOnly(updated<XDtEjbValueObj:currentAggregateName/>s); }
/**
* Important: This method returns an unmodifiable collection.
*/
! public <XDtMethod:methodTagValue tagName="ejb:value-object"
paramName="type"/> get<XDtEjbValueObj:currentAggregateName/>Collection() {
return wrapReadOnly(<XDtEjbValueObj:currentAggregateName/>s); }
/**
--- 186,220 ----
<XDtEjbValueObj:currentAggregateName/>HasBeenSet = true;
}
! </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); }
/**
***************
*** 233,237 ****
* @deprecated
*/
! public <XDtClass:ifClassTagValueEquals tagName="ejb:value-object"
paramName="synchronization" value="full">synchronized
</XDtClass:ifClassTagValueEquals>void
setAdded<XDtEjbValueObj:currentAggregateName/>s(<XDtMethod:methodTagValue
tagName="ejb:value-object" paramName="type"/>
added<XDtEjbValueObj:currentAggregateName/>s)
{
//This operation is atomic if the input collection is synchronized.
--- 233,237 ----
* @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.
***************
*** 256,260 ****
* @deprecated
*/
! public <XDtClass:ifClassTagValueEquals tagName="ejb:value-object"
paramName="synchronization" value="full">synchronized
</XDtClass:ifClassTagValueEquals>void
setOnceAdded<XDtEjbValueObj:currentAggregateName/>s(<XDtMethod:methodTagValue
tagName="ejb:value-object" paramName="type"/>
onceAdded<XDtEjbValueObj:currentAggregateName/>s)
{
//This operation is atomic if the input collection is synchronized.
--- 256,260 ----
* @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.
***************
*** 279,283 ****
* @deprecated
*/
! public <XDtClass:ifClassTagValueEquals tagName="ejb:value-object"
paramName="synchronization" value="full">synchronized
</XDtClass:ifClassTagValueEquals>void
setRemoved<XDtEjbValueObj:currentAggregateName/>s(<XDtMethod:methodTagValue
tagName="ejb:value-object" paramName="type"/>
removed<XDtEjbValueObj:currentAggregateName/>s)
{
//This operation is atomic if the input collection is synchronized.
--- 279,283 ----
* @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.
***************
*** 302,306 ****
* @deprecated
*/
! public <XDtClass:ifClassTagValueEquals tagName="ejb:value-object"
paramName="synchronization" value="full">synchronized
</XDtClass:ifClassTagValueEquals>void
setUpdated<XDtEjbValueObj:currentAggregateName/>s(<XDtMethod:methodTagValue
tagName="ejb:value-object" paramName="type"/>
updated<XDtEjbValueObj:currentAggregateName/>s)
{
//This operation is atomic if the input collection is synchronized.
--- 302,306 ----
* @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.
***************
*** 423,427 ****
this.<XDtEjbValueObj:currentAggregateName/>s.addAll(from.<XDtEjbValueObj:currentAggregateName/>s);
}
! </XDtMethod:ifHasMethodTag>
</XDtEjbValueObj:forAllRelations>
--- 423,427 ----
this.<XDtEjbValueObj:currentAggregateName/>s.addAll(from.<XDtEjbValueObj:currentAggregateName/>s);
}
! </XDtEjbValueObj:ifIsCollection>
</XDtEjbValueObj:forAllRelations>
***************
*** 567,571 ****
</XDtEjbPersistent:forAllPersistentFields>
<XDtEjbValueObj:forAllRelations superclasses="false"
valueobject="<XDtEjbValueObj:valueObjectMatch/>">
! <XDtMethod:ifDoesntHaveMethodTag tagName="ejb:value-object"
paramName="type">
if(this.<XDtEjbValueObj:currentAggregateName/> !=
that.<XDtEjbValueObj:currentAggregateName/>) {
--- 567,571 ----
</XDtEjbPersistent:forAllPersistentFields>
<XDtEjbValueObj:forAllRelations superclasses="false"
valueobject="<XDtEjbValueObj:valueObjectMatch/>">
! <XDtEjbValueObj:ifIsNotCollection>
if(this.<XDtEjbValueObj:currentAggregateName/> !=
that.<XDtEjbValueObj:currentAggregateName/>) {
***************
*** 578,587 ****
}
! </XDtMethod:ifDoesntHaveMethodTag>
! <XDtMethod:ifHasMethodTag tagName="ejb:value-object" paramName="type">
! // <XDtEjbValueObj:currentAggregateName/> is an aggregate type. We
won't compare the contents of collections (for performance reasons), so note
! //that these will not be considered when calculating equality or
hash codes. You would be wise to use strict ordering if possible, as that makes
! //for more tractable behavior.
! </XDtMethod:ifHasMethodTag>
</XDtEjbValueObj:forAllRelations>
--- 578,587 ----
}
! </XDtEjbValueObj:ifIsNotCollection>
! <XDtEjbValueObj:ifIsCollection>
! // <XDtEjbValueObj:currentAggregateName/> is an aggregate type. We
won't compare the contents of collections (for performance reasons), so note
! //that these will not be considered when calculating equality or
hash codes. You would be wise to use strict ordering if possible, as that makes
! //for more tractable behavior.
! </XDtEjbValueObj:ifIsCollection>
</XDtEjbValueObj:forAllRelations>
***************
*** 771,778 ****
<XDtEjbValueObj:forAllRelations superclasses="false"
valueobject="<XDtEjbValueObj:valueObjectMatch/>">
! <XDtMethod:ifHasMethodTag tagName="ejb:value-object" paramName="type">
{
//Anonymous block to protect from namespace collisions.
! <XDtMethod:methodTagValue tagName="ejb:value-object"
paramName="type"/> tempData;
tempData = wrapCollection(new
<XDtEjbValueObj:concreteCollectionType/>());
--- 771,778 ----
<XDtEjbValueObj:forAllRelations superclasses="false"
valueobject="<XDtEjbValueObj:valueObjectMatch/>">
! <XDtEjbValueObj:ifIsCollection>
{
//Anonymous block to protect from namespace collisions.
! <XDtEjbValueObj:collectionType/> tempData;
tempData = wrapCollection(new
<XDtEjbValueObj:concreteCollectionType/>());
***************
*** 797,801 ****
}
! </XDtMethod:ifHasMethodTag>
</XDtEjbValueObj:forAllRelations>
--- 797,801 ----
}
! </XDtEjbValueObj:ifIsCollection>
</XDtEjbValueObj:forAllRelations>
***************
*** 824,839 ****
</XDtMerge:merge>
</XDtEjbPersistent:forAllPersistentFields>
! <XDtEjbValueObj:forAllRelations superclasses="false"
valueobject="<XDtEjbValueObj:valueObjectMatch/>">
! <XDtMethod:ifDoesntHaveMethodTag tagName="ejb:value-object"
paramName="type">
result = 37*result + ((this.<XDtEjbValueObj:currentAggregateName/> !=
null) ? this.<XDtEjbValueObj:currentAggregateName/>.hashCode() : 0);
! </XDtMethod:ifDoesntHaveMethodTag>
! <XDtMethod:ifHasMethodTag tagName="ejb:value-object" paramName="type">
! // <XDtEjbValueObj:currentAggregateName/> is an aggregate type. We
won't compare the contents of collections (for performance reasons), so note
! //that these will not be considered when calculating equality or
hash codes. You would be wise to use strict ordering if possible, as that makes
! //for more tractable behavior.
! </XDtMethod:ifHasMethodTag>
</XDtEjbValueObj:forAllRelations>
!
! </XDtClass:ifClassTagValueNotEquals>
return result;
--- 824,838 ----
</XDtMerge:merge>
</XDtEjbPersistent:forAllPersistentFields>
! <XDtEjbValueObj:forAllRelations superclasses="false"
valueobject="<XDtEjbValueObj:valueObjectMatch/>">
! <XDtEjbValueObj:ifIsNotCollection>
result = 37*result + ((this.<XDtEjbValueObj:currentAggregateName/> !=
null) ? this.<XDtEjbValueObj:currentAggregateName/>.hashCode() : 0);
! </XDtEjbValueObj:ifIsNotCollection>
! <XDtEjbValueObj:ifIsCollection>
! // <XDtEjbValueObj:currentAggregateName/> is an aggregate type. We
won't compare the contents of collections (for performance reasons), so note
! //that these will not be considered when calculating equality or hash
codes. You would be wise to use strict ordering if possible, as that makes
! //for more tractable behavior.
! </XDtEjbValueObj:ifIsCollection>
</XDtEjbValueObj:forAllRelations>
! </XDtClass:ifClassTagValueNotEquals>
return result;
***************
*** 899,925 ****
</XDtEjbPersistent:forAllPersistentFields>
<XDtEjbValueObj:forAllRelations superclasses="false"
valueobject="<XDtEjbValueObj:valueObjectMatch/>">
! <XDtMethod:ifDoesntHaveMethodTag tagName="ejb:value-object"
paramName="type">
public <XDtEjbValueObj:currentAggregateType/>
get<XDtEjbValueObj:currentAggregateName/>()
{
return getUnderlying().<XDtEjbValueObj:currentAggregateName/>;
}
! </XDtMethod:ifDoesntHaveMethodTag>
! <XDtMethod:ifHasMethodTag tagName="ejb:value-object" paramName="type">
! public <XDtMethod:methodTagValue tagName="ejb:value-object"
paramName="type"/> getAdded<XDtEjbValueObj:currentAggregateName/>s() {
return
getUnderlying().getAdded<XDtEjbValueObj:currentAggregateName/>s();
}
! public <XDtMethod:methodTagValue tagName="ejb:value-object"
paramName="type"/> getOnceAdded<XDtEjbValueObj:currentAggregateName/>s() {
return
getUnderlying().getOnceAdded<XDtEjbValueObj:currentAggregateName/>s();
}
! public <XDtMethod:methodTagValue tagName="ejb:value-object"
paramName="type"/> getRemoved<XDtEjbValueObj:currentAggregateName/>s() {
return
getUnderlying().getRemoved<XDtEjbValueObj:currentAggregateName/>s();
}
! public <XDtMethod:methodTagValue tagName="ejb:value-object"
paramName="type"/> getUpdated<XDtEjbValueObj:currentAggregateName/>s() {
return
getUnderlying().getUpdated<XDtEjbValueObj:currentAggregateName/>s();
}
! public <XDtMethod:methodTagValue tagName="ejb:value-object"
paramName="type"/> get<XDtEjbValueObj:currentAggregateName/>Collection() {
return
getUnderlying().get<XDtEjbValueObj:currentAggregateName/>Collection();
}
! </XDtMethod:ifHasMethodTag>
</XDtEjbValueObj:forAllRelations>
--- 898,924 ----
</XDtEjbPersistent:forAllPersistentFields>
<XDtEjbValueObj:forAllRelations superclasses="false"
valueobject="<XDtEjbValueObj:valueObjectMatch/>">
! <XDtEjbValueObj:ifIsNotCollection>
public <XDtEjbValueObj:currentAggregateType/>
get<XDtEjbValueObj:currentAggregateName/>()
{
return getUnderlying().<XDtEjbValueObj:currentAggregateName/>;
}
! </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() {
return
getUnderlying().get<XDtEjbValueObj:currentAggregateName/>Collection();
}
! </XDtEjbValueObj:ifIsCollection>
</XDtEjbValueObj:forAllRelations>
-------------------------------------------------------
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
