svn commit: r833947 - in /ibatis/java/ibator/trunk/core/ibator-core: doc/html/configreference/daoGenerator.html src/main/java/org/apache/ibatis/ibator/generator/ibatis2/IntrospectedTableIbatis2Java2Impl.java

[jgbutler]

Author: jgbutler
Date: Mon Nov  9 00:05:36 2009
New Revision: 833947

URL: http://svn.apache.org/viewvc?rev=833947&view=rev
Log:
[ibator] more changes for ibatis3

Modified:
    
ibatis/java/ibator/trunk/core/ibator-core/doc/html/configreference/daoGenerator.html
    
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/IntrospectedTableIbatis2Java2Impl.java

Modified: 
ibatis/java/ibator/trunk/core/ibator-core/doc/html/configreference/daoGenerator.html
URL: 
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/doc/html/configreference/daoGenerator.html?rev=833947&r1=833946&r2=833947&view=diff
==============================================================================
--- 
ibatis/java/ibator/trunk/core/ibator-core/doc/html/configreference/daoGenerator.html
 (original)
+++ 
ibatis/java/ibator/trunk/core/ibator-core/doc/html/configreference/daoGenerator.html
 Mon Nov  9 00:05:36 2009
@@ -30,10 +30,10 @@
   </tr>
   <tr>
     <td valign="top">type</td>
-    <td>This attribute is used to select one of the predefined DAO templates, 
or
-        to specify a user provided DAO template.
-        Any user provided DAO template must extend the class
-        
<code>org.apache.ibatis.ibator.generator.ibatis2.dao.templates.AbstractDAOTemplate</code>
+    <td>This attribute is used to select one of the predefined DAO generators, 
or
+        to specify a user provided DAO generator.
+        Any user provided DAO generator must extend the class
+        <code>org.apache.ibatis.ibator.generator.AbstractJavaGenerator</code>
         class, and must have a public default constructor.
         <p>The attribute accepts the following four values for selecting one 
of the
         predefined DAO generators:</p>

Modified: 
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/IntrospectedTableIbatis2Java2Impl.java
URL: 
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/IntrospectedTableIbatis2Java2Impl.java?rev=833947&r1=833946&r2=833947&view=diff
==============================================================================
--- 
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/IntrospectedTableIbatis2Java2Impl.java
 (original)
+++ 
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/IntrospectedTableIbatis2Java2Impl.java
 Mon Nov  9 00:05:36 2009
@@ -28,7 +28,6 @@
 import org.apache.ibatis.ibator.generator.AbstractJavaGenerator;
 import org.apache.ibatis.ibator.generator.AbstractXmlGenerator;
 import org.apache.ibatis.ibator.generator.ibatis2.dao.DAOGenerator;
-import 
org.apache.ibatis.ibator.generator.ibatis2.dao.templates.AbstractDAOTemplate;
 import 
org.apache.ibatis.ibator.generator.ibatis2.dao.templates.GenericCIDAOTemplate;
 import 
org.apache.ibatis.ibator.generator.ibatis2.dao.templates.GenericSIDAOTemplate;
 import 
org.apache.ibatis.ibator.generator.ibatis2.dao.templates.IbatisDAOTemplate;
@@ -75,20 +74,19 @@
         
         String type = 
ibatorContext.getDaoGeneratorConfiguration().getConfigurationType();
         
-        AbstractDAOTemplate abstractDAOTemplate;
+        AbstractJavaGenerator javaGenerator;
         if ("IBATIS".equalsIgnoreCase(type)) { //$NON-NLS-1$
-            abstractDAOTemplate = new IbatisDAOTemplate();
+            javaGenerator = new DAOGenerator(new IbatisDAOTemplate(), 
isJava5Targeted());
         } else if ("SPRING".equalsIgnoreCase(type)) { //$NON-NLS-1$
-            abstractDAOTemplate = new SpringDAOTemplate();
+            javaGenerator = new DAOGenerator(new SpringDAOTemplate(), 
isJava5Targeted());
         } else if ("GENERIC-CI".equalsIgnoreCase(type)) { //$NON-NLS-1$
-            abstractDAOTemplate = new GenericCIDAOTemplate();
+            javaGenerator = new DAOGenerator(new GenericCIDAOTemplate(), 
isJava5Targeted());
         } else if ("GENERIC-SI".equalsIgnoreCase(type)) { //$NON-NLS-1$
-            abstractDAOTemplate = new GenericSIDAOTemplate();
+            javaGenerator = new DAOGenerator(new GenericSIDAOTemplate(), 
isJava5Targeted());
         } else {
-            abstractDAOTemplate = (AbstractDAOTemplate) 
IbatorObjectFactory.createInternalObject(type);
+            javaGenerator = (AbstractJavaGenerator) 
IbatorObjectFactory.createInternalObject(type);
         }
 
-        AbstractJavaGenerator javaGenerator = new 
DAOGenerator(abstractDAOTemplate, isJava5Targeted());
         initializeAbstractGenerator(javaGenerator, warnings, progressCallback);
         daoGenerators.add(javaGenerator);
     }