You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by dk...@apache.org on 2011/10/04 17:03:26 UTC
svn commit: r1178825 - in /cayenne/main/trunk/framework:
cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/ObjEntity.java
cayenne-tools/src/main/resources/templates/v1_2/client-superclass.vm
Author: dkazimirchyk
Date: Tue Oct 4 15:03:26 2011
New Revision: 1178825
URL: http://svn.apache.org/viewvc?rev=1178825&view=rev
Log:
CAY-1622 Generated classes shouldn't produce serialVersionUID compiler warning
updated client-superclass Velocity template + added relationships target entity to hash
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/ObjEntity.java
cayenne/main/trunk/framework/cayenne-tools/src/main/resources/templates/v1_2/client-superclass.vm
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/ObjEntity.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/ObjEntity.java?rev=1178825&r1=1178824&r2=1178825&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/ObjEntity.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/ObjEntity.java Tue Oct 4 15:03:26 2011
@@ -1277,7 +1277,7 @@ public class ObjEntity extends Entity im
for (ObjRelationship rel : getRelationships()) {
dout.writeUTF(rel.getName());
dout.writeUTF(rel.getCollectionType() != null
- ? rel.getCollectionType() : "to-one");
+ ? rel.getCollectionType() : rel.getTargetEntityName());
}
dout.flush();
Modified: cayenne/main/trunk/framework/cayenne-tools/src/main/resources/templates/v1_2/client-superclass.vm
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-tools/src/main/resources/templates/v1_2/client-superclass.vm?rev=1178825&r1=1178824&r2=1178825&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-tools/src/main/resources/templates/v1_2/client-superclass.vm (original)
+++ cayenne/main/trunk/framework/cayenne-tools/src/main/resources/templates/v1_2/client-superclass.vm Tue Oct 4 15:03:26 2011
@@ -57,6 +57,9 @@ ${importUtils.generate()}
*/
public abstract class ${superClassName} extends ${baseClassName} {
+## SerialVersionUID
+ private static final long serialVersionUID = ${object.SerialVersionUID}L;
+
## Create ivars names
#foreach( $attr in ${object.DeclaredAttributes} )
public static final String ${stringUtils.capitalizedAsConstant($attr.Name)}_PROPERTY = "${attr.Name}";