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=724237&r1=724236&r2=724237&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 Sun Dec 7 18:53:06 2008 @@ -33,8 +33,9 @@ * */ public class UpdateByExampleSelectiveMethodGenerator extends - DAOElementGeneratorBaseImpl { + AbstractDAOElementGenerator { + @Override public void addImplementationElements(TopLevelClass topLevelClass) { Set<FullyQualifiedJavaType> importedTypes = new TreeSet<FullyQualifiedJavaType>(); Method method = getMethodShell(importedTypes); @@ -60,6 +61,7 @@ } } + @Override public void addInterfaceElements(Interface interfaze) { if (getExampleMethodVisibility() == JavaVisibility.PUBLIC) { Set<FullyQualifiedJavaType> importedTypes = new TreeSet<FullyQualifiedJavaType>();
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=724237&r1=724236&r2=724237&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 Sun Dec 7 18:53:06 2008 @@ -33,12 +33,13 @@ * */ public class UpdateByExampleWithBLOBsMethodGenerator extends - DAOElementGeneratorBaseImpl { + AbstractDAOElementGenerator { public UpdateByExampleWithBLOBsMethodGenerator() { super(); } + @Override public void addImplementationElements(TopLevelClass topLevelClass) { Set<FullyQualifiedJavaType> importedTypes = new TreeSet<FullyQualifiedJavaType>(); Method method = getMethodShell(importedTypes); @@ -61,6 +62,7 @@ } } + @Override public void addInterfaceElements(Interface interfaze) { if (getExampleMethodVisibility() == JavaVisibility.PUBLIC) { Set<FullyQualifiedJavaType> importedTypes = new TreeSet<FullyQualifiedJavaType>(); 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=724237&r1=724236&r2=724237&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 Sun Dec 7 18:53:06 2008 @@ -33,12 +33,13 @@ * */ public class UpdateByExampleWithoutBLOBsMethodGenerator extends - DAOElementGeneratorBaseImpl { + AbstractDAOElementGenerator { public UpdateByExampleWithoutBLOBsMethodGenerator() { super(); } + @Override public void addImplementationElements(TopLevelClass topLevelClass) { Set<FullyQualifiedJavaType> importedTypes = new TreeSet<FullyQualifiedJavaType>(); Method method = getMethodShell(importedTypes); @@ -61,6 +62,7 @@ } } + @Override public void addInterfaceElements(Interface interfaze) { if (getExampleMethodVisibility() == JavaVisibility.PUBLIC) { Set<FullyQualifiedJavaType> importedTypes = new TreeSet<FullyQualifiedJavaType>(); 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=724237&r1=724236&r2=724237&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 Sun Dec 7 18:53:06 2008 @@ -33,12 +33,13 @@ * */ public class UpdateByPrimaryKeySelectiveMethodGenerator extends - DAOElementGeneratorBaseImpl { + AbstractDAOElementGenerator { public UpdateByPrimaryKeySelectiveMethodGenerator() { super(); } + @Override public void addImplementationElements(TopLevelClass topLevelClass) { Set<FullyQualifiedJavaType> importedTypes = new TreeSet<FullyQualifiedJavaType>(); Method method = getMethodShell(importedTypes); @@ -59,6 +60,7 @@ } } + @Override public void addInterfaceElements(Interface interfaze) { Set<FullyQualifiedJavaType> importedTypes = new TreeSet<FullyQualifiedJavaType>(); Method method = getMethodShell(importedTypes); Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/UpdateByPrimaryKeyWithBLOBsMethodGenerator.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/UpdateByPrimaryKeyWithBLOBsMethodGenerator.java?rev=724237&r1=724236&r2=724237&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/UpdateByPrimaryKeyWithBLOBsMethodGenerator.java (original) +++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/UpdateByPrimaryKeyWithBLOBsMethodGenerator.java Sun Dec 7 18:53:06 2008 @@ -33,12 +33,13 @@ * */ public class UpdateByPrimaryKeyWithBLOBsMethodGenerator extends - DAOElementGeneratorBaseImpl { + AbstractDAOElementGenerator { public UpdateByPrimaryKeyWithBLOBsMethodGenerator() { super(); } + @Override public void addImplementationElements(TopLevelClass topLevelClass) { Set<FullyQualifiedJavaType> importedTypes = new TreeSet<FullyQualifiedJavaType>(); Method method = getMethodShell(importedTypes); @@ -59,6 +60,7 @@ } } + @Override public void addInterfaceElements(Interface interfaze) { Set<FullyQualifiedJavaType> importedTypes = new TreeSet<FullyQualifiedJavaType>(); Method method = getMethodShell(importedTypes); Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/UpdateByPrimaryKeyWithoutBLOBsMethodGenerator.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/UpdateByPrimaryKeyWithoutBLOBsMethodGenerator.java?rev=724237&r1=724236&r2=724237&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/UpdateByPrimaryKeyWithoutBLOBsMethodGenerator.java (original) +++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/UpdateByPrimaryKeyWithoutBLOBsMethodGenerator.java Sun Dec 7 18:53:06 2008 @@ -33,12 +33,13 @@ * */ public class UpdateByPrimaryKeyWithoutBLOBsMethodGenerator extends - DAOElementGeneratorBaseImpl { + AbstractDAOElementGenerator { public UpdateByPrimaryKeyWithoutBLOBsMethodGenerator() { super(); } + @Override public void addImplementationElements(TopLevelClass topLevelClass) { Set<FullyQualifiedJavaType> importedTypes = new TreeSet<FullyQualifiedJavaType>(); Method method = getMethodShell(importedTypes); @@ -59,6 +60,7 @@ } } + @Override public void addInterfaceElements(Interface interfaze) { Set<FullyQualifiedJavaType> importedTypes = new TreeSet<FullyQualifiedJavaType>(); Method method = getMethodShell(importedTypes); Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/BaseModelClassGenerator.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/BaseModelClassGenerator.java?rev=724237&r1=724236&r2=724237&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/BaseModelClassGenerator.java (original) +++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/BaseModelClassGenerator.java Sun Dec 7 18:53:06 2008 @@ -24,7 +24,7 @@ import org.apache.ibatis.ibator.api.dom.java.Method; import org.apache.ibatis.ibator.api.dom.java.Parameter; import org.apache.ibatis.ibator.config.PropertyRegistry; -import org.apache.ibatis.ibator.generator.AbstractGeneratorImpl; +import org.apache.ibatis.ibator.generator.AbstractJavaGenerator; import org.apache.ibatis.ibator.internal.util.JavaBeansUtil; import org.apache.ibatis.ibator.internal.util.StringUtility; @@ -33,7 +33,7 @@ * @author Jeff Butler * */ -public abstract class BaseModelClassGenerator extends AbstractGeneratorImpl { +public abstract class BaseModelClassGenerator extends AbstractJavaGenerator { public BaseModelClassGenerator() { super(); Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/BaseRecordGenerator.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/BaseRecordGenerator.java?rev=724237&r1=724236&r2=724237&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/BaseRecordGenerator.java (original) +++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/BaseRecordGenerator.java Sun Dec 7 18:53:06 2008 @@ -28,7 +28,6 @@ import org.apache.ibatis.ibator.api.dom.java.JavaVisibility; import org.apache.ibatis.ibator.api.dom.java.Method; import org.apache.ibatis.ibator.api.dom.java.TopLevelClass; -import org.apache.ibatis.ibator.generator.JavaGenerator; import org.apache.ibatis.ibator.internal.util.messages.Messages; /** @@ -36,12 +35,13 @@ * @author Jeff Butler * */ -public class BaseRecordGenerator extends BaseModelClassGenerator implements JavaGenerator { +public class BaseRecordGenerator extends BaseModelClassGenerator { public BaseRecordGenerator() { super(); } + @Override public List<CompilationUnit> getCompilationUnits() { FullyQualifiedTable table = introspectedTable.getFullyQualifiedTable(); progressCallback.startTask(Messages.getString("Progress.8", table.toString())); Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/ExampleGenerator.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/ExampleGenerator.java?rev=724237&r1=724236&r2=724237&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/ExampleGenerator.java (original) +++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/ExampleGenerator.java Sun Dec 7 18:53:06 2008 @@ -33,7 +33,6 @@ import org.apache.ibatis.ibator.api.dom.java.Method; import org.apache.ibatis.ibator.api.dom.java.Parameter; import org.apache.ibatis.ibator.api.dom.java.TopLevelClass; -import org.apache.ibatis.ibator.generator.JavaGenerator; import org.apache.ibatis.ibator.internal.rules.IbatorRules; import org.apache.ibatis.ibator.internal.util.JavaBeansUtil; import org.apache.ibatis.ibator.internal.util.StringUtility; @@ -44,7 +43,7 @@ * @author Jeff Butler * */ -public class ExampleGenerator extends BaseModelClassGenerator implements JavaGenerator { +public class ExampleGenerator extends BaseModelClassGenerator { private boolean generateForJava5; @@ -53,6 +52,7 @@ this.generateForJava5 = generateForJava5; } + @Override public List<CompilationUnit> getCompilationUnits() { FullyQualifiedTable table = introspectedTable.getFullyQualifiedTable(); progressCallback.startTask(Messages.getString("Progress.6", table.toString())); Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/PrimaryKeyGenerator.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/PrimaryKeyGenerator.java?rev=724237&r1=724236&r2=724237&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/PrimaryKeyGenerator.java (original) +++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/PrimaryKeyGenerator.java Sun Dec 7 18:53:06 2008 @@ -28,7 +28,6 @@ import org.apache.ibatis.ibator.api.dom.java.JavaVisibility; import org.apache.ibatis.ibator.api.dom.java.Method; import org.apache.ibatis.ibator.api.dom.java.TopLevelClass; -import org.apache.ibatis.ibator.generator.JavaGenerator; import org.apache.ibatis.ibator.internal.util.messages.Messages; /** @@ -36,15 +35,17 @@ * @author Jeff Butler * */ -public class PrimaryKeyGenerator extends BaseModelClassGenerator implements JavaGenerator { +public class PrimaryKeyGenerator extends BaseModelClassGenerator { public PrimaryKeyGenerator() { super(); } - /* (non-Javadoc) - * @see org.apache.ibatis.ibator.generator.ibatis2.model.ModelGenerator#getTopLevelClass(org.apache.ibatis.ibator.api.IntrospectedTable, java.util.List) + /* + * (non-Javadoc) + * @see org.apache.ibatis.ibator.generator.JavaGenerator#getCompilationUnits() */ + @Override public List<CompilationUnit> getCompilationUnits() { FullyQualifiedTable table = introspectedTable.getFullyQualifiedTable(); progressCallback.startTask(Messages.getString("Progress.7", table.toString())); Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/RecordWithBLOBsGenerator.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/RecordWithBLOBsGenerator.java?rev=724237&r1=724236&r2=724237&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/RecordWithBLOBsGenerator.java (original) +++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/RecordWithBLOBsGenerator.java Sun Dec 7 18:53:06 2008 @@ -28,7 +28,6 @@ import org.apache.ibatis.ibator.api.dom.java.JavaVisibility; import org.apache.ibatis.ibator.api.dom.java.Method; import org.apache.ibatis.ibator.api.dom.java.TopLevelClass; -import org.apache.ibatis.ibator.generator.JavaGenerator; import org.apache.ibatis.ibator.internal.util.messages.Messages; /** @@ -36,15 +35,17 @@ * @author Jeff Butler * */ -public class RecordWithBLOBsGenerator extends BaseModelClassGenerator implements JavaGenerator { +public class RecordWithBLOBsGenerator extends BaseModelClassGenerator { public RecordWithBLOBsGenerator() { super(); } - /* (non-Javadoc) - * @see org.apache.ibatis.ibator.generator.ibatis2.model.ModelGenerator#getTopLevelClass(org.apache.ibatis.ibator.api.IntrospectedTable, java.util.List) + /* + * (non-Javadoc) + * @see org.apache.ibatis.ibator.generator.JavaGenerator#getCompilationUnits() */ + @Override public List<CompilationUnit> getCompilationUnits() { FullyQualifiedTable table = introspectedTable.getFullyQualifiedTable(); progressCallback.startTask(Messages.getString("Progress.9", table.toString())); Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/SqlMapGenerator.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/SqlMapGenerator.java?rev=724237&r1=724236&r2=724237&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/SqlMapGenerator.java (original) +++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/SqlMapGenerator.java Sun Dec 7 18:53:06 2008 @@ -19,9 +19,9 @@ import org.apache.ibatis.ibator.api.dom.xml.Attribute; import org.apache.ibatis.ibator.api.dom.xml.Document; import org.apache.ibatis.ibator.api.dom.xml.XmlElement; -import org.apache.ibatis.ibator.generator.AbstractGeneratorImpl; -import org.apache.ibatis.ibator.generator.XmlGenerator; +import org.apache.ibatis.ibator.generator.AbstractXmlGenerator; import org.apache.ibatis.ibator.generator.ibatis2.XmlConstants; +import org.apache.ibatis.ibator.generator.ibatis2.sqlmap.elements.AbstractXmlElementGenerator; import org.apache.ibatis.ibator.generator.ibatis2.sqlmap.elements.CountByExampleElementGenerator; import org.apache.ibatis.ibator.generator.ibatis2.sqlmap.elements.DeleteByExampleElementGenerator; import org.apache.ibatis.ibator.generator.ibatis2.sqlmap.elements.DeleteByPrimaryKeyElementGenerator; @@ -39,7 +39,6 @@ import org.apache.ibatis.ibator.generator.ibatis2.sqlmap.elements.UpdateByPrimaryKeySelectiveElementGenerator; import org.apache.ibatis.ibator.generator.ibatis2.sqlmap.elements.UpdateByPrimaryKeyWithBLOBsElementGenerator; import org.apache.ibatis.ibator.generator.ibatis2.sqlmap.elements.UpdateByPrimaryKeyWithoutBLOBsElementGenerator; -import org.apache.ibatis.ibator.generator.ibatis2.sqlmap.elements.XmlElementGenerator; import org.apache.ibatis.ibator.internal.util.messages.Messages; /** @@ -47,7 +46,7 @@ * @author Jeff Butler * */ -public class SqlMapGenerator extends AbstractGeneratorImpl implements XmlGenerator { +public class SqlMapGenerator extends AbstractXmlGenerator { public SqlMapGenerator() { super(); @@ -85,124 +84,124 @@ protected void addResultMapWithoutBLOBsElement(XmlElement parentElement) { if (introspectedTable.getRules().generateBaseResultMap()) { - XmlElementGenerator elementGenerator = new ResultMapWithoutBLOBsElementGenerator(); + AbstractXmlElementGenerator elementGenerator = new ResultMapWithoutBLOBsElementGenerator(); initializeAndExecuteGenerator(elementGenerator, parentElement); } } protected void addResultMapWithBLOBsElement(XmlElement parentElement) { if (introspectedTable.getRules().generateResultMapWithBLOBs()) { - XmlElementGenerator elementGenerator = new ResultMapWithBLOBsElementGenerator(); + AbstractXmlElementGenerator elementGenerator = new ResultMapWithBLOBsElementGenerator(); initializeAndExecuteGenerator(elementGenerator, parentElement); } } protected void addExampleWhereClauseElement(XmlElement parentElement) { if (introspectedTable.getRules().generateSQLExampleWhereClause()) { - XmlElementGenerator elementGenerator = new ExampleWhereClauseElementGenerator(); + AbstractXmlElementGenerator elementGenerator = new ExampleWhereClauseElementGenerator(); initializeAndExecuteGenerator(elementGenerator, parentElement); } } protected void addSelectByExampleWithoutBLOBsElement(XmlElement parentElement) { if (introspectedTable.getRules().generateSelectByExampleWithoutBLOBs()) { - XmlElementGenerator elementGenerator = new SelectByExampleWithoutBLOBsElementGenerator(); + AbstractXmlElementGenerator elementGenerator = new SelectByExampleWithoutBLOBsElementGenerator(); initializeAndExecuteGenerator(elementGenerator, parentElement); } } protected void addSelectByExampleWithBLOBsElement(XmlElement parentElement) { if (introspectedTable.getRules().generateSelectByExampleWithBLOBs()) { - XmlElementGenerator elementGenerator = new SelectByExampleWithBLOBsElementGenerator(); + AbstractXmlElementGenerator elementGenerator = new SelectByExampleWithBLOBsElementGenerator(); initializeAndExecuteGenerator(elementGenerator, parentElement); } } protected void addSelectByPrimaryKeyElement(XmlElement parentElement) { if (introspectedTable.getRules().generateSelectByPrimaryKey()) { - XmlElementGenerator elementGenerator = new SelectByPrimaryKeyElementGenerator(); + AbstractXmlElementGenerator elementGenerator = new SelectByPrimaryKeyElementGenerator(); initializeAndExecuteGenerator(elementGenerator, parentElement); } } protected void addDeleteByExampleElement(XmlElement parentElement) { if (introspectedTable.getRules().generateDeleteByExample()) { - XmlElementGenerator elementGenerator = new DeleteByExampleElementGenerator(); + AbstractXmlElementGenerator elementGenerator = new DeleteByExampleElementGenerator(); initializeAndExecuteGenerator(elementGenerator, parentElement); } } protected void addDeleteByPrimaryKeyElement(XmlElement parentElement) { if (introspectedTable.getRules().generateDeleteByPrimaryKey()) { - XmlElementGenerator elementGenerator = new DeleteByPrimaryKeyElementGenerator(); + AbstractXmlElementGenerator elementGenerator = new DeleteByPrimaryKeyElementGenerator(); initializeAndExecuteGenerator(elementGenerator, parentElement); } } protected void addInsertElement(XmlElement parentElement) { if (introspectedTable.getRules().generateInsert()) { - XmlElementGenerator elementGenerator = new InsertElementGenerator(); + AbstractXmlElementGenerator elementGenerator = new InsertElementGenerator(); initializeAndExecuteGenerator(elementGenerator, parentElement); } } protected void addInsertSelectiveElement(XmlElement parentElement) { if (introspectedTable.getRules().generateInsertSelective()) { - XmlElementGenerator elementGenerator = new InsertSelectiveElementGenerator(); + AbstractXmlElementGenerator elementGenerator = new InsertSelectiveElementGenerator(); initializeAndExecuteGenerator(elementGenerator, parentElement); } } protected void addCountByExampleElement(XmlElement parentElement) { if (introspectedTable.getRules().generateCountByExample()) { - XmlElementGenerator elementGenerator = new CountByExampleElementGenerator(); + AbstractXmlElementGenerator elementGenerator = new CountByExampleElementGenerator(); initializeAndExecuteGenerator(elementGenerator, parentElement); } } protected void addUpdateByExampleSelectiveElement(XmlElement parentElement) { if (introspectedTable.getRules().generateUpdateByExampleSelective()) { - XmlElementGenerator elementGenerator = new UpdateByExampleSelectiveElementGenerator(); + AbstractXmlElementGenerator elementGenerator = new UpdateByExampleSelectiveElementGenerator(); initializeAndExecuteGenerator(elementGenerator, parentElement); } } protected void addUpdateByExampleWithBLOBsElement(XmlElement parentElement) { if (introspectedTable.getRules().generateUpdateByExampleWithBLOBs()) { - XmlElementGenerator elementGenerator = new UpdateByExampleWithBLOBsElementGenerator(); + AbstractXmlElementGenerator elementGenerator = new UpdateByExampleWithBLOBsElementGenerator(); initializeAndExecuteGenerator(elementGenerator, parentElement); } } protected void addUpdateByExampleWithoutBLOBsElement(XmlElement parentElement) { if (introspectedTable.getRules().generateUpdateByExampleWithoutBLOBs()) { - XmlElementGenerator elementGenerator = new UpdateByExampleWithoutBLOBsElementGenerator(); + AbstractXmlElementGenerator elementGenerator = new UpdateByExampleWithoutBLOBsElementGenerator(); initializeAndExecuteGenerator(elementGenerator, parentElement); } } protected void addUpdateByPrimaryKeySelectiveElement(XmlElement parentElement) { if (introspectedTable.getRules().generateUpdateByPrimaryKeySelective()) { - XmlElementGenerator elementGenerator = new UpdateByPrimaryKeySelectiveElementGenerator(); + AbstractXmlElementGenerator elementGenerator = new UpdateByPrimaryKeySelectiveElementGenerator(); initializeAndExecuteGenerator(elementGenerator, parentElement); } } protected void addUpdateByPrimaryKeyWithBLOBsElement(XmlElement parentElement) { if (introspectedTable.getRules().generateUpdateByPrimaryKeyWithBLOBs()) { - XmlElementGenerator elementGenerator = new UpdateByPrimaryKeyWithBLOBsElementGenerator(); + AbstractXmlElementGenerator elementGenerator = new UpdateByPrimaryKeyWithBLOBsElementGenerator(); initializeAndExecuteGenerator(elementGenerator, parentElement); } } protected void addUpdateByPrimaryKeyWithoutBLOBsElement(XmlElement parentElement) { if (introspectedTable.getRules().generateUpdateByPrimaryKeyWithoutBLOBs()) { - XmlElementGenerator elementGenerator = new UpdateByPrimaryKeyWithoutBLOBsElementGenerator(); + AbstractXmlElementGenerator elementGenerator = new UpdateByPrimaryKeyWithoutBLOBsElementGenerator(); initializeAndExecuteGenerator(elementGenerator, parentElement); } } - protected void initializeAndExecuteGenerator(XmlElementGenerator elementGenerator, XmlElement parentElement) { + protected void initializeAndExecuteGenerator(AbstractXmlElementGenerator elementGenerator, XmlElement parentElement) { elementGenerator.setIbatorContext(ibatorContext); elementGenerator.setIntrospectedTable(introspectedTable); elementGenerator.setProgressCallback(progressCallback); @@ -210,6 +209,7 @@ elementGenerator.addElements(parentElement); } + @Override public Document getDocument() { Document document = new Document(XmlConstants.SQL_MAP_PUBLIC_ID, XmlConstants.SQL_MAP_SYSTEM_ID); Copied: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/AbstractXmlElementGenerator.java (from r703569, ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/XmlElementGenerator.java) URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/AbstractXmlElementGenerator.java?p2=ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/AbstractXmlElementGenerator.java&p1=ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/XmlElementGenerator.java&r1=703569&r2=724237&rev=724237&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/XmlElementGenerator.java (original) +++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/AbstractXmlElementGenerator.java Sun Dec 7 18:53:06 2008 @@ -15,14 +15,49 @@ */ package org.apache.ibatis.ibator.generator.ibatis2.sqlmap.elements; +import org.apache.ibatis.ibator.api.IntrospectedColumn; +import org.apache.ibatis.ibator.api.dom.xml.Attribute; +import org.apache.ibatis.ibator.api.dom.xml.TextElement; import org.apache.ibatis.ibator.api.dom.xml.XmlElement; +import org.apache.ibatis.ibator.config.GeneratedKey; import org.apache.ibatis.ibator.generator.AbstractGenerator; +import org.apache.ibatis.ibator.internal.util.StringUtility; /** * * @author Jeff Butler * */ -public interface XmlElementGenerator extends AbstractGenerator { - void addElements(XmlElement parentElement); +public abstract class AbstractXmlElementGenerator extends AbstractGenerator { + public abstract void addElements(XmlElement parentElement); + + public AbstractXmlElementGenerator() { + super(); + } + + /** + * This method should return an XmlElement for the select key used to + * automatically generate keys. + * + * @param columnDefinition + * the column related to the select key statement + * @param generatedKey + * the generated key for the current table + * @return the selectKey element + */ + protected XmlElement getSelectKey(IntrospectedColumn introspectedColumn, GeneratedKey generatedKey) { + String identityColumnType = introspectedColumn + .getFullyQualifiedJavaType().getFullyQualifiedName(); + + XmlElement answer = new XmlElement("selectKey"); //$NON-NLS-1$ + answer.addAttribute(new Attribute("resultClass", identityColumnType)); //$NON-NLS-1$ + answer.addAttribute(new Attribute( + "keyProperty", introspectedColumn.getJavaProperty())); //$NON-NLS-1$ + if(StringUtility.stringHasValue(generatedKey.getType())) { + answer.addAttribute(new Attribute("type", generatedKey.getType())); //$NON-NLS-1$ + } + answer.addElement(new TextElement(generatedKey.getRuntimeSqlStatement())); + + return answer; + } } Propchange: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/AbstractXmlElementGenerator.java ------------------------------------------------------------------------------ svn:mergeinfo = Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/CountByExampleElementGenerator.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/CountByExampleElementGenerator.java?rev=724237&r1=724236&r2=724237&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/CountByExampleElementGenerator.java (original) +++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/CountByExampleElementGenerator.java Sun Dec 7 18:53:06 2008 @@ -27,12 +27,13 @@ * @author Jeff Butler * */ -public class CountByExampleElementGenerator extends XmlElementGeneratorBaseImpl { +public class CountByExampleElementGenerator extends AbstractXmlElementGenerator { public CountByExampleElementGenerator() { super(); } + @Override public void addElements(XmlElement parentElement) { XmlElement answer = new XmlElement("select"); //$NON-NLS-1$ Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/DeleteByExampleElementGenerator.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/DeleteByExampleElementGenerator.java?rev=724237&r1=724236&r2=724237&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/DeleteByExampleElementGenerator.java (original) +++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/DeleteByExampleElementGenerator.java Sun Dec 7 18:53:06 2008 @@ -27,12 +27,13 @@ * @author Jeff Butler * */ -public class DeleteByExampleElementGenerator extends XmlElementGeneratorBaseImpl { +public class DeleteByExampleElementGenerator extends AbstractXmlElementGenerator { public DeleteByExampleElementGenerator() { super(); } + @Override public void addElements(XmlElement parentElement) { XmlElement answer = new XmlElement("delete"); //$NON-NLS-1$ Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/DeleteByPrimaryKeyElementGenerator.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/DeleteByPrimaryKeyElementGenerator.java?rev=724237&r1=724236&r2=724237&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/DeleteByPrimaryKeyElementGenerator.java (original) +++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/DeleteByPrimaryKeyElementGenerator.java Sun Dec 7 18:53:06 2008 @@ -28,12 +28,13 @@ * @author Jeff Butler * */ -public class DeleteByPrimaryKeyElementGenerator extends XmlElementGeneratorBaseImpl { +public class DeleteByPrimaryKeyElementGenerator extends AbstractXmlElementGenerator { public DeleteByPrimaryKeyElementGenerator() { super(); } + @Override public void addElements(XmlElement parentElement) { XmlElement answer = new XmlElement("delete"); //$NON-NLS-1$ FullyQualifiedTable table = introspectedTable.getFullyQualifiedTable(); Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/ExampleWhereClauseElementGenerator.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/ExampleWhereClauseElementGenerator.java?rev=724237&r1=724236&r2=724237&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/ExampleWhereClauseElementGenerator.java (original) +++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/ExampleWhereClauseElementGenerator.java Sun Dec 7 18:53:06 2008 @@ -27,12 +27,13 @@ * @author Jeff Butler * */ -public class ExampleWhereClauseElementGenerator extends XmlElementGeneratorBaseImpl { +public class ExampleWhereClauseElementGenerator extends AbstractXmlElementGenerator { public ExampleWhereClauseElementGenerator() { super(); } + @Override public void addElements(XmlElement parentElement) { XmlElement answer = new XmlElement("sql"); //$NON-NLS-1$ Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/InsertElementGenerator.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/InsertElementGenerator.java?rev=724237&r1=724236&r2=724237&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/InsertElementGenerator.java (original) +++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/InsertElementGenerator.java Sun Dec 7 18:53:06 2008 @@ -29,12 +29,13 @@ * @author Jeff Butler * */ -public class InsertElementGenerator extends XmlElementGeneratorBaseImpl { +public class InsertElementGenerator extends AbstractXmlElementGenerator { public InsertElementGenerator() { super(); } + @Override public void addElements(XmlElement parentElement) { XmlElement answer = new XmlElement("insert"); //$NON-NLS-1$ Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/InsertSelectiveElementGenerator.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/InsertSelectiveElementGenerator.java?rev=724237&r1=724236&r2=724237&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/InsertSelectiveElementGenerator.java (original) +++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/InsertSelectiveElementGenerator.java Sun Dec 7 18:53:06 2008 @@ -29,12 +29,13 @@ * @author Jeff Butler * */ -public class InsertSelectiveElementGenerator extends XmlElementGeneratorBaseImpl { +public class InsertSelectiveElementGenerator extends AbstractXmlElementGenerator { public InsertSelectiveElementGenerator() { super(); } + @Override public void addElements(XmlElement parentElement) { XmlElement answer = new XmlElement("insert"); //$NON-NLS-1$ Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/ResultMapWithBLOBsElementGenerator.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/ResultMapWithBLOBsElementGenerator.java?rev=724237&r1=724236&r2=724237&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/ResultMapWithBLOBsElementGenerator.java (original) +++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/ResultMapWithBLOBsElementGenerator.java Sun Dec 7 18:53:06 2008 @@ -29,12 +29,13 @@ * @author Jeff Butler * */ -public class ResultMapWithBLOBsElementGenerator extends XmlElementGeneratorBaseImpl { +public class ResultMapWithBLOBsElementGenerator extends AbstractXmlElementGenerator { public ResultMapWithBLOBsElementGenerator() { super(); } + @Override public void addElements(XmlElement parentElement) { boolean useColumnIndex = StringUtility.isTrue(introspectedTable.getTableConfigurationProperty(PropertyRegistry.TABLE_USE_COLUMN_INDEXES)); Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/ResultMapWithoutBLOBsElementGenerator.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/ResultMapWithoutBLOBsElementGenerator.java?rev=724237&r1=724236&r2=724237&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/ResultMapWithoutBLOBsElementGenerator.java (original) +++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/ResultMapWithoutBLOBsElementGenerator.java Sun Dec 7 18:53:06 2008 @@ -28,12 +28,13 @@ * @author Jeff Butler * */ -public class ResultMapWithoutBLOBsElementGenerator extends XmlElementGeneratorBaseImpl { +public class ResultMapWithoutBLOBsElementGenerator extends AbstractXmlElementGenerator { public ResultMapWithoutBLOBsElementGenerator() { super(); } + @Override public void addElements(XmlElement parentElement) { boolean useColumnIndex = StringUtility.isTrue(introspectedTable.getTableConfigurationProperty(PropertyRegistry.TABLE_USE_COLUMN_INDEXES)); Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/SelectByExampleWithBLOBsElementGenerator.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/SelectByExampleWithBLOBsElementGenerator.java?rev=724237&r1=724236&r2=724237&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/SelectByExampleWithBLOBsElementGenerator.java (original) +++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/SelectByExampleWithBLOBsElementGenerator.java Sun Dec 7 18:53:06 2008 @@ -30,12 +30,13 @@ * */ public class SelectByExampleWithBLOBsElementGenerator extends - XmlElementGeneratorBaseImpl { + AbstractXmlElementGenerator { public SelectByExampleWithBLOBsElementGenerator() { super(); } + @Override public void addElements(XmlElement parentElement) { FullyQualifiedTable table = introspectedTable.getFullyQualifiedTable(); FullyQualifiedJavaType fqjt = introspectedTable.getExampleType(); Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/SelectByExampleWithoutBLOBsElementGenerator.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/SelectByExampleWithoutBLOBsElementGenerator.java?rev=724237&r1=724236&r2=724237&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/SelectByExampleWithoutBLOBsElementGenerator.java (original) +++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/SelectByExampleWithoutBLOBsElementGenerator.java Sun Dec 7 18:53:06 2008 @@ -29,12 +29,13 @@ * @author Jeff Butler * */ -public class SelectByExampleWithoutBLOBsElementGenerator extends XmlElementGeneratorBaseImpl { +public class SelectByExampleWithoutBLOBsElementGenerator extends AbstractXmlElementGenerator { public SelectByExampleWithoutBLOBsElementGenerator() { super(); } + @Override public void addElements(XmlElement parentElement) { FullyQualifiedTable table = introspectedTable.getFullyQualifiedTable(); FullyQualifiedJavaType fqjt = introspectedTable.getExampleType(); Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/SelectByPrimaryKeyElementGenerator.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/SelectByPrimaryKeyElementGenerator.java?rev=724237&r1=724236&r2=724237&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/SelectByPrimaryKeyElementGenerator.java (original) +++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/SelectByPrimaryKeyElementGenerator.java Sun Dec 7 18:53:06 2008 @@ -29,12 +29,13 @@ * @author Jeff Butler * */ -public class SelectByPrimaryKeyElementGenerator extends XmlElementGeneratorBaseImpl { +public class SelectByPrimaryKeyElementGenerator extends AbstractXmlElementGenerator { public SelectByPrimaryKeyElementGenerator() { super(); } + @Override public void addElements(XmlElement parentElement) { XmlElement answer = new XmlElement("select"); //$NON-NLS-1$ FullyQualifiedTable table = introspectedTable.getFullyQualifiedTable(); Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/UpdateByExampleSelectiveElementGenerator.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/UpdateByExampleSelectiveElementGenerator.java?rev=724237&r1=724236&r2=724237&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/UpdateByExampleSelectiveElementGenerator.java (original) +++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/UpdateByExampleSelectiveElementGenerator.java Sun Dec 7 18:53:06 2008 @@ -28,12 +28,13 @@ * */ public class UpdateByExampleSelectiveElementGenerator extends - XmlElementGeneratorBaseImpl { + AbstractXmlElementGenerator { public UpdateByExampleSelectiveElementGenerator() { super(); } + @Override public void addElements(XmlElement parentElement) { XmlElement answer = new XmlElement("update"); //$NON-NLS-1$ FullyQualifiedTable table = introspectedTable.getFullyQualifiedTable(); Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/UpdateByExampleWithBLOBsElementGenerator.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/UpdateByExampleWithBLOBsElementGenerator.java?rev=724237&r1=724236&r2=724237&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/UpdateByExampleWithBLOBsElementGenerator.java (original) +++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/UpdateByExampleWithBLOBsElementGenerator.java Sun Dec 7 18:53:06 2008 @@ -31,12 +31,13 @@ * */ public class UpdateByExampleWithBLOBsElementGenerator extends - XmlElementGeneratorBaseImpl { + AbstractXmlElementGenerator { public UpdateByExampleWithBLOBsElementGenerator() { super(); } + @Override public void addElements(XmlElement parentElement) { XmlElement answer = new XmlElement("update"); //$NON-NLS-1$ FullyQualifiedTable table = introspectedTable.getFullyQualifiedTable(); Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/UpdateByExampleWithoutBLOBsElementGenerator.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/UpdateByExampleWithoutBLOBsElementGenerator.java?rev=724237&r1=724236&r2=724237&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/UpdateByExampleWithoutBLOBsElementGenerator.java (original) +++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/UpdateByExampleWithoutBLOBsElementGenerator.java Sun Dec 7 18:53:06 2008 @@ -31,12 +31,13 @@ * */ public class UpdateByExampleWithoutBLOBsElementGenerator extends - XmlElementGeneratorBaseImpl { + AbstractXmlElementGenerator { public UpdateByExampleWithoutBLOBsElementGenerator() { super(); } + @Override public void addElements(XmlElement parentElement) { XmlElement answer = new XmlElement("update"); //$NON-NLS-1$ FullyQualifiedTable table = introspectedTable.getFullyQualifiedTable(); Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/UpdateByPrimaryKeySelectiveElementGenerator.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/UpdateByPrimaryKeySelectiveElementGenerator.java?rev=724237&r1=724236&r2=724237&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/UpdateByPrimaryKeySelectiveElementGenerator.java (original) +++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/UpdateByPrimaryKeySelectiveElementGenerator.java Sun Dec 7 18:53:06 2008 @@ -29,12 +29,13 @@ * */ public class UpdateByPrimaryKeySelectiveElementGenerator extends - XmlElementGeneratorBaseImpl { + AbstractXmlElementGenerator { public UpdateByPrimaryKeySelectiveElementGenerator() { super(); } + @Override public void addElements(XmlElement parentElement) { XmlElement answer = new XmlElement("update"); //$NON-NLS-1$ FullyQualifiedTable table = introspectedTable.getFullyQualifiedTable(); Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/UpdateByPrimaryKeyWithBLOBsElementGenerator.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/UpdateByPrimaryKeyWithBLOBsElementGenerator.java?rev=724237&r1=724236&r2=724237&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/UpdateByPrimaryKeyWithBLOBsElementGenerator.java (original) +++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/UpdateByPrimaryKeyWithBLOBsElementGenerator.java Sun Dec 7 18:53:06 2008 @@ -32,12 +32,13 @@ * */ public class UpdateByPrimaryKeyWithBLOBsElementGenerator extends - XmlElementGeneratorBaseImpl { + AbstractXmlElementGenerator { public UpdateByPrimaryKeyWithBLOBsElementGenerator() { super(); } + @Override public void addElements(XmlElement parentElement) { XmlElement answer = new XmlElement("update"); //$NON-NLS-1$ FullyQualifiedTable table = introspectedTable.getFullyQualifiedTable(); Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/UpdateByPrimaryKeyWithoutBLOBsElementGenerator.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/UpdateByPrimaryKeyWithoutBLOBsElementGenerator.java?rev=724237&r1=724236&r2=724237&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/UpdateByPrimaryKeyWithoutBLOBsElementGenerator.java (original) +++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/UpdateByPrimaryKeyWithoutBLOBsElementGenerator.java Sun Dec 7 18:53:06 2008 @@ -31,12 +31,13 @@ * */ public class UpdateByPrimaryKeyWithoutBLOBsElementGenerator extends - XmlElementGeneratorBaseImpl { + AbstractXmlElementGenerator { public UpdateByPrimaryKeyWithoutBLOBsElementGenerator() { super(); } + @Override public void addElements(XmlElement parentElement) { XmlElement answer = new XmlElement("update"); //$NON-NLS-1$ FullyQualifiedTable table = introspectedTable.getFullyQualifiedTable(); Modified: ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/ibatorConfig.xml URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/ibatorConfig.xml?rev=724237&r1=724236&r2=724237&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/ibatorConfig.xml (original) +++ ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/ibatorConfig.xml Sun Dec 7 18:53:06 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE ibatorConfiguration - PUBLIC "-//Apache Software Foundation//DTD Apache iBATIS ibator Configuration 1.0//EN" + PUBLIC "-//Apache Software Foundation//DTD Apache iBATIS Ibator Configuration 1.0//EN" "http://ibatis.apache.org/dtd/ibator-config_1_0.dtd";> <ibatorConfiguration> Modified: ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/ibatorConfig.xml URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/ibatorConfig.xml?rev=724237&r1=724236&r2=724237&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/ibatorConfig.xml (original) +++ ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/ibatorConfig.xml Sun Dec 7 18:53:06 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE ibatorConfiguration - PUBLIC "-//Apache Software Foundation//DTD Apache iBATIS ibator Configuration 1.0//EN" + PUBLIC "-//Apache Software Foundation//DTD Apache iBATIS Ibator Configuration 1.0//EN" "http://ibatis.apache.org/dtd/ibator-config_1_0.dtd";> <ibatorConfiguration>
