svn commit: r1917023 - in /db/torque/trunk/torque-templates: pom.xml src/main/java/org/apache/torque/templates/typemapping/TypeMap.java src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/setterReferencedObjectByObjectKey.vm

Author: gk
Date: Tue Apr 16 10:12:17 2024
New Revision: 1917023

URL: http://svn.apache.org/viewvc?rev=1917023&view=rev
Log:
- replace tabs wit hspace in pom.xml
- use non deprecated Float or Double Number initializers instead of new constructors

Modified:
    db/torque/trunk/torque-templates/pom.xml
    db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/TypeMap.java
    db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/setterReferencedObjectByObjectKey.vm

Modified: db/torque/trunk/torque-templates/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/pom.xml?rev=1917023&r1=1917022&r2=1917023&view=diff
==============================================================================
--- db/torque/trunk/torque-templates/pom.xml (original)
+++ db/torque/trunk/torque-templates/pom.xml Tue Apr 16 10:12:17 2024
@@ -154,21 +154,21 @@
             <build>
                 <plugins>
                    <plugin>
-				      <groupId>org.apache.maven.plugins</groupId>
-				      <artifactId>maven-compiler-plugin</artifactId>
-				      <executions>
-				        <execution>
-                          <phase>integration-test</phase>
-				          <goals>
-				            <goal>testCompile</goal>
-				          </goals>
-				        </execution>
-				      </executions>
-				    </plugin>
-                     <plugin>
-		                <groupId>org.codehaus.mojo</groupId>
-		                <artifactId>build-helper-maven-plugin</artifactId>
-		                <executions>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <executions>
+                      <execution>
+                        <phase>integration-test</phase>
+                        <goals>
+                          <goal>testCompile</goal>
+                        </goals>
+                      </execution>
+                    </executions>
+                  </plugin>
+                  <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>build-helper-maven-plugin</artifactId>
+                    <executions>
 		                  <!--execution>
 		                    <id>add-generated-resources</id>
 		                    <phase>pre-integration-test</phase>

Modified: db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/TypeMap.java
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/TypeMap.java?rev=1917023&r1=1917022&r2=1917023&view=diff
==============================================================================
--- db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/TypeMap.java (original)
+++ db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/TypeMap.java Tue Apr 16 10:12:17 2024
@@ -113,11 +113,11 @@ public final class TypeMap
     /** A sample java object for BIGINT columns. */
     public static final String BIGINT_OBJECT_TYPE = "Long.valueOf(0)";
     /** A sample java object for REAL columns. */
-    public static final String REAL_OBJECT_TYPE = "new Float(0)";
+    public static final String REAL_OBJECT_TYPE = "Float.valueOf((float) 0)";
     /** A sample java object for FLOAT columns. */
-    public static final String FLOAT_OBJECT_TYPE = "new Double(0)";
+    public static final String FLOAT_OBJECT_TYPE = "Double.valueOf((double) 0)";
     /** A sample java object for DOUBLE columns. */
-    public static final String DOUBLE_OBJECT_TYPE = "new Double(0)";
+    public static final String DOUBLE_OBJECT_TYPE = "Double.valueOf((double) 0)";
     /** A sample java object for BINARY columns. */
     public static final String BINARY_OBJECT_TYPE = "new Object()"; //?
     /** A sample java object for VARBINARY columns. */

Modified: db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/setterReferencedObjectByObjectKey.vm
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/setterReferencedObjectByObjectKey.vm?rev=1917023&r1=1917022&r2=1917023&view=diff
==============================================================================
--- db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/setterReferencedObjectByObjectKey.vm (original)
+++ db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/setterReferencedObjectByObjectKey.vm Tue Apr 16 10:12:17 2024
@@ -82,9 +82,9 @@
   #elseif ($localFieldType == "Byte")
         ${localFieldSetter}(Byte.valueOf(((NumberKey) $keyVariable).byteValue()));
   #elseif ($localFieldType == "Float")
-        ${localFieldSetter}(new Float(((NumberKey) $keyVariable).floatValue()));
+        ${localFieldSetter}(Float.valueOf(((NumberKey) $keyVariable).floatValue()));
   #elseif ($localFieldType == "Double")
-        ${localFieldSetter}(new Double(((NumberKey) $keyVariable).doubleValue()));
+        ${localFieldSetter}(Double.valueof(((NumberKey) $keyVariable).doubleValue()));
   #elseif ($localFieldType == "String")
         ${localFieldSetter}(${keyVariable}.toString());
   #elseif ($localFieldType == "Date")