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 2009/03/20 22:09:46 UTC
svn commit: r756759 [1/2] - in /ibatis/trunk/java/tools/ibator/core: build/
buildsupport/org/apache/ibatis/ibator/build/ doc/ htmldoc/
src/org/apache/ibatis/ibator/ant/ src/org/apache/ibatis/ibator/api/
src/org/apache/ibatis/ibator/config/ src/org/apac...
Author: jgbutler
Date: Fri Mar 20 21:09:45 2009
New Revision: 756759
URL: http://svn.apache.org/viewvc?rev=756759&view=rev
Log:
[Ibator] - Improve the CommentGenerator interface, and capture additional data during introspection
Modified:
ibatis/trunk/java/tools/ibator/core/build/version.properties
ibatis/trunk/java/tools/ibator/core/buildsupport/org/apache/ibatis/ibator/build/EmmaDumperTask.java
ibatis/trunk/java/tools/ibator/core/buildsupport/org/apache/ibatis/ibator/build/SqlScriptRunnerTask.java
ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt
ibatis/trunk/java/tools/ibator/core/htmldoc/whatsNew.html
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/ant/IbatorAntTask.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/CommentGenerator.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/DAOMethodNameCalculator.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/Ibator.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/IbatorPlugin.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/IntrospectedColumn.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/JavaTypeResolver.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/ProgressCallback.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/ShellCallback.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/ColumnRenamingRule.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/DAOGenerator.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/CountByExampleMethodGenerator.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/DeleteByExampleMethodGenerator.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/DeleteByPrimaryKeyMethodGenerator.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/InsertMethodGenerator.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/InsertSelectiveMethodGenerator.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/SelectByExampleWithBLOBsMethodGenerator.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/SelectByExampleWithoutBLOBsMethodGenerator.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/SelectByPrimaryKeyMethodGenerator.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/UpdateByExampleParmsInnerclassGenerator.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/UpdateByExampleSelectiveMethodGenerator.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/UpdateByExampleWithBLOBsMethodGenerator.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/UpdateByExampleWithoutBLOBsMethodGenerator.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/UpdateByPrimaryKeySelectiveMethodGenerator.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/UpdateByPrimaryKeyWithBLOBsMethodGenerator.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/UpdateByPrimaryKeyWithoutBLOBsMethodGenerator.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/templates/AbstractDAOTemplate.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/BaseModelClassGenerator.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/ExampleGenerator.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/DefaultCommentGenerator.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/IbatorObjectFactory.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/XmlFileMergerJaxp.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/db/DatabaseIntrospector.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/plugins/EqualsHashCodePlugin.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/plugins/SerializablePlugin.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/plugins/SqlMapConfigPlugin.java
Modified: ibatis/trunk/java/tools/ibator/core/build/version.properties
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/build/version.properties?rev=756759&r1=756758&r2=756759&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/build/version.properties (original)
+++ ibatis/trunk/java/tools/ibator/core/build/version.properties Fri Mar 20 21:09:45 2009
@@ -1,4 +1,4 @@
#Ibator build version info
-#Tue Mar 10 11:54:23 CDT 2009
+#Fri Mar 20 15:17:17 CDT 2009
version=1.2.2
-buildNum=716
+buildNum=717
Modified: ibatis/trunk/java/tools/ibator/core/buildsupport/org/apache/ibatis/ibator/build/EmmaDumperTask.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/buildsupport/org/apache/ibatis/ibator/build/EmmaDumperTask.java?rev=756759&r1=756758&r2=756759&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/buildsupport/org/apache/ibatis/ibator/build/EmmaDumperTask.java (original)
+++ ibatis/trunk/java/tools/ibator/core/buildsupport/org/apache/ibatis/ibator/build/EmmaDumperTask.java Fri Mar 20 21:09:45 2009
@@ -22,7 +22,7 @@
import org.apache.tools.ant.Task;
/**
- * This class is used in the ibator build to force emma to dump
+ * This class is used in the Ibator build to force emma to dump
* coverage information to disk. This is needed because emma
* doesn't normally dump until a JVM exit and there are several
* places where emma is run during the build - and most data is
Modified: ibatis/trunk/java/tools/ibator/core/buildsupport/org/apache/ibatis/ibator/build/SqlScriptRunnerTask.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/buildsupport/org/apache/ibatis/ibator/build/SqlScriptRunnerTask.java?rev=756759&r1=756758&r2=756759&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/buildsupport/org/apache/ibatis/ibator/build/SqlScriptRunnerTask.java (original)
+++ ibatis/trunk/java/tools/ibator/core/buildsupport/org/apache/ibatis/ibator/build/SqlScriptRunnerTask.java Fri Mar 20 21:09:45 2009
@@ -31,7 +31,7 @@
import org.apache.tools.ant.Task;
/**
- * This task executes an SQL script. It is used during the ibator build
+ * This task executes an SQL script. It is used during the Ibator build
* because the built in Ant SQL task treats some of the columns in "awful table"
* as properties.
*
Modified: ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt?rev=756759&r1=756758&r2=756759&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt (original)
+++ ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt Fri Mar 20 21:09:45 2009
@@ -1,6 +1,9 @@
-------------------------------------------------------------------------------
Version 1.2.2:
+Announcements:
+1. CommentGenerator interface has changed
+
Bugs:
1. Fixed NPE when no DAOs are generated
2. Fixed IBATIS-579 - don't allow column names with spaces to break
@@ -18,6 +21,7 @@
8. Added page describing some of PostgreSQL idiosyncracies with Ibator
9. IBATIS-586 - Added the ability to specify nested property elements on
columnOverrides (thanks to Dan Turkenkopf for the idea and a nice initial patch)
+10. Gather column comments during introspection
-------------------------------------------------------------------------------
Version 1.2.1:
Modified: ibatis/trunk/java/tools/ibator/core/htmldoc/whatsNew.html
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/htmldoc/whatsNew.html?rev=756759&r1=756758&r2=756759&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/htmldoc/whatsNew.html (original)
+++ ibatis/trunk/java/tools/ibator/core/htmldoc/whatsNew.html Fri Mar 20 21:09:45 2009
@@ -17,6 +17,34 @@
<h1>What's New in Ibator</h1>
<h2>Version 1.2.2</h2>
+<h3>Announcements</h3>
+<ul>
+ <li>The <code>org.apache.ibatis.ibator.api.CommentGenerator</code> interface
+ has changed. Classes that implement this interface <b>must be changed</b>. With
+ this change, implementing classes have access to many more data elements
+ from which to generate comments. Additionally, this change makes the comment
+ generator interface more consistent with the other public Ibator interfaces.
+ Details of the change follow:
+ <ul>
+ <li>Methods which accepted the parameter <code>FullyQualifiedTable</code>
+ now accept the parameter <code>IntrospectedTable</code> instead.
+ The <code>FullyQualifiedTable</code> instance is available through
+ the method <code>IntrospectedTable.getFullyQualifiedTable()</code>.
+ </li>
+ <li>Methods which accepted the <code>String</code> parameter <code>columnName</code>
+ now accept the parameter <code>IntrospectedColumn</code> instead.
+ The column name is available through
+ the method <code>IntrospectedColumn.getActualColumnName()</code>.
+ </li>
+ </ul>
+ <p><b>Important Note:</b> any implementation that subclasses the Ibator
+ supplied class <code>DefaultCommentGenerator</code> does not need to
+ change immediately with this release.
+ The old methods have been deprecated and will be removed with the next
+ release of Ibator - so subclasses should be reworked as soon as
+ convenient.</p>
+ </li>
+</ul>
<h3>Bugs Fixed</h3>
<ul>
<li>NPE when no DAOs are generated.</li>
@@ -49,7 +77,7 @@
support to generated Example classes. See the
<a href="configreference/ibatorPlugin.html"><ibatorPlugin></a> page
for more information.</li>
- <li>Added "delimitAllColumns" attribute to table configurations. This suppports databases
+ <li>Added "delimitAllColumns" attribute to table configurations. This supports databases
like PosgreSQL that are case sensitive for identifiers. See the
<a href="configreference/table.html"><table></a> page
for more information.</li>
@@ -59,6 +87,8 @@
<li>IBATIS-586 - Added the ability to specify nested property elements on columnOverrides.
See the <a href="configreference/columnOverride.html"><columnOverride></a> page
for more information. Thanks to Dan Turkenkopf for the idea and a nice initial patch.</li>
+ <li>The IntrospectedColumn class now contains any column remarks returned during
+ database introspection. This may be useful for some CommentGenerators.</li>
</ul>
<h2>Version 1.2.1</h2>
Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/ant/IbatorAntTask.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/ant/IbatorAntTask.java?rev=756759&r1=756758&r2=756759&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/ant/IbatorAntTask.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/ant/IbatorAntTask.java Fri Mar 20 21:09:45 2009
@@ -59,14 +59,14 @@
* </pre>
*
* The task requires that the attribute "configFile" be set to an
- * existing ibator XML configuration file.
+ * existing Ibator XML configuration file.
* <p>
* The task supports these optional attributes:
* <ul>
* <li>"overwrite" - if true, then existing Java files will be overwritten.
* if false (default), then existing Java files will be untouched and
- * ibator will write new Java files with a unique name</li>
- * <li>"verbose" - if true, then ibator will log progress messages to
+ * Ibator will write new Java files with a unique name</li>
+ * <li>"verbose" - if true, then Ibator will log progress messages to
* the Ant log. Default is false</li>
* <li>"contextIds" - a comma delimited list of contaxtIds to use
* for this run</li>
Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/CommentGenerator.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/CommentGenerator.java?rev=756759&r1=756758&r2=756759&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/CommentGenerator.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/CommentGenerator.java Fri Mar 20 21:09:45 2009
@@ -26,7 +26,7 @@
/**
* Implementations of this interface are used to generate comments
- * for the various artifacts generated by ibator.
+ * for the various artifacts generated by Ibator.
*
* @author Jeff Butler
*/
@@ -53,29 +53,29 @@
* tag, the Eclipse based Java merge feature will fail.
*
* @param field
- * @param table
+ * @param introspectedTable
* @param columnName
*/
- public void addFieldComment(Field field, FullyQualifiedTable table, String columnName);
+ public void addFieldComment(Field field, IntrospectedTable introspectedTable, IntrospectedColumn introspectedColumn);
- public void addFieldComment(Field field, FullyQualifiedTable table);
+ public void addFieldComment(Field field, IntrospectedTable introspectedTable);
- public void addClassComment(InnerClass innerClass, FullyQualifiedTable table);
+ public void addClassComment(InnerClass innerClass, IntrospectedTable introspectedTable);
- public void addEnumComment(InnerEnum innerEnum, FullyQualifiedTable table);
+ public void addEnumComment(InnerEnum innerEnum, IntrospectedTable introspectedTable);
- public void addGetterComment(Method method, FullyQualifiedTable table, String columnName);
+ public void addGetterComment(Method method, IntrospectedTable introspectedTable, IntrospectedColumn introspectedColumn);
- public void addSetterComment(Method method, FullyQualifiedTable table, String columnName);
+ public void addSetterComment(Method method, IntrospectedTable introspectedTable, IntrospectedColumn introspectedColumn);
- public void addGeneralMethodComment(Method method, FullyQualifiedTable table);
+ public void addGeneralMethodComment(Method method, IntrospectedTable introspectedTable);
/**
* This method is called to add a file level comment to a generated
* java file. This method could be used to add a general file
* comment (such as a copyright notice). However, note that the Java
* file merge function in Eclipse does not deal with this comment.
- * If you run ibator repeatedly, you will only retain the comment
+ * If you run Ibator repeatedly, you will only retain the comment
* from the initial run.<p>
*
* The default implementation does nothing.
@@ -96,7 +96,7 @@
* the root element. This method could be used to add a general file
* comment (such as a copyright notice). However, note that the XML
* file merge function does not deal with this comment. If you run
- * ibator repeatedly, you will only retain the comment from the
+ * Ibator repeatedly, you will only retain the comment from the
* initial run.<p>
*
* The default implementation does nothing.
Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/DAOMethodNameCalculator.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/DAOMethodNameCalculator.java?rev=756759&r1=756758&r2=756759&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/DAOMethodNameCalculator.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/DAOMethodNameCalculator.java Fri Mar 20 21:09:45 2009
@@ -86,7 +86,7 @@
/**
* Calculates and returns a name for the select by example with BLOBs method.
- * If the table contains BLOBs, then ibator will generate different select by
+ * If the table contains BLOBs, then Ibator will generate different select by
* example methods - one including BLOBs, one not including BLOBs.
*
* @param introspectedTable
Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/Ibator.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/Ibator.java?rev=756759&r1=756758&r2=756759&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/Ibator.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/Ibator.java Fri Mar 20 21:09:45 2009
@@ -38,7 +38,7 @@
import org.apache.ibatis.ibator.internal.util.messages.Messages;
/**
- * This class is the main interface to the ibator for iBATIS code generator. A
+ * This class is the main interface to the Ibator for iBATIS code generator. A
* typical execution of the tool involves these steps:
*
* <ol>
@@ -70,14 +70,14 @@
/**
* Constructs an Ibator object.
*
- * @param ibatorConfiguration The configuration for this run of ibator
+ * @param ibatorConfiguration The configuration for this run of Ibator
* @param shellCallback an instance of a ShellCallback interface. You may specify
- * <code>null</code> in which case ibator will use the DefaultShellCallback.
+ * <code>null</code> in which case Ibator will use the DefaultShellCallback.
* @param warnings Any warnings generated during execution will be added to this
* list. Warnings do not affect the running of the tool, but they
* may affect the results. A typical warning is an unsupported
* data type. In that case, the column will be ignored and
- * generation will continue. ibator will only add Strings to the
+ * generation will continue. Ibator will only add Strings to the
* list. You may specify <code>null</code> if you do not
* want warnings returned.
* @throws InvalidConfigurationException if the specified configuration
Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/IbatorPlugin.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/IbatorPlugin.java?rev=756759&r1=756758&r2=756759&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/IbatorPlugin.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/IbatorPlugin.java Fri Mar 20 21:09:45 2009
@@ -27,10 +27,10 @@
import org.apache.ibatis.ibator.config.IbatorContext;
/**
- * This interface defines methods that will be called by ibator at different
+ * This interface defines methods that will be called by Ibator at different
* times during the code generation process. These methods can be used to
- * extend or modify the code generated by ibator. Clients may implement this
- * interface in its entirety, or extend the IbatorPluginAdapter (highly recomended).
+ * extend or modify the code generated by Ibator. Clients may implement this
+ * interface in its entirety, or extend the IbatorPluginAdapter (highly recommended).
* <p>
* Plugins have a lifecycle. In general, the lifecycle is this:
*
@@ -51,7 +51,7 @@
* called one time</li>
* </ol>
*
- * Plugins are related to ibator contexts - so each context will have its
+ * Plugins are related to Ibator contexts - so each context will have its
* own set of plugins. If the same plugin is specified in multple contexts,
* then each context will hold a unique instance of the plugin.
* <p>
@@ -59,7 +59,7 @@
* in the configuration.
* <p>
* The daoXXX, modelXXX, and sqlMapXXX methods are called by the code
- * generators supplied with ibator. If you replace ibator's default code
+ * generators supplied with Ibator. If you replace Ibator's default code
* generators with other implementations, these methods may not be called.
*
* @author Jeff Butler
@@ -119,7 +119,7 @@
*
* @param warnings add strings to this list to specify warnings. For example,
* if the plugin is invalid, you should specify why. Warnings are reported
- * to users after the completion of the ibator run.
+ * to users after the completion of the Ibator run.
* @return true if the plugin is in a valid state. Invalid plugins will not be
* called
*/
@@ -131,8 +131,8 @@
* This method is called once, after all other Java files have been
* generated.
*
- * @return a List of GeneratedJavaFiles - ibator will persist these
- * files with the other files from this run of ibator.
+ * @return a List of GeneratedJavaFiles - Ibator will persist these
+ * files with the other files from this run of Ibator.
*/
List<GeneratedJavaFile> contextGenerateAdditionalJavaFiles();
@@ -141,10 +141,10 @@
* by your implementation that might be related to a specific table.
* This method is called once for every table in the configuration.
*
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
- * @return a List of GeneratedJavaFiles - ibator will persist these
- * files with the other files from this run of ibator.
+ * @return a List of GeneratedJavaFiles - Ibator will persist these
+ * files with the other files from this run of Ibator.
*/
List<GeneratedJavaFile> contextGenerateAdditionalJavaFiles(IntrospectedTable introspectedTable);
@@ -154,8 +154,8 @@
* This method is called once, after all other XML files have been
* generated.
*
- * @return a List of GeneratedXmlFiles - ibator will persist these
- * files with the other files from this run of ibator.
+ * @return a List of GeneratedXmlFiles - Ibator will persist these
+ * files with the other files from this run of Ibator.
*/
List<GeneratedXmlFile> contextGenerateAdditionalXmlFiles();
@@ -164,10 +164,10 @@
* by your implementation that might be related to a specific table.
* This method is called once for every table in the configuration.
*
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
- * @return a List of GeneratedXmlFiles - ibator will persist these
- * files with the other files from this run of ibator.
+ * @return a List of GeneratedXmlFiles - Ibator will persist these
+ * files with the other files from this run of Ibator.
*/
List<GeneratedXmlFile> contextGenerateAdditionalXmlFiles(IntrospectedTable introspectedTable);
@@ -177,7 +177,7 @@
* DAO interface.
*
* @param interfaze the generated interface
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the interface should be generated, false
* if the generated interface should be ignored. In the case
@@ -192,7 +192,7 @@
* DAO implementation.
*
* @param topLevelClass the generated implementation class
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the implementation class should be generated, false
* if the generated implementation class should be ignored. In the case
@@ -209,7 +209,7 @@
* @param topLevelClass the partially implemented DAO implementation
* class. You can add additional imported classes to the
* implementation class if necessary.
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the method should be generated, false
* if the generated method should be ignored. In the case
@@ -226,7 +226,7 @@
* @param topLevelClass the partially implemented DAO implementation
* class. You can add additional imported classes to the
* implementation class if necessary.
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the method should be generated, false
* if the generated method should be ignored. In the case
@@ -243,7 +243,7 @@
* @param topLevelClass the partially implemented DAO implementation
* class. You can add additional imported classes to the
* implementation class if necessary.
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the method should be generated, false
* if the generated method should be ignored. In the case
@@ -260,7 +260,7 @@
* @param topLevelClass the partially implemented DAO implementation
* class. You can add additional imported classes to the
* implementation class if necessary.
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the method should be generated, false
* if the generated method should be ignored. In the case
@@ -277,7 +277,7 @@
* @param topLevelClass the partially implemented DAO implementation
* class. You can add additional imported classes to the
* implementation class if necessary.
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the method should be generated, false
* if the generated method should be ignored. In the case
@@ -294,7 +294,7 @@
* @param topLevelClass the partially implemented DAO implementation
* class. You can add additional imported classes to the
* implementation class if necessary.
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the method should be generated, false
* if the generated method should be ignored. In the case
@@ -311,7 +311,7 @@
* @param topLevelClass the partially implemented DAO implementation
* class. You can add additional imported classes to the
* implementation class if necessary.
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the method should be generated, false
* if the generated method should be ignored. In the case
@@ -328,7 +328,7 @@
* @param topLevelClass the partially implemented DAO implementation
* class. You can add additional imported classes to the
* implementation class if necessary.
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the method should be generated, false
* if the generated method should be ignored. In the case
@@ -345,7 +345,7 @@
* @param topLevelClass the partially implemented DAO implementation
* class. You can add additional imported classes to the
* implementation class if necessary.
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the method should be generated, false
* if the generated method should be ignored. In the case
@@ -362,7 +362,7 @@
* @param topLevelClass the partially implemented DAO implementation
* class. You can add additional imported classes to the
* implementation class if necessary.
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the method should be generated, false
* if the generated method should be ignored. In the case
@@ -379,7 +379,7 @@
* @param topLevelClass the partially implemented DAO implementation
* class. You can add additional imported classes to the
* implementation class if necessary.
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the method should be generated, false
* if the generated method should be ignored. In the case
@@ -396,7 +396,7 @@
* @param topLevelClass the partially implemented DAO implementation
* class. You can add additional imported classes to the
* implementation class if necessary.
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the method should be generated, false
* if the generated method should be ignored. In the case
@@ -413,7 +413,7 @@
* @param topLevelClass the partially implemented DAO implementation
* class. You can add additional imported classes to the
* implementation class if necessary.
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the method should be generated, false
* if the generated method should be ignored. In the case
@@ -430,7 +430,7 @@
* @param topLevelClass the partially implemented DAO implementation
* class. You can add additional imported classes to the
* implementation class if necessary.
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the method should be generated, false
* if the generated method should be ignored. In the case
@@ -447,7 +447,7 @@
* @param interfaze the partially implemented DAO interface
* class. You can add additional imported classes to the
* interface class if necessary.
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the method should be generated, false
* if the generated method should be ignored. In the case
@@ -464,7 +464,7 @@
* @param interfaze the partially implemented DAO interface
* class. You can add additional imported classes to the
* interface class if necessary.
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the method should be generated, false
* if the generated method should be ignored. In the case
@@ -481,7 +481,7 @@
* @param interfaze the partially implemented DAO interface
* class. You can add additional imported classes to the
* interface class if necessary.
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the method should be generated, false
* if the generated method should be ignored. In the case
@@ -498,7 +498,7 @@
* @param interfaze the partially implemented DAO interface
* class. You can add additional imported classes to the
* interface class if necessary.
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the method should be generated, false
* if the generated method should be ignored. In the case
@@ -515,7 +515,7 @@
* @param interfaze the partially implemented DAO interface
* class. You can add additional imported classes to the
* interface class if necessary.
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the method should be generated, false
* if the generated method should be ignored. In the case
@@ -532,7 +532,7 @@
* @param interfaze the partially implemented DAO interface
* class. You can add additional imported classes to the
* interface class if necessary.
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the method should be generated, false
* if the generated method should be ignored. In the case
@@ -549,7 +549,7 @@
* @param interfaze the partially implemented DAO interface
* class. You can add additional imported classes to the
* interface class if necessary.
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the method should be generated, false
* if the generated method should be ignored. In the case
@@ -566,7 +566,7 @@
* @param interfaze the partially implemented DAO interface
* class. You can add additional imported classes to the
* interface class if necessary.
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the method should be generated, false
* if the generated method should be ignored. In the case
@@ -583,7 +583,7 @@
* @param interfaze the partially implemented DAO interface
* class. You can add additional imported classes to the
* interface class if necessary.
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the method should be generated, false
* if the generated method should be ignored. In the case
@@ -600,7 +600,7 @@
* @param interfaze the partially implemented DAO interface
* class. You can add additional imported classes to the
* interface class if necessary.
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the method should be generated, false
* if the generated method should be ignored. In the case
@@ -617,7 +617,7 @@
* @param interfaze the partially implemented DAO interface
* class. You can add additional imported classes to the
* interface class if necessary.
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the method should be generated, false
* if the generated method should be ignored. In the case
@@ -634,7 +634,7 @@
* @param interfaze the partially implemented DAO interface
* class. You can add additional imported classes to the
* interface class if necessary.
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the method should be generated, false
* if the generated method should be ignored. In the case
@@ -651,7 +651,7 @@
* @param interfaze the partially implemented DAO interface
* class. You can add additional imported classes to the
* interface class if necessary.
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the method should be generated, false
* if the generated method should be ignored. In the case
@@ -668,7 +668,7 @@
* @param interfaze the partially implemented DAO interface
* class. You can add additional imported classes to the
* interface class if necessary.
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the method should be generated, false
* if the generated method should be ignored. In the case
@@ -685,10 +685,10 @@
* @param topLevelClass the partially implemented model
* class. You can add additional imported classes to the
* implementation class if necessary.
- * @param introspectedColumn ibator's class containing information
+ * @param introspectedColumn Ibator's class containing information
* about the column related to this field as introspected from
* the database
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @param modelClassType the type of class that the field is generated
* for
@@ -708,7 +708,7 @@
* @param topLevelClass the partially implemented model
* class. You can add additional imported classes to the
* implementation class if necessary.
- * @param introspectedColumn ibator's class containing information
+ * @param introspectedColumn Ibator's class containing information
* about the column related to this field as introspected from
* the database
* @param introspectedTable ibator's class containing information
@@ -731,10 +731,10 @@
* @param topLevelClass the partially implemented model
* class. You can add additional imported classes to the
* implementation class if necessary.
- * @param introspectedColumn ibator's class containing information
+ * @param introspectedColumn Ibator's class containing information
* about the column related to this field as introspected from
* the database
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @param modelClassType the type of class that the field is generated
* for
@@ -747,15 +747,15 @@
/**
* This method is called after the primary key class is generated by
- * the ibator supplied JavaModelGenerator. This method will only be
+ * the Ibator supplied JavaModelGenerator. This method will only be
* called if the table rules call for generation of a primary key class.
* <p/>
- * This method is only guaranteed to be called by the ibator
+ * This method is only guaranteed to be called by the Ibator
* supplied Java model generators. Other user supplied generators
* may, or may not, call this method.
*
* @param topLevelClass the generated primary key class
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the class should be generated, false
* if the generated class should be ignored. In the case
@@ -766,15 +766,15 @@
/**
* This method is called after the base record class is generated by
- * the ibator supplied JavaModelGenerator. This method will only be
+ * the Ibator supplied JavaModelGenerator. This method will only be
* called if the table rules call for generation of a base record class.
* <p/>
- * This method is only guaranteed to be called by the ibator
+ * This method is only guaranteed to be called by the Ibator
* supplied Java model generators. Other user supplied generators
* may, or may not, call this method.
*
* @param topLevelClass the generated base record class
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the class should be generated, false
* if the generated class should be ignored. In the case
@@ -785,15 +785,15 @@
/**
* This method is called after the record with BLOBs class is generated by
- * the ibator supplied JavaModelGenerator. This method will only be
+ * the Ibator supplied JavaModelGenerator. This method will only be
* called if the table rules call for generation of a record with BLOBs class.
* <p/>
- * This method is only guaranteed to be called by the ibator
+ * This method is only guaranteed to be called by the Ibator
* supplied Java model generators. Other user supplied generators
* may, or may not, call this method.
*
* @param topLevelClass the generated record with BLOBs class
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the class should be generated, false
* if the generated class should be ignored. In the case
@@ -804,15 +804,15 @@
/**
* This method is called after the example class is generated by
- * the ibator supplied JavaModelGenerator. This method will only be
+ * the Ibator supplied JavaModelGenerator. This method will only be
* called if the table rules call for generation of an example class.
* <p/>
- * This method is only guaranteed to be called by the ibator
+ * This method is only guaranteed to be called by the Ibator
* supplied Java model generators. Other user supplied generators
* may, or may not, call this method.
*
* @param topLevelClass the generated example class
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the class should be generated, false
* if the generated class should be ignored. In the case
@@ -826,7 +826,7 @@
*
* @param sqlMap the generated file (containing the file name,
* package name, and project name)
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the sqlMap should be generated, false
* if the generated sqlMap should be ignored. In the case
@@ -840,9 +840,9 @@
* This method can be used to add additional XML elements the the
* generated document.
*
- * @param document the generated document (note that this is ibator's
+ * @param document the generated document (note that this is Ibator's
* internal Document class - not the w3c XML Document class)
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the document should be generated, false
* if the generated document should be ignored. In the case
@@ -857,7 +857,7 @@
* This method is called when the base resultMap is generated.
*
* @param element the generated <resultMap> element
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the element should be generated, false
* if the generated element should be ignored. In the case
@@ -870,7 +870,7 @@
* This method is called when the countByExample element is generated.
*
* @param element the generated <select> element
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the element should be generated, false
* if the generated element should be ignored. In the case
@@ -883,7 +883,7 @@
* This method is called when the deleteByExample element is generated.
*
* @param element the generated <delete> element
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the element should be generated, false
* if the generated element should be ignored. In the case
@@ -896,7 +896,7 @@
* This method is called when the deleteByPrimaryKey element is generated.
*
* @param element the generated <delete> element
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the element should be generated, false
* if the generated element should be ignored. In the case
@@ -909,7 +909,7 @@
* This method is called when the exampleWhereClause element is generated.
*
* @param element the generated <sql> element
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the element should be generated, false
* if the generated element should be ignored. In the case
@@ -922,7 +922,7 @@
* This method is called when the baseColumnList element is generated.
*
* @param element the generated <sql> element
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the element should be generated, false
* if the generated element should be ignored. In the case
@@ -935,7 +935,7 @@
* This method is called when the blobColumnList element is generated.
*
* @param element the generated <sql> element
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the element should be generated, false
* if the generated element should be ignored. In the case
@@ -948,7 +948,7 @@
* This method is called when the insert element is generated.
*
* @param element the generated <insert> element
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the element should be generated, false
* if the generated element should be ignored. In the case
@@ -961,7 +961,7 @@
* This method is called when the insert selective element is generated.
*
* @param element the generated <insert> element
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the element should be generated, false
* if the generated element should be ignored. In the case
@@ -975,7 +975,7 @@
* generated - this resultMap will extend the base resultMap.
*
* @param element the generated <resultMap> element
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the element should be generated, false
* if the generated element should be ignored. In the case
@@ -988,7 +988,7 @@
* This method is called when the selectByPrimaryKey element is generated.
*
* @param element the generated <select> element
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the element should be generated, false
* if the generated element should be ignored. In the case
@@ -1001,7 +1001,7 @@
* This method is called when the selectByExample element is generated.
*
* @param element the generated <select> element
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the element should be generated, false
* if the generated element should be ignored. In the case
@@ -1014,7 +1014,7 @@
* This method is called when the selectByExampleWithBLOBs element is generated.
*
* @param element the generated <select> element
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the element should be generated, false
* if the generated element should be ignored. In the case
@@ -1027,7 +1027,7 @@
* This method is called when the updateByExampleSelective element is generated.
*
* @param element the generated <update> element
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the element should be generated, false
* if the generated element should be ignored. In the case
@@ -1040,7 +1040,7 @@
* This method is called when the updateByExampleWithBLOBs element is generated.
*
* @param element the generated <update> element
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the element should be generated, false
* if the generated element should be ignored. In the case
@@ -1053,7 +1053,7 @@
* This method is called when the updateByExampleWithourBLOBs element is generated.
*
* @param element the generated <update> element
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the element should be generated, false
* if the generated element should be ignored. In the case
@@ -1066,7 +1066,7 @@
* This method is called when the updateByPrimaryKeySelective element is generated.
*
* @param element the generated <update> element
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the element should be generated, false
* if the generated element should be ignored. In the case
@@ -1079,7 +1079,7 @@
* This method is called when the updateByPrimaryKeyWithBLOBs element is generated.
*
* @param element the generated <update> element
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the element should be generated, false
* if the generated element should be ignored. In the case
@@ -1092,7 +1092,7 @@
* This method is called when the updateByPrimaryKeyWithoutBLOBs element is generated.
*
* @param element the generated <update> element
- * @param introspectedTable ibator's class containing information
+ * @param introspectedTable Ibator's class containing information
* about the table as introspected from the database
* @return true if the element should be generated, false
* if the generated element should be ignored. In the case
Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/IntrospectedColumn.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/IntrospectedColumn.java?rev=756759&r1=756758&r2=756759&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/IntrospectedColumn.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/IntrospectedColumn.java Fri Mar 20 21:09:45 2009
@@ -59,6 +59,9 @@
protected IntrospectedTable introspectedTable;
protected Properties properties;
+
+ // any database comment associated with this column. May be null
+ protected String remarks;
/**
* Constructs a Column definition. This object holds all the
@@ -403,4 +406,12 @@
public void setProperties(Properties properties) {
this.properties.putAll(properties);
}
+
+ public String getRemarks() {
+ return remarks;
+ }
+
+ public void setRemarks(String remarks) {
+ this.remarks = remarks;
+ }
}
Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/JavaTypeResolver.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/JavaTypeResolver.java?rev=756759&r1=756758&r2=756759&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/JavaTypeResolver.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/JavaTypeResolver.java Fri Mar 20 21:09:45 2009
@@ -53,7 +53,7 @@
void setIbatorContext(IbatorContext ibatorContext);
/**
- * ibator will supply a list to this method. The implementation class may
+ * Ibator will supply a list to this method. The implementation class may
* add strings to the list that will be treated as warning messages and
* displayed to the user. The concept of a warning is that code generation
* can continue, but that the results may not be what is expected.
@@ -69,7 +69,7 @@
* @param introspectedColumn the column whose Java type needs to be
* calculated
* @return true the calculated type, or null if an unsupported data type. If null
- * is returned, ibator will set the type to Object and issue a warning
+ * is returned, Ibator will set the type to Object and issue a warning
* unless the column is ignored or otherwise overridden
*/
FullyQualifiedJavaType calculateJavaType(IntrospectedColumn introspectedColumn);
Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/ProgressCallback.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/ProgressCallback.java?rev=756759&r1=756758&r2=756759&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/ProgressCallback.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/ProgressCallback.java Fri Mar 20 21:09:45 2009
@@ -33,7 +33,7 @@
* <li>done()</li>
* </ol>
* <p>
- * Periodically, ibator will call <code>checkCancel()</code> to see if the method should
+ * Periodically, Ibator will call <code>checkCancel()</code> to see if the method should
* be canceled.
* <p>
* For planning purposes, the most common use case will have a ratio
@@ -80,12 +80,12 @@
void startTask(String taskName);
/**
- * ibator calls this method when all generated files have been saved
+ * Ibator calls this method when all generated files have been saved
*/
void done();
/**
- * ibator will call this method periodically during a long running method.
+ * Ibator will call this method periodically during a long running method.
* If the the implementation throws <code>InterruptedException</code> then the method
* will be canceled. Any files that have already been saved will remain on
* the file system.
Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/ShellCallback.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/ShellCallback.java?rev=756759&r1=756758&r2=756759&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/ShellCallback.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/ShellCallback.java Fri Mar 20 21:09:45 2009
@@ -20,11 +20,11 @@
import org.apache.ibatis.ibator.exception.ShellException;
/**
- * This interface defines methods that a shell should support to enable ibator
- * to work. A "shell" is defined as the ibator execution environment (i.e. an Eclipse
+ * This interface defines methods that a shell should support to enable Ibator
+ * to work. A "shell" is defined as the Ibator execution environment (i.e. an Eclipse
* plugin, and Ant task, a NetBeans plugin, etc.)
*
- * ibator provides a default ShellCallback that is very low function and does
+ * Ibator provides a default ShellCallback that is very low function and does
* not support the merging of Java files. The default shell callback is only
* appropriate for use in well controlled environments where no changes are ever made
* to generated Java files.
@@ -33,8 +33,8 @@
*/
public interface ShellCallback {
/**
- * ibator will call this method to ask the shell to resolve a project/package
- * combination into a directory on the file system. ibator will call this method
+ * Ibator will call this method to ask the shell to resolve a project/package
+ * combination into a directory on the file system. Ibator will call this method
* repeatedly (once for each generated file), so it would be wise for an implementing
* class to cache results.
*
@@ -44,22 +44,22 @@
* <li>Must exist</li>
* </ul>
*
- * ibator default shell callback interprets both values as directories
+ * Ibator default shell callback interprets both values as directories
* and simply concatenates the two values to generate the default directory.
*
* @param targetProject
* @param targetPackage
* @return the directory (must exist)
* @throws ShellException if the project/package cannot be resolved into
- * a directory on the file system. In this case, ibator will not save the
- * file it is currently working on. ibator
+ * a directory on the file system. In this case, Ibator will not save the
+ * file it is currently working on. Ibator
* will add the exception message to the list of warnings automatically.
*/
File getDirectory(String targetProject, String targetPackage) throws ShellException;
/**
- * ibator will call this method if a newly generated Java file would overwrite an existing
- * file. This method should return the merged source (formatted). ibator will write the
+ * Ibator will call this method if a newly generated Java file would overwrite an existing
+ * file. This method should return the merged source (formatted). Ibator will write the
* merged source as-is to the file system.
*
* A merge typically follows these steps:
@@ -67,7 +67,7 @@
* <li>Delete any methods/fields in the existing file that have the specified JavaDoc tag</li>
* <li>Add any new super interfaces from the new file into the existing file</li>
* <li>Make sure that the existing file's super class matches the new file</li>
- * <li>Make sure that the existing file is of the same type es the existing file
+ * <li>Make sure that the existing file is of the same type as the existing file
* (either interface or class)</li>
* <li>Add any new imports from the new file into the existing file</li>
* <li>Add all methods and fields from the new file into the existing file</li>
@@ -82,20 +82,20 @@
* @param javadocTags the JavaDoc tags that denotes which methods and fields in the
* old file to delete (if the Java element has any of these tags, the
* element is eligible for merge)
- * @return the merged source, properly formatted. ibator will save the source
+ * @return the merged source, properly formatted. Ibator will save the source
* exactly as returned from this method.
* @throws ShellException if the file cannot be merged for some reason. If this
- * exception is thrown, ibator will not save anything and
- * the existing file will remain undisturbed. ibator
+ * exception is thrown, Ibator will not save anything and
+ * the existing file will remain undisturbed. Ibator
* will add the exception message to the list of warnings automatically.
*/
String mergeJavaFile(String newFileSource, String existingFileFullPath, String[] javadocTags) throws ShellException;
/**
- * After all files are saved to the file system, ibator will call this method
+ * After all files are saved to the file system, Ibator will call this method
* once for each unique project that was affected by the generation run.
* This method is useful if your IDE needs to be informed that file system objects
- * have been created or updated. If you are using ibator outside of an IDE,
+ * have been created or updated. If you are using Ibator outside of an IDE,
* your implementation need not do anything in this method.
*
* @param project the project to be refreshed
@@ -104,7 +104,7 @@
/**
* Return true if the callback supports Java merging, otherwise false.
- * ibator will only call the <code>mergeJavaFile()</code> method if this
+ * Ibator will only call the <code>mergeJavaFile()</code> method if this
* method returns <code>true</code>.
*
* @return a boolean specifying whether Java merge is supported or not
@@ -112,14 +112,14 @@
boolean isMergeSupported();
/**
- * Return true if ibator should overwrite an existing file if one
+ * Return true if Ibator should overwrite an existing file if one
* exists. Ibator will only call this method if
* <code>isMergeSupported()</code> returns <code>false</code>
* and a file exists that would be overwritten by a generated
- * file. If you return <code>true</code>, then ibator will log
+ * file. If you return <code>true</code>, then Ibator will log
* a warning specifying what file was overwritten.
*
- * @return true if you want ibator to overwrite existing files
+ * @return true if you want Ibator to overwrite existing files
*/
boolean isOverwriteEnabled();
}
Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/ColumnRenamingRule.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/ColumnRenamingRule.java?rev=756759&r1=756758&r2=756759&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/ColumnRenamingRule.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/ColumnRenamingRule.java Fri Mar 20 21:09:45 2009
@@ -23,7 +23,7 @@
import org.apache.ibatis.ibator.internal.util.messages.Messages;
/**
- * This class is used to specify a renaming fule for columns
+ * This class is used to specify a renaming rule for columns
* in a table. This renaming rule will be run against all
* column names before calculating the corresponding property name.
* The most common use case is when columns in a table are all
@@ -47,7 +47,7 @@
* <li>replaceString=""</li>
* </ul>
*
- * Note that internally, ibator uses the
+ * Note that internally, Ibator uses the
* <code>java.util.regex.Matcher.replaceAll</code> method
* for this function. See the documentation of that method
* for example of the regular expression language used in
Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/DAOGenerator.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/DAOGenerator.java?rev=756759&r1=756758&r2=756759&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/DAOGenerator.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/DAOGenerator.java Fri Mar 20 21:09:45 2009
@@ -108,7 +108,6 @@
CommentGenerator commentGenerator = ibatorContext.getCommentGenerator();
- FullyQualifiedTable table = introspectedTable.getFullyQualifiedTable();
TopLevelClass answer = new TopLevelClass(implementationType);
answer.setVisibility(JavaVisibility.PUBLIC);
answer.setSuperClass(daoTemplate.getSuperClass());
@@ -124,15 +123,15 @@
// add constructor from the template
answer.addMethod(daoTemplate.getConstructorClone(commentGenerator,
- implementationType, table));
+ implementationType, introspectedTable));
// add any fields from the template
- for (Field field : daoTemplate.getFieldClones(commentGenerator, table)) {
+ for (Field field : daoTemplate.getFieldClones(commentGenerator, introspectedTable)) {
answer.addField(field);
}
// add any methods from the template
- for (Method method : daoTemplate.getMethodClones(commentGenerator, table)) {
+ for (Method method : daoTemplate.getMethodClones(commentGenerator, introspectedTable)) {
answer.addMethod(method);
}
Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/CountByExampleMethodGenerator.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/CountByExampleMethodGenerator.java?rev=756759&r1=756758&r2=756759&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/CountByExampleMethodGenerator.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/CountByExampleMethodGenerator.java Fri Mar 20 21:09:45 2009
@@ -82,7 +82,6 @@
}
private Method getMethodShell(Set<FullyQualifiedJavaType> importedTypes) {
- FullyQualifiedTable table = introspectedTable.getFullyQualifiedTable();
FullyQualifiedJavaType type = introspectedTable.getExampleType();
importedTypes.add(type);
@@ -99,7 +98,7 @@
}
ibatorContext.getCommentGenerator().addGeneralMethodComment(method,
- table);
+ introspectedTable);
return method;
}
Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/DeleteByExampleMethodGenerator.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/DeleteByExampleMethodGenerator.java?rev=756759&r1=756758&r2=756759&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/DeleteByExampleMethodGenerator.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/DeleteByExampleMethodGenerator.java Fri Mar 20 21:09:45 2009
@@ -71,7 +71,6 @@
}
private Method getMethodShell(Set<FullyQualifiedJavaType> importedTypes) {
- FullyQualifiedTable table = introspectedTable.getFullyQualifiedTable();
FullyQualifiedJavaType type = introspectedTable.getExampleType();
importedTypes.add(type);
@@ -88,7 +87,7 @@
}
ibatorContext.getCommentGenerator().addGeneralMethodComment(method,
- table);
+ introspectedTable);
return method;
}
Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/DeleteByPrimaryKeyMethodGenerator.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/DeleteByPrimaryKeyMethodGenerator.java?rev=756759&r1=756758&r2=756759&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/DeleteByPrimaryKeyMethodGenerator.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/DeleteByPrimaryKeyMethodGenerator.java Fri Mar 20 21:09:45 2009
@@ -99,8 +99,6 @@
}
private Method getMethodShell(Set<FullyQualifiedJavaType> importedTypes) {
- FullyQualifiedTable table = introspectedTable.getFullyQualifiedTable();
-
Method method = new Method();
method.setVisibility(JavaVisibility.PUBLIC);
method.setReturnType(FullyQualifiedJavaType.getIntInstance());
@@ -126,7 +124,7 @@
}
ibatorContext.getCommentGenerator().addGeneralMethodComment(method,
- table);
+ introspectedTable);
return method;
}
Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/InsertMethodGenerator.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/InsertMethodGenerator.java?rev=756759&r1=756758&r2=756759&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/InsertMethodGenerator.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/InsertMethodGenerator.java Fri Mar 20 21:09:45 2009
@@ -103,7 +103,6 @@
}
private Method getMethodShell(Set<FullyQualifiedJavaType> importedTypes) {
- FullyQualifiedTable table = introspectedTable.getFullyQualifiedTable();
Method method = new Method();
FullyQualifiedJavaType returnType;
@@ -142,7 +141,7 @@
}
ibatorContext.getCommentGenerator().addGeneralMethodComment(method,
- table);
+ introspectedTable);
return method;
}
Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/InsertSelectiveMethodGenerator.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/InsertSelectiveMethodGenerator.java?rev=756759&r1=756758&r2=756759&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/InsertSelectiveMethodGenerator.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/InsertSelectiveMethodGenerator.java Fri Mar 20 21:09:45 2009
@@ -101,7 +101,6 @@
}
private Method getMethodShell(Set<FullyQualifiedJavaType> importedTypes) {
- FullyQualifiedTable table = introspectedTable.getFullyQualifiedTable();
Method method = new Method();
FullyQualifiedJavaType returnType;
@@ -137,7 +136,7 @@
}
ibatorContext.getCommentGenerator().addGeneralMethodComment(method,
- table);
+ introspectedTable);
return method;
}
Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/SelectByExampleWithBLOBsMethodGenerator.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/SelectByExampleWithBLOBsMethodGenerator.java?rev=756759&r1=756758&r2=756759&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/SelectByExampleWithBLOBsMethodGenerator.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/SelectByExampleWithBLOBsMethodGenerator.java Fri Mar 20 21:09:45 2009
@@ -81,7 +81,6 @@
}
private Method getMethodShell(Set<FullyQualifiedJavaType> importedTypes) {
- FullyQualifiedTable table = introspectedTable.getFullyQualifiedTable();
FullyQualifiedJavaType type = introspectedTable.getExampleType();
importedTypes.add(type);
importedTypes.add(FullyQualifiedJavaType.getNewListInstance());
@@ -119,7 +118,7 @@
}
ibatorContext.getCommentGenerator().addGeneralMethodComment(method,
- table);
+ introspectedTable);
return method;
}
Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/SelectByExampleWithoutBLOBsMethodGenerator.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/SelectByExampleWithoutBLOBsMethodGenerator.java?rev=756759&r1=756758&r2=756759&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/SelectByExampleWithoutBLOBsMethodGenerator.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/SelectByExampleWithoutBLOBsMethodGenerator.java Fri Mar 20 21:09:45 2009
@@ -81,7 +81,6 @@
}
private Method getMethodShell(Set<FullyQualifiedJavaType> importedTypes) {
- FullyQualifiedTable table = introspectedTable.getFullyQualifiedTable();
FullyQualifiedJavaType type = introspectedTable.getExampleType();
importedTypes.add(type);
importedTypes.add(FullyQualifiedJavaType.getNewListInstance());
@@ -123,7 +122,7 @@
}
ibatorContext.getCommentGenerator().addGeneralMethodComment(method,
- table);
+ introspectedTable);
return method;
}
Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/SelectByPrimaryKeyMethodGenerator.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/SelectByPrimaryKeyMethodGenerator.java?rev=756759&r1=756758&r2=756759&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/SelectByPrimaryKeyMethodGenerator.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/SelectByPrimaryKeyMethodGenerator.java Fri Mar 20 21:09:45 2009
@@ -106,8 +106,6 @@
}
private Method getMethodShell(Set<FullyQualifiedJavaType> importedTypes) {
- FullyQualifiedTable table = introspectedTable.getFullyQualifiedTable();
-
Method method = new Method();
method.setVisibility(JavaVisibility.PUBLIC);
@@ -137,7 +135,7 @@
}
ibatorContext.getCommentGenerator().addGeneralMethodComment(method,
- table);
+ introspectedTable);
return method;
}
Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/UpdateByExampleParmsInnerclassGenerator.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/UpdateByExampleParmsInnerclassGenerator.java?rev=756759&r1=756758&r2=756759&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/UpdateByExampleParmsInnerclassGenerator.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/UpdateByExampleParmsInnerclassGenerator.java Fri Mar 20 21:09:45 2009
@@ -15,7 +15,6 @@
*/
package org.apache.ibatis.ibator.generator.ibatis2.dao.elements;
-import org.apache.ibatis.ibator.api.FullyQualifiedTable;
import org.apache.ibatis.ibator.api.dom.java.Field;
import org.apache.ibatis.ibator.api.dom.java.FullyQualifiedJavaType;
import org.apache.ibatis.ibator.api.dom.java.InnerClass;
@@ -39,7 +38,6 @@
@Override
public void addImplementationElements(TopLevelClass topLevelClass) {
- FullyQualifiedTable table = introspectedTable.getFullyQualifiedTable();
topLevelClass.addImportedType(introspectedTable.getExampleType());
InnerClass innerClass = new InnerClass(
@@ -47,7 +45,7 @@
innerClass.setVisibility(JavaVisibility.PRIVATE);
innerClass.setStatic(true);
innerClass.setSuperClass(introspectedTable.getExampleType());
- ibatorContext.getCommentGenerator().addClassComment(innerClass, table);
+ ibatorContext.getCommentGenerator().addClassComment(innerClass, introspectedTable);
Method method = new Method();
method.setConstructor(true);
Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/UpdateByExampleSelectiveMethodGenerator.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/UpdateByExampleSelectiveMethodGenerator.java?rev=756759&r1=756758&r2=756759&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/UpdateByExampleSelectiveMethodGenerator.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/UpdateByExampleSelectiveMethodGenerator.java Fri Mar 20 21:09:45 2009
@@ -75,7 +75,6 @@
}
private Method getMethodShell(Set<FullyQualifiedJavaType> importedTypes) {
- FullyQualifiedTable table = introspectedTable.getFullyQualifiedTable();
FullyQualifiedJavaType parameterType;
if (introspectedTable.getRules().generateRecordWithBLOBsClass()) {
@@ -103,7 +102,7 @@
}
ibatorContext.getCommentGenerator().addGeneralMethodComment(method,
- table);
+ introspectedTable);
return method;
}
Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/UpdateByExampleWithBLOBsMethodGenerator.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/UpdateByExampleWithBLOBsMethodGenerator.java?rev=756759&r1=756758&r2=756759&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/UpdateByExampleWithBLOBsMethodGenerator.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/UpdateByExampleWithBLOBsMethodGenerator.java Fri Mar 20 21:09:45 2009
@@ -76,7 +76,6 @@
}
private Method getMethodShell(Set<FullyQualifiedJavaType> importedTypes) {
- FullyQualifiedTable table = introspectedTable.getFullyQualifiedTable();
FullyQualifiedJavaType parameterType;
if (introspectedTable.getRules().generateRecordWithBLOBsClass()) {
parameterType = introspectedTable.getRecordWithBLOBsType();
@@ -98,7 +97,7 @@
importedTypes.add(fqjt);
}
- ibatorContext.getCommentGenerator().addGeneralMethodComment(method, table);
+ ibatorContext.getCommentGenerator().addGeneralMethodComment(method, introspectedTable);
return method;
}
Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/UpdateByExampleWithoutBLOBsMethodGenerator.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/UpdateByExampleWithoutBLOBsMethodGenerator.java?rev=756759&r1=756758&r2=756759&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/UpdateByExampleWithoutBLOBsMethodGenerator.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/UpdateByExampleWithoutBLOBsMethodGenerator.java Fri Mar 20 21:09:45 2009
@@ -76,7 +76,6 @@
}
private Method getMethodShell(Set<FullyQualifiedJavaType> importedTypes) {
- FullyQualifiedTable table = introspectedTable.getFullyQualifiedTable();
FullyQualifiedJavaType parameterType;
if (introspectedTable.getRules().generateBaseRecordClass()) {
parameterType = introspectedTable.getBaseRecordType();
@@ -98,7 +97,7 @@
importedTypes.add(fqjt);
}
- ibatorContext.getCommentGenerator().addGeneralMethodComment(method, table);
+ ibatorContext.getCommentGenerator().addGeneralMethodComment(method, introspectedTable);
return method;
}
Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/UpdateByPrimaryKeySelectiveMethodGenerator.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/UpdateByPrimaryKeySelectiveMethodGenerator.java?rev=756759&r1=756758&r2=756759&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/UpdateByPrimaryKeySelectiveMethodGenerator.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/UpdateByPrimaryKeySelectiveMethodGenerator.java Fri Mar 20 21:09:45 2009
@@ -72,7 +72,6 @@
}
private Method getMethodShell(Set<FullyQualifiedJavaType> importedTypes) {
- FullyQualifiedTable table = introspectedTable.getFullyQualifiedTable();
FullyQualifiedJavaType parameterType;
if (introspectedTable.getRules().generateRecordWithBLOBsClass()) {
@@ -94,7 +93,7 @@
importedTypes.add(fqjt);
}
- ibatorContext.getCommentGenerator().addGeneralMethodComment(method, table);
+ ibatorContext.getCommentGenerator().addGeneralMethodComment(method, introspectedTable);
return method;
}