Author: aadamchik
Date: Sat Nov 8 10:45:32 2008
New Revision: 712422
URL: http://svn.apache.org/viewvc?rev=712422&view=rev
Log:
CAY-1113 Primitives in ROP support
template formatting
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/resources/dotemplates/v1_2/client-superclass.vm
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteCascade.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteDeny.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteNullify.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteRule.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtMeaningfulPk.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtReflexive.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable1.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable2.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable3.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTableBool.java
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/resources/dotemplates/v1_2/client-superclass.vm
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/resources/dotemplates/v1_2/client-superclass.vm?rev=712422&r1=712421&r2=712422&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/resources/dotemplates/v1_2/client-superclass.vm
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/resources/dotemplates/v1_2/client-superclass.vm
Sat Nov 8 10:45:32 2008
@@ -83,17 +83,16 @@
## Create attribute set/get methods
#foreach( $attr in ${object.DeclaredAttributes} )
-
#if ( $importUtils.isBoolean(${attr.Type}) )
- public boolean is${stringUtils.capitalized($attr.Name)}() {
- if(objectContext != null) {
+ public boolean is${stringUtils.capitalized($attr.Name)}() {
+ if(objectContext != null) {
objectContext.prepareForAccess(this, "${attr.Name}", false);
}
return ${attr.Name};
}
#else
-public $importUtils.formatJavaType(${attr.Type})
get${stringUtils.capitalized($attr.Name)}() {
+ public $importUtils.formatJavaType(${attr.Type})
get${stringUtils.capitalized($attr.Name)}() {
if(objectContext != null) {
objectContext.prepareForAccess(this, "${attr.Name}", false);
}
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteCascade.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteCascade.java?rev=712422&r1=712421&r2=712422&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteCascade.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteCascade.java
Sat Nov 8 10:45:32 2008
@@ -38,7 +38,6 @@
}
}
-
public ClientMtDeleteRule getCascade() {
if(objectContext != null) {
objectContext.prepareForAccess(this, "cascade", true);
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteDeny.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteDeny.java?rev=712422&r1=712421&r2=712422&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteDeny.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteDeny.java
Sat Nov 8 10:45:32 2008
@@ -38,7 +38,6 @@
}
}
-
public ClientMtDeleteRule getDeny() {
if(objectContext != null) {
objectContext.prepareForAccess(this, "deny", true);
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteNullify.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteNullify.java?rev=712422&r1=712421&r2=712422&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteNullify.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteNullify.java
Sat Nov 8 10:45:32 2008
@@ -38,7 +38,6 @@
}
}
-
public ClientMtDeleteRule getNullify() {
if(objectContext != null) {
objectContext.prepareForAccess(this, "nullify", true);
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteRule.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteRule.java?rev=712422&r1=712421&r2=712422&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteRule.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteRule.java
Sat Nov 8 10:45:32 2008
@@ -45,7 +45,6 @@
}
}
-
public List<ClientMtDeleteCascade> getFromCascade() {
if(objectContext != null) {
objectContext.prepareForAccess(this, "fromCascade", true);
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtMeaningfulPk.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtMeaningfulPk.java?rev=712422&r1=712421&r2=712422&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtMeaningfulPk.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtMeaningfulPk.java
Sat Nov 8 10:45:32 2008
@@ -34,5 +34,4 @@
}
}
-
}
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtReflexive.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtReflexive.java?rev=712422&r1=712421&r2=712422&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtReflexive.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtReflexive.java
Sat Nov 8 10:45:32 2008
@@ -42,7 +42,6 @@
}
}
-
public List<ClientMtReflexive> getChildren() {
if(objectContext != null) {
objectContext.prepareForAccess(this, "children", true);
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable1.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable1.java?rev=712422&r1=712421&r2=712422&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable1.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable1.java
Sat Nov 8 10:45:32 2008
@@ -41,7 +41,6 @@
}
}
-
public String getServerAttribute1() {
if(objectContext != null) {
objectContext.prepareForAccess(this, "serverAttribute1", false);
@@ -63,7 +62,6 @@
}
}
-
public List<ClientMtTable2> getTable2Array() {
if(objectContext != null) {
objectContext.prepareForAccess(this, "table2Array", true);
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable2.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable2.java?rev=712422&r1=712421&r2=712422&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable2.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable2.java
Sat Nov 8 10:45:32 2008
@@ -38,7 +38,6 @@
}
}
-
public ClientMtTable1 getTable1() {
if(objectContext != null) {
objectContext.prepareForAccess(this, "table1", true);
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable3.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable3.java?rev=712422&r1=712421&r2=712422&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable3.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable3.java
Sat Nov 8 10:45:32 2008
@@ -38,7 +38,6 @@
}
}
-
public String getCharColumn() {
if(objectContext != null) {
objectContext.prepareForAccess(this, "charColumn", false);
@@ -60,7 +59,6 @@
}
}
-
public Integer getIntColumn() {
if(objectContext != null) {
objectContext.prepareForAccess(this, "intColumn", false);
@@ -82,5 +80,4 @@
}
}
-
}
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTableBool.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTableBool.java?rev=712422&r1=712421&r2=712422&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTableBool.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTableBool.java
Sat Nov 8 10:45:32 2008
@@ -15,9 +15,8 @@
protected boolean blablacheck;
protected int number;
-
- public boolean isBlablacheck() {
- if(objectContext != null) {
+ public boolean isBlablacheck() {
+ if(objectContext != null) {
objectContext.prepareForAccess(this, "blablacheck", false);
}
@@ -37,11 +36,7 @@
}
}
-
-
-
-
-public int getNumber() {
+ public int getNumber() {
if(objectContext != null) {
objectContext.prepareForAccess(this, "number", false);
}
@@ -62,7 +57,4 @@
}
}
-
-
-
}
