User: ara_e_w Date: 02/09/18 12:49:16 Modified: modules/ejb/src/xdoclet/modules/ejb/entity/resources dataobject.xdt do-entity-value-instantiation.xdt do-entity-value.xdt entity-body.xdt entity-cmp11.xdt entity-object-hashcode.xdt entity-value-instantiation.xdt entity-value.xdt entitybmp.xdt entitycmp.xdt entityfacade.xdt entitypk.xdt valueobject.xdt Log: - everything is full qualified now, importedList removed from xdt files and marked deprecated - removed system.out from catormapping handler ** make sure any type you generate is a full qualified class ** Revision Changes Path 1.10 +10 -12 xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/resources/dataobject.xdt Index: dataobject.xdt =================================================================== RCS file: /cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/resources/dataobject.xdt,v retrieving revision 1.9 retrieving revision 1.10 diff -u -w -r1.9 -r1.10 --- dataobject.xdt 10 Sep 2002 07:36:47 -0000 1.9 +++ dataobject.xdt 18 Sep 2002 19:49:16 -0000 1.10 @@ -3,8 +3,6 @@ */ package <XDtPackage:packageOf><XDtEjbDataObj:dataObjectClass/></XDtPackage:packageOf>; -<XDtClass:importedList currentClass="<XDtEjbDataObj:dataObjectClass/>"/> - /** * <XDtI18n:getString bundle="xdoclet.modules.ejb" resource="data_object_for" arguments="<XDtEjb:ejbName/>"/> <XDtClass:classCommentTags indent="0"/> */ @@ -40,10 +38,10 @@ public <XDtClass:classOf><XDtEjbDataObj:dataObjectClass/></XDtClass:classOf>( <XDtEjbPersistent:persistentfieldList superclasses="true"/> ) { <XDtEjbPersistent:forAllPersistentFields superclasses="true"> - <XDtMethod:ifHasMethod name="<XDtMethod:setterMethod/>" parameters="<XDtMethod:methodType fullQualifiedFormat='true'/>"> + <XDtMethod:ifHasMethod name="<XDtMethod:setterMethod/>" parameters="<XDtMethod:methodType/>"> <XDtMethod:setterMethod/>(<XDtMethod:propertyName/>); </XDtMethod:ifHasMethod> - <XDtMethod:ifDoesntHaveMethod name="<XDtMethod:setterMethod/>" parameters="<XDtMethod:methodType fullQualifiedFormat='true'/>"> + <XDtMethod:ifDoesntHaveMethod name="<XDtMethod:setterMethod/>" parameters="<XDtMethod:methodType/>"> this.<XDtMethod:propertyName/> = <XDtMethod:propertyName/>; </XDtMethod:ifDoesntHaveMethod> </XDtEjbPersistent:forAllPersistentFields> @@ -53,10 +51,10 @@ public <XDtClass:classOf><XDtEjbDataObj:dataObjectClass/></XDtClass:classOf>( <XDtClass:classOf><XDtEjbDataObj:dataObjectClass/></XDtClass:classOf> otherData ) { <XDtEjbPersistent:forAllPersistentFields superclasses="true"> - <XDtMethod:ifHasMethod name="<XDtMethod:setterMethod/>" parameters="<XDtMethod:methodType fullQualifiedFormat='true'/>"> + <XDtMethod:ifHasMethod name="<XDtMethod:setterMethod/>" parameters="<XDtMethod:methodType/>"> <XDtMethod:setterMethod/>(otherData.<XDtMethod:getterMethod/>()); </XDtMethod:ifHasMethod> - <XDtMethod:ifDoesntHaveMethod name="<XDtMethod:setterMethod/>" parameters="<XDtMethod:methodType fullQualifiedFormat='true'/>"> + <XDtMethod:ifDoesntHaveMethod name="<XDtMethod:setterMethod/>" parameters="<XDtMethod:methodType/>"> this.<XDtMethod:propertyName/> = <XDtMethod:propertyName/>; </XDtMethod:ifDoesntHaveMethod> </XDtEjbPersistent:forAllPersistentFields> @@ -100,7 +98,7 @@ return this.<XDtMethod:propertyName/>; } - <XDtMethod:ifHasMethod name="<XDtMethod:setterMethod/>" parameters="<XDtMethod:methodType fullQualifiedFormat='true'/>"> + <XDtMethod:ifHasMethod name="<XDtMethod:setterMethod/>" parameters="<XDtMethod:methodType/>"> public void <XDtMethod:setterMethod/>( <XDtEjbDataObj:dataObjectClassNameFromInterfaceName/> <XDtMethod:propertyName/> ) { this.<XDtMethod:propertyName/> = <XDtMethod:propertyName/>; @@ -152,10 +150,10 @@ boolean lEquals = true; <XDtEjbPersistent:forAllPersistentFields superclasses="false"> - <XDtType:ifIsPrimitive value="<XDtMethod:methodType fullQualifiedFormat='true'/>"> + <XDtType:ifIsPrimitive value="<XDtMethod:methodType/>"> lEquals = lEquals && this.<XDtMethod:propertyName/> == lTest.<XDtMethod:propertyName/>; </XDtType:ifIsPrimitive> - <XDtType:ifIsNotPrimitive value="<XDtMethod:methodType fullQualifiedFormat='true'/>"> + <XDtType:ifIsNotPrimitive value="<XDtMethod:methodType/>"> if( this.<XDtMethod:propertyName/> == null ) { lEquals = lEquals && ( lTest.<XDtMethod:propertyName/> == null ); 1.2 +1 -1 xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/resources/do-entity-value-instantiation.xdt Index: do-entity-value-instantiation.xdt =================================================================== RCS file: /cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/resources/do-entity-value-instantiation.xdt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -w -r1.1 -r1.2 --- do-entity-value-instantiation.xdt 13 Aug 2002 04:08:07 -0000 1.1 +++ do-entity-value-instantiation.xdt 18 Sep 2002 19:49:16 -0000 1.2 @@ -1,7 +1,7 @@ try { <XDtEjbPersistent:forAllPersistentFields valueobject="<XDtEjbValueObj:currentValueObjectMatch/>"> - <XDtMethod:ifHasMethod name="<XDtMethod:setterMethod/>" parameters="<XDtMethod:methodType fullQualifiedFormat='true'/>"> + <XDtMethod:ifHasMethod name="<XDtMethod:setterMethod/>" parameters="<XDtMethod:methodType/>"> <XDtEjbValueObj:currentValueObjectAttribute/>.<XDtMethod:setterMethod/>( <XDtMethod:getterMethod/>() ); </XDtMethod:ifHasMethod> </XDtEjbPersistent:forAllPersistentFields> 1.2 +3 -3 xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/resources/do-entity-value.xdt Index: do-entity-value.xdt =================================================================== RCS file: /cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/resources/do-entity-value.xdt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -w -r1.1 -r1.2 --- do-entity-value.xdt 13 Aug 2002 04:08:07 -0000 1.1 +++ do-entity-value.xdt 18 Sep 2002 19:49:16 -0000 1.2 @@ -13,7 +13,7 @@ </XDtMerge:merge> <XDtEjbPersistent:forAllPersistentFields valueobject="<XDtEjbValueObj:currentValueObjectMatch/>"> - <XDtMethod:ifHasMethod name="<XDtMethod:setterMethod/>" parameters="<XDtMethod:methodType fullQualifiedFormat='true'/>"> + <XDtMethod:ifHasMethod name="<XDtMethod:setterMethod/>" parameters="<XDtMethod:methodType/>"> <XDtMethod:ifMethodTagValueEquals tagName="ejb:value-object" paramName="relation" value="external"> <XDtEjbValueObj:currentValueObjectAttribute/>.<XDtMethod:setterMethod/>( <XDtMethod:getterMethod/>() ); </XDtMethod:ifMethodTagValueEquals> @@ -36,7 +36,7 @@ { <XDtEjbPersistent:forAllPersistentFields not-pk="true" valueobject="<XDtEjbValueObj:currentValueObjectMatch/>"> <XDtEjbPk:ifIsNotPrimkeyField> - <XDtMethod:ifHasMethod name="<XDtMethod:setterMethod/>" parameters="<XDtMethod:methodType fullQualifiedFormat='true'/>"> + <XDtMethod:ifHasMethod name="<XDtMethod:setterMethod/>" parameters="<XDtMethod:methodType/>"> <XDtMethod:setterMethod/>( valueHolder.<XDtMethod:getterMethod/>() ); </XDtMethod:ifHasMethod> </XDtEjbPk:ifIsNotPrimkeyField> 1.10 +1 -1 xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/resources/entity-body.xdt Index: entity-body.xdt =================================================================== RCS file: /cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/resources/entity-body.xdt,v retrieving revision 1.9 retrieving revision 1.10 diff -u -w -r1.9 -r1.10 --- entity-body.xdt 8 Sep 2002 02:28:44 -0000 1.9 +++ entity-body.xdt 18 Sep 2002 19:49:16 -0000 1.10 @@ -50,7 +50,7 @@ try { <XDtEjbPersistent:forAllPersistentFields not-pk="true"> - <XDtMethod:ifHasMethod name="<XDtMethod:setterMethod/>" parameters="<XDtMethod:methodType fullQualifiedFormat='true'/>"> + <XDtMethod:ifHasMethod name="<XDtMethod:setterMethod/>" parameters="<XDtMethod:methodType/>"> <XDtMethod:setterMethod/>( dataHolder.<XDtMethod:getterMethod/>() ); </XDtMethod:ifHasMethod> </XDtEjbPersistent:forAllPersistentFields> 1.5 +1 -1 xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/resources/entity-cmp11.xdt Index: entity-cmp11.xdt =================================================================== RCS file: /cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/resources/entity-cmp11.xdt,v retrieving revision 1.4 retrieving revision 1.5 diff -u -w -r1.4 -r1.5 --- entity-cmp11.xdt 4 Jul 2002 20:31:35 -0000 1.4 +++ entity-cmp11.xdt 18 Sep 2002 19:49:16 -0000 1.5 @@ -34,7 +34,7 @@ </XDtMethod:ifIsNotAbstract> } - <XDtMethod:ifHasMethod name="<XDtMethod:setterMethod/>" parameters="<XDtMethod:methodType fullQualifiedFormat='true'/>"> + <XDtMethod:ifHasMethod name="<XDtMethod:setterMethod/>" parameters="<XDtMethod:methodType/>"> public void <XDtMethod:setterMethod/>( <XDtMethod:methodType/> <XDtMethod:propertyName/> ) <XDtMethod:exceptionList method="<XDtMethod:setterMethod/>"/> { <XDtMethod:ifIsNotAbstract method="<XDtMethod:setterMethod/>"> 1.5 +4 -4 xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/resources/entity-object-hashcode.xdt Index: entity-object-hashcode.xdt =================================================================== RCS file: /cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/resources/entity-object-hashcode.xdt,v retrieving revision 1.4 retrieving revision 1.5 diff -u -w -r1.4 -r1.5 --- entity-object-hashcode.xdt 3 Sep 2002 08:33:33 -0000 1.4 +++ entity-object-hashcode.xdt 18 Sep 2002 19:49:16 -0000 1.5 @@ -61,7 +61,7 @@ } } </XDtType:ifIsOfType> - <XDtType:ifIsPrimitiveArray value="<XDtMethod:methodType fullQualifiedFormat='true'/>"> + <XDtType:ifIsPrimitiveArray value="<XDtMethod:methodType/>"> <XDtType:ifIsNotOfType type="boolean[]" value="return-type"> <XDtType:ifIsNotOfType type="long[]" value="return-type"> <XDtType:ifIsNotOfType type="float[]" value="return-type"> @@ -79,13 +79,13 @@ </XDtType:ifIsNotOfType> </XDtType:ifIsNotOfType> </XDtType:ifIsPrimitiveArray> - <XDtType:ifIsPrimitive value="<XDtMethod:methodType fullQualifiedFormat='true'/>"> + <XDtType:ifIsPrimitive value="<XDtMethod:methodType/>"> <XDtType:ifIsNotOfType type="boolean" value="return-type"> <XDtType:ifIsNotOfType type="long" value="return-type"> <XDtType:ifIsNotOfType type="float" value="return-type"> <XDtType:ifIsNotOfType type="double" value="return-type"> <XDtType:ifIsNotOfType type="byte" value="return-type"> - <XDtType:ifIsNotPrimitiveArray value="<XDtMethod:methodType fullQualifiedFormat='true'/>"> + <XDtType:ifIsNotPrimitiveArray value="<XDtMethod:methodType/>"> result = 37*result + (int) <XDtMethod:propertyName/>; </XDtType:ifIsNotPrimitiveArray> </XDtType:ifIsNotOfType> @@ -94,6 +94,6 @@ </XDtType:ifIsNotOfType> </XDtType:ifIsNotOfType> </XDtType:ifIsPrimitive> - <XDtType:ifIsNotPrimitive value="<XDtMethod:methodType fullQualifiedFormat='true'/>"> + <XDtType:ifIsNotPrimitive value="<XDtMethod:methodType/>"> result = 37*result + ((this.<XDtMethod:propertyName/> != null) ? this.<XDtMethod:propertyName/>.hashCode() : 0); </XDtType:ifIsNotPrimitive> 1.5 +1 -1 xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/resources/entity-value-instantiation.xdt 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.4 retrieving revision 1.5 diff -u -w -r1.4 -r1.5 --- entity-value-instantiation.xdt 1 Aug 2002 18:06:35 -0000 1.4 +++ entity-value-instantiation.xdt 18 Sep 2002 19:49:16 -0000 1.5 @@ -1,7 +1,7 @@ try { <XDtEjbPersistent:forAllPersistentFields valueobject="<XDtEjbValueObj:currentValueObjectMatch/>"> - <XDtMethod:ifHasMethod name="<XDtMethod:setterMethod/>" parameters="<XDtMethod:methodType fullQualifiedFormat='true'/>"> + <XDtMethod:ifHasMethod name="<XDtMethod:setterMethod/>" parameters="<XDtMethod:methodType/>"> <XDtEjbValueObj:currentValueObjectAttribute/>.<XDtMethod:setterMethod/>( <XDtMethod:getterMethod/>() ); </XDtMethod:ifHasMethod> </XDtEjbPersistent:forAllPersistentFields> 1.7 +2 -2 xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/resources/entity-value.xdt Index: entity-value.xdt =================================================================== RCS file: /cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/resources/entity-value.xdt,v retrieving revision 1.6 retrieving revision 1.7 diff -u -w -r1.6 -r1.7 --- entity-value.xdt 10 Aug 2002 01:20:12 -0000 1.6 +++ entity-value.xdt 18 Sep 2002 19:49:16 -0000 1.7 @@ -125,7 +125,7 @@ </XDtMerge:merge> <XDtEjbPersistent:forAllPersistentFields valueobject="<XDtEjbValueObj:currentValueObjectMatch/>"> - <XDtMethod:ifHasMethod name="<XDtMethod:setterMethod/>" parameters="<XDtMethod:methodType fullQualifiedFormat='true'/>"> + <XDtMethod:ifHasMethod name="<XDtMethod:setterMethod/>" parameters="<XDtMethod:methodType/>"> <XDtMethod:ifMethodTagValueEquals tagName="ejb:value-object" paramName="relation" value="external"> <XDtEjbValueObj:currentValueObjectAttribute/>.<XDtMethod:setterMethod/>( <XDtMethod:getterMethod/>() ); </XDtMethod:ifMethodTagValueEquals> @@ -151,7 +151,7 @@ { <XDtEjbPersistent:forAllPersistentFields not-pk="true" valueobject="<XDtEjbValueObj:currentValueObjectMatch/>"> <XDtEjbPk:ifIsNotPrimkeyField> - <XDtMethod:ifHasMethod name="<XDtMethod:setterMethod/>" parameters="<XDtMethod:methodType fullQualifiedFormat='true'/>"> + <XDtMethod:ifHasMethod name="<XDtMethod:setterMethod/>" parameters="<XDtMethod:methodType/>"> <XDtMethod:setterMethod/>( valueHolder.<XDtMethod:getterMethod/>() ); </XDtMethod:ifHasMethod> </XDtEjbPk:ifIsNotPrimkeyField> 1.5 +0 -2 xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/resources/entitybmp.xdt Index: entitybmp.xdt =================================================================== RCS file: /cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/resources/entitybmp.xdt,v retrieving revision 1.4 retrieving revision 1.5 diff -u -w -r1.4 -r1.5 --- entitybmp.xdt 21 Aug 2002 22:33:30 -0000 1.4 +++ entitybmp.xdt 18 Sep 2002 19:49:16 -0000 1.5 @@ -3,8 +3,6 @@ */ package <XDtPackage:packageOf><XDtEjbBmp:entityBmpClass/></XDtPackage:packageOf>; -<XDtClass:importedList currentClass="<XDtEjbBmp:entityBmpClass/>"/> - /** * <XDtI18n:getString bundle="xdoclet.modules.ejb" resource="bmp_layer_for" arguments="<XDtEjb:ejbName/>"/> <XDtClass:classCommentTags indent="0"/> */ 1.4 +0 -2 xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/resources/entitycmp.xdt Index: entitycmp.xdt =================================================================== RCS file: /cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/resources/entitycmp.xdt,v retrieving revision 1.3 retrieving revision 1.4 diff -u -w -r1.3 -r1.4 --- entitycmp.xdt 31 May 2002 20:43:56 -0000 1.3 +++ entitycmp.xdt 18 Sep 2002 19:49:16 -0000 1.4 @@ -3,8 +3,6 @@ */ package <XDtPackage:packageOf><XDtEjbCmp:entityCmpClass/></XDtPackage:packageOf>; -<XDtClass:importedList currentClass="<XDtEjbCmp:entityCmpClass/>"/> - /** * <XDtI18n:getString bundle="xdoclet.modules.ejb" resource="cmp_layer_for" arguments="<XDtEjb:ejbName/>"/> <XDtClass:classCommentTags indent="0"/> */ 1.4 +19 -21 xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/resources/entityfacade.xdt Index: entityfacade.xdt =================================================================== RCS file: /cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/resources/entityfacade.xdt,v retrieving revision 1.3 retrieving revision 1.4 diff -u -w -r1.3 -r1.4 --- entityfacade.xdt 11 Sep 2002 18:27:59 -0000 1.3 +++ entityfacade.xdt 18 Sep 2002 19:49:16 -0000 1.4 @@ -2,12 +2,10 @@ * <XDtI18n:getString bundle="xdoclet.modules.ejb" resource="do_not_edit"/> * this class must be processed by xdoclet in the second run!!!! */ - package <XDtPackage:packageOf><XDtEjbFacade:entityFacadeClass/></XDtPackage:packageOf>; - -<XDtClass:importedList currentClass="<XDtEjbFacade:entityFacadeClass/>"/> import java.util.*; + /** * <XDtI18n:getString bundle="xdoclet.modules.ejb" resource="session_facade_for" arguments="<XDtEjb:ejbName/>"/> <XDtClass:classCommentTags indent="0"/> 1.6 +4 -6 xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/resources/entitypk.xdt Index: entitypk.xdt =================================================================== RCS file: /cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/resources/entitypk.xdt,v retrieving revision 1.5 retrieving revision 1.6 diff -u -w -r1.5 -r1.6 --- entitypk.xdt 4 Jul 2002 20:31:35 -0000 1.5 +++ entitypk.xdt 18 Sep 2002 19:49:16 -0000 1.6 @@ -3,8 +3,6 @@ */ package <XDtPackage:packageOf><XDtEjbPk:pkClass/></XDtPackage:packageOf>; -<XDtClass:importedList currentClass="<XDtEjbPk:pkClass/>"/> - /** * <XDtI18n:getString bundle="xdoclet.modules.ejb" resource="primary_key_for" arguments="<XDtEjb:ejbName/>"/> <XDtClass:classCommentTags indent="0"/> */ @@ -52,7 +50,7 @@ if( _hashCode == Integer.MIN_VALUE ) { <XDtEjbPersistent:forAllPersistentFields superclasses="true" only-pk="true"> - <XDtType:ifIsPrimitive value="<XDtMethod:methodType fullQualifiedFormat='true'/>"> + <XDtType:ifIsPrimitive value="<XDtMethod:methodType/>"> <XDtType:ifIsOfType type="boolean" extent="concrete-type"> _hashCode += this.<XDtMethod:propertyName/> ? 1 : 0; </XDtType:ifIsOfType> @@ -60,7 +58,7 @@ _hashCode += (int)this.<XDtMethod:propertyName/>; </XDtType:ifIsNotOfType> </XDtType:ifIsPrimitive> - <XDtType:ifIsNotPrimitive value="<XDtMethod:methodType fullQualifiedFormat='true'/>"> + <XDtType:ifIsNotPrimitive value="<XDtMethod:methodType/>"> if (this.<XDtMethod:propertyName/> != null) _hashCode += this.<XDtMethod:propertyName/>.hashCode(); </XDtType:ifIsNotPrimitive> </XDtEjbPersistent:forAllPersistentFields> @@ -85,10 +83,10 @@ { <XDtClass:setMatchValue value="<XDtEjbPk:pkClass/>"> <XDtEjbPersistent:forAllPersistentFields superclasses="true" only-pk="true"> - <XDtType:ifIsPrimitive value="<XDtMethod:methodType fullQualifiedFormat='true'/>"> + <XDtType:ifIsPrimitive value="<XDtMethod:methodType/>"> eq = eq && this.<XDtMethod:propertyName/> == pk.<XDtMethod:propertyName/>; </XDtType:ifIsPrimitive> - <XDtType:ifIsNotPrimitive value="<XDtMethod:methodType fullQualifiedFormat='true'/>"> + <XDtType:ifIsNotPrimitive value="<XDtMethod:methodType/>"> if( this.<XDtMethod:propertyName/> == null && ((<XDtClass:matchValue/>)obj).<XDtMethod:getterMethod/>() == null ) { eq = true; 1.12 +7 -7 xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/resources/valueobject.xdt Index: valueobject.xdt =================================================================== RCS file: /cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/resources/valueobject.xdt,v retrieving revision 1.11 retrieving revision 1.12 diff -u -w -r1.11 -r1.12 --- valueobject.xdt 11 Sep 2002 18:27:59 -0000 1.11 +++ valueobject.xdt 18 Sep 2002 19:49:16 -0000 1.12 @@ -3,7 +3,7 @@ */ package <XDtPackage:packageOf><XDtEjbValueObj:valueObjectClass/></XDtPackage:packageOf>; -<XDtClass:importedList currentClass="<XDtEjbValueObj:valueObjectClass/>"/> +import java.util.*; /** * Value object for <XDtEjb:ejbName/>. @@ -91,7 +91,7 @@ // somebody would ask for it later... this.pk = pk; <XDtEjbPersistent:forAllPersistentFields superclasses="true" valueobject="<XDtEjbValueObj:valueObjectMatch/>"> - <XDtMethod:ifHasMethod name="<XDtMethod:setterMethod/>" parameters="<XDtMethod:methodType fullQualifiedFormat='true'/>"> + <XDtMethod:ifHasMethod name="<XDtMethod:setterMethod/>" parameters="<XDtMethod:methodType/>"> <XDtEjbPk:ifHasPrimkeyField> <XDtEjbPk:ifIsPrimkeyField> <XDtMethod:setterMethod/>( pk ); @@ -112,7 +112,7 @@ return this.<XDtMethod:propertyName/>; } - <XDtMethod:ifHasMethod name="<XDtMethod:setterMethod/>" parameters="<XDtMethod:methodType fullQualifiedFormat='true'/>"> + <XDtMethod:ifHasMethod name="<XDtMethod:setterMethod/>" parameters="<XDtMethod:methodType/>"> public void <XDtMethod:setterMethod/>( <XDtMethod:methodType/> <XDtMethod:propertyName/> ) { this.<XDtMethod:propertyName/> = <XDtMethod:propertyName/>; @@ -284,10 +284,10 @@ if ( ! that.hasIdentity() ) return false; boolean lEquals = true; <XDtEjbPersistent:forAllPersistentFields superclasses="true" valueobject="<XDtEjbValueObj:valueObjectMatch/>" only-pk="true"> - <XDtType:ifIsPrimitive value="<XDtMethod:methodType fullQualifiedFormat='true'/>"> + <XDtType:ifIsPrimitive value="<XDtMethod:methodType/>"> lEquals = lEquals && this.<XDtMethod:propertyName/> == that.<XDtMethod:propertyName/>; </XDtType:ifIsPrimitive> - <XDtType:ifIsNotPrimitive value="<XDtMethod:methodType fullQualifiedFormat='true'/>"> + <XDtType:ifIsNotPrimitive value="<XDtMethod:methodType/>"> if( this.<XDtMethod:propertyName/> == null ) { lEquals = lEquals && ( that.<XDtMethod:propertyName/> == null ); @@ -316,10 +316,10 @@ <XDtClass:classOf><XDtEjbValueObj:valueObjectClass/></XDtClass:classOf> that = (<XDtClass:classOf><XDtEjbValueObj:valueObjectClass/></XDtClass:classOf>) other; boolean lEquals = true; <XDtEjbPersistent:forAllPersistentFields superclasses="true" valueobject="<XDtEjbValueObj:valueObjectMatch/>" not-pk="true"> - <XDtType:ifIsPrimitive value="<XDtMethod:methodType fullQualifiedFormat='true'/>"> + <XDtType:ifIsPrimitive value="<XDtMethod:methodType/>"> lEquals = lEquals && this.<XDtMethod:propertyName/> == that.<XDtMethod:propertyName/>; </XDtType:ifIsPrimitive> - <XDtType:ifIsNotPrimitive value="<XDtMethod:methodType fullQualifiedFormat='true'/>"> + <XDtType:ifIsNotPrimitive value="<XDtMethod:methodType/>"> if( this.<XDtMethod:propertyName/> == null ) { lEquals = lEquals && ( that.<XDtMethod:propertyName/> == null );
------------------------------------------------------- This SF.NET email is sponsored by: AMD - Your access to the experts on Hammer Technology! Open Source & Linux Developers, register now for the AMD Developer Symposium. Code: EX8664 http://www.developwithamd.com/developerlab _______________________________________________ Xdoclet-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/xdoclet-devel