You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ibatis.apache.org by jg...@apache.org on 2007/06/06 04:29:34 UTC

svn commit: r544712 - in /ibatis/trunk/java/mapper/mapper2/tools/abator/core: build/ doc/ htmldoc/ src/org/apache/ibatis/abator/internal/java/model/ testJava2/abatortest/java2/execute/conditional/java2/ testJava2/abatortest/java2/execute/conditional/le...

Author: jgbutler
Date: Tue Jun  5 19:29:32 2007
New Revision: 544712

URL: http://svn.apache.org/viewvc?view=rev&rev=544712
Log:
Fixes for IBATIS-414 (Abator) - allow generated example and criteria classes to be extended

Added:
    ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/setupCmdLine.bat
Modified:
    ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/build.bat
    ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/clean.bat
    ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/version.properties
    ibatis/trunk/java/mapper/mapper2/tools/abator/core/doc/ReleaseNotes.txt
    ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/whatsNew.html
    ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/model/JavaModelGeneratorJava2Impl.java
    ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/model/JavaModelGeneratorJava5Impl.java
    ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/conditional/java2/ConditionalJava2Tests.java
    ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/conditional/legacy/ConditionalLegacyTests.java
    ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/flat/java2/FlatJava2Tests.java
    ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/flat/legacy/FlatLegacyTests.java
    ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/hierarchical/java2/HierarchicalJava2Tests.java
    ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/hierarchical/legacy/HierarchicalLegacyTests.java
    ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/conditional/java2/ConditionalJava2Tests.java
    ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/conditional/java5/ConditionalJava5Tests.java
    ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/conditional/legacy/ConditionalLegacyTests.java
    ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/flat/java2/FlatJava2Tests.java
    ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/flat/java5/FlatJava5Tests.java
    ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/flat/legacy/FlatLegacyTests.java
    ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/hierarchical/java2/HierarchicalJava2Tests.java
    ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/hierarchical/java5/HierarchicalJava5Tests.java
    ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/hierarchical/legacy/HierarchicalLegacyTests.java

Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/build.bat
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/build.bat?view=diff&rev=544712&r1=544711&r2=544712
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/build.bat (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/build.bat Tue Jun  5 19:29:32 2007
@@ -1,8 +1,7 @@
 @echo off
-rem This file assumes:
-rem    JAVA_HOME is set to a JSE 5.0 or greater JDK/JRE
-rem    JAVA_HOME\bin is in the path
-rem    ANT_HOME is set to an Ant install
-rem    ANT_HOME\bin is in the path
+
+setlocal
+
+call setupCmdLine.bat
 
 ant -lib ../devlib

Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/clean.bat
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/clean.bat?view=diff&rev=544712&r1=544711&r2=544712
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/clean.bat (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/clean.bat Tue Jun  5 19:29:32 2007
@@ -1,8 +1,7 @@
 @echo off
-rem This file assumes:
-rem    JAVA_HOME is set to a JSE 5.0 or greater JDK/JRE
-rem    JAVA_HOME\bin is in the path
-rem    ANT_HOME is set to an Ant install
-rem    ANT_HOME\bin is in the path
+
+setlocal
+
+call setupCmdLine.bat
 
 ant clean

Added: ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/setupCmdLine.bat
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/setupCmdLine.bat?view=auto&rev=544712
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/setupCmdLine.bat (added)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/setupCmdLine.bat Tue Jun  5 19:29:32 2007
@@ -0,0 +1,11 @@
+rem Change the values in this file to the proper directories on your machine
+
+if defined ANT_HOME goto ant_home_defined
+set ANT_HOME=C:\JavaTools\apache-ant-1.6.5
+set PATH=%PATH%;%ANT_HOME%\bin;
+
+:ant_home_defined
+if defined JAVA_HOME goto java_home_defined
+set JAVA_HOME=C:\JavaTools\jdk1.5.0_11
+
+:java_home_defined

Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/version.properties
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/version.properties?view=diff&rev=544712&r1=544711&r2=544712
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/version.properties (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/version.properties Tue Jun  5 19:29:32 2007
@@ -1,4 +1,4 @@
 #Abator build version info
-#Sat Apr 07 18:40:25 CDT 2007
+#Tue Jun 05 21:25:26 CDT 2007
 version=1.0.1
-buildNum=357
+buildNum=363

Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/doc/ReleaseNotes.txt
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/doc/ReleaseNotes.txt?view=diff&rev=544712&r1=544711&r2=544712
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/doc/ReleaseNotes.txt (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/doc/ReleaseNotes.txt Tue Jun  5 19:29:32 2007
@@ -29,6 +29,7 @@
    columns.
 9. API change to allow generating with selected contexts rather than
    the entire config file.
+10. IBATIS-414 - make the Example and Criteria classes extendable
 
 -------------------------------------------------------------------------------
 Version 1.0.0:

Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/whatsNew.html
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/whatsNew.html?view=diff&rev=544712&r1=544711&r2=544712
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/whatsNew.html (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/whatsNew.html Tue Jun  5 19:29:32 2007
@@ -50,6 +50,7 @@
     See the <a href="configreference/table.html">&lt;table&gt;</a>
     reference page for more information.</li>
   <li>Fixed bug - incorrect datatype mapping for JDBC BIT datatype</li>
+  <li>Made the generated Example and Criteria classes extendable</li>
 </ul>
 
 <h2>Version 1.0.0</h2>

Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/model/JavaModelGeneratorJava2Impl.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/model/JavaModelGeneratorJava2Impl.java?view=diff&rev=544712&r1=544711&r2=544712
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/model/JavaModelGeneratorJava2Impl.java (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/model/JavaModelGeneratorJava2Impl.java Tue Jun  5 19:29:32 2007
@@ -714,7 +714,7 @@
         // add field, getter, setter for orderby clause
         Field field = new Field();
         field.addComment(table);
-        field.setVisibility(JavaVisibility.PRIVATE);
+        field.setVisibility(JavaVisibility.PROTECTED);
         field.setType(FullyQualifiedJavaType.getStringInstance());
         field.setName("orderByClause"); //$NON-NLS-1$
         topLevelClass.addField(field);
@@ -739,7 +739,7 @@
         // add field and methods for the list of ored criteria
         field = new Field();
         field.addComment(table);
-        field.setVisibility(JavaVisibility.PRIVATE);
+        field.setVisibility(JavaVisibility.PROTECTED);
 
         FullyQualifiedJavaType fqjt = FullyQualifiedJavaType
                 .getNewListInstance();
@@ -811,7 +811,7 @@
         answer.addComment(introspectedTable.getTable());
 
         method = new Method();
-        method.setVisibility(JavaVisibility.PRIVATE);
+        method.setVisibility(JavaVisibility.PROTECTED);
         method.setName("Criteria"); //$NON-NLS-1$
         method.setConstructor(true);
         method.addBodyLine("super();"); //$NON-NLS-1$
@@ -876,7 +876,7 @@
                 .getNewArrayListInstance());
 
         field = new Field();
-        field.setVisibility(JavaVisibility.PRIVATE);
+        field.setVisibility(JavaVisibility.PROTECTED);
         FullyQualifiedJavaType listOfStrings = FullyQualifiedJavaType
                 .getNewListInstance();
         field.setType(listOfStrings);
@@ -894,7 +894,7 @@
                 .getNewListInstance();
 
         field = new Field();
-        field.setVisibility(JavaVisibility.PRIVATE);
+        field.setVisibility(JavaVisibility.PROTECTED);
         field.setType(listOfMaps);
         field.setName("criteriaWithSingleValue"); //$NON-NLS-1$
         answer.addField(field);
@@ -907,7 +907,7 @@
         answer.addMethod(method);
 
         field = new Field();
-        field.setVisibility(JavaVisibility.PRIVATE);
+        field.setVisibility(JavaVisibility.PROTECTED);
         field.setType(listOfMaps);
         field.setName("criteriaWithListValue"); //$NON-NLS-1$
         answer.addField(field);
@@ -920,7 +920,7 @@
         answer.addMethod(method);
 
         field = new Field();
-        field.setVisibility(JavaVisibility.PRIVATE);
+        field.setVisibility(JavaVisibility.PROTECTED);
         field.setType(listOfMaps);
         field.setName("criteriaWithBetweenValue"); //$NON-NLS-1$
         answer.addField(field);
@@ -934,7 +934,7 @@
 
         // now add the methods for simplifying the individual field set methods
         method = new Method();
-        method.setVisibility(JavaVisibility.PRIVATE);
+        method.setVisibility(JavaVisibility.PROTECTED);
         if (abatorContext.getSuppressTypeWarnings()) {
             method.addSuppressTypeWarningsAnnotation();
         }
@@ -960,7 +960,7 @@
                 .getNewListInstance();
 
         method = new Method();
-        method.setVisibility(JavaVisibility.PRIVATE);
+        method.setVisibility(JavaVisibility.PROTECTED);
         if (abatorContext.getSuppressTypeWarnings()) {
             method.addSuppressTypeWarningsAnnotation();
         }
@@ -982,7 +982,7 @@
         answer.addMethod(method);
 
         method = new Method();
-        method.setVisibility(JavaVisibility.PRIVATE);
+        method.setVisibility(JavaVisibility.PROTECTED);
         if (abatorContext.getSuppressTypeWarnings()) {
             method.addSuppressTypeWarningsAnnotation();
         }
@@ -1018,7 +1018,7 @@
             topLevelClass.addImportedType(FullyQualifiedJavaType
                     .getNewIteratorInstance());
             method = new Method();
-            method.setVisibility(JavaVisibility.PRIVATE);
+            method.setVisibility(JavaVisibility.PROTECTED);
             method.setName("addCriterionForJDBCDate"); //$NON-NLS-1$
             method.addParameter(new Parameter(FullyQualifiedJavaType
                     .getStringInstance(), "condition")); //$NON-NLS-1$
@@ -1031,7 +1031,7 @@
             answer.addMethod(method);
 
             method = new Method();
-            method.setVisibility(JavaVisibility.PRIVATE);
+            method.setVisibility(JavaVisibility.PROTECTED);
             if (abatorContext.getSuppressTypeWarnings()) {
                 method.addSuppressTypeWarningsAnnotation();
             }
@@ -1057,7 +1057,7 @@
             answer.addMethod(method);
 
             method = new Method();
-            method.setVisibility(JavaVisibility.PRIVATE);
+            method.setVisibility(JavaVisibility.PROTECTED);
             method.setName("addCriterionForJDBCDate"); //$NON-NLS-1$
             method.addParameter(new Parameter(FullyQualifiedJavaType
                     .getStringInstance(), "condition")); //$NON-NLS-1$
@@ -1082,7 +1082,7 @@
             topLevelClass.addImportedType(FullyQualifiedJavaType
                     .getNewIteratorInstance());
             method = new Method();
-            method.setVisibility(JavaVisibility.PRIVATE);
+            method.setVisibility(JavaVisibility.PROTECTED);
             method.setName("addCriterionForJDBCTime"); //$NON-NLS-1$
             method.addParameter(new Parameter(FullyQualifiedJavaType
                     .getStringInstance(), "condition")); //$NON-NLS-1$
@@ -1095,7 +1095,7 @@
             answer.addMethod(method);
 
             method = new Method();
-            method.setVisibility(JavaVisibility.PRIVATE);
+            method.setVisibility(JavaVisibility.PROTECTED);
             if (abatorContext.getSuppressTypeWarnings()) {
                 method.addSuppressTypeWarningsAnnotation();
             }
@@ -1121,7 +1121,7 @@
             answer.addMethod(method);
 
             method = new Method();
-            method.setVisibility(JavaVisibility.PRIVATE);
+            method.setVisibility(JavaVisibility.PROTECTED);
             method.setName("addCriterionForJDBCTime"); //$NON-NLS-1$
             method.addParameter(new Parameter(FullyQualifiedJavaType
                     .getStringInstance(), "condition")); //$NON-NLS-1$
@@ -1251,7 +1251,7 @@
         answer.add(sb.toString());
 
         Field field = new Field();
-        field.setVisibility(JavaVisibility.PRIVATE);
+        field.setVisibility(JavaVisibility.PROTECTED);
         field.setType(listOfMaps);
         field.setName(sb.toString());
         innerClass.addField(field);
@@ -1271,7 +1271,7 @@
         answer.add(sb.toString());
 
         field = new Field();
-        field.setVisibility(JavaVisibility.PRIVATE);
+        field.setVisibility(JavaVisibility.PROTECTED);
         field.setType(listOfMaps);
         field.setName(sb.toString());
         innerClass.addField(field);
@@ -1291,7 +1291,7 @@
         answer.add(sb.toString());
         
         field = new Field();
-        field.setVisibility(JavaVisibility.PRIVATE);
+        field.setVisibility(JavaVisibility.PROTECTED);
         field.setType(listOfMaps);
         field.setName(sb.toString());
         innerClass.addField(field);
@@ -1326,7 +1326,7 @@
 
         // now add the methods for simplifying the individual field set methods
         method = new Method();
-        method.setVisibility(JavaVisibility.PRIVATE);
+        method.setVisibility(JavaVisibility.PROTECTED);
         sb.setLength(0);
         sb.append("add"); //$NON-NLS-1$
         sb.append(cd.getJavaProperty());
@@ -1364,7 +1364,7 @@
         sb.append("Criterion"); //$NON-NLS-1$
         
         method = new Method();
-        method.setVisibility(JavaVisibility.PRIVATE);
+        method.setVisibility(JavaVisibility.PROTECTED);
         method.setName(sb.toString());
         method.addParameter(new Parameter(FullyQualifiedJavaType
                 .getStringInstance(), "condition")); //$NON-NLS-1$
@@ -1393,7 +1393,7 @@
         sb.append("Criterion"); //$NON-NLS-1$
 
         method = new Method();
-        method.setVisibility(JavaVisibility.PRIVATE);
+        method.setVisibility(JavaVisibility.PROTECTED);
         method.setName(sb.toString());
         method.addParameter(new Parameter(FullyQualifiedJavaType
                 .getStringInstance(), "condition")); //$NON-NLS-1$

Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/model/JavaModelGeneratorJava5Impl.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/model/JavaModelGeneratorJava5Impl.java?view=diff&rev=544712&r1=544711&r2=544712
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/model/JavaModelGeneratorJava5Impl.java (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/model/JavaModelGeneratorJava5Impl.java Tue Jun  5 19:29:32 2007
@@ -59,7 +59,7 @@
         // add field, getter, setter for orderby clause
         Field field = new Field();
         field.addComment(table);
-        field.setVisibility(JavaVisibility.PRIVATE);
+        field.setVisibility(JavaVisibility.PROTECTED);
         field.setType(FullyQualifiedJavaType.getStringInstance());
         field.setName("orderByClause"); //$NON-NLS-1$
         topLevelClass.addField(field);
@@ -84,7 +84,7 @@
         // add field and methods for the list of ored criteria
         field = new Field();
         field.addComment(table);
-        field.setVisibility(JavaVisibility.PRIVATE);
+        field.setVisibility(JavaVisibility.PROTECTED);
 
         FullyQualifiedJavaType fqjt = FullyQualifiedJavaType
                 .getNewListInstance();
@@ -151,7 +151,7 @@
         answer.addComment(introspectedTable.getTable());
 
         method = new Method();
-        method.setVisibility(JavaVisibility.PRIVATE);
+        method.setVisibility(JavaVisibility.PROTECTED);
         method.setName("Criteria"); //$NON-NLS-1$
         method.setConstructor(true);
         method.addBodyLine("super();"); //$NON-NLS-1$
@@ -216,7 +216,7 @@
                 .getNewArrayListInstance());
 
         field = new Field();
-        field.setVisibility(JavaVisibility.PRIVATE);
+        field.setVisibility(JavaVisibility.PROTECTED);
         FullyQualifiedJavaType listOfStrings = FullyQualifiedJavaType
                 .getNewListInstance();
         listOfStrings.addTypeArgument(FullyQualifiedJavaType
@@ -244,7 +244,7 @@
         listOfMaps.addTypeArgument(innerMapType);
 
         field = new Field();
-        field.setVisibility(JavaVisibility.PRIVATE);
+        field.setVisibility(JavaVisibility.PROTECTED);
         field.setType(listOfMaps);
         field.setName("criteriaWithSingleValue"); //$NON-NLS-1$
         answer.addField(field);
@@ -257,7 +257,7 @@
         answer.addMethod(method);
 
         field = new Field();
-        field.setVisibility(JavaVisibility.PRIVATE);
+        field.setVisibility(JavaVisibility.PROTECTED);
         field.setType(listOfMaps);
         field.setName("criteriaWithListValue"); //$NON-NLS-1$
         answer.addField(field);
@@ -270,7 +270,7 @@
         answer.addMethod(method);
 
         field = new Field();
-        field.setVisibility(JavaVisibility.PRIVATE);
+        field.setVisibility(JavaVisibility.PROTECTED);
         field.setType(listOfMaps);
         field.setName("criteriaWithBetweenValue"); //$NON-NLS-1$
         answer.addField(field);
@@ -284,7 +284,7 @@
 
         // now add the methods for simplifying the individual field set methods
         method = new Method();
-        method.setVisibility(JavaVisibility.PRIVATE);
+        method.setVisibility(JavaVisibility.PROTECTED);
         method.setName("addCriterion"); //$NON-NLS-1$
         method.addParameter(new Parameter(FullyQualifiedJavaType
                 .getStringInstance(), "condition")); //$NON-NLS-1$
@@ -309,7 +309,7 @@
                 "java.lang.Object", true)); //$NON-NLS-1$
 
         method = new Method();
-        method.setVisibility(JavaVisibility.PRIVATE);
+        method.setVisibility(JavaVisibility.PROTECTED);
         method.setName("addCriterion"); //$NON-NLS-1$
         method.addParameter(new Parameter(FullyQualifiedJavaType
                 .getStringInstance(), "condition")); //$NON-NLS-1$
@@ -328,7 +328,7 @@
         answer.addMethod(method);
 
         method = new Method();
-        method.setVisibility(JavaVisibility.PRIVATE);
+        method.setVisibility(JavaVisibility.PROTECTED);
         method.setName("addCriterion"); //$NON-NLS-1$
         method.addParameter(new Parameter(FullyQualifiedJavaType
                 .getStringInstance(), "condition")); //$NON-NLS-1$
@@ -362,7 +362,7 @@
             topLevelClass.addImportedType(FullyQualifiedJavaType
                     .getNewIteratorInstance());
             method = new Method();
-            method.setVisibility(JavaVisibility.PRIVATE);
+            method.setVisibility(JavaVisibility.PROTECTED);
             method.setName("addCriterionForJDBCDate"); //$NON-NLS-1$
             method.addParameter(new Parameter(FullyQualifiedJavaType
                     .getStringInstance(), "condition")); //$NON-NLS-1$
@@ -375,7 +375,7 @@
             answer.addMethod(method);
 
             method = new Method();
-            method.setVisibility(JavaVisibility.PRIVATE);
+            method.setVisibility(JavaVisibility.PROTECTED);
             method.setName("addCriterionForJDBCDate"); //$NON-NLS-1$
             method.addParameter(new Parameter(FullyQualifiedJavaType
                     .getStringInstance(), "condition")); //$NON-NLS-1$
@@ -398,7 +398,7 @@
             answer.addMethod(method);
 
             method = new Method();
-            method.setVisibility(JavaVisibility.PRIVATE);
+            method.setVisibility(JavaVisibility.PROTECTED);
             method.setName("addCriterionForJDBCDate"); //$NON-NLS-1$
             method.addParameter(new Parameter(FullyQualifiedJavaType
                     .getStringInstance(), "condition")); //$NON-NLS-1$
@@ -423,7 +423,7 @@
             topLevelClass.addImportedType(FullyQualifiedJavaType
                     .getNewIteratorInstance());
             method = new Method();
-            method.setVisibility(JavaVisibility.PRIVATE);
+            method.setVisibility(JavaVisibility.PROTECTED);
             method.setName("addCriterionForJDBCTime"); //$NON-NLS-1$
             method.addParameter(new Parameter(FullyQualifiedJavaType
                     .getStringInstance(), "condition")); //$NON-NLS-1$
@@ -436,7 +436,7 @@
             answer.addMethod(method);
 
             method = new Method();
-            method.setVisibility(JavaVisibility.PRIVATE);
+            method.setVisibility(JavaVisibility.PROTECTED);
             method.setName("addCriterionForJDBCTime"); //$NON-NLS-1$
             method.addParameter(new Parameter(FullyQualifiedJavaType
                     .getStringInstance(), "condition")); //$NON-NLS-1$
@@ -459,7 +459,7 @@
             answer.addMethod(method);
 
             method = new Method();
-            method.setVisibility(JavaVisibility.PRIVATE);
+            method.setVisibility(JavaVisibility.PROTECTED);
             method.setName("addCriterionForJDBCTime"); //$NON-NLS-1$
             method.addParameter(new Parameter(FullyQualifiedJavaType
                     .getStringInstance(), "condition")); //$NON-NLS-1$
@@ -604,7 +604,7 @@
         answer.add(sb.toString());
 
         Field field = new Field();
-        field.setVisibility(JavaVisibility.PRIVATE);
+        field.setVisibility(JavaVisibility.PROTECTED);
         field.setType(listOfMaps);
         field.setName(sb.toString());
         innerClass.addField(field);
@@ -624,7 +624,7 @@
         answer.add(sb.toString());
 
         field = new Field();
-        field.setVisibility(JavaVisibility.PRIVATE);
+        field.setVisibility(JavaVisibility.PROTECTED);
         field.setType(listOfMaps);
         field.setName(sb.toString());
         innerClass.addField(field);
@@ -644,7 +644,7 @@
         answer.add(sb.toString());
         
         field = new Field();
-        field.setVisibility(JavaVisibility.PRIVATE);
+        field.setVisibility(JavaVisibility.PROTECTED);
         field.setType(listOfMaps);
         field.setName(sb.toString());
         innerClass.addField(field);
@@ -679,7 +679,7 @@
 
         // now add the methods for simplifying the individual field set methods
         method = new Method();
-        method.setVisibility(JavaVisibility.PRIVATE);
+        method.setVisibility(JavaVisibility.PROTECTED);
         sb.setLength(0);
         sb.append("add"); //$NON-NLS-1$
         sb.append(cd.getJavaProperty());
@@ -719,7 +719,7 @@
         sb.append("Criterion"); //$NON-NLS-1$
         
         method = new Method();
-        method.setVisibility(JavaVisibility.PRIVATE);
+        method.setVisibility(JavaVisibility.PROTECTED);
         method.setName(sb.toString());
         method.addParameter(new Parameter(FullyQualifiedJavaType
                 .getStringInstance(), "condition")); //$NON-NLS-1$
@@ -748,7 +748,7 @@
         sb.append("Criterion"); //$NON-NLS-1$
 
         method = new Method();
-        method.setVisibility(JavaVisibility.PRIVATE);
+        method.setVisibility(JavaVisibility.PROTECTED);
         method.setName(sb.toString());
         method.addParameter(new Parameter(FullyQualifiedJavaType
                 .getStringInstance(), "condition")); //$NON-NLS-1$

Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/conditional/java2/ConditionalJava2Tests.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/conditional/java2/ConditionalJava2Tests.java?view=diff&rev=544712&r1=544711&r2=544712
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/conditional/java2/ConditionalJava2Tests.java (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/conditional/java2/ConditionalJava2Tests.java Tue Jun  5 19:29:32 2007
@@ -74,7 +74,7 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(new Double(11.22));
-            record.setFloatfield(new Float(33.44));
+            record.setFloatfield(new Double(33.44));
             record.setIntegerfield(new Integer(5));
             dao.insert(record);
 
@@ -101,19 +101,19 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(new Double(11.22));
-            record.setFloatfield(new Float(33.44));
+            record.setFloatfield(new Double(33.44));
             record.setIntegerfield(new Integer(5));
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(new Double(44.55));
-            record.setFloatfield(new Float(66.77));
+            record.setFloatfield(new Double(66.77));
             record.setIntegerfield(new Integer(8));
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(new Double(88.99));
-            record.setFloatfield(new Float(100.111));
+            record.setFloatfield(new Double(100.111));
             record.setIntegerfield(new Integer(9));
             dao.insert(record);
 
@@ -137,19 +137,19 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(new Double(11.22));
-            record.setFloatfield(new Float(33.44));
+            record.setFloatfield(new Double(33.44));
             record.setIntegerfield(new Integer(5));
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(new Double(44.55));
-            record.setFloatfield(new Float(66.77));
+            record.setFloatfield(new Double(66.77));
             record.setIntegerfield(new Integer(8));
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(new Double(88.99));
-            record.setFloatfield(new Float(100.111));
+            record.setFloatfield(new Double(100.111));
             record.setIntegerfield(new Integer(9));
             dao.insert(record);
 
@@ -169,19 +169,19 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(new Double(11.22));
-            record.setFloatfield(new Float(33.44));
+            record.setFloatfield(new Double(33.44));
             record.setIntegerfield(new Integer(5));
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(new Double(44.55));
-            record.setFloatfield(new Float(66.77));
+            record.setFloatfield(new Double(66.77));
             record.setIntegerfield(new Integer(8));
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(new Double(88.99));
-            record.setFloatfield(new Float(100.111));
+            record.setFloatfield(new Double(100.111));
             record.setIntegerfield(new Integer(9));
             dao.insert(record);
 

Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/conditional/legacy/ConditionalLegacyTests.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/conditional/legacy/ConditionalLegacyTests.java?view=diff&rev=544712&r1=544711&r2=544712
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/conditional/legacy/ConditionalLegacyTests.java (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/conditional/legacy/ConditionalLegacyTests.java Tue Jun  5 19:29:32 2007
@@ -73,7 +73,7 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(new Double(11.22));
-            record.setFloatfield(new Float(33.44));
+            record.setFloatfield(new Double(33.44));
             record.setIntegerfield(new Integer(5));
             dao.insert(record);
 
@@ -101,19 +101,19 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(new Double(11.22));
-            record.setFloatfield(new Float(33.44));
+            record.setFloatfield(new Double(33.44));
             record.setIntegerfield(new Integer(5));
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(new Double(44.55));
-            record.setFloatfield(new Float(66.77));
+            record.setFloatfield(new Double(66.77));
             record.setIntegerfield(new Integer(8));
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(new Double(88.99));
-            record.setFloatfield(new Float(100.111));
+            record.setFloatfield(new Double(100.111));
             record.setIntegerfield(new Integer(9));
             dao.insert(record);
 
@@ -139,19 +139,19 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(new Double(11.22));
-            record.setFloatfield(new Float(33.44));
+            record.setFloatfield(new Double(33.44));
             record.setIntegerfield(new Integer(5));
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(new Double(44.55));
-            record.setFloatfield(new Float(66.77));
+            record.setFloatfield(new Double(66.77));
             record.setIntegerfield(new Integer(8));
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(new Double(88.99));
-            record.setFloatfield(new Float(100.111));
+            record.setFloatfield(new Double(100.111));
             record.setIntegerfield(new Integer(9));
             dao.insert(record);
 

Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/flat/java2/FlatJava2Tests.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/flat/java2/FlatJava2Tests.java?view=diff&rev=544712&r1=544711&r2=544712
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/flat/java2/FlatJava2Tests.java (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/flat/java2/FlatJava2Tests.java Tue Jun  5 19:29:32 2007
@@ -70,7 +70,7 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(new Double(11.22));
-            record.setFloatfield(new Float(33.44));
+            record.setFloatfield(new Double(33.44));
             record.setIntegerfield(new Integer(5));
             dao.insert(record);
 
@@ -97,19 +97,19 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(new Double(11.22));
-            record.setFloatfield(new Float(33.44));
+            record.setFloatfield(new Double(33.44));
             record.setIntegerfield(new Integer(5));
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(new Double(44.55));
-            record.setFloatfield(new Float(66.77));
+            record.setFloatfield(new Double(66.77));
             record.setIntegerfield(new Integer(8));
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(new Double(88.99));
-            record.setFloatfield(new Float(100.111));
+            record.setFloatfield(new Double(100.111));
             record.setIntegerfield(new Integer(9));
             dao.insert(record);
 
@@ -133,19 +133,19 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(new Double(11.22));
-            record.setFloatfield(new Float(33.44));
+            record.setFloatfield(new Double(33.44));
             record.setIntegerfield(new Integer(5));
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(new Double(44.55));
-            record.setFloatfield(new Float(66.77));
+            record.setFloatfield(new Double(66.77));
             record.setIntegerfield(new Integer(8));
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(new Double(88.99));
-            record.setFloatfield(new Float(100.111));
+            record.setFloatfield(new Double(100.111));
             record.setIntegerfield(new Integer(9));
             dao.insert(record);
 
@@ -165,19 +165,19 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(new Double(11.22));
-            record.setFloatfield(new Float(33.44));
+            record.setFloatfield(new Double(33.44));
             record.setIntegerfield(new Integer(5));
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(new Double(44.55));
-            record.setFloatfield(new Float(66.77));
+            record.setFloatfield(new Double(66.77));
             record.setIntegerfield(new Integer(8));
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(new Double(88.99));
-            record.setFloatfield(new Float(100.111));
+            record.setFloatfield(new Double(100.111));
             record.setIntegerfield(new Integer(9));
             dao.insert(record);
 

Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/flat/legacy/FlatLegacyTests.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/flat/legacy/FlatLegacyTests.java?view=diff&rev=544712&r1=544711&r2=544712
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/flat/legacy/FlatLegacyTests.java (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/flat/legacy/FlatLegacyTests.java Tue Jun  5 19:29:32 2007
@@ -69,7 +69,7 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(new Double(11.22));
-            record.setFloatfield(new Float(33.44));
+            record.setFloatfield(new Double(33.44));
             record.setIntegerfield(new Integer(5));
             dao.insert(record);
 
@@ -97,19 +97,19 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(new Double(11.22));
-            record.setFloatfield(new Float(33.44));
+            record.setFloatfield(new Double(33.44));
             record.setIntegerfield(new Integer(5));
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(new Double(44.55));
-            record.setFloatfield(new Float(66.77));
+            record.setFloatfield(new Double(66.77));
             record.setIntegerfield(new Integer(8));
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(new Double(88.99));
-            record.setFloatfield(new Float(100.111));
+            record.setFloatfield(new Double(100.111));
             record.setIntegerfield(new Integer(9));
             dao.insert(record);
 
@@ -135,19 +135,19 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(new Double(11.22));
-            record.setFloatfield(new Float(33.44));
+            record.setFloatfield(new Double(33.44));
             record.setIntegerfield(new Integer(5));
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(new Double(44.55));
-            record.setFloatfield(new Float(66.77));
+            record.setFloatfield(new Double(66.77));
             record.setIntegerfield(new Integer(8));
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(new Double(88.99));
-            record.setFloatfield(new Float(100.111));
+            record.setFloatfield(new Double(100.111));
             record.setIntegerfield(new Integer(9));
             dao.insert(record);
 

Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/hierarchical/java2/HierarchicalJava2Tests.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/hierarchical/java2/HierarchicalJava2Tests.java?view=diff&rev=544712&r1=544711&r2=544712
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/hierarchical/java2/HierarchicalJava2Tests.java (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/hierarchical/java2/HierarchicalJava2Tests.java Tue Jun  5 19:29:32 2007
@@ -77,7 +77,7 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(new Double(11.22));
-            record.setFloatfield(new Float(33.44));
+            record.setFloatfield(new Double(33.44));
             record.setIntegerfield(new Integer(5));
             dao.insert(record);
 
@@ -104,19 +104,19 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(new Double(11.22));
-            record.setFloatfield(new Float(33.44));
+            record.setFloatfield(new Double(33.44));
             record.setIntegerfield(new Integer(5));
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(new Double(44.55));
-            record.setFloatfield(new Float(66.77));
+            record.setFloatfield(new Double(66.77));
             record.setIntegerfield(new Integer(8));
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(new Double(88.99));
-            record.setFloatfield(new Float(100.111));
+            record.setFloatfield(new Double(100.111));
             record.setIntegerfield(new Integer(9));
             dao.insert(record);
 
@@ -140,19 +140,19 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(new Double(11.22));
-            record.setFloatfield(new Float(33.44));
+            record.setFloatfield(new Double(33.44));
             record.setIntegerfield(new Integer(5));
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(new Double(44.55));
-            record.setFloatfield(new Float(66.77));
+            record.setFloatfield(new Double(66.77));
             record.setIntegerfield(new Integer(8));
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(new Double(88.99));
-            record.setFloatfield(new Float(100.111));
+            record.setFloatfield(new Double(100.111));
             record.setIntegerfield(new Integer(9));
             dao.insert(record);
 
@@ -172,19 +172,19 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(new Double(11.22));
-            record.setFloatfield(new Float(33.44));
+            record.setFloatfield(new Double(33.44));
             record.setIntegerfield(new Integer(5));
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(new Double(44.55));
-            record.setFloatfield(new Float(66.77));
+            record.setFloatfield(new Double(66.77));
             record.setIntegerfield(new Integer(8));
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(new Double(88.99));
-            record.setFloatfield(new Float(100.111));
+            record.setFloatfield(new Double(100.111));
             record.setIntegerfield(new Integer(9));
             dao.insert(record);
 

Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/hierarchical/legacy/HierarchicalLegacyTests.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/hierarchical/legacy/HierarchicalLegacyTests.java?view=diff&rev=544712&r1=544711&r2=544712
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/hierarchical/legacy/HierarchicalLegacyTests.java (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/hierarchical/legacy/HierarchicalLegacyTests.java Tue Jun  5 19:29:32 2007
@@ -76,7 +76,7 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(new Double(11.22));
-            record.setFloatfield(new Float(33.44));
+            record.setFloatfield(new Double(33.44));
             record.setIntegerfield(new Integer(5));
             dao.insert(record);
 
@@ -104,19 +104,19 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(new Double(11.22));
-            record.setFloatfield(new Float(33.44));
+            record.setFloatfield(new Double(33.44));
             record.setIntegerfield(new Integer(5));
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(new Double(44.55));
-            record.setFloatfield(new Float(66.77));
+            record.setFloatfield(new Double(66.77));
             record.setIntegerfield(new Integer(8));
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(new Double(88.99));
-            record.setFloatfield(new Float(100.111));
+            record.setFloatfield(new Double(100.111));
             record.setIntegerfield(new Integer(9));
             dao.insert(record);
 
@@ -142,19 +142,19 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(new Double(11.22));
-            record.setFloatfield(new Float(33.44));
+            record.setFloatfield(new Double(33.44));
             record.setIntegerfield(new Integer(5));
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(new Double(44.55));
-            record.setFloatfield(new Float(66.77));
+            record.setFloatfield(new Double(66.77));
             record.setIntegerfield(new Integer(8));
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(new Double(88.99));
-            record.setFloatfield(new Float(100.111));
+            record.setFloatfield(new Double(100.111));
             record.setIntegerfield(new Integer(9));
             dao.insert(record);
 

Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/conditional/java2/ConditionalJava2Tests.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/conditional/java2/ConditionalJava2Tests.java?view=diff&rev=544712&r1=544711&r2=544712
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/conditional/java2/ConditionalJava2Tests.java (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/conditional/java2/ConditionalJava2Tests.java Tue Jun  5 19:29:32 2007
@@ -73,7 +73,7 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(11.22);
-            record.setFloatfield(33.44f);
+            record.setFloatfield(33.44);
             record.setIntegerfield(5);
             dao.insert(record);
 
@@ -100,19 +100,19 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(11.22);
-            record.setFloatfield(33.44f);
+            record.setFloatfield(33.44);
             record.setIntegerfield(5);
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(44.55);
-            record.setFloatfield(66.77f);
+            record.setFloatfield(66.77);
             record.setIntegerfield(8);
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(88.99);
-            record.setFloatfield(100.111f);
+            record.setFloatfield(100.111);
             record.setIntegerfield(9);
             dao.insert(record);
 
@@ -136,19 +136,19 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(11.22);
-            record.setFloatfield(33.44f);
+            record.setFloatfield(33.44);
             record.setIntegerfield(5);
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(44.55);
-            record.setFloatfield(66.77f);
+            record.setFloatfield(66.77);
             record.setIntegerfield(8);
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(88.99);
-            record.setFloatfield(100.111f);
+            record.setFloatfield(100.111);
             record.setIntegerfield(9);
             dao.insert(record);
 
@@ -168,19 +168,19 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(11.22);
-            record.setFloatfield(33.44f);
+            record.setFloatfield(33.44);
             record.setIntegerfield(5);
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(44.55);
-            record.setFloatfield(66.77f);
+            record.setFloatfield(66.77);
             record.setIntegerfield(8);
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(88.99);
-            record.setFloatfield(100.111f);
+            record.setFloatfield(100.111);
             record.setIntegerfield(9);
             dao.insert(record);
 

Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/conditional/java5/ConditionalJava5Tests.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/conditional/java5/ConditionalJava5Tests.java?view=diff&rev=544712&r1=544711&r2=544712
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/conditional/java5/ConditionalJava5Tests.java (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/conditional/java5/ConditionalJava5Tests.java Tue Jun  5 19:29:32 2007
@@ -73,7 +73,7 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(11.22);
-            record.setFloatfield(33.44f);
+            record.setFloatfield(33.44);
             record.setIntegerfield(5);
             dao.insert(record);
 
@@ -100,19 +100,19 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(11.22);
-            record.setFloatfield(33.44f);
+            record.setFloatfield(33.44);
             record.setIntegerfield(5);
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(44.55);
-            record.setFloatfield(66.77f);
+            record.setFloatfield(66.77);
             record.setIntegerfield(8);
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(88.99);
-            record.setFloatfield(100.111f);
+            record.setFloatfield(100.111);
             record.setIntegerfield(9);
             dao.insert(record);
 
@@ -136,19 +136,19 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(11.22);
-            record.setFloatfield(33.44f);
+            record.setFloatfield(33.44);
             record.setIntegerfield(5);
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(44.55);
-            record.setFloatfield(66.77f);
+            record.setFloatfield(66.77);
             record.setIntegerfield(8);
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(88.99);
-            record.setFloatfield(100.111f);
+            record.setFloatfield(100.111);
             record.setIntegerfield(9);
             dao.insert(record);
 
@@ -168,19 +168,19 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(11.22);
-            record.setFloatfield(33.44f);
+            record.setFloatfield(33.44);
             record.setIntegerfield(5);
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(44.55);
-            record.setFloatfield(66.77f);
+            record.setFloatfield(66.77);
             record.setIntegerfield(8);
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(88.99);
-            record.setFloatfield(100.111f);
+            record.setFloatfield(100.111);
             record.setIntegerfield(9);
             dao.insert(record);
 

Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/conditional/legacy/ConditionalLegacyTests.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/conditional/legacy/ConditionalLegacyTests.java?view=diff&rev=544712&r1=544711&r2=544712
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/conditional/legacy/ConditionalLegacyTests.java (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/conditional/legacy/ConditionalLegacyTests.java Tue Jun  5 19:29:32 2007
@@ -72,7 +72,7 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(11.22);
-            record.setFloatfield(33.44f);
+            record.setFloatfield(33.44);
             record.setIntegerfield(5);
             dao.insert(record);
 
@@ -100,19 +100,19 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(11.22);
-            record.setFloatfield(33.44f);
+            record.setFloatfield(33.44);
             record.setIntegerfield(5);
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(44.55);
-            record.setFloatfield(66.77f);
+            record.setFloatfield(66.77);
             record.setIntegerfield(8);
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(88.99);
-            record.setFloatfield(100.111f);
+            record.setFloatfield(100.111);
             record.setIntegerfield(9);
             dao.insert(record);
 
@@ -138,19 +138,19 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(11.22);
-            record.setFloatfield(33.44f);
+            record.setFloatfield(33.44);
             record.setIntegerfield(5);
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(44.55);
-            record.setFloatfield(66.77f);
+            record.setFloatfield(66.77);
             record.setIntegerfield(8);
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(88.99);
-            record.setFloatfield(100.111f);
+            record.setFloatfield(100.111);
             record.setIntegerfield(9);
             dao.insert(record);
 

Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/flat/java2/FlatJava2Tests.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/flat/java2/FlatJava2Tests.java?view=diff&rev=544712&r1=544711&r2=544712
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/flat/java2/FlatJava2Tests.java (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/flat/java2/FlatJava2Tests.java Tue Jun  5 19:29:32 2007
@@ -69,7 +69,7 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(11.22);
-            record.setFloatfield(33.44f);
+            record.setFloatfield(33.44);
             record.setIntegerfield(5);
             dao.insert(record);
 
@@ -96,19 +96,19 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(11.22);
-            record.setFloatfield(33.44f);
+            record.setFloatfield(33.44);
             record.setIntegerfield(5);
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(44.55);
-            record.setFloatfield(66.77f);
+            record.setFloatfield(66.77);
             record.setIntegerfield(8);
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(88.99);
-            record.setFloatfield(100.111f);
+            record.setFloatfield(100.111);
             record.setIntegerfield(9);
             dao.insert(record);
 
@@ -132,19 +132,19 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(11.22);
-            record.setFloatfield(33.44f);
+            record.setFloatfield(33.44);
             record.setIntegerfield(5);
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(44.55);
-            record.setFloatfield(66.77f);
+            record.setFloatfield(66.77);
             record.setIntegerfield(8);
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(88.99);
-            record.setFloatfield(100.111f);
+            record.setFloatfield(100.111);
             record.setIntegerfield(9);
             dao.insert(record);
 
@@ -164,19 +164,19 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(11.22);
-            record.setFloatfield(33.44f);
+            record.setFloatfield(33.44);
             record.setIntegerfield(5);
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(44.55);
-            record.setFloatfield(66.77f);
+            record.setFloatfield(66.77);
             record.setIntegerfield(8);
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(88.99);
-            record.setFloatfield(100.111f);
+            record.setFloatfield(100.111);
             record.setIntegerfield(9);
             dao.insert(record);
 

Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/flat/java5/FlatJava5Tests.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/flat/java5/FlatJava5Tests.java?view=diff&rev=544712&r1=544711&r2=544712
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/flat/java5/FlatJava5Tests.java (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/flat/java5/FlatJava5Tests.java Tue Jun  5 19:29:32 2007
@@ -69,7 +69,7 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(11.22);
-            record.setFloatfield(33.44f);
+            record.setFloatfield(33.44);
             record.setIntegerfield(5);
             dao.insert(record);
 
@@ -96,19 +96,19 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(11.22);
-            record.setFloatfield(33.44f);
+            record.setFloatfield(33.44);
             record.setIntegerfield(5);
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(44.55);
-            record.setFloatfield(66.77f);
+            record.setFloatfield(66.77);
             record.setIntegerfield(8);
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(88.99);
-            record.setFloatfield(100.111f);
+            record.setFloatfield(100.111);
             record.setIntegerfield(9);
             dao.insert(record);
 
@@ -132,19 +132,19 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(11.22);
-            record.setFloatfield(33.44f);
+            record.setFloatfield(33.44);
             record.setIntegerfield(5);
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(44.55);
-            record.setFloatfield(66.77f);
+            record.setFloatfield(66.77);
             record.setIntegerfield(8);
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(88.99);
-            record.setFloatfield(100.111f);
+            record.setFloatfield(100.111);
             record.setIntegerfield(9);
             dao.insert(record);
 
@@ -164,19 +164,19 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(11.22);
-            record.setFloatfield(33.44f);
+            record.setFloatfield(33.44);
             record.setIntegerfield(5);
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(44.55);
-            record.setFloatfield(66.77f);
+            record.setFloatfield(66.77);
             record.setIntegerfield(8);
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(88.99);
-            record.setFloatfield(100.111f);
+            record.setFloatfield(100.111);
             record.setIntegerfield(9);
             dao.insert(record);
 

Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/flat/legacy/FlatLegacyTests.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/flat/legacy/FlatLegacyTests.java?view=diff&rev=544712&r1=544711&r2=544712
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/flat/legacy/FlatLegacyTests.java (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/flat/legacy/FlatLegacyTests.java Tue Jun  5 19:29:32 2007
@@ -69,7 +69,7 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(11.22);
-            record.setFloatfield(33.44f);
+            record.setFloatfield(33.44);
             record.setIntegerfield(5);
             dao.insert(record);
 
@@ -97,19 +97,19 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(11.22);
-            record.setFloatfield(33.44f);
+            record.setFloatfield(33.44);
             record.setIntegerfield(5);
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(44.55);
-            record.setFloatfield(66.77f);
+            record.setFloatfield(66.77);
             record.setIntegerfield(8);
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(88.99);
-            record.setFloatfield(100.111f);
+            record.setFloatfield(100.111);
             record.setIntegerfield(9);
             dao.insert(record);
 
@@ -135,19 +135,19 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(11.22);
-            record.setFloatfield(33.44f);
+            record.setFloatfield(33.44);
             record.setIntegerfield(5);
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(44.55);
-            record.setFloatfield(66.77f);
+            record.setFloatfield(66.77);
             record.setIntegerfield(8);
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(88.99);
-            record.setFloatfield(100.111f);
+            record.setFloatfield(100.111);
             record.setIntegerfield(9);
             dao.insert(record);
 

Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/hierarchical/java2/HierarchicalJava2Tests.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/hierarchical/java2/HierarchicalJava2Tests.java?view=diff&rev=544712&r1=544711&r2=544712
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/hierarchical/java2/HierarchicalJava2Tests.java (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/hierarchical/java2/HierarchicalJava2Tests.java Tue Jun  5 19:29:32 2007
@@ -76,7 +76,7 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(11.22);
-            record.setFloatfield(33.44f);
+            record.setFloatfield(33.44);
             record.setIntegerfield(5);
             dao.insert(record);
 
@@ -103,19 +103,19 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(11.22);
-            record.setFloatfield(33.44f);
+            record.setFloatfield(33.44);
             record.setIntegerfield(5);
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(44.55);
-            record.setFloatfield(66.77f);
+            record.setFloatfield(66.77);
             record.setIntegerfield(8);
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(88.99);
-            record.setFloatfield(100.111f);
+            record.setFloatfield(100.111);
             record.setIntegerfield(9);
             dao.insert(record);
 
@@ -139,19 +139,19 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(11.22);
-            record.setFloatfield(33.44f);
+            record.setFloatfield(33.44);
             record.setIntegerfield(5);
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(44.55);
-            record.setFloatfield(66.77f);
+            record.setFloatfield(66.77);
             record.setIntegerfield(8);
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(88.99);
-            record.setFloatfield(100.111f);
+            record.setFloatfield(100.111);
             record.setIntegerfield(9);
             dao.insert(record);
 
@@ -171,19 +171,19 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(11.22);
-            record.setFloatfield(33.44f);
+            record.setFloatfield(33.44);
             record.setIntegerfield(5);
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(44.55);
-            record.setFloatfield(66.77f);
+            record.setFloatfield(66.77);
             record.setIntegerfield(8);
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(88.99);
-            record.setFloatfield(100.111f);
+            record.setFloatfield(100.111);
             record.setIntegerfield(9);
             dao.insert(record);
 

Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/hierarchical/java5/HierarchicalJava5Tests.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/hierarchical/java5/HierarchicalJava5Tests.java?view=diff&rev=544712&r1=544711&r2=544712
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/hierarchical/java5/HierarchicalJava5Tests.java (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/hierarchical/java5/HierarchicalJava5Tests.java Tue Jun  5 19:29:32 2007
@@ -76,7 +76,7 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(11.22);
-            record.setFloatfield(33.44f);
+            record.setFloatfield(33.44);
             record.setIntegerfield(5);
             dao.insert(record);
 
@@ -103,19 +103,19 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(11.22);
-            record.setFloatfield(33.44f);
+            record.setFloatfield(33.44);
             record.setIntegerfield(5);
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(44.55);
-            record.setFloatfield(66.77f);
+            record.setFloatfield(66.77);
             record.setIntegerfield(8);
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(88.99);
-            record.setFloatfield(100.111f);
+            record.setFloatfield(100.111);
             record.setIntegerfield(9);
             dao.insert(record);
 
@@ -139,19 +139,19 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(11.22);
-            record.setFloatfield(33.44f);
+            record.setFloatfield(33.44);
             record.setIntegerfield(5);
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(44.55);
-            record.setFloatfield(66.77f);
+            record.setFloatfield(66.77);
             record.setIntegerfield(8);
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(88.99);
-            record.setFloatfield(100.111f);
+            record.setFloatfield(100.111);
             record.setIntegerfield(9);
             dao.insert(record);
 
@@ -171,19 +171,19 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(11.22);
-            record.setFloatfield(33.44f);
+            record.setFloatfield(33.44);
             record.setIntegerfield(5);
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(44.55);
-            record.setFloatfield(66.77f);
+            record.setFloatfield(66.77);
             record.setIntegerfield(8);
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(88.99);
-            record.setFloatfield(100.111f);
+            record.setFloatfield(100.111);
             record.setIntegerfield(9);
             dao.insert(record);
 

Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/hierarchical/legacy/HierarchicalLegacyTests.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/hierarchical/legacy/HierarchicalLegacyTests.java?view=diff&rev=544712&r1=544711&r2=544712
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/hierarchical/legacy/HierarchicalLegacyTests.java (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/hierarchical/legacy/HierarchicalLegacyTests.java Tue Jun  5 19:29:32 2007
@@ -75,7 +75,7 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(11.22);
-            record.setFloatfield(33.44f);
+            record.setFloatfield(33.44);
             record.setIntegerfield(5);
             dao.insert(record);
 
@@ -103,19 +103,19 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(11.22);
-            record.setFloatfield(33.44f);
+            record.setFloatfield(33.44);
             record.setIntegerfield(5);
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(44.55);
-            record.setFloatfield(66.77f);
+            record.setFloatfield(66.77);
             record.setIntegerfield(8);
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(88.99);
-            record.setFloatfield(100.111f);
+            record.setFloatfield(100.111);
             record.setIntegerfield(9);
             dao.insert(record);
 
@@ -141,19 +141,19 @@
         try {
             Fieldsonly record = new Fieldsonly();
             record.setDoublefield(11.22);
-            record.setFloatfield(33.44f);
+            record.setFloatfield(33.44);
             record.setIntegerfield(5);
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(44.55);
-            record.setFloatfield(66.77f);
+            record.setFloatfield(66.77);
             record.setIntegerfield(8);
             dao.insert(record);
 
             record = new Fieldsonly();
             record.setDoublefield(88.99);
-            record.setFloatfield(100.111f);
+            record.setFloatfield(100.111);
             record.setIntegerfield(9);
             dao.insert(record);