Update of
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/resources
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15424/modules/ejb/src/xdoclet/modules/ejb/entity/resources
Modified Files:
valueobject.xdt
Log Message:
renamed the pk instance variable to primaryKey to ensure that only one
cmp-field name ('primaryKey') is reserved when using value objects(XDT-480)
Index: valueobject.xdt
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/resources/valueobject.xdt,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** valueobject.xdt 2 Apr 2005 21:17:55 -0000 1.26
--- valueobject.xdt 3 Apr 2005 08:40:45 -0000 1.27
***************
*** 59,63 ****
</XDtEjbValueObj:forAllRelations>
! private <XDtEjbPk:pkClass/> pk;
<XDtEjbBmp:ifUseSoftLocking>
--- 59,63 ----
</XDtEjbValueObj:forAllRelations>
! private <XDtEjbPk:pkClass/> primaryKey;
<XDtEjbBmp:ifUseSoftLocking>
***************
*** 68,79 ****
{
<XDtEjbPk:ifDoesntHavePrimkeyField>
! pk = new <XDtEjbPk:pkClass/>();
</XDtEjbPk:ifDoesntHavePrimkeyField>
}
<XDtEjbValueObj:ifGeneratePKConstructor>
! public
<XDtClass:classOf><XDtEjbValueObj:valueObjectClass/></XDtClass:classOf>(<XDtEjbPk:pkClass/>
pk)
{
! this.pk = pk;
}
--- 68,79 ----
{
<XDtEjbPk:ifDoesntHavePrimkeyField>
! primaryKey = new <XDtEjbPk:pkClass/>();
</XDtEjbPk:ifDoesntHavePrimkeyField>
}
<XDtEjbValueObj:ifGeneratePKConstructor>
! public
<XDtClass:classOf><XDtEjbValueObj:valueObjectClass/></XDtClass:classOf>(<XDtEjbPk:pkClass/>
primaryKey)
{
! this.primaryKey = primaryKey;
}
***************
*** 82,92 ****
{
<XDtEjbPersistent:forAllPersistentFields superclasses="true"
valueobject="<XDtEjbValueObj:valueObjectMatch/>">
! <XDtMethod:setterMethod/>(<XDtMethod:propertyName/>);
</XDtEjbPersistent:forAllPersistentFields>
<XDtEjbPk:ifHasPrimkeyField>
! pk = this.<XDtEjbPk:primkeyGetter/>();
</XDtEjbPk:ifHasPrimkeyField>
<XDtEjbPk:ifDoesntHavePrimkeyField>
! pk = new <XDtEjbPk:pkClass/>(<XDtEjbPk:pkfieldListFrom name="this"/>);
</XDtEjbPk:ifDoesntHavePrimkeyField>
}
--- 82,92 ----
{
<XDtEjbPersistent:forAllPersistentFields superclasses="true"
valueobject="<XDtEjbValueObj:valueObjectMatch/>">
! <XDtMethod:setterMethod/>(<XDtMethod:propertyName/>);
</XDtEjbPersistent:forAllPersistentFields>
<XDtEjbPk:ifHasPrimkeyField>
! primaryKey = this.<XDtEjbPk:primkeyGetter/>();
</XDtEjbPk:ifHasPrimkeyField>
<XDtEjbPk:ifDoesntHavePrimkeyField>
! primaryKey = new <XDtEjbPk:pkClass/>(<XDtEjbPk:pkfieldListFrom
name="this"/>);
</XDtEjbPk:ifDoesntHavePrimkeyField>
}
***************
*** 112,119 ****
<XDtEjbPk:ifHasPrimkeyField>
! pk = this.<XDtEjbPk:primkeyGetter/>();
</XDtEjbPk:ifHasPrimkeyField>
<XDtEjbPk:ifDoesntHavePrimkeyField>
! pk = new <XDtEjbPk:pkClass/>(<XDtEjbPk:pkfieldListFrom name="this"/>);
</XDtEjbPk:ifDoesntHavePrimkeyField>
}
--- 112,119 ----
<XDtEjbPk:ifHasPrimkeyField>
! primaryKey = this.<XDtEjbPk:primkeyGetter/>();
</XDtEjbPk:ifHasPrimkeyField>
<XDtEjbPk:ifDoesntHavePrimkeyField>
! primaryKey = new <XDtEjbPk:pkClass/>(<XDtEjbPk:pkfieldListFrom
name="this"/>);
</XDtEjbPk:ifDoesntHavePrimkeyField>
}
***************
*** 121,142 ****
public <XDtClass:ifClassTagValueEquals tagName="ejb:value-object"
paramName="synchronization" value="full">synchronized
</XDtClass:ifClassTagValueEquals><XDtEjbPk:pkClass/> getPrimaryKey()
{
! return pk;
}
! public <XDtClass:ifClassTagValueEquals tagName="ejb:value-object"
paramName="synchronization" value="full">synchronized
</XDtClass:ifClassTagValueEquals>void setPrimaryKey( <XDtEjbPk:pkClass/> pk )
{
// it's also nice to update PK object - just in case
// somebody would ask for it later...
! this.pk = pk;
<XDtEjbPersistent:forAllPersistentFields superclasses="true"
valueobject="<XDtEjbValueObj:valueObjectMatch/>">
<XDtMethod:ifHasMethod name="<XDtMethod:setterMethod/>"
parameters="<XDtMethod:methodType/>">
<XDtEjbPk:ifHasPrimkeyField>
<XDtEjbPk:ifIsPrimkeyField>
! <XDtMethod:setterMethod/>( pk );
</XDtEjbPk:ifIsPrimkeyField>
</XDtEjbPk:ifHasPrimkeyField>
<XDtEjbPk:ifDoesntHavePrimkeyField>
<XDtEjbPk:ifIsPkField>
! <XDtMethod:setterMethod/>( pk.<XDtEjbCmp:fieldName/> );
</XDtEjbPk:ifIsPkField>
</XDtEjbPk:ifDoesntHavePrimkeyField>
--- 121,142 ----
public <XDtClass:ifClassTagValueEquals tagName="ejb:value-object"
paramName="synchronization" value="full">synchronized
</XDtClass:ifClassTagValueEquals><XDtEjbPk:pkClass/> getPrimaryKey()
{
! return primaryKey;
}
! public <XDtClass:ifClassTagValueEquals tagName="ejb:value-object"
paramName="synchronization" value="full">synchronized
</XDtClass:ifClassTagValueEquals>void setPrimaryKey( <XDtEjbPk:pkClass/>
primaryKey)
{
// it's also nice to update PK object - just in case
// somebody would ask for it later...
! this.primaryKey = primaryKey;
<XDtEjbPersistent:forAllPersistentFields superclasses="true"
valueobject="<XDtEjbValueObj:valueObjectMatch/>">
<XDtMethod:ifHasMethod name="<XDtMethod:setterMethod/>"
parameters="<XDtMethod:methodType/>">
<XDtEjbPk:ifHasPrimkeyField>
<XDtEjbPk:ifIsPrimkeyField>
! <XDtMethod:setterMethod/>( primaryKey );
</XDtEjbPk:ifIsPrimkeyField>
</XDtEjbPk:ifHasPrimkeyField>
<XDtEjbPk:ifDoesntHavePrimkeyField>
<XDtEjbPk:ifIsPkField>
! <XDtMethod:setterMethod/>( primaryKey.<XDtEjbCmp:fieldName/> );
</XDtEjbPk:ifIsPkField>
</XDtEjbPk:ifDoesntHavePrimkeyField>
***************
*** 159,168 ****
<XDtEjbPk:ifHasPrimkeyField>
<XDtEjbPk:ifIsPrimkeyField>
! pk = <XDtMethod:propertyName/>;
</XDtEjbPk:ifIsPrimkeyField>
</XDtEjbPk:ifHasPrimkeyField>
<XDtEjbPk:ifDoesntHavePrimkeyField>
<XDtEjbPk:ifIsPkField>
! pk.<XDtMethod:setterMethod/>(<XDtMethod:propertyName/>);
</XDtEjbPk:ifIsPkField>
</XDtEjbPk:ifDoesntHavePrimkeyField>
--- 159,168 ----
<XDtEjbPk:ifHasPrimkeyField>
<XDtEjbPk:ifIsPrimkeyField>
! primaryKey = <XDtMethod:propertyName/>;
</XDtEjbPk:ifIsPrimkeyField>
</XDtEjbPk:ifHasPrimkeyField>
<XDtEjbPk:ifDoesntHavePrimkeyField>
<XDtEjbPk:ifIsPkField>
!
primaryKey.<XDtMethod:setterMethod/>(<XDtMethod:propertyName/>);
</XDtEjbPk:ifIsPkField>
</XDtEjbPk:ifDoesntHavePrimkeyField>
-------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
