You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by ol...@apache.org on 2011/12/19 14:44:30 UTC

svn commit: r1220741 [2/3] - in /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo: db1/auto/ db2/auto/ embeddable/auto/ generic/auto/ inherit/auto/ inheritance/vertical/auto/ inheritance_flat/auto/ locking...

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtMapToManyTarget.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtMapToManyTarget.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtMapToManyTarget.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtMapToManyTarget.java Mon Dec 19 13:44:27 2011
@@ -16,11 +16,11 @@ public abstract class _MtMapToManyTarget
     public static final String ID_PK_COLUMN = "ID";
 
     public void setMapToMany(MtMapToMany mapToMany) {
-        setToOneTarget("mapToMany", mapToMany, true);
+        setToOneTarget(MAP_TO_MANY_PROPERTY, mapToMany, true);
     }
 
     public MtMapToMany getMapToMany() {
-        return (MtMapToMany)readProperty("mapToMany");
+        return (MtMapToMany)readProperty(MAP_TO_MANY_PROPERTY);
     }
 
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtMeaningfulPk.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtMeaningfulPk.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtMeaningfulPk.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtMeaningfulPk.java Mon Dec 19 13:44:27 2011
@@ -15,10 +15,10 @@ public abstract class _MtMeaningfulPk ex
     public static final String PK_PK_COLUMN = "PK";
 
     public void setPk(String pk) {
-        writeProperty("pk", pk);
+        writeProperty(PK_PROPERTY, pk);
     }
     public String getPk() {
-        return (String)readProperty("pk");
+        return (String)readProperty(PK_PROPERTY);
     }
 
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtReflexive.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtReflexive.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtReflexive.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtReflexive.java Mon Dec 19 13:44:27 2011
@@ -20,30 +20,30 @@ public abstract class _MtReflexive exten
     public static final String ID_PK_COLUMN = "ID";
 
     public void setName(String name) {
-        writeProperty("name", name);
+        writeProperty(NAME_PROPERTY, name);
     }
     public String getName() {
-        return (String)readProperty("name");
+        return (String)readProperty(NAME_PROPERTY);
     }
 
     public void addToChildren(MtReflexive obj) {
-        addToManyTarget("children", obj, true);
+        addToManyTarget(CHILDREN_PROPERTY, obj, true);
     }
     public void removeFromChildren(MtReflexive obj) {
-        removeToManyTarget("children", obj, true);
+        removeToManyTarget(CHILDREN_PROPERTY, obj, true);
     }
     @SuppressWarnings("unchecked")
     public List<MtReflexive> getChildren() {
-        return (List<MtReflexive>)readProperty("children");
+        return (List<MtReflexive>)readProperty(CHILDREN_PROPERTY);
     }
 
 
     public void setToParent(MtReflexive toParent) {
-        setToOneTarget("toParent", toParent, true);
+        setToOneTarget(TO_PARENT_PROPERTY, toParent, true);
     }
 
     public MtReflexive getToParent() {
-        return (MtReflexive)readProperty("toParent");
+        return (MtReflexive)readProperty(TO_PARENT_PROPERTY);
     }
 
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable1.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable1.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable1.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable1.java Mon Dec 19 13:44:27 2011
@@ -20,28 +20,28 @@ public abstract class _MtTable1 extends 
     public static final String TABLE1_ID_PK_COLUMN = "TABLE1_ID";
 
     public void setGlobalAttribute1(String globalAttribute1) {
-        writeProperty("globalAttribute1", globalAttribute1);
+        writeProperty(GLOBAL_ATTRIBUTE1_PROPERTY, globalAttribute1);
     }
     public String getGlobalAttribute1() {
-        return (String)readProperty("globalAttribute1");
+        return (String)readProperty(GLOBAL_ATTRIBUTE1_PROPERTY);
     }
 
     public void setServerAttribute1(String serverAttribute1) {
-        writeProperty("serverAttribute1", serverAttribute1);
+        writeProperty(SERVER_ATTRIBUTE1_PROPERTY, serverAttribute1);
     }
     public String getServerAttribute1() {
-        return (String)readProperty("serverAttribute1");
+        return (String)readProperty(SERVER_ATTRIBUTE1_PROPERTY);
     }
 
     public void addToTable2Array(MtTable2 obj) {
-        addToManyTarget("table2Array", obj, true);
+        addToManyTarget(TABLE2ARRAY_PROPERTY, obj, true);
     }
     public void removeFromTable2Array(MtTable2 obj) {
-        removeToManyTarget("table2Array", obj, true);
+        removeToManyTarget(TABLE2ARRAY_PROPERTY, obj, true);
     }
     @SuppressWarnings("unchecked")
     public List<MtTable2> getTable2Array() {
-        return (List<MtTable2>)readProperty("table2Array");
+        return (List<MtTable2>)readProperty(TABLE2ARRAY_PROPERTY);
     }
 
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable1Subclass.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable1Subclass.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable1Subclass.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable1Subclass.java Mon Dec 19 13:44:27 2011
@@ -15,10 +15,10 @@ public abstract class _MtTable1Subclass 
     public static final String TABLE1_ID_PK_COLUMN = "TABLE1_ID";
 
     public void setSubclassAttribute1(String subclassAttribute1) {
-        writeProperty("subclassAttribute1", subclassAttribute1);
+        writeProperty(SUBCLASS_ATTRIBUTE1_PROPERTY, subclassAttribute1);
     }
     public String getSubclassAttribute1() {
-        return (String)readProperty("subclassAttribute1");
+        return (String)readProperty(SUBCLASS_ATTRIBUTE1_PROPERTY);
     }
 
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable2.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable2.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable2.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable2.java Mon Dec 19 13:44:27 2011
@@ -19,27 +19,27 @@ public abstract class _MtTable2 extends 
     public static final String TABLE2_ID_PK_COLUMN = "TABLE2_ID";
 
     public void setGlobalAttribute(String globalAttribute) {
-        writeProperty("globalAttribute", globalAttribute);
+        writeProperty(GLOBAL_ATTRIBUTE_PROPERTY, globalAttribute);
     }
     public String getGlobalAttribute() {
-        return (String)readProperty("globalAttribute");
+        return (String)readProperty(GLOBAL_ATTRIBUTE_PROPERTY);
     }
 
     public void setTable1(MtTable1 table1) {
-        setToOneTarget("table1", table1, true);
+        setToOneTarget(TABLE1_PROPERTY, table1, true);
     }
 
     public MtTable1 getTable1() {
-        return (MtTable1)readProperty("table1");
+        return (MtTable1)readProperty(TABLE1_PROPERTY);
     }
 
 
     public void setTable3(MtTable3 table3) {
-        setToOneTarget("table3", table3, true);
+        setToOneTarget(TABLE3_PROPERTY, table3, true);
     }
 
     public MtTable3 getTable3() {
-        return (MtTable3)readProperty("table3");
+        return (MtTable3)readProperty(TABLE3_PROPERTY);
     }
 
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable3.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable3.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable3.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable3.java Mon Dec 19 13:44:27 2011
@@ -21,35 +21,35 @@ public abstract class _MtTable3 extends 
     public static final String TABLE3_ID_PK_COLUMN = "TABLE3_ID";
 
     public void setBinaryColumn(byte[] binaryColumn) {
-        writeProperty("binaryColumn", binaryColumn);
+        writeProperty(BINARY_COLUMN_PROPERTY, binaryColumn);
     }
     public byte[] getBinaryColumn() {
-        return (byte[])readProperty("binaryColumn");
+        return (byte[])readProperty(BINARY_COLUMN_PROPERTY);
     }
 
     public void setCharColumn(String charColumn) {
-        writeProperty("charColumn", charColumn);
+        writeProperty(CHAR_COLUMN_PROPERTY, charColumn);
     }
     public String getCharColumn() {
-        return (String)readProperty("charColumn");
+        return (String)readProperty(CHAR_COLUMN_PROPERTY);
     }
 
     public void setIntColumn(Integer intColumn) {
-        writeProperty("intColumn", intColumn);
+        writeProperty(INT_COLUMN_PROPERTY, intColumn);
     }
     public Integer getIntColumn() {
-        return (Integer)readProperty("intColumn");
+        return (Integer)readProperty(INT_COLUMN_PROPERTY);
     }
 
     public void addToTable2Array(MtTable2 obj) {
-        addToManyTarget("table2Array", obj, true);
+        addToManyTarget(TABLE2ARRAY_PROPERTY, obj, true);
     }
     public void removeFromTable2Array(MtTable2 obj) {
-        removeToManyTarget("table2Array", obj, true);
+        removeToManyTarget(TABLE2ARRAY_PROPERTY, obj, true);
     }
     @SuppressWarnings("unchecked")
     public List<MtTable2> getTable2Array() {
-        return (List<MtTable2>)readProperty("table2Array");
+        return (List<MtTable2>)readProperty(TABLE2ARRAY_PROPERTY);
     }
 
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable4.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable4.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable4.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable4.java Mon Dec 19 13:44:27 2011
@@ -18,14 +18,14 @@ public abstract class _MtTable4 extends 
     public static final String ID_PK_COLUMN = "ID";
 
     public void addToTable5s(MtTable5 obj) {
-        addToManyTarget("table5s", obj, true);
+        addToManyTarget(TABLE5S_PROPERTY, obj, true);
     }
     public void removeFromTable5s(MtTable5 obj) {
-        removeToManyTarget("table5s", obj, true);
+        removeToManyTarget(TABLE5S_PROPERTY, obj, true);
     }
     @SuppressWarnings("unchecked")
     public List<MtTable5> getTable5s() {
-        return (List<MtTable5>)readProperty("table5s");
+        return (List<MtTable5>)readProperty(TABLE5S_PROPERTY);
     }
 
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable5.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable5.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable5.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable5.java Mon Dec 19 13:44:27 2011
@@ -18,14 +18,14 @@ public abstract class _MtTable5 extends 
     public static final String ID_PK_COLUMN = "ID";
 
     public void addToTable4s(MtTable4 obj) {
-        addToManyTarget("table4s", obj, true);
+        addToManyTarget(TABLE4S_PROPERTY, obj, true);
     }
     public void removeFromTable4s(MtTable4 obj) {
-        removeToManyTarget("table4s", obj, true);
+        removeToManyTarget(TABLE4S_PROPERTY, obj, true);
     }
     @SuppressWarnings("unchecked")
     public List<MtTable4> getTable4s() {
-        return (List<MtTable4>)readProperty("table4s");
+        return (List<MtTable4>)readProperty(TABLE4S_PROPERTY);
     }
 
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTablePrimitives.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTablePrimitives.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTablePrimitives.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTablePrimitives.java Mon Dec 19 13:44:27 2011
@@ -16,18 +16,18 @@ public abstract class _MtTablePrimitives
     public static final String ID_PK_COLUMN = "ID";
 
     public void setBooleanColumn(boolean booleanColumn) {
-        writeProperty("booleanColumn", booleanColumn);
+        writeProperty(BOOLEAN_COLUMN_PROPERTY, booleanColumn);
     }
 	public boolean isBooleanColumn() {
-        Boolean value = (Boolean)readProperty("booleanColumn");
+        Boolean value = (Boolean)readProperty(BOOLEAN_COLUMN_PROPERTY);
         return (value != null) ? value.booleanValue() : false;
     }
 
     public void setIntColumn(int intColumn) {
-        writeProperty("intColumn", intColumn);
+        writeProperty(INT_COLUMN_PROPERTY, intColumn);
     }
     public int getIntColumn() {
-        Object value = readProperty("intColumn");
+        Object value = readProperty(INT_COLUMN_PROPERTY);
         return (value != null) ? (Integer) value : 0;
     }
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTooneDep.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTooneDep.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTooneDep.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTooneDep.java Mon Dec 19 13:44:27 2011
@@ -16,11 +16,11 @@ public abstract class _MtTooneDep extend
     public static final String ID_PK_COLUMN = "ID";
 
     public void setToMaster(MtTooneMaster toMaster) {
-        setToOneTarget("toMaster", toMaster, true);
+        setToOneTarget(TO_MASTER_PROPERTY, toMaster, true);
     }
 
     public MtTooneMaster getToMaster() {
-        return (MtTooneMaster)readProperty("toMaster");
+        return (MtTooneMaster)readProperty(TO_MASTER_PROPERTY);
     }
 
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTooneMaster.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTooneMaster.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTooneMaster.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTooneMaster.java Mon Dec 19 13:44:27 2011
@@ -16,11 +16,11 @@ public abstract class _MtTooneMaster ext
     public static final String ID_PK_COLUMN = "ID";
 
     public void setToDependent(MtTooneDep toDependent) {
-        setToOneTarget("toDependent", toDependent, true);
+        setToOneTarget(TO_DEPENDENT_PROPERTY, toDependent, true);
     }
 
     public MtTooneDep getToDependent() {
-        return (MtTooneDep)readProperty("toDependent");
+        return (MtTooneDep)readProperty(TO_DEPENDENT_PROPERTY);
     }
 
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/qualified/auto/_Qualified1.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/qualified/auto/_Qualified1.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/qualified/auto/_Qualified1.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/qualified/auto/_Qualified1.java Mon Dec 19 13:44:27 2011
@@ -20,28 +20,28 @@ public abstract class _Qualified1 extend
     public static final String ID_PK_COLUMN = "ID";
 
     public void setDeleted(Boolean deleted) {
-        writeProperty("deleted", deleted);
+        writeProperty(DELETED_PROPERTY, deleted);
     }
     public Boolean getDeleted() {
-        return (Boolean)readProperty("deleted");
+        return (Boolean)readProperty(DELETED_PROPERTY);
     }
 
     public void setName(String name) {
-        writeProperty("name", name);
+        writeProperty(NAME_PROPERTY, name);
     }
     public String getName() {
-        return (String)readProperty("name");
+        return (String)readProperty(NAME_PROPERTY);
     }
 
     public void addToQualified2s(Qualified2 obj) {
-        addToManyTarget("qualified2s", obj, true);
+        addToManyTarget(QUALIFIED2S_PROPERTY, obj, true);
     }
     public void removeFromQualified2s(Qualified2 obj) {
-        removeToManyTarget("qualified2s", obj, true);
+        removeToManyTarget(QUALIFIED2S_PROPERTY, obj, true);
     }
     @SuppressWarnings("unchecked")
     public List<Qualified2> getQualified2s() {
-        return (List<Qualified2>)readProperty("qualified2s");
+        return (List<Qualified2>)readProperty(QUALIFIED2S_PROPERTY);
     }
 
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/qualified/auto/_Qualified2.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/qualified/auto/_Qualified2.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/qualified/auto/_Qualified2.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/qualified/auto/_Qualified2.java Mon Dec 19 13:44:27 2011
@@ -18,25 +18,25 @@ public abstract class _Qualified2 extend
     public static final String ID_PK_COLUMN = "ID";
 
     public void setDeleted(Boolean deleted) {
-        writeProperty("deleted", deleted);
+        writeProperty(DELETED_PROPERTY, deleted);
     }
     public Boolean getDeleted() {
-        return (Boolean)readProperty("deleted");
+        return (Boolean)readProperty(DELETED_PROPERTY);
     }
 
     public void setName(String name) {
-        writeProperty("name", name);
+        writeProperty(NAME_PROPERTY, name);
     }
     public String getName() {
-        return (String)readProperty("name");
+        return (String)readProperty(NAME_PROPERTY);
     }
 
     public void setQualified1(Qualified1 qualified1) {
-        setToOneTarget("qualified1", qualified1, true);
+        setToOneTarget(QUALIFIED1_PROPERTY, qualified1, true);
     }
 
     public Qualified1 getQualified1() {
-        return (Qualified1)readProperty("qualified1");
+        return (Qualified1)readProperty(QUALIFIED1_PROPERTY);
     }
 
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/quotemap/auto/_QuoteAdress.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/quotemap/auto/_QuoteAdress.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/quotemap/auto/_QuoteAdress.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/quotemap/auto/_QuoteAdress.java Mon Dec 19 13:44:27 2011
@@ -1,6 +1,7 @@
 package org.apache.cayenne.testdo.quotemap.auto;
 
 import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.testdo.quotemap.Quote_Person;
 
 /**
  * Class _QuoteAdress was generated by Cayenne.
@@ -12,21 +13,31 @@ public abstract class _QuoteAdress exten
 
     public static final String CITY_PROPERTY = "city";
     public static final String GROUP_PROPERTY = "group";
+    public static final String PERSON_REL_PROPERTY = "person_Rel";
 
     public static final String ADDRESS_ID_PK_COLUMN = "ADDRESS ID";
 
     public void setCity(String city) {
-        writeProperty("city", city);
+        writeProperty(CITY_PROPERTY, city);
     }
     public String getCity() {
-        return (String)readProperty("city");
+        return (String)readProperty(CITY_PROPERTY);
     }
 
     public void setGroup(String group) {
-        writeProperty("group", group);
+        writeProperty(GROUP_PROPERTY, group);
     }
     public String getGroup() {
-        return (String)readProperty("group");
+        return (String)readProperty(GROUP_PROPERTY);
     }
 
+    public void setPerson_Rel(Quote_Person person_Rel) {
+        setToOneTarget(PERSON_REL_PROPERTY, person_Rel, true);
+    }
+
+    public Quote_Person getPerson_Rel() {
+        return (Quote_Person)readProperty(PERSON_REL_PROPERTY);
+    }
+
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/quotemap/auto/_Quote_Person.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/quotemap/auto/_Quote_Person.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/quotemap/auto/_Quote_Person.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/quotemap/auto/_Quote_Person.java Mon Dec 19 13:44:27 2011
@@ -23,46 +23,46 @@ public abstract class _Quote_Person exte
     public static final String ID_PK_COLUMN = "id";
 
     public void setDAte(Date dAte) {
-        writeProperty("dAte", dAte);
+        writeProperty(D_ATE_PROPERTY, dAte);
     }
     public Date getDAte() {
-        return (Date)readProperty("dAte");
+        return (Date)readProperty(D_ATE_PROPERTY);
     }
 
     public void setFULL_name(String fULL_name) {
-        writeProperty("fULL_name", fULL_name);
+        writeProperty(F_ULL_NAME_PROPERTY, fULL_name);
     }
     public String getFULL_name() {
-        return (String)readProperty("fULL_name");
+        return (String)readProperty(F_ULL_NAME_PROPERTY);
     }
 
     public void setGroup(String group) {
-        writeProperty("group", group);
+        writeProperty(GROUP_PROPERTY, group);
     }
     public String getGroup() {
-        return (String)readProperty("group");
+        return (String)readProperty(GROUP_PROPERTY);
     }
 
     public void setName(String name) {
-        writeProperty("name", name);
+        writeProperty(NAME_PROPERTY, name);
     }
     public String getName() {
-        return (String)readProperty("name");
+        return (String)readProperty(NAME_PROPERTY);
     }
 
     public void setSalary(Integer salary) {
-        writeProperty("salary", salary);
+        writeProperty(SALARY_PROPERTY, salary);
     }
     public Integer getSalary() {
-        return (Integer)readProperty("salary");
+        return (Integer)readProperty(SALARY_PROPERTY);
     }
 
     public void setAddress_Rel(QuoteAdress address_Rel) {
-        setToOneTarget("address_Rel", address_Rel, true);
+        setToOneTarget(ADDRESS_REL_PROPERTY, address_Rel, true);
     }
 
     public QuoteAdress getAddress_Rel() {
-        return (QuoteAdress)readProperty("address_Rel");
+        return (QuoteAdress)readProperty(ADDRESS_REL_PROPERTY);
     }
 
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_Child.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_Child.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_Child.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_Child.java Mon Dec 19 13:44:27 2011
@@ -16,11 +16,11 @@ public abstract class _Child extends Cay
     public static final String ID_PK_COLUMN = "ID";
 
     public void setMaster(Master master) {
-        setToOneTarget("master", master, true);
+        setToOneTarget(MASTER_PROPERTY, master, true);
     }
 
     public Master getMaster() {
-        return (Master)readProperty("master");
+        return (Master)readProperty(MASTER_PROPERTY);
     }
 
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ClobDetail.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ClobDetail.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ClobDetail.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ClobDetail.java Mon Dec 19 13:44:27 2011
@@ -1,11 +1,15 @@
 package org.apache.cayenne.testdo.relationship.auto;
 
-/** Class _ClobDetail was generated by Cayenne.
-  * It is probably a good idea to avoid changing this class manually, 
-  * since it may be overwritten next time code is regenerated. 
-  * If you need to make any customizations, please use subclass. 
-  */
-public class _ClobDetail extends org.apache.cayenne.CayenneDataObject {
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.testdo.relationship.ClobMaster;
+
+/**
+ * Class _ClobDetail was generated by Cayenne.
+ * It is probably a good idea to avoid changing this class manually,
+ * since it may be overwritten next time code is regenerated.
+ * If you need to make any customizations, please use subclass.
+ */
+public abstract class _ClobDetail extends CayenneDataObject {
 
     public static final String NAME_PROPERTY = "name";
     public static final String MASTER_PROPERTY = "master";
@@ -13,20 +17,19 @@ public class _ClobDetail extends org.apa
     public static final String CLOB_DETAIL_ID_PK_COLUMN = "CLOB_DETAIL_ID";
 
     public void setName(String name) {
-        writeProperty("name", name);
+        writeProperty(NAME_PROPERTY, name);
     }
     public String getName() {
-        return (String)readProperty("name");
+        return (String)readProperty(NAME_PROPERTY);
     }
-    
-    
-    public void setMaster(org.apache.cayenne.testdo.relationship.ClobMaster master) {
-        setToOneTarget("master", master, true);
+
+    public void setMaster(ClobMaster master) {
+        setToOneTarget(MASTER_PROPERTY, master, true);
     }
 
-    public org.apache.cayenne.testdo.relationship.ClobMaster getMaster() {
-        return (org.apache.cayenne.testdo.relationship.ClobMaster)readProperty("master");
-    } 
-    
-    
+    public ClobMaster getMaster() {
+        return (ClobMaster)readProperty(MASTER_PROPERTY);
+    }
+
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ClobMaster.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ClobMaster.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ClobMaster.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ClobMaster.java Mon Dec 19 13:44:27 2011
@@ -2,12 +2,16 @@ package org.apache.cayenne.testdo.relati
 
 import java.util.List;
 
-/** Class _ClobMaster was generated by Cayenne.
-  * It is probably a good idea to avoid changing this class manually, 
-  * since it may be overwritten next time code is regenerated. 
-  * If you need to make any customizations, please use subclass. 
-  */
-public class _ClobMaster extends org.apache.cayenne.CayenneDataObject {
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.testdo.relationship.ClobDetail;
+
+/**
+ * Class _ClobMaster was generated by Cayenne.
+ * It is probably a good idea to avoid changing this class manually,
+ * since it may be overwritten next time code is regenerated.
+ * If you need to make any customizations, please use subclass.
+ */
+public abstract class _ClobMaster extends CayenneDataObject {
 
     public static final String CLOB_COLUMN_PROPERTY = "clobColumn";
     public static final String NAME_PROPERTY = "name";
@@ -16,30 +20,29 @@ public class _ClobMaster extends org.apa
     public static final String CLOB_MASTER_ID_PK_COLUMN = "CLOB_MASTER_ID";
 
     public void setClobColumn(String clobColumn) {
-        writeProperty("clobColumn", clobColumn);
+        writeProperty(CLOB_COLUMN_PROPERTY, clobColumn);
     }
     public String getClobColumn() {
-        return (String)readProperty("clobColumn");
+        return (String)readProperty(CLOB_COLUMN_PROPERTY);
     }
-    
-    
+
     public void setName(String name) {
-        writeProperty("name", name);
+        writeProperty(NAME_PROPERTY, name);
     }
     public String getName() {
-        return (String)readProperty("name");
+        return (String)readProperty(NAME_PROPERTY);
     }
-    
-    
-    public void addToDetails(org.apache.cayenne.testdo.relationship.ClobDetail obj) {
-        addToManyTarget("details", obj, true);
+
+    public void addToDetails(ClobDetail obj) {
+        addToManyTarget(DETAILS_PROPERTY, obj, true);
     }
-    public void removeFromDetails(org.apache.cayenne.testdo.relationship.ClobDetail obj) {
-        removeToManyTarget("details", obj, true);
+    public void removeFromDetails(ClobDetail obj) {
+        removeToManyTarget(DETAILS_PROPERTY, obj, true);
     }
-    public List getDetails() {
-        return (List)readProperty("details");
+    @SuppressWarnings("unchecked")
+    public List<ClobDetail> getDetails() {
+        return (List<ClobDetail>)readProperty(DETAILS_PROPERTY);
     }
-    
-    
+
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_CollectionToMany.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_CollectionToMany.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_CollectionToMany.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_CollectionToMany.java Mon Dec 19 13:44:27 2011
@@ -1,25 +1,32 @@
 package org.apache.cayenne.testdo.relationship.auto;
 
-/** Class _CollectionToMany was generated by Cayenne.
-  * It is probably a good idea to avoid changing this class manually, 
-  * since it may be overwritten next time code is regenerated. 
-  * If you need to make any customizations, please use subclass. 
-  */
-public class _CollectionToMany extends org.apache.cayenne.CayenneDataObject {
+import java.util.Collection;
+
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.testdo.relationship.CollectionToManyTarget;
+
+/**
+ * Class _CollectionToMany was generated by Cayenne.
+ * It is probably a good idea to avoid changing this class manually,
+ * since it may be overwritten next time code is regenerated.
+ * If you need to make any customizations, please use subclass.
+ */
+public abstract class _CollectionToMany extends CayenneDataObject {
 
     public static final String TARGETS_PROPERTY = "targets";
 
     public static final String ID_PK_COLUMN = "ID";
 
-    public void addToTargets(org.apache.cayenne.testdo.relationship.CollectionToManyTarget obj) {
-        addToManyTarget("targets", obj, true);
+    public void addToTargets(CollectionToManyTarget obj) {
+        addToManyTarget(TARGETS_PROPERTY, obj, true);
     }
-    public void removeFromTargets(org.apache.cayenne.testdo.relationship.CollectionToManyTarget obj) {
-        removeToManyTarget("targets", obj, true);
+    public void removeFromTargets(CollectionToManyTarget obj) {
+        removeToManyTarget(TARGETS_PROPERTY, obj, true);
     }
-    public java.util.Collection getTargets() {
-        return (java.util.Collection)readProperty("targets");
+    @SuppressWarnings("unchecked")
+    public Collection<CollectionToManyTarget> getTargets() {
+        return (Collection<CollectionToManyTarget>)readProperty(TARGETS_PROPERTY);
     }
-    
-    
+
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_CollectionToManyTarget.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_CollectionToManyTarget.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_CollectionToManyTarget.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_CollectionToManyTarget.java Mon Dec 19 13:44:27 2011
@@ -1,23 +1,27 @@
 package org.apache.cayenne.testdo.relationship.auto;
 
-/** Class _CollectionToManyTarget was generated by Cayenne.
-  * It is probably a good idea to avoid changing this class manually, 
-  * since it may be overwritten next time code is regenerated. 
-  * If you need to make any customizations, please use subclass. 
-  */
-public class _CollectionToManyTarget extends org.apache.cayenne.CayenneDataObject {
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.testdo.relationship.CollectionToMany;
+
+/**
+ * Class _CollectionToManyTarget was generated by Cayenne.
+ * It is probably a good idea to avoid changing this class manually,
+ * since it may be overwritten next time code is regenerated.
+ * If you need to make any customizations, please use subclass.
+ */
+public abstract class _CollectionToManyTarget extends CayenneDataObject {
 
     public static final String COLLECTION_TO_MANY_PROPERTY = "collectionToMany";
 
     public static final String ID_PK_COLUMN = "ID";
 
-    public void setCollectionToMany(org.apache.cayenne.testdo.relationship.CollectionToMany collectionToMany) {
-        setToOneTarget("collectionToMany", collectionToMany, true);
+    public void setCollectionToMany(CollectionToMany collectionToMany) {
+        setToOneTarget(COLLECTION_TO_MANY_PROPERTY, collectionToMany, true);
+    }
+
+    public CollectionToMany getCollectionToMany() {
+        return (CollectionToMany)readProperty(COLLECTION_TO_MANY_PROPERTY);
     }
 
-    public org.apache.cayenne.testdo.relationship.CollectionToMany getCollectionToMany() {
-        return (org.apache.cayenne.testdo.relationship.CollectionToMany)readProperty("collectionToMany");
-    } 
-    
-    
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_DeleteRuleFlatA.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_DeleteRuleFlatA.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_DeleteRuleFlatA.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_DeleteRuleFlatA.java Mon Dec 19 13:44:27 2011
@@ -2,26 +2,31 @@ package org.apache.cayenne.testdo.relati
 
 import java.util.List;
 
-/** Class _DeleteRuleFlatA was generated by Cayenne.
-  * It is probably a good idea to avoid changing this class manually, 
-  * since it may be overwritten next time code is regenerated. 
-  * If you need to make any customizations, please use subclass. 
-  */
-public class _DeleteRuleFlatA extends org.apache.cayenne.CayenneDataObject {
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.testdo.relationship.DeleteRuleFlatB;
+
+/**
+ * Class _DeleteRuleFlatA was generated by Cayenne.
+ * It is probably a good idea to avoid changing this class manually,
+ * since it may be overwritten next time code is regenerated.
+ * If you need to make any customizations, please use subclass.
+ */
+public abstract class _DeleteRuleFlatA extends CayenneDataObject {
 
     public static final String FLAT_B_PROPERTY = "flatB";
 
     public static final String FLATA_ID_PK_COLUMN = "FLATA_ID";
 
-    public void addToFlatB(org.apache.cayenne.testdo.relationship.DeleteRuleFlatB obj) {
-        addToManyTarget("flatB", obj, true);
+    public void addToFlatB(DeleteRuleFlatB obj) {
+        addToManyTarget(FLAT_B_PROPERTY, obj, true);
     }
-    public void removeFromFlatB(org.apache.cayenne.testdo.relationship.DeleteRuleFlatB obj) {
-        removeToManyTarget("flatB", obj, true);
+    public void removeFromFlatB(DeleteRuleFlatB obj) {
+        removeToManyTarget(FLAT_B_PROPERTY, obj, true);
     }
-    public List getFlatB() {
-        return (List)readProperty("flatB");
+    @SuppressWarnings("unchecked")
+    public List<DeleteRuleFlatB> getFlatB() {
+        return (List<DeleteRuleFlatB>)readProperty(FLAT_B_PROPERTY);
     }
-    
-    
+
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_DeleteRuleFlatB.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_DeleteRuleFlatB.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_DeleteRuleFlatB.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_DeleteRuleFlatB.java Mon Dec 19 13:44:27 2011
@@ -2,26 +2,31 @@ package org.apache.cayenne.testdo.relati
 
 import java.util.List;
 
-/** Class _DeleteRuleFlatB was generated by Cayenne.
-  * It is probably a good idea to avoid changing this class manually, 
-  * since it may be overwritten next time code is regenerated. 
-  * If you need to make any customizations, please use subclass. 
-  */
-public class _DeleteRuleFlatB extends org.apache.cayenne.CayenneDataObject {
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.testdo.relationship.DeleteRuleFlatA;
+
+/**
+ * Class _DeleteRuleFlatB was generated by Cayenne.
+ * It is probably a good idea to avoid changing this class manually,
+ * since it may be overwritten next time code is regenerated.
+ * If you need to make any customizations, please use subclass.
+ */
+public abstract class _DeleteRuleFlatB extends CayenneDataObject {
 
     public static final String UNTITLED_REL_PROPERTY = "untitledRel";
 
     public static final String FLATB_ID_PK_COLUMN = "FLATB_ID";
 
-    public void addToUntitledRel(org.apache.cayenne.testdo.relationship.DeleteRuleFlatA obj) {
-        addToManyTarget("untitledRel", obj, true);
+    public void addToUntitledRel(DeleteRuleFlatA obj) {
+        addToManyTarget(UNTITLED_REL_PROPERTY, obj, true);
     }
-    public void removeFromUntitledRel(org.apache.cayenne.testdo.relationship.DeleteRuleFlatA obj) {
-        removeToManyTarget("untitledRel", obj, true);
+    public void removeFromUntitledRel(DeleteRuleFlatA obj) {
+        removeToManyTarget(UNTITLED_REL_PROPERTY, obj, true);
     }
-    public List getUntitledRel() {
-        return (List)readProperty("untitledRel");
+    @SuppressWarnings("unchecked")
+    public List<DeleteRuleFlatA> getUntitledRel() {
+        return (List<DeleteRuleFlatA>)readProperty(UNTITLED_REL_PROPERTY);
     }
-    
-    
+
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_DeleteRuleTest1.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_DeleteRuleTest1.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_DeleteRuleTest1.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_DeleteRuleTest1.java Mon Dec 19 13:44:27 2011
@@ -1,23 +1,27 @@
 package org.apache.cayenne.testdo.relationship.auto;
 
-/** Class _DeleteRuleTest1 was generated by Cayenne.
-  * It is probably a good idea to avoid changing this class manually, 
-  * since it may be overwritten next time code is regenerated. 
-  * If you need to make any customizations, please use subclass. 
-  */
-public class _DeleteRuleTest1 extends org.apache.cayenne.CayenneDataObject {
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.testdo.relationship.DeleteRuleTest2;
+
+/**
+ * Class _DeleteRuleTest1 was generated by Cayenne.
+ * It is probably a good idea to avoid changing this class manually,
+ * since it may be overwritten next time code is regenerated.
+ * If you need to make any customizations, please use subclass.
+ */
+public abstract class _DeleteRuleTest1 extends CayenneDataObject {
 
     public static final String TEST2_PROPERTY = "test2";
 
     public static final String DEL_RULE_TEST1_ID_PK_COLUMN = "DEL_RULE_TEST1_ID";
 
-    public void setTest2(org.apache.cayenne.testdo.relationship.DeleteRuleTest2 test2) {
-        setToOneTarget("test2", test2, true);
+    public void setTest2(DeleteRuleTest2 test2) {
+        setToOneTarget(TEST2_PROPERTY, test2, true);
+    }
+
+    public DeleteRuleTest2 getTest2() {
+        return (DeleteRuleTest2)readProperty(TEST2_PROPERTY);
     }
 
-    public org.apache.cayenne.testdo.relationship.DeleteRuleTest2 getTest2() {
-        return (org.apache.cayenne.testdo.relationship.DeleteRuleTest2)readProperty("test2");
-    } 
-    
-    
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_DeleteRuleTest2.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_DeleteRuleTest2.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_DeleteRuleTest2.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_DeleteRuleTest2.java Mon Dec 19 13:44:27 2011
@@ -2,38 +2,45 @@ package org.apache.cayenne.testdo.relati
 
 import java.util.List;
 
-/** Class _DeleteRuleTest2 was generated by Cayenne.
-  * It is probably a good idea to avoid changing this class manually, 
-  * since it may be overwritten next time code is regenerated. 
-  * If you need to make any customizations, please use subclass. 
-  */
-public class _DeleteRuleTest2 extends org.apache.cayenne.CayenneDataObject {
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.testdo.relationship.DeleteRuleTest1;
+import org.apache.cayenne.testdo.relationship.DeleteRuleTest3;
+
+/**
+ * Class _DeleteRuleTest2 was generated by Cayenne.
+ * It is probably a good idea to avoid changing this class manually,
+ * since it may be overwritten next time code is regenerated.
+ * If you need to make any customizations, please use subclass.
+ */
+public abstract class _DeleteRuleTest2 extends CayenneDataObject {
 
     public static final String DELETE_RULE_TEST3ARRAY_PROPERTY = "deleteRuleTest3Array";
     public static final String TEST1ARRAY_PROPERTY = "test1Array";
 
     public static final String DEL_RULE_TEST2_ID_PK_COLUMN = "DEL_RULE_TEST2_ID";
 
-    public void addToDeleteRuleTest3Array(org.apache.cayenne.testdo.relationship.DeleteRuleTest3 obj) {
-        addToManyTarget("deleteRuleTest3Array", obj, true);
+    public void addToDeleteRuleTest3Array(DeleteRuleTest3 obj) {
+        addToManyTarget(DELETE_RULE_TEST3ARRAY_PROPERTY, obj, true);
     }
-    public void removeFromDeleteRuleTest3Array(org.apache.cayenne.testdo.relationship.DeleteRuleTest3 obj) {
-        removeToManyTarget("deleteRuleTest3Array", obj, true);
+    public void removeFromDeleteRuleTest3Array(DeleteRuleTest3 obj) {
+        removeToManyTarget(DELETE_RULE_TEST3ARRAY_PROPERTY, obj, true);
     }
-    public List getDeleteRuleTest3Array() {
-        return (List)readProperty("deleteRuleTest3Array");
+    @SuppressWarnings("unchecked")
+    public List<DeleteRuleTest3> getDeleteRuleTest3Array() {
+        return (List<DeleteRuleTest3>)readProperty(DELETE_RULE_TEST3ARRAY_PROPERTY);
     }
-    
-    
-    public void addToTest1Array(org.apache.cayenne.testdo.relationship.DeleteRuleTest1 obj) {
-        addToManyTarget("test1Array", obj, true);
+
+
+    public void addToTest1Array(DeleteRuleTest1 obj) {
+        addToManyTarget(TEST1ARRAY_PROPERTY, obj, true);
     }
-    public void removeFromTest1Array(org.apache.cayenne.testdo.relationship.DeleteRuleTest1 obj) {
-        removeToManyTarget("test1Array", obj, true);
+    public void removeFromTest1Array(DeleteRuleTest1 obj) {
+        removeToManyTarget(TEST1ARRAY_PROPERTY, obj, true);
     }
-    public List getTest1Array() {
-        return (List)readProperty("test1Array");
+    @SuppressWarnings("unchecked")
+    public List<DeleteRuleTest1> getTest1Array() {
+        return (List<DeleteRuleTest1>)readProperty(TEST1ARRAY_PROPERTY);
     }
-    
-    
+
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_DeleteRuleTest3.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_DeleteRuleTest3.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_DeleteRuleTest3.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_DeleteRuleTest3.java Mon Dec 19 13:44:27 2011
@@ -1,23 +1,27 @@
 package org.apache.cayenne.testdo.relationship.auto;
 
-/** Class _DeleteRuleTest3 was generated by Cayenne.
-  * It is probably a good idea to avoid changing this class manually, 
-  * since it may be overwritten next time code is regenerated. 
-  * If you need to make any customizations, please use subclass. 
-  */
-public class _DeleteRuleTest3 extends org.apache.cayenne.CayenneDataObject {
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.testdo.relationship.DeleteRuleTest2;
+
+/**
+ * Class _DeleteRuleTest3 was generated by Cayenne.
+ * It is probably a good idea to avoid changing this class manually,
+ * since it may be overwritten next time code is regenerated.
+ * If you need to make any customizations, please use subclass.
+ */
+public abstract class _DeleteRuleTest3 extends CayenneDataObject {
 
     public static final String TO_DELETE_RULE_TEST2_PROPERTY = "toDeleteRuleTest2";
 
     public static final String DELETE_RULE_TEST_3_ID_PK_COLUMN = "DELETE_RULE_TEST_3_ID";
 
-    public void setToDeleteRuleTest2(org.apache.cayenne.testdo.relationship.DeleteRuleTest2 toDeleteRuleTest2) {
-        setToOneTarget("toDeleteRuleTest2", toDeleteRuleTest2, true);
+    public void setToDeleteRuleTest2(DeleteRuleTest2 toDeleteRuleTest2) {
+        setToOneTarget(TO_DELETE_RULE_TEST2_PROPERTY, toDeleteRuleTest2, true);
+    }
+
+    public DeleteRuleTest2 getToDeleteRuleTest2() {
+        return (DeleteRuleTest2)readProperty(TO_DELETE_RULE_TEST2_PROPERTY);
     }
 
-    public org.apache.cayenne.testdo.relationship.DeleteRuleTest2 getToDeleteRuleTest2() {
-        return (org.apache.cayenne.testdo.relationship.DeleteRuleTest2)readProperty("toDeleteRuleTest2");
-    } 
-    
-    
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FkOfDifferentType.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FkOfDifferentType.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FkOfDifferentType.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FkOfDifferentType.java Mon Dec 19 13:44:27 2011
@@ -1,23 +1,27 @@
 package org.apache.cayenne.testdo.relationship.auto;
 
-/** Class _FkOfDifferentType was generated by Cayenne.
-  * It is probably a good idea to avoid changing this class manually, 
-  * since it may be overwritten next time code is regenerated. 
-  * If you need to make any customizations, please use subclass. 
-  */
-public class _FkOfDifferentType extends org.apache.cayenne.CayenneDataObject {
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.testdo.relationship.RelationshipHelper;
+
+/**
+ * Class _FkOfDifferentType was generated by Cayenne.
+ * It is probably a good idea to avoid changing this class manually,
+ * since it may be overwritten next time code is regenerated.
+ * If you need to make any customizations, please use subclass.
+ */
+public abstract class _FkOfDifferentType extends CayenneDataObject {
 
     public static final String RELATIONSHIP_HELPER_PROPERTY = "relationshipHelper";
 
     public static final String ID_PK_COLUMN = "ID";
 
-    public void setRelationshipHelper(org.apache.cayenne.testdo.relationship.RelationshipHelper relationshipHelper) {
-        setToOneTarget("relationshipHelper", relationshipHelper, true);
+    public void setRelationshipHelper(RelationshipHelper relationshipHelper) {
+        setToOneTarget(RELATIONSHIP_HELPER_PROPERTY, relationshipHelper, true);
+    }
+
+    public RelationshipHelper getRelationshipHelper() {
+        return (RelationshipHelper)readProperty(RELATIONSHIP_HELPER_PROPERTY);
     }
 
-    public org.apache.cayenne.testdo.relationship.RelationshipHelper getRelationshipHelper() {
-        return (org.apache.cayenne.testdo.relationship.RelationshipHelper)readProperty("relationshipHelper");
-    } 
-    
-    
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FlattenedCircular.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FlattenedCircular.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FlattenedCircular.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FlattenedCircular.java Mon Dec 19 13:44:27 2011
@@ -13,32 +13,32 @@ import org.apache.cayenne.testdo.relatio
  */
 public abstract class _FlattenedCircular extends CayenneDataObject {
 
-    public static final String SIDE2S_PROPERTY = "side2s";
     public static final String SIDE1S_PROPERTY = "side1s";
+    public static final String SIDE2S_PROPERTY = "side2s";
 
     public static final String ID_PK_COLUMN = "ID";
 
-    public void addToSide2s(FlattenedCircular obj) {
-        addToManyTarget("side2s", obj, true);
+    public void addToSide1s(FlattenedCircular obj) {
+        addToManyTarget(SIDE1S_PROPERTY, obj, true);
     }
-    public void removeFromSide2s(FlattenedCircular obj) {
-        removeToManyTarget("side2s", obj, true);
+    public void removeFromSide1s(FlattenedCircular obj) {
+        removeToManyTarget(SIDE1S_PROPERTY, obj, true);
     }
     @SuppressWarnings("unchecked")
-    public List<FlattenedCircular> getSide2s() {
-        return (List<FlattenedCircular>)readProperty("side2s");
+    public List<FlattenedCircular> getSide1s() {
+        return (List<FlattenedCircular>)readProperty(SIDE1S_PROPERTY);
     }
 
 
-    public void addToSide1s(FlattenedCircular obj) {
-        addToManyTarget("side1s", obj, true);
+    public void addToSide2s(FlattenedCircular obj) {
+        addToManyTarget(SIDE2S_PROPERTY, obj, true);
     }
-    public void removeFromSide1s(FlattenedCircular obj) {
-        removeToManyTarget("side1s", obj, true);
+    public void removeFromSide2s(FlattenedCircular obj) {
+        removeToManyTarget(SIDE2S_PROPERTY, obj, true);
     }
     @SuppressWarnings("unchecked")
-    public List<FlattenedCircular> getSide1s() {
-        return (List<FlattenedCircular>)readProperty("side1s");
+    public List<FlattenedCircular> getSide2s() {
+        return (List<FlattenedCircular>)readProperty(SIDE2S_PROPERTY);
     }
 
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FlattenedTest1.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FlattenedTest1.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FlattenedTest1.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FlattenedTest1.java Mon Dec 19 13:44:27 2011
@@ -21,47 +21,48 @@ public abstract class _FlattenedTest1 ex
     public static final String FT3OVER_COMPLEX_PROPERTY = "ft3OverComplex";
     public static final String FT4ARRAY_FOR1_PROPERTY = "ft4ArrayFor1";
 
+    public static final String FT1_ID_PK_COLUMN = "FT1_ID";
 
     public void setName(String name) {
-        writeProperty("name", name);
+        writeProperty(NAME_PROPERTY, name);
     }
     public String getName() {
-        return (String)readProperty("name");
+        return (String)readProperty(NAME_PROPERTY);
     }
 
     public void addToFt2Array(FlattenedTest2 obj) {
-        addToManyTarget("ft2Array", obj, true);
+        addToManyTarget(FT2ARRAY_PROPERTY, obj, true);
     }
     public void removeFromFt2Array(FlattenedTest2 obj) {
-        removeToManyTarget("ft2Array", obj, true);
+        removeToManyTarget(FT2ARRAY_PROPERTY, obj, true);
     }
     @SuppressWarnings("unchecked")
     public List<FlattenedTest2> getFt2Array() {
-        return (List<FlattenedTest2>)readProperty("ft2Array");
+        return (List<FlattenedTest2>)readProperty(FT2ARRAY_PROPERTY);
     }
 
 
     @SuppressWarnings("unchecked")
     public List<FlattenedTest3> getFt3Array() {
-        return (List<FlattenedTest3>)readProperty("ft3Array");
+        return (List<FlattenedTest3>)readProperty(FT3ARRAY_PROPERTY);
     }
 
 
     public void addToFt3OverComplex(FlattenedTest3 obj) {
-        addToManyTarget("ft3OverComplex", obj, true);
+        addToManyTarget(FT3OVER_COMPLEX_PROPERTY, obj, true);
     }
     public void removeFromFt3OverComplex(FlattenedTest3 obj) {
-        removeToManyTarget("ft3OverComplex", obj, true);
+        removeToManyTarget(FT3OVER_COMPLEX_PROPERTY, obj, true);
     }
     @SuppressWarnings("unchecked")
     public List<FlattenedTest3> getFt3OverComplex() {
-        return (List<FlattenedTest3>)readProperty("ft3OverComplex");
+        return (List<FlattenedTest3>)readProperty(FT3OVER_COMPLEX_PROPERTY);
     }
 
 
     @SuppressWarnings("unchecked")
     public List<FlattenedTest4> getFt4ArrayFor1() {
-        return (List<FlattenedTest4>)readProperty("ft4ArrayFor1");
+        return (List<FlattenedTest4>)readProperty(FT4ARRAY_FOR1_PROPERTY);
     }
 
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FlattenedTest2.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FlattenedTest2.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FlattenedTest2.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FlattenedTest2.java Mon Dec 19 13:44:27 2011
@@ -2,12 +2,17 @@ package org.apache.cayenne.testdo.relati
 
 import java.util.List;
 
-/** Class _FlattenedTest2 was generated by Cayenne.
-  * It is probably a good idea to avoid changing this class manually, 
-  * since it may be overwritten next time code is regenerated. 
-  * If you need to make any customizations, please use subclass. 
-  */
-public class _FlattenedTest2 extends org.apache.cayenne.CayenneDataObject {
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.testdo.relationship.FlattenedTest1;
+import org.apache.cayenne.testdo.relationship.FlattenedTest3;
+
+/**
+ * Class _FlattenedTest2 was generated by Cayenne.
+ * It is probably a good idea to avoid changing this class manually,
+ * since it may be overwritten next time code is regenerated.
+ * If you need to make any customizations, please use subclass.
+ */
+public abstract class _FlattenedTest2 extends CayenneDataObject {
 
     public static final String NAME_PROPERTY = "name";
     public static final String FT3ARRAY_PROPERTY = "ft3Array";
@@ -16,31 +21,31 @@ public class _FlattenedTest2 extends org
     public static final String FT2_ID_PK_COLUMN = "FT2_ID";
 
     public void setName(String name) {
-        writeProperty("name", name);
+        writeProperty(NAME_PROPERTY, name);
     }
     public String getName() {
-        return (String)readProperty("name");
+        return (String)readProperty(NAME_PROPERTY);
     }
-    
-    
-    public void addToFt3Array(org.apache.cayenne.testdo.relationship.FlattenedTest3 obj) {
-        addToManyTarget("ft3Array", obj, true);
-    }
-    public void removeFromFt3Array(org.apache.cayenne.testdo.relationship.FlattenedTest3 obj) {
-        removeToManyTarget("ft3Array", obj, true);
-    }
-    public List getFt3Array() {
-        return (List)readProperty("ft3Array");
-    }
-    
-    
-    public void setToFT1(org.apache.cayenne.testdo.relationship.FlattenedTest1 toFT1) {
-        setToOneTarget("toFT1", toFT1, true);
-    }
-
-    public org.apache.cayenne.testdo.relationship.FlattenedTest1 getToFT1() {
-        return (org.apache.cayenne.testdo.relationship.FlattenedTest1)readProperty("toFT1");
-    } 
-    
-    
+
+    public void addToFt3Array(FlattenedTest3 obj) {
+        addToManyTarget(FT3ARRAY_PROPERTY, obj, true);
+    }
+    public void removeFromFt3Array(FlattenedTest3 obj) {
+        removeToManyTarget(FT3ARRAY_PROPERTY, obj, true);
+    }
+    @SuppressWarnings("unchecked")
+    public List<FlattenedTest3> getFt3Array() {
+        return (List<FlattenedTest3>)readProperty(FT3ARRAY_PROPERTY);
+    }
+
+
+    public void setToFT1(FlattenedTest1 toFT1) {
+        setToOneTarget(TO_FT1_PROPERTY, toFT1, true);
+    }
+
+    public FlattenedTest1 getToFT1() {
+        return (FlattenedTest1)readProperty(TO_FT1_PROPERTY);
+    }
+
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FlattenedTest3.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FlattenedTest3.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FlattenedTest3.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FlattenedTest3.java Mon Dec 19 13:44:27 2011
@@ -1,42 +1,59 @@
 package org.apache.cayenne.testdo.relationship.auto;
 
-/** Class _FlattenedTest3 was generated by Cayenne.
-  * It is probably a good idea to avoid changing this class manually, 
-  * since it may be overwritten next time code is regenerated. 
-  * If you need to make any customizations, please use subclass. 
-  */
-public class _FlattenedTest3 extends org.apache.cayenne.CayenneDataObject {
+import java.util.List;
+
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.testdo.relationship.FlattenedTest1;
+import org.apache.cayenne.testdo.relationship.FlattenedTest2;
+import org.apache.cayenne.testdo.relationship.FlattenedTest4;
+
+/**
+ * Class _FlattenedTest3 was generated by Cayenne.
+ * It is probably a good idea to avoid changing this class manually,
+ * since it may be overwritten next time code is regenerated.
+ * If you need to make any customizations, please use subclass.
+ */
+public abstract class _FlattenedTest3 extends CayenneDataObject {
 
     public static final String NAME_PROPERTY = "name";
+    public static final String FT4ARRAY_PROPERTY = "ft4Array";
     public static final String TO_FT1_PROPERTY = "toFT1";
     public static final String TO_FT2_PROPERTY = "toFT2";
 
     public static final String FT3_ID_PK_COLUMN = "FT3_ID";
 
     public void setName(String name) {
-        writeProperty("name", name);
+        writeProperty(NAME_PROPERTY, name);
     }
     public String getName() {
-        return (String)readProperty("name");
+        return (String)readProperty(NAME_PROPERTY);
+    }
+
+    public void addToFt4Array(FlattenedTest4 obj) {
+        addToManyTarget(FT4ARRAY_PROPERTY, obj, true);
+    }
+    public void removeFromFt4Array(FlattenedTest4 obj) {
+        removeToManyTarget(FT4ARRAY_PROPERTY, obj, true);
+    }
+    @SuppressWarnings("unchecked")
+    public List<FlattenedTest4> getFt4Array() {
+        return (List<FlattenedTest4>)readProperty(FT4ARRAY_PROPERTY);
+    }
+
+
+
+    public FlattenedTest1 getToFT1() {
+        return (FlattenedTest1)readProperty(TO_FT1_PROPERTY);
+    }
+
+
+    public void setToFT2(FlattenedTest2 toFT2) {
+        setToOneTarget(TO_FT2_PROPERTY, toFT2, true);
     }
-    
-    
-    public void setToFT1(org.apache.cayenne.testdo.relationship.FlattenedTest1 toFT1) {
-        setToOneTarget("toFT1", toFT1, true);
-    }
-
-    public org.apache.cayenne.testdo.relationship.FlattenedTest1 getToFT1() {
-        return (org.apache.cayenne.testdo.relationship.FlattenedTest1)readProperty("toFT1");
-    } 
-    
-    
-    public void setToFT2(org.apache.cayenne.testdo.relationship.FlattenedTest2 toFT2) {
-        setToOneTarget("toFT2", toFT2, true);
-    }
-
-    public org.apache.cayenne.testdo.relationship.FlattenedTest2 getToFT2() {
-        return (org.apache.cayenne.testdo.relationship.FlattenedTest2)readProperty("toFT2");
-    } 
-    
-    
+
+    public FlattenedTest2 getToFT2() {
+        return (FlattenedTest2)readProperty(TO_FT2_PROPERTY);
+    }
+
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FlattenedTest4.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FlattenedTest4.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FlattenedTest4.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FlattenedTest4.java Mon Dec 19 13:44:27 2011
@@ -14,20 +14,21 @@ public abstract class _FlattenedTest4 ex
     public static final String NAME_PROPERTY = "name";
     public static final String TO_FT3_PROPERTY = "toFT3";
 
+    public static final String FT4_ID_PK_COLUMN = "FT4_ID";
 
     public void setName(String name) {
-        writeProperty("name", name);
+        writeProperty(NAME_PROPERTY, name);
     }
     public String getName() {
-        return (String)readProperty("name");
+        return (String)readProperty(NAME_PROPERTY);
     }
 
     public void setToFT3(FlattenedTest3 toFT3) {
-        setToOneTarget("toFT3", toFT3, true);
+        setToOneTarget(TO_FT3_PROPERTY, toFT3, true);
     }
 
     public FlattenedTest3 getToFT3() {
-        return (FlattenedTest3)readProperty("toFT3");
+        return (FlattenedTest3)readProperty(TO_FT3_PROPERTY);
     }
 
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_IdMapToMany.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_IdMapToMany.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_IdMapToMany.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_IdMapToMany.java Mon Dec 19 13:44:27 2011
@@ -1,25 +1,32 @@
 package org.apache.cayenne.testdo.relationship.auto;
 
-/** Class _IdMapToMany was generated by Cayenne.
-  * It is probably a good idea to avoid changing this class manually, 
-  * since it may be overwritten next time code is regenerated. 
-  * If you need to make any customizations, please use subclass. 
-  */
-public abstract class _IdMapToMany extends org.apache.cayenne.CayenneDataObject {
+import java.util.Map;
+
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.testdo.relationship.IdMapToManyTarget;
+
+/**
+ * Class _IdMapToMany was generated by Cayenne.
+ * It is probably a good idea to avoid changing this class manually,
+ * since it may be overwritten next time code is regenerated.
+ * If you need to make any customizations, please use subclass.
+ */
+public abstract class _IdMapToMany extends CayenneDataObject {
 
     public static final String TARGETS_PROPERTY = "targets";
 
     public static final String ID_PK_COLUMN = "ID";
 
-    public void addToTargets(org.apache.cayenne.testdo.relationship.IdMapToManyTarget obj) {
-        addToManyTarget("targets", obj, true);
+    public void addToTargets(IdMapToManyTarget obj) {
+        addToManyTarget(TARGETS_PROPERTY, obj, true);
     }
-    public void removeFromTargets(org.apache.cayenne.testdo.relationship.IdMapToManyTarget obj) {
-        removeToManyTarget("targets", obj, true);
+    public void removeFromTargets(IdMapToManyTarget obj) {
+        removeToManyTarget(TARGETS_PROPERTY, obj, true);
     }
-    public java.util.Map getTargets() {
-        return (java.util.Map)readProperty("targets");
+    @SuppressWarnings("unchecked")
+    public Map<Object, IdMapToManyTarget> getTargets() {
+        return (Map<Object, IdMapToManyTarget>)readProperty(TARGETS_PROPERTY);
     }
-    
-    
+
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_IdMapToManyTarget.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_IdMapToManyTarget.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_IdMapToManyTarget.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_IdMapToManyTarget.java Mon Dec 19 13:44:27 2011
@@ -1,23 +1,27 @@
 package org.apache.cayenne.testdo.relationship.auto;
 
-/** Class _IdMapToManyTarget was generated by Cayenne.
-  * It is probably a good idea to avoid changing this class manually, 
-  * since it may be overwritten next time code is regenerated. 
-  * If you need to make any customizations, please use subclass. 
-  */
-public abstract class _IdMapToManyTarget extends org.apache.cayenne.CayenneDataObject {
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.testdo.relationship.IdMapToMany;
+
+/**
+ * Class _IdMapToManyTarget was generated by Cayenne.
+ * It is probably a good idea to avoid changing this class manually,
+ * since it may be overwritten next time code is regenerated.
+ * If you need to make any customizations, please use subclass.
+ */
+public abstract class _IdMapToManyTarget extends CayenneDataObject {
 
     public static final String MAP_TO_MANY_PROPERTY = "mapToMany";
 
     public static final String ID_PK_COLUMN = "ID";
 
-    public void setMapToMany(org.apache.cayenne.testdo.relationship.IdMapToMany mapToMany) {
-        setToOneTarget("mapToMany", mapToMany, true);
+    public void setMapToMany(IdMapToMany mapToMany) {
+        setToOneTarget(MAP_TO_MANY_PROPERTY, mapToMany, true);
+    }
+
+    public IdMapToMany getMapToMany() {
+        return (IdMapToMany)readProperty(MAP_TO_MANY_PROPERTY);
     }
 
-    public org.apache.cayenne.testdo.relationship.IdMapToMany getMapToMany() {
-        return (org.apache.cayenne.testdo.relationship.IdMapToMany)readProperty("mapToMany");
-    } 
-    
-    
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_MapToMany.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_MapToMany.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_MapToMany.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_MapToMany.java Mon Dec 19 13:44:27 2011
@@ -1,25 +1,32 @@
 package org.apache.cayenne.testdo.relationship.auto;
 
-/** Class _MapToMany was generated by Cayenne.
-  * It is probably a good idea to avoid changing this class manually, 
-  * since it may be overwritten next time code is regenerated. 
-  * If you need to make any customizations, please use subclass. 
-  */
-public class _MapToMany extends org.apache.cayenne.CayenneDataObject {
+import java.util.Map;
+
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.testdo.relationship.MapToManyTarget;
+
+/**
+ * Class _MapToMany was generated by Cayenne.
+ * It is probably a good idea to avoid changing this class manually,
+ * since it may be overwritten next time code is regenerated.
+ * If you need to make any customizations, please use subclass.
+ */
+public abstract class _MapToMany extends CayenneDataObject {
 
     public static final String TARGETS_PROPERTY = "targets";
 
     public static final String ID_PK_COLUMN = "ID";
 
-    public void addToTargets(org.apache.cayenne.testdo.relationship.MapToManyTarget obj) {
-        addToManyTarget("targets", obj, true);
+    public void addToTargets(MapToManyTarget obj) {
+        addToManyTarget(TARGETS_PROPERTY, obj, true);
     }
-    public void removeFromTargets(org.apache.cayenne.testdo.relationship.MapToManyTarget obj) {
-        removeToManyTarget("targets", obj, true);
+    public void removeFromTargets(MapToManyTarget obj) {
+        removeToManyTarget(TARGETS_PROPERTY, obj, true);
     }
-    public java.util.Map getTargets() {
-        return (java.util.Map)readProperty("targets");
+    @SuppressWarnings("unchecked")
+    public Map<String, MapToManyTarget> getTargets() {
+        return (Map<String, MapToManyTarget>)readProperty(TARGETS_PROPERTY);
     }
-    
-    
+
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_MapToManyTarget.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_MapToManyTarget.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_MapToManyTarget.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_MapToManyTarget.java Mon Dec 19 13:44:27 2011
@@ -1,11 +1,15 @@
 package org.apache.cayenne.testdo.relationship.auto;
 
-/** Class _MapToManyTarget was generated by Cayenne.
-  * It is probably a good idea to avoid changing this class manually, 
-  * since it may be overwritten next time code is regenerated. 
-  * If you need to make any customizations, please use subclass. 
-  */
-public class _MapToManyTarget extends org.apache.cayenne.CayenneDataObject {
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.testdo.relationship.MapToMany;
+
+/**
+ * Class _MapToManyTarget was generated by Cayenne.
+ * It is probably a good idea to avoid changing this class manually,
+ * since it may be overwritten next time code is regenerated.
+ * If you need to make any customizations, please use subclass.
+ */
+public abstract class _MapToManyTarget extends CayenneDataObject {
 
     public static final String NAME_PROPERTY = "name";
     public static final String MAP_TO_MANY_PROPERTY = "mapToMany";
@@ -13,20 +17,19 @@ public class _MapToManyTarget extends or
     public static final String ID_PK_COLUMN = "ID";
 
     public void setName(String name) {
-        writeProperty("name", name);
+        writeProperty(NAME_PROPERTY, name);
     }
     public String getName() {
-        return (String)readProperty("name");
+        return (String)readProperty(NAME_PROPERTY);
     }
-    
-    
-    public void setMapToMany(org.apache.cayenne.testdo.relationship.MapToMany mapToMany) {
-        setToOneTarget("mapToMany", mapToMany, true);
+
+    public void setMapToMany(MapToMany mapToMany) {
+        setToOneTarget(MAP_TO_MANY_PROPERTY, mapToMany, true);
     }
 
-    public org.apache.cayenne.testdo.relationship.MapToMany getMapToMany() {
-        return (org.apache.cayenne.testdo.relationship.MapToMany)readProperty("mapToMany");
-    } 
-    
-    
+    public MapToMany getMapToMany() {
+        return (MapToMany)readProperty(MAP_TO_MANY_PROPERTY);
+    }
+
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_Master.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_Master.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_Master.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_Master.java Mon Dec 19 13:44:27 2011
@@ -19,21 +19,21 @@ public abstract class _Master extends Ca
     public static final String ID_PK_COLUMN = "ID";
 
     public void setName(String name) {
-        writeProperty("name", name);
+        writeProperty(NAME_PROPERTY, name);
     }
     public String getName() {
-        return (String)readProperty("name");
+        return (String)readProperty(NAME_PROPERTY);
     }
 
     public void addToChildren(Child obj) {
-        addToManyTarget("children", obj, true);
+        addToManyTarget(CHILDREN_PROPERTY, obj, true);
     }
     public void removeFromChildren(Child obj) {
-        removeToManyTarget("children", obj, true);
+        removeToManyTarget(CHILDREN_PROPERTY, obj, true);
     }
     @SuppressWarnings("unchecked")
     public List<Child> getChildren() {
-        return (List<Child>)readProperty("children");
+        return (List<Child>)readProperty(CHILDREN_PROPERTY);
     }
 
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_MeaningfulFK.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_MeaningfulFK.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_MeaningfulFK.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_MeaningfulFK.java Mon Dec 19 13:44:27 2011
@@ -1,11 +1,15 @@
 package org.apache.cayenne.testdo.relationship.auto;
 
-/** Class _MeaningfulFK was generated by Cayenne.
-  * It is probably a good idea to avoid changing this class manually, 
-  * since it may be overwritten next time code is regenerated. 
-  * If you need to make any customizations, please use subclass. 
-  */
-public class _MeaningfulFK extends org.apache.cayenne.CayenneDataObject {
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.testdo.relationship.RelationshipHelper;
+
+/**
+ * Class _MeaningfulFK was generated by Cayenne.
+ * It is probably a good idea to avoid changing this class manually,
+ * since it may be overwritten next time code is regenerated.
+ * If you need to make any customizations, please use subclass.
+ */
+public abstract class _MeaningfulFK extends CayenneDataObject {
 
     public static final String RELATIONSHIP_HELPER_ID_PROPERTY = "relationshipHelperID";
     public static final String TO_RELATIONSHIP_HELPER_PROPERTY = "toRelationshipHelper";
@@ -13,20 +17,19 @@ public class _MeaningfulFK extends org.a
     public static final String MEANIGNFUL_FK_ID_PK_COLUMN = "MEANIGNFUL_FK_ID";
 
     public void setRelationshipHelperID(Integer relationshipHelperID) {
-        writeProperty("relationshipHelperID", relationshipHelperID);
+        writeProperty(RELATIONSHIP_HELPER_ID_PROPERTY, relationshipHelperID);
     }
     public Integer getRelationshipHelperID() {
-        return (Integer)readProperty("relationshipHelperID");
+        return (Integer)readProperty(RELATIONSHIP_HELPER_ID_PROPERTY);
     }
-    
-    
-    public void setToRelationshipHelper(org.apache.cayenne.testdo.relationship.RelationshipHelper toRelationshipHelper) {
-        setToOneTarget("toRelationshipHelper", toRelationshipHelper, true);
+
+    public void setToRelationshipHelper(RelationshipHelper toRelationshipHelper) {
+        setToOneTarget(TO_RELATIONSHIP_HELPER_PROPERTY, toRelationshipHelper, true);
     }
 
-    public org.apache.cayenne.testdo.relationship.RelationshipHelper getToRelationshipHelper() {
-        return (org.apache.cayenne.testdo.relationship.RelationshipHelper)readProperty("toRelationshipHelper");
-    } 
-    
-    
+    public RelationshipHelper getToRelationshipHelper() {
+        return (RelationshipHelper)readProperty(TO_RELATIONSHIP_HELPER_PROPERTY);
+    }
+
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ReflexiveAndToOne.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ReflexiveAndToOne.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ReflexiveAndToOne.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ReflexiveAndToOne.java Mon Dec 19 13:44:27 2011
@@ -2,12 +2,17 @@ package org.apache.cayenne.testdo.relati
 
 import java.util.List;
 
-/** Class _ReflexiveAndToOne was generated by Cayenne.
-  * It is probably a good idea to avoid changing this class manually, 
-  * since it may be overwritten next time code is regenerated. 
-  * If you need to make any customizations, please use subclass. 
-  */
-public class _ReflexiveAndToOne extends org.apache.cayenne.CayenneDataObject {
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.testdo.relationship.ReflexiveAndToOne;
+import org.apache.cayenne.testdo.relationship.RelationshipHelper;
+
+/**
+ * Class _ReflexiveAndToOne was generated by Cayenne.
+ * It is probably a good idea to avoid changing this class manually,
+ * since it may be overwritten next time code is regenerated.
+ * If you need to make any customizations, please use subclass.
+ */
+public abstract class _ReflexiveAndToOne extends CayenneDataObject {
 
     public static final String NAME_PROPERTY = "name";
     public static final String CHILDREN_PROPERTY = "children";
@@ -17,40 +22,40 @@ public class _ReflexiveAndToOne extends 
     public static final String REFLEXIVE_AND_TO_ONE_ID_PK_COLUMN = "REFLEXIVE_AND_TO_ONE_ID";
 
     public void setName(String name) {
-        writeProperty("name", name);
+        writeProperty(NAME_PROPERTY, name);
     }
     public String getName() {
-        return (String)readProperty("name");
+        return (String)readProperty(NAME_PROPERTY);
     }
-    
-    
-    public void addToChildren(org.apache.cayenne.testdo.relationship.ReflexiveAndToOne obj) {
-        addToManyTarget("children", obj, true);
-    }
-    public void removeFromChildren(org.apache.cayenne.testdo.relationship.ReflexiveAndToOne obj) {
-        removeToManyTarget("children", obj, true);
-    }
-    public List getChildren() {
-        return (List)readProperty("children");
-    }
-    
-    
-    public void setToHelper(org.apache.cayenne.testdo.relationship.RelationshipHelper toHelper) {
-        setToOneTarget("toHelper", toHelper, true);
-    }
-
-    public org.apache.cayenne.testdo.relationship.RelationshipHelper getToHelper() {
-        return (org.apache.cayenne.testdo.relationship.RelationshipHelper)readProperty("toHelper");
-    } 
-    
-    
-    public void setToParent(org.apache.cayenne.testdo.relationship.ReflexiveAndToOne toParent) {
-        setToOneTarget("toParent", toParent, true);
-    }
-
-    public org.apache.cayenne.testdo.relationship.ReflexiveAndToOne getToParent() {
-        return (org.apache.cayenne.testdo.relationship.ReflexiveAndToOne)readProperty("toParent");
-    } 
-    
-    
+
+    public void addToChildren(ReflexiveAndToOne obj) {
+        addToManyTarget(CHILDREN_PROPERTY, obj, true);
+    }
+    public void removeFromChildren(ReflexiveAndToOne obj) {
+        removeToManyTarget(CHILDREN_PROPERTY, obj, true);
+    }
+    @SuppressWarnings("unchecked")
+    public List<ReflexiveAndToOne> getChildren() {
+        return (List<ReflexiveAndToOne>)readProperty(CHILDREN_PROPERTY);
+    }
+
+
+    public void setToHelper(RelationshipHelper toHelper) {
+        setToOneTarget(TO_HELPER_PROPERTY, toHelper, true);
+    }
+
+    public RelationshipHelper getToHelper() {
+        return (RelationshipHelper)readProperty(TO_HELPER_PROPERTY);
+    }
+
+
+    public void setToParent(ReflexiveAndToOne toParent) {
+        setToOneTarget(TO_PARENT_PROPERTY, toParent, true);
+    }
+
+    public ReflexiveAndToOne getToParent() {
+        return (ReflexiveAndToOne)readProperty(TO_PARENT_PROPERTY);
+    }
+
+
 }