You are viewing a plain text version of this content. The canonical link for it is here.
Posted to torque-dev@db.apache.org by gm...@apache.org on 2006/12/06 05:26:36 UTC
svn commit: r482888 - in /db/torque/templates/trunk/src/templates/om:
MapBuilder.vm Object.vm ObjectWithManager.vm
Author: gmonroe
Date: Tue Dec 5 20:26:34 2006
New Revision: 482888
URL: http://svn.apache.org/viewvc?view=rev&rev=482888
Log:
Fixed formatting errors caused by converting tabs to spaces
with tabstops at 8 rather than 4.
Modified:
db/torque/templates/trunk/src/templates/om/MapBuilder.vm
db/torque/templates/trunk/src/templates/om/Object.vm
db/torque/templates/trunk/src/templates/om/ObjectWithManager.vm
Modified: db/torque/templates/trunk/src/templates/om/MapBuilder.vm
URL: http://svn.apache.org/viewvc/db/torque/templates/trunk/src/templates/om/MapBuilder.vm?view=diff&rev=482888&r1=482887&r2=482888
==============================================================================
--- db/torque/templates/trunk/src/templates/om/MapBuilder.vm (original)
+++ db/torque/templates/trunk/src/templates/om/MapBuilder.vm Tue Dec 5 20:26:34 2006
@@ -81,7 +81,7 @@
public synchronized void doBuild() throws TorqueException
{
if ( isBuilt() ) {
- return;
+ return;
}
dbMap = Torque.getDatabaseMap("$table.Database.Name");
@@ -94,7 +94,7 @@
tMap.setDescription("$table.Description");
#end
#if ($table.IdMethod == "native")
- tMap.setPrimaryKeyMethod(TableMap.NATIVE);
+ tMap.setPrimaryKeyMethod(TableMap.NATIVE);
#elseif ($table.IdMethod == "idbroker")
tMap.setPrimaryKeyMethod(TableMap.ID_BROKER);
#else
@@ -117,7 +117,7 @@
#if ($table.Interface)
#set ($interfaceName = $table.Interface)
#end
- tMap.setUseManager(true);
+ tMap.setUseManager(true);
tMap.setManagerClass( ${packageManager}.${interfaceName}Manager.class );
#end
@@ -138,41 +138,41 @@
cMap.setTorqueType( "$col.Domain.Type.Name" );
cMap.setUsePrimitive($col.UsePrimitive);
cMap.setPrimaryKey($col.isPrimaryKey());
- cMap.setNotNull($col.isNotNull());
+ cMap.setNotNull($col.isNotNull());
cMap.setJavaName( "$cfc" );
cMap.setAutoIncrement($col.AutoIncrement);
- cMap.setProtected($col.Protected);
+ cMap.setProtected($col.Protected);
#if( $col.JavaType )
- cMap.setJavaType( "${col.JavaType}" );
+ cMap.setJavaType( "${col.JavaType}" );
#end
#if( $col.Description )
- cMap.setDescription("${col.Description}");
+ cMap.setDescription("${col.Description}");
#end
#if( $col.DefaultValue )
- cMap.setDefault("$col.DefaultValue");
+ cMap.setDefault("$col.DefaultValue");
#end
#if( $col.InheritanceType )
- cMap.setInheritance("$col.InheritanceType");
+ cMap.setInheritance("$col.InheritanceType");
#end
#if( $col.InputValidator )
- cMap.setInputValidator("$col.InputValidator");
+ cMap.setInputValidator("$col.InputValidator");
#end
#if( $col.JavaNamingMethod )
- cMap.setJavaNamingMethod("$col.JavaNamingMethod");
+ cMap.setJavaNamingMethod("$col.JavaNamingMethod");
#end
#if( $col.Precision )
cMap.setSize( $col.Precision );
- #if( $col.Scale )
+ #if( $col.Scale )
cMap.setScale( $col.Scale );
#end
#end
#if($col.isForeignKey())
- cMap.setForeignKey("$col.RelatedTableName", "$col.RelatedColumnName");
+ cMap.setForeignKey("$col.RelatedTableName", "$col.RelatedColumnName");
#end
#if($col.isInheritance() )
#set($tableUseInheritance = "true");
- cMap.setUseInheritance($col.Inheritance);
- InheritanceMap iMap = null;
+ cMap.setUseInheritance($col.Inheritance);
+ InheritanceMap iMap = null;
#foreach ($inh in $col.Children)
iMap = new InheritanceMap(cMap,"$inh.Key","$inh.ClassName","$inh.Ancestor");
cMap.addInheritanceMap(iMap);
Modified: db/torque/templates/trunk/src/templates/om/Object.vm
URL: http://svn.apache.org/viewvc/db/torque/templates/trunk/src/templates/om/Object.vm?view=diff&rev=482888&r1=482887&r2=482888
==============================================================================
--- db/torque/templates/trunk/src/templates/om/Object.vm (original)
+++ db/torque/templates/trunk/src/templates/om/Object.vm Tue Dec 5 20:26:34 2006
@@ -1143,7 +1143,7 @@
}
${col.SetterName}(((Short)value).shortValue());
#elseif ($cjtype == "byte")
- if (value == null || ! (Byte.class.isInstance(value)))
+ if (value == null || ! (Byte.class.isInstance(value)))
{
throw new IllegalArgumentException("setByName: value parameter was null or not a Byte object.");
}
@@ -1803,8 +1803,8 @@
#foreach ($col in $table.Columns)
#if ($col.isPrimaryKey())
#if($col.Primitive)
- #set ($fktype = $col.JavaNative)
- #set ($casttype = "")
+ #set ($fktype = $col.JavaNative)
+ #set ($casttype = "")
#if ($fktype == "short")
#set ($casttype = "(short)")
#elseif($fktype == "byte")
Modified: db/torque/templates/trunk/src/templates/om/ObjectWithManager.vm
URL: http://svn.apache.org/viewvc/db/torque/templates/trunk/src/templates/om/ObjectWithManager.vm?view=diff&rev=482888&r1=482887&r2=482888
==============================================================================
--- db/torque/templates/trunk/src/templates/om/ObjectWithManager.vm (original)
+++ db/torque/templates/trunk/src/templates/om/ObjectWithManager.vm Tue Dec 5 20:26:34 2006
@@ -1160,7 +1160,7 @@
}
${col.SetterName}(((Short)value).shortValue());
#elseif ($cjtype == "byte")
- if (value == null || ! (Byte.class.isInstance(value)))
+ if (value == null || ! (Byte.class.isInstance(value)))
{
throw new IllegalArgumentException("setByName: value parameter was null or not a Byte object.");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org