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/06/03 05:49:30 UTC
svn commit: r781254 - in /ibatis/trunk/java/tools/ibator/core: build/ doc/
src/org/apache/ibatis/ibator/api/ src/org/apache/ibatis/ibator/api/dom/java/
src/org/apache/ibatis/ibator/config/
src/org/apache/ibatis/ibator/generator/ibatis2/dao/ src/org/apa...
Author: jgbutler
Date: Wed Jun 3 03:49:27 2009
New Revision: 781254
URL: http://svn.apache.org/viewvc?rev=781254&view=rev
Log:
[ibator] more refactorings for iBATIS3
Modified:
ibatis/trunk/java/tools/ibator/core/build/version.properties
ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/IntrospectedTable.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/InnerClass.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/Interface.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/TopLevelClass.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/MergeConstants.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/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/model/BaseRecordGenerator.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/generator/ibatis2/model/PrimaryKeyGenerator.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/RecordWithBLOBsGenerator.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/CountByExampleElementGenerator.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/DeleteByExampleElementGenerator.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/DeleteByPrimaryKeyElementGenerator.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/ResultMapWithBLOBsElementGenerator.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/ResultMapWithoutBLOBsElementGenerator.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/SelectByExampleWithBLOBsElementGenerator.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/SelectByExampleWithoutBLOBsElementGenerator.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/SelectByPrimaryKeyElementGenerator.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/UpdateByPrimaryKeySelectiveElementGenerator.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/UpdateByPrimaryKeyWithBLOBsElementGenerator.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/UpdateByPrimaryKeyWithoutBLOBsElementGenerator.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/XmlFileMergerJaxp.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/rules/BaseIbatorRules.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/plugins/RenameExampleClassPlugin.java
ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/miscellaneous/MiscellaneousTests.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=781254&r1=781253&r2=781254&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/build/version.properties (original)
+++ ibatis/trunk/java/tools/ibator/core/build/version.properties Wed Jun 3 03:49:27 2009
@@ -1,4 +1,4 @@
#Ibator build version info
-#Thu May 28 17:11:28 EDT 2009
+#Tue Jun 02 22:46:10 CDT 2009
version=1.2.2
-buildNum=737
+buildNum=739
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=781254&r1=781253&r2=781254&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt (original)
+++ ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt Wed Jun 3 03:49:27 2009
@@ -28,6 +28,10 @@
11. IBATIS-592 - Additional attributes for SqlMaps
12. Fixed addCriterionfor JDBC* methods so that they all do a null check
13. Fixed IbatorRunner so that configuration errors are shown (thanks to Karel Rank)
+14. Added XML ids to changeable attributes on introspected table, also
+ change the XML merger so that the XML ids no longer need to contain
+ the prefix "ibatorgenerated_"
+15. Many refactorings to make way for iBATIS3
-------------------------------------------------------------------------------
Version 1.2.1:
Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/IntrospectedTable.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/IntrospectedTable.java?rev=781254&r1=781253&r2=781254&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/IntrospectedTable.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/IntrospectedTable.java Wed Jun 3 03:49:27 2009
@@ -22,12 +22,10 @@
import java.util.List;
import java.util.Map;
-import org.apache.ibatis.ibator.api.dom.java.FullyQualifiedJavaType;
import org.apache.ibatis.ibator.config.DAOGeneratorConfiguration;
import org.apache.ibatis.ibator.config.GeneratedKey;
import org.apache.ibatis.ibator.config.IbatorContext;
import org.apache.ibatis.ibator.config.JavaModelGeneratorConfiguration;
-import org.apache.ibatis.ibator.config.MergeConstants;
import org.apache.ibatis.ibator.config.ModelType;
import org.apache.ibatis.ibator.config.PropertyRegistry;
import org.apache.ibatis.ibator.config.SqlMapGeneratorConfiguration;
@@ -99,7 +97,7 @@
* Internal attributes are used
* to store commonly accessed items by all code generators
*/
- protected Map<IntrospectedTable.InternalAttribute, Object> internalAttributes;
+ protected Map<IntrospectedTable.InternalAttribute, String> internalAttributes;
public IntrospectedTable() {
super();
@@ -107,7 +105,7 @@
baseColumns = new ArrayList<IntrospectedColumn>();
blobColumns = new ArrayList<IntrospectedColumn>();
attributes = new HashMap<String, Object>();
- internalAttributes = new HashMap<IntrospectedTable.InternalAttribute, Object>();
+ internalAttributes = new HashMap<IntrospectedTable.InternalAttribute, String>();
}
public FullyQualifiedTable getFullyQualifiedTable() {
@@ -314,8 +312,8 @@
return tableConfiguration.getProperty(property);
}
- public FullyQualifiedJavaType getPrimaryKeyType() {
- return (FullyQualifiedJavaType) internalAttributes.get(InternalAttribute.ATTR_PRIMARY_KEY_TYPE);
+ public String getPrimaryKeyType() {
+ return internalAttributes.get(InternalAttribute.ATTR_PRIMARY_KEY_TYPE);
}
/**
@@ -324,16 +322,16 @@
* key and non-BLOB fields). Note that
* the value will be calculated regardless of whether the table has these columns or not.
*/
- public FullyQualifiedJavaType getBaseRecordType() {
- return (FullyQualifiedJavaType) internalAttributes.get(InternalAttribute.ATTR_BASE_RECORD_TYPE);
+ public String getBaseRecordType() {
+ return internalAttributes.get(InternalAttribute.ATTR_BASE_RECORD_TYPE);
}
/**
*
* @return the type for the example class.
*/
- public FullyQualifiedJavaType getExampleType() {
- return (FullyQualifiedJavaType) internalAttributes.get(InternalAttribute.ATTR_EXAMPLE_TYPE);
+ public String getExampleType() {
+ return internalAttributes.get(InternalAttribute.ATTR_EXAMPLE_TYPE);
}
/**
@@ -341,8 +339,8 @@
* @return the type for the record with BLOBs class. Note that
* the value will be calculated regardless of whether the table has BLOB columns or not.
*/
- public FullyQualifiedJavaType getRecordWithBLOBsType() {
- return (FullyQualifiedJavaType) internalAttributes.get(InternalAttribute.ATTR_RECORD_WITH_BLOBS_TYPE);
+ public String getRecordWithBLOBsType() {
+ return internalAttributes.get(InternalAttribute.ATTR_RECORD_WITH_BLOBS_TYPE);
}
/**
@@ -353,11 +351,11 @@
* @return the name of the SqlMap file
*/
public String getSqlMapFileName() {
- return (String) internalAttributes.get(InternalAttribute.ATTR_SQL_MAP_FILE_NAME);
+ return internalAttributes.get(InternalAttribute.ATTR_SQL_MAP_FILE_NAME);
}
public String getSqlMapNamespace() {
- return (String) internalAttributes.get(InternalAttribute.ATTR_SQL_MAP_NAMESPACE);
+ return internalAttributes.get(InternalAttribute.ATTR_SQL_MAP_NAMESPACE);
}
/**
@@ -366,15 +364,15 @@
* @return the package for the SqlMap for the current table
*/
public String getSqlMapPackage() {
- return (String) internalAttributes.get(InternalAttribute.ATTR_SQL_MAP_PACKAGE);
+ return internalAttributes.get(InternalAttribute.ATTR_SQL_MAP_PACKAGE);
}
- public FullyQualifiedJavaType getDAOImplementationType() {
- return (FullyQualifiedJavaType) internalAttributes.get(InternalAttribute.ATTR_DAO_IMPLEMENTATION_TYPE);
+ public String getDAOImplementationType() {
+ return internalAttributes.get(InternalAttribute.ATTR_DAO_IMPLEMENTATION_TYPE);
}
- public FullyQualifiedJavaType getDAOInterfaceType() {
- return (FullyQualifiedJavaType) internalAttributes.get(InternalAttribute.ATTR_DAO_INTERFACE_TYPE);
+ public String getDAOInterfaceType() {
+ return internalAttributes.get(InternalAttribute.ATTR_DAO_INTERFACE_TYPE);
}
public boolean hasAnyColumns() {
@@ -472,101 +470,25 @@
setSqlMapFullyQualifiedRuntimeTableName(calculateSqlMapFullyQualifiedRuntimeTableName());
setSqlMapAliasedFullyQualifiedRuntimeTableName(calculateSqlMapAliasedFullyQualifiedRuntimeTableName());
- StringBuilder sb = new StringBuilder();
-
- sb.append(MergeConstants.NEW_XML_ELEMENT_PREFIX);
- sb.append("countByExample"); //$NON-NLS-1$
- setCountByExampleStatementId(sb.toString());
-
- sb.setLength(0);
- sb.append(MergeConstants.NEW_XML_ELEMENT_PREFIX);
- sb.append("deleteByExample"); //$NON-NLS-1$
- setDeleteByExampleStatementId(sb.toString());
-
- sb.setLength(0);
- sb.append(MergeConstants.NEW_XML_ELEMENT_PREFIX);
- sb.append("deleteByPrimaryKey"); //$NON-NLS-1$
- setDeleteByPrimaryKeyStatementId(sb.toString());
-
- sb.setLength(0);
- sb.append(MergeConstants.NEW_XML_ELEMENT_PREFIX);
- sb.append("insert"); //$NON-NLS-1$
- setInsertStatementId(sb.toString());
-
- sb.setLength(0);
- sb.append(MergeConstants.NEW_XML_ELEMENT_PREFIX);
- sb.append("insertSelective"); //$NON-NLS-1$
- setInsertSelectiveStatementId(sb.toString());
-
- sb.setLength(0);
- sb.append(MergeConstants.NEW_XML_ELEMENT_PREFIX);
- sb.append("selectByExample"); //$NON-NLS-1$
- setSelectByExampleStatementId(sb.toString());
-
- sb.setLength(0);
- sb.append(MergeConstants.NEW_XML_ELEMENT_PREFIX);
- sb.append("selectByExampleWithBLOBs"); //$NON-NLS-1$
- setSelectByExampleWithBLOBsStatementId(sb.toString());
-
- sb.setLength(0);
- sb.append(MergeConstants.NEW_XML_ELEMENT_PREFIX);
- sb.append("selectByPrimaryKey"); //$NON-NLS-1$
- setSelectByPrimaryKeyStatementId(sb.toString());
-
- sb.setLength(0);
- sb.append(MergeConstants.NEW_XML_ELEMENT_PREFIX);
- sb.append("updateByExample"); //$NON-NLS-1$
- setUpdateByExampleStatementId(sb.toString());
-
- sb.setLength(0);
- sb.append(MergeConstants.NEW_XML_ELEMENT_PREFIX);
- sb.append("updateByExampleSelective"); //$NON-NLS-1$
- setUpdateByExampleSelectiveStatementId(sb.toString());
-
- sb.setLength(0);
- sb.append(MergeConstants.NEW_XML_ELEMENT_PREFIX);
- sb.append("updateByExampleWithBLOBs"); //$NON-NLS-1$
- setUpdateByExampleWithBLOBsStatementId(sb.toString());
-
- sb.setLength(0);
- sb.append(MergeConstants.NEW_XML_ELEMENT_PREFIX);
- sb.append("updateByPrimaryKey"); //$NON-NLS-1$
- setUpdateByPrimaryKeyStatementId(sb.toString());
-
- sb.setLength(0);
- sb.append(MergeConstants.NEW_XML_ELEMENT_PREFIX);
- sb.append("updateByPrimaryKeySelective"); //$NON-NLS-1$
- setUpdateByPrimaryKeySelectiveStatementId(sb.toString());
-
- sb.setLength(0);
- sb.append(MergeConstants.NEW_XML_ELEMENT_PREFIX);
- sb.append("updateByPrimaryKeyWithBLOBs"); //$NON-NLS-1$
- setUpdateByPrimaryKeyWithBLOBsStatementId(sb.toString());
-
- sb.setLength(0);
- sb.append(MergeConstants.NEW_XML_ELEMENT_PREFIX);
- sb.append("BaseResultMap"); //$NON-NLS-1$
- setBaseResultMapId(sb.toString());
-
- sb.setLength(0);
- sb.append(MergeConstants.NEW_XML_ELEMENT_PREFIX);
- sb.append("ResultMapWithBLOBs"); //$NON-NLS-1$
- setResultMapWithBLOBsId(sb.toString());
-
- sb.setLength(0);
- sb.append(MergeConstants.NEW_XML_ELEMENT_PREFIX);
- sb.append("Example_Where_Clause"); //$NON-NLS-1$
- setExampleWhereClauseId(sb.toString());
-
- sb.setLength(0);
- sb.append(MergeConstants.NEW_XML_ELEMENT_PREFIX);
- sb.append("Base_Column_List"); //$NON-NLS-1$
- setBaseColumnListId(sb.toString());
-
- sb.setLength(0);
- sb.append(MergeConstants.NEW_XML_ELEMENT_PREFIX);
- sb.append("Blob_Column_List"); //$NON-NLS-1$
- setBlobColumnListId(sb.toString());
+ setCountByExampleStatementId("countByExample"); //$NON-NLS-1$
+ setDeleteByExampleStatementId("deleteByExample"); //$NON-NLS-1$
+ setDeleteByPrimaryKeyStatementId("deleteByPrimaryKey"); //$NON-NLS-1$
+ setInsertStatementId("insert"); //$NON-NLS-1$
+ setInsertSelectiveStatementId("insertSelective"); //$NON-NLS-1$
+ setSelectByExampleStatementId("selectByExample"); //$NON-NLS-1$
+ setSelectByExampleWithBLOBsStatementId("selectByExampleWithBLOBs"); //$NON-NLS-1$
+ setSelectByPrimaryKeyStatementId("selectByPrimaryKey"); //$NON-NLS-1$
+ setUpdateByExampleStatementId("updateByExample"); //$NON-NLS-1$
+ setUpdateByExampleSelectiveStatementId("updateByExampleSelective"); //$NON-NLS-1$
+ setUpdateByExampleWithBLOBsStatementId("updateByExampleWithBLOBs"); //$NON-NLS-1$
+ setUpdateByPrimaryKeyStatementId("updateByPrimaryKey"); //$NON-NLS-1$
+ setUpdateByPrimaryKeySelectiveStatementId("updateByPrimaryKeySelective"); //$NON-NLS-1$
+ setUpdateByPrimaryKeyWithBLOBsStatementId("updateByPrimaryKeyWithBLOBs"); //$NON-NLS-1$
+ setBaseResultMapId("BaseResultMap"); //$NON-NLS-1$
+ setResultMapWithBLOBsId("ResultMapWithBLOBs"); //$NON-NLS-1$
+ setExampleWhereClauseId("Example_Where_Clause"); //$NON-NLS-1$
+ setBaseColumnListId("Base_Column_List"); //$NON-NLS-1$
+ setBlobColumnListId("Blob_Column_List"); //$NON-NLS-1$
}
public void setBlobColumnListId(String s) {
@@ -625,7 +547,7 @@
internalAttributes.put(InternalAttribute.ATTR_SELECT_BY_EXAMPLE_STATEMENT_ID, s);
}
- private void setInsertSelectiveStatementId(String s) {
+ public void setInsertSelectiveStatementId(String s) {
internalAttributes.put(InternalAttribute.ATTR_INSERT_SELECTIVE_STATEMENT_ID, s);
}
@@ -646,79 +568,79 @@
}
public String getBlobColumnListId() {
- return (String) internalAttributes.get(InternalAttribute.ATTR_BLOB_COLUMN_LIST_ID);
+ return internalAttributes.get(InternalAttribute.ATTR_BLOB_COLUMN_LIST_ID);
}
public String getBaseColumnListId() {
- return (String) internalAttributes.get(InternalAttribute.ATTR_BASE_COLUMN_LIST_ID);
+ return internalAttributes.get(InternalAttribute.ATTR_BASE_COLUMN_LIST_ID);
}
public String getExampleWhereClauseId() {
- return (String) internalAttributes.get(InternalAttribute.ATTR_EXAMPLE_WHERE_CLAUSE_ID);
+ return internalAttributes.get(InternalAttribute.ATTR_EXAMPLE_WHERE_CLAUSE_ID);
}
public String getResultMapWithBLOBsId() {
- return (String) internalAttributes.get(InternalAttribute.ATTR_RESULT_MAP_WITH_BLOBS_ID);
+ return internalAttributes.get(InternalAttribute.ATTR_RESULT_MAP_WITH_BLOBS_ID);
}
public String getBaseResultMapId() {
- return (String) internalAttributes.get(InternalAttribute.ATTR_BASE_RESULT_MAP_ID);
+ return internalAttributes.get(InternalAttribute.ATTR_BASE_RESULT_MAP_ID);
}
public String getUpdateByPrimaryKeyWithBLOBsStatementId() {
- return (String) internalAttributes.get(InternalAttribute.ATTR_UPDATE_BY_PRIMARY_KEY_WITH_BLOBS_STATEMENT_ID);
+ return internalAttributes.get(InternalAttribute.ATTR_UPDATE_BY_PRIMARY_KEY_WITH_BLOBS_STATEMENT_ID);
}
public String getUpdateByPrimaryKeySelectiveStatementId() {
- return (String) internalAttributes.get(InternalAttribute.ATTR_UPDATE_BY_PRIMARY_KEY_SELECTIVE_STATEMENT_ID);
+ return internalAttributes.get(InternalAttribute.ATTR_UPDATE_BY_PRIMARY_KEY_SELECTIVE_STATEMENT_ID);
}
public String getUpdateByPrimaryKeyStatementId() {
- return (String) internalAttributes.get(InternalAttribute.ATTR_UPDATE_BY_PRIMARY_KEY_STATEMENT_ID);
+ return internalAttributes.get(InternalAttribute.ATTR_UPDATE_BY_PRIMARY_KEY_STATEMENT_ID);
}
public String getUpdateByExampleWithBLOBsStatementId() {
- return (String) internalAttributes.get(InternalAttribute.ATTR_UPDATE_BY_EXAMPLE_WITH_BLOBS_STATEMENT_ID);
+ return internalAttributes.get(InternalAttribute.ATTR_UPDATE_BY_EXAMPLE_WITH_BLOBS_STATEMENT_ID);
}
public String getUpdateByExampleSelectiveStatementId() {
- return (String) internalAttributes.get(InternalAttribute.ATTR_UPDATE_BY_EXAMPLE_SELECTIVE_STATEMENT_ID);
+ return internalAttributes.get(InternalAttribute.ATTR_UPDATE_BY_EXAMPLE_SELECTIVE_STATEMENT_ID);
}
public String getUpdateByExampleStatementId() {
- return (String) internalAttributes.get(InternalAttribute.ATTR_UPDATE_BY_EXAMPLE_STATEMENT_ID);
+ return internalAttributes.get(InternalAttribute.ATTR_UPDATE_BY_EXAMPLE_STATEMENT_ID);
}
public String getSelectByPrimaryKeyStatementId() {
- return (String) internalAttributes.get(InternalAttribute.ATTR_SELECT_BY_PRIMARY_KEY_STATEMENT_ID);
+ return internalAttributes.get(InternalAttribute.ATTR_SELECT_BY_PRIMARY_KEY_STATEMENT_ID);
}
public String getSelectByExampleWithBLOBsStatementId() {
- return (String) internalAttributes.get(InternalAttribute.ATTR_SELECT_BY_EXAMPLE_WITH_BLOBS_STATEMENT_ID);
+ return internalAttributes.get(InternalAttribute.ATTR_SELECT_BY_EXAMPLE_WITH_BLOBS_STATEMENT_ID);
}
public String getSelectByExampleStatementId() {
- return (String) internalAttributes.get(InternalAttribute.ATTR_SELECT_BY_EXAMPLE_STATEMENT_ID);
+ return internalAttributes.get(InternalAttribute.ATTR_SELECT_BY_EXAMPLE_STATEMENT_ID);
}
public String getInsertSelectiveStatementId() {
- return (String) internalAttributes.get(InternalAttribute.ATTR_INSERT_SELECTIVE_STATEMENT_ID);
+ return internalAttributes.get(InternalAttribute.ATTR_INSERT_SELECTIVE_STATEMENT_ID);
}
public String getInsertStatementId() {
- return (String) internalAttributes.get(InternalAttribute.ATTR_INSERT_STATEMENT_ID);
+ return internalAttributes.get(InternalAttribute.ATTR_INSERT_STATEMENT_ID);
}
public String getDeleteByPrimaryKeyStatementId() {
- return (String) internalAttributes.get(InternalAttribute.ATTR_DELETE_BY_PRIMARY_KEY_STATEMENT_ID);
+ return internalAttributes.get(InternalAttribute.ATTR_DELETE_BY_PRIMARY_KEY_STATEMENT_ID);
}
public String getDeleteByExampleStatementId() {
- return (String) internalAttributes.get(InternalAttribute.ATTR_DELETE_BY_EXAMPLE_STATEMENT_ID);
+ return internalAttributes.get(InternalAttribute.ATTR_DELETE_BY_EXAMPLE_STATEMENT_ID);
}
public String getCountByExampleStatementId() {
- return (String) internalAttributes.get(InternalAttribute.ATTR_COUNT_BY_EXAMPLE_STATEMENT_ID);
+ return internalAttributes.get(InternalAttribute.ATTR_COUNT_BY_EXAMPLE_STATEMENT_ID);
}
protected String calculateDAOImplementationPackage() {
@@ -765,16 +687,14 @@
sb.append('.');
sb.append(fullyQualifiedTable.getDomainObjectName());
sb.append("DAOImpl"); //$NON-NLS-1$
- FullyQualifiedJavaType fqjt = new FullyQualifiedJavaType(sb.toString());
- setDAOImplementationType(fqjt);
+ setDAOImplementationType(sb.toString());
sb.setLength(0);
sb.append(calculateDAOInterfacePackage());
sb.append('.');
sb.append(fullyQualifiedTable.getDomainObjectName());
sb.append("DAO"); //$NON-NLS-1$
- fqjt = new FullyQualifiedJavaType(sb.toString());
- setDAOInterfaceType(fqjt);
+ setDAOInterfaceType(sb.toString());
}
protected String calculateJavaModelPackage() {
@@ -797,31 +717,27 @@
sb.append('.');
sb.append(fullyQualifiedTable.getDomainObjectName());
sb.append("Key"); //$NON-NLS-1$
- FullyQualifiedJavaType fqjt = new FullyQualifiedJavaType(sb.toString());
- setPrimaryKeyType(fqjt);
+ setPrimaryKeyType(sb.toString());
sb.setLength(0);
sb.append(pakkage);
sb.append('.');
sb.append(fullyQualifiedTable.getDomainObjectName());
- fqjt = new FullyQualifiedJavaType(sb.toString());
- setBaseRecordType(fqjt);
+ setBaseRecordType(sb.toString());
sb.setLength(0);
sb.append(pakkage);
sb.append('.');
sb.append(fullyQualifiedTable.getDomainObjectName());
sb.append("WithBLOBs"); //$NON-NLS-1$
- fqjt = new FullyQualifiedJavaType(sb.toString());
- setRecordWithBLOBsType(fqjt);
+ setRecordWithBLOBsType(sb.toString());
sb.setLength(0);
sb.append(pakkage);
sb.append('.');
sb.append(fullyQualifiedTable.getDomainObjectName());
sb.append("Example"); //$NON-NLS-1$
- fqjt = new FullyQualifiedJavaType(sb.toString());
- setExampleType(fqjt);
+ setExampleType(sb.toString());
}
protected String calculateSqlMapPackage() {
@@ -854,11 +770,11 @@
}
public String getFullyQualifiedTableNameAtRuntime() {
- return (String) internalAttributes.get(InternalAttribute.ATTR_SQL_MAP_FULLY_QUALIFIED_TABLE_NAME_AT_RUNTIME);
+ return internalAttributes.get(InternalAttribute.ATTR_SQL_MAP_FULLY_QUALIFIED_TABLE_NAME_AT_RUNTIME);
}
public String getAliasedFullyQualifiedTableNameAtRuntime() {
- return (String) internalAttributes.get(InternalAttribute.ATTR_SQL_MAP_ALIASED_FULLY_QUALIFIED_TABLE_NAME_AT_RUNTIME);
+ return internalAttributes.get(InternalAttribute.ATTR_SQL_MAP_ALIASED_FULLY_QUALIFIED_TABLE_NAME_AT_RUNTIME);
}
@@ -922,27 +838,27 @@
return tableConfiguration;
}
- public void setDAOImplementationType(FullyQualifiedJavaType DAOImplementationType) {
+ public void setDAOImplementationType(String DAOImplementationType) {
internalAttributes.put(InternalAttribute.ATTR_DAO_IMPLEMENTATION_TYPE, DAOImplementationType);
}
- public void setDAOInterfaceType(FullyQualifiedJavaType DAOInterfaceType) {
+ public void setDAOInterfaceType(String DAOInterfaceType) {
internalAttributes.put(InternalAttribute.ATTR_DAO_INTERFACE_TYPE, DAOInterfaceType);
}
- public void setPrimaryKeyType(FullyQualifiedJavaType primaryKeyType) {
+ public void setPrimaryKeyType(String primaryKeyType) {
internalAttributes.put(InternalAttribute.ATTR_PRIMARY_KEY_TYPE, primaryKeyType);
}
- public void setBaseRecordType(FullyQualifiedJavaType baseRecordType) {
+ public void setBaseRecordType(String baseRecordType) {
internalAttributes.put(InternalAttribute.ATTR_BASE_RECORD_TYPE, baseRecordType);
}
- public void setRecordWithBLOBsType(FullyQualifiedJavaType recordWithBLOBsType) {
+ public void setRecordWithBLOBsType(String recordWithBLOBsType) {
internalAttributes.put(InternalAttribute.ATTR_RECORD_WITH_BLOBS_TYPE, recordWithBLOBsType);
}
- public void setExampleType(FullyQualifiedJavaType exampleType) {
+ public void setExampleType(String exampleType) {
internalAttributes.put(InternalAttribute.ATTR_EXAMPLE_TYPE, exampleType);
}
Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/InnerClass.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/InnerClass.java?rev=781254&r1=781253&r2=781254&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/InnerClass.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/InnerClass.java Wed Jun 3 03:49:27 2009
@@ -56,6 +56,10 @@
superInterfaceTypes = new HashSet<FullyQualifiedJavaType>();
methods = new ArrayList<Method>();
}
+
+ public InnerClass(String typeName) {
+ this(new FullyQualifiedJavaType(typeName));
+ }
/**
* @return Returns the fields.
@@ -82,6 +86,10 @@
public void setSuperClass(FullyQualifiedJavaType superClass) {
this.superClass = superClass;
}
+
+ public void setSuperClass(String superClassType) {
+ this.superClass = new FullyQualifiedJavaType(superClassType);
+ }
/**
* @return Returns the innerClasses.
*/
Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/Interface.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/Interface.java?rev=781254&r1=781253&r2=781254&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/Interface.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/Interface.java Wed Jun 3 03:49:27 2009
@@ -52,6 +52,10 @@
fileCommentLines = new ArrayList<String>();
}
+ public Interface(String type) {
+ this(new FullyQualifiedJavaType(type));
+ }
+
public Set<FullyQualifiedJavaType> getImportedTypes() {
return Collections.unmodifiableSet(importedTypes);
}
Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/TopLevelClass.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/TopLevelClass.java?rev=781254&r1=781253&r2=781254&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/TopLevelClass.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/TopLevelClass.java Wed Jun 3 03:49:27 2009
@@ -39,8 +39,12 @@
super(type);
importedTypes = new TreeSet<FullyQualifiedJavaType>();
fileCommentLines = new ArrayList<String>();
-}
+ }
+ public TopLevelClass(String typeName) {
+ this(new FullyQualifiedJavaType(typeName));
+ }
+
/**
* @return Returns the importedTypes.
*/
Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/MergeConstants.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/MergeConstants.java?rev=781254&r1=781253&r2=781254&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/MergeConstants.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/MergeConstants.java Wed Jun 3 03:49:27 2009
@@ -31,7 +31,6 @@
private MergeConstants() {
}
- public static final String NEW_XML_ELEMENT_PREFIX = "ibatorgenerated_"; //$NON-NLS-1$
public static final String[] OLD_XML_ELEMENT_PREFIXES =
{"ibatorgenerated_", "abatorgenerated_"}; //$NON-NLS-1$ //$NON-NLS-2$
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=781254&r1=781253&r2=781254&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 Wed Jun 3 03:49:27 2009
@@ -103,8 +103,8 @@
}
protected TopLevelClass getTopLevelClassShell() {
- FullyQualifiedJavaType interfaceType = introspectedTable.getDAOInterfaceType();
- FullyQualifiedJavaType implementationType = introspectedTable.getDAOImplementationType();
+ FullyQualifiedJavaType interfaceType = new FullyQualifiedJavaType(introspectedTable.getDAOInterfaceType());
+ FullyQualifiedJavaType implementationType = new FullyQualifiedJavaType(introspectedTable.getDAOImplementationType());
CommentGenerator commentGenerator = ibatorContext.getCommentGenerator();
@@ -139,7 +139,7 @@
}
protected Interface getInterfaceShell() {
- Interface answer = new Interface(introspectedTable.getDAOInterfaceType());
+ Interface answer = new Interface(new FullyQualifiedJavaType(introspectedTable.getDAOInterfaceType()));
answer.setVisibility(JavaVisibility.PUBLIC);
String rootInterface = introspectedTable.getTableConfigurationProperty(PropertyRegistry.ANY_ROOT_INTERFACE);
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=781254&r1=781253&r2=781254&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 Wed Jun 3 03:49:27 2009
@@ -78,7 +78,7 @@
}
private Method getMethodShell(Set<FullyQualifiedJavaType> importedTypes) {
- FullyQualifiedJavaType type = introspectedTable.getExampleType();
+ FullyQualifiedJavaType type = new FullyQualifiedJavaType(introspectedTable.getExampleType());
importedTypes.add(type);
Method method = new 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=781254&r1=781253&r2=781254&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 Wed Jun 3 03:49:27 2009
@@ -68,7 +68,7 @@
}
private Method getMethodShell(Set<FullyQualifiedJavaType> importedTypes) {
- FullyQualifiedJavaType type = introspectedTable.getExampleType();
+ FullyQualifiedJavaType type = new FullyQualifiedJavaType(introspectedTable.getExampleType());
importedTypes.add(type);
Method method = new 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=781254&r1=781253&r2=781254&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 Wed Jun 3 03:49:27 2009
@@ -48,8 +48,8 @@
if (!introspectedTable.getRules().generatePrimaryKeyClass()) {
// no primary key class, but primary key is enabled. Primary
// key columns must be in the base class.
- FullyQualifiedJavaType keyType = introspectedTable
- .getBaseRecordType();
+ FullyQualifiedJavaType keyType =
+ new FullyQualifiedJavaType(introspectedTable.getBaseRecordType());
topLevelClass.addImportedType(keyType);
sb.setLength(0);
@@ -103,7 +103,7 @@
.getDeleteByPrimaryKeyMethodName(introspectedTable));
if (introspectedTable.getRules().generatePrimaryKeyClass()) {
- FullyQualifiedJavaType type = introspectedTable.getPrimaryKeyType();
+ FullyQualifiedJavaType type = new FullyQualifiedJavaType(introspectedTable.getPrimaryKeyType());
importedTypes.add(type);
method.addParameter(new Parameter(type, "key")); //$NON-NLS-1$
} else {
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=781254&r1=781253&r2=781254&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 Wed Jun 3 03:49:27 2009
@@ -78,7 +78,7 @@
}
private Method getMethodShell(Set<FullyQualifiedJavaType> importedTypes) {
- FullyQualifiedJavaType type = introspectedTable.getExampleType();
+ FullyQualifiedJavaType type = new FullyQualifiedJavaType(introspectedTable.getExampleType());
importedTypes.add(type);
importedTypes.add(FullyQualifiedJavaType.getNewListInstance());
@@ -90,10 +90,10 @@
if (generateForJava5) {
FullyQualifiedJavaType fqjt;
if (introspectedTable.getRules().generateRecordWithBLOBsClass()) {
- fqjt = introspectedTable.getRecordWithBLOBsType();
+ fqjt = new FullyQualifiedJavaType(introspectedTable.getRecordWithBLOBsType());
} else {
// the blob fields must be rolled up into the base class
- fqjt = introspectedTable.getBaseRecordType();
+ fqjt = new FullyQualifiedJavaType(introspectedTable.getBaseRecordType());
}
importedTypes.add(fqjt);
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=781254&r1=781253&r2=781254&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 Wed Jun 3 03:49:27 2009
@@ -78,7 +78,7 @@
}
private Method getMethodShell(Set<FullyQualifiedJavaType> importedTypes) {
- FullyQualifiedJavaType type = introspectedTable.getExampleType();
+ FullyQualifiedJavaType type = new FullyQualifiedJavaType(introspectedTable.getExampleType());
importedTypes.add(type);
importedTypes.add(FullyQualifiedJavaType.getNewListInstance());
@@ -91,9 +91,9 @@
if (generateForJava5) {
FullyQualifiedJavaType fqjt;
if (introspectedTable.getRules().generateBaseRecordClass()) {
- fqjt = introspectedTable.getBaseRecordType();
+ fqjt = new FullyQualifiedJavaType(introspectedTable.getBaseRecordType());
} else if (introspectedTable.getRules().generatePrimaryKeyClass()) {
- fqjt = introspectedTable.getPrimaryKeyType();
+ fqjt = new FullyQualifiedJavaType(introspectedTable.getPrimaryKeyType());
} else {
throw new RuntimeException(Messages
.getString("RuntimeError.12")); //$NON-NLS-1$
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=781254&r1=781253&r2=781254&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 Wed Jun 3 03:49:27 2009
@@ -49,8 +49,8 @@
if (!introspectedTable.getRules().generatePrimaryKeyClass()) {
// no primary key class, but primary key is enabled. Primary
// key columns must be in the base class.
- FullyQualifiedJavaType keyType = introspectedTable
- .getBaseRecordType();
+ FullyQualifiedJavaType keyType =
+ new FullyQualifiedJavaType(introspectedTable.getBaseRecordType());
topLevelClass.addImportedType(keyType);
sb.setLength(0);
@@ -106,8 +106,8 @@
Method method = new Method();
method.setVisibility(JavaVisibility.PUBLIC);
- FullyQualifiedJavaType returnType = introspectedTable.getRules()
- .calculateAllFieldsClass();
+ FullyQualifiedJavaType returnType =
+ introspectedTable.getRules().calculateAllFieldsClass();
method.setReturnType(returnType);
importedTypes.add(returnType);
@@ -115,7 +115,7 @@
.getSelectByPrimaryKeyMethodName(introspectedTable));
if (introspectedTable.getRules().generatePrimaryKeyClass()) {
- FullyQualifiedJavaType type = introspectedTable.getPrimaryKeyType();
+ FullyQualifiedJavaType type = new FullyQualifiedJavaType(introspectedTable.getPrimaryKeyType());
importedTypes.add(type);
method.addParameter(new Parameter(type, "key")); //$NON-NLS-1$
} else {
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=781254&r1=781253&r2=781254&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 Wed Jun 3 03:49:27 2009
@@ -38,7 +38,7 @@
@Override
public void addImplementationElements(TopLevelClass topLevelClass) {
- topLevelClass.addImportedType(introspectedTable.getExampleType());
+ topLevelClass.addImportedType(new FullyQualifiedJavaType(introspectedTable.getExampleType()));
InnerClass innerClass = new InnerClass(
new FullyQualifiedJavaType("UpdateByExampleParms")); //$NON-NLS-1$
@@ -55,7 +55,7 @@
new Parameter(FullyQualifiedJavaType.getObjectInstance(),
"record")); //$NON-NLS-1$
method.addParameter(
- new Parameter(introspectedTable.getExampleType(),
+ new Parameter(new FullyQualifiedJavaType(introspectedTable.getExampleType()),
"example")); //$NON-NLS-1$
method.addBodyLine("super(example);"); //$NON-NLS-1$
method.addBodyLine("this.record = record;"); //$NON-NLS-1$
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=781254&r1=781253&r2=781254&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 Wed Jun 3 03:49:27 2009
@@ -75,11 +75,11 @@
FullyQualifiedJavaType parameterType;
if (introspectedTable.getRules().generateRecordWithBLOBsClass()) {
- parameterType = introspectedTable.getRecordWithBLOBsType();
+ parameterType = new FullyQualifiedJavaType(introspectedTable.getRecordWithBLOBsType());
} else if (introspectedTable.getRules().generateBaseRecordClass()) {
- parameterType = introspectedTable.getBaseRecordType();
+ parameterType = new FullyQualifiedJavaType(introspectedTable.getBaseRecordType());
} else {
- parameterType = introspectedTable.getPrimaryKeyType();
+ parameterType = new FullyQualifiedJavaType(introspectedTable.getPrimaryKeyType());
}
importedTypes.add(parameterType);
@@ -90,8 +90,8 @@
method.setName(getDAOMethodNameCalculator()
.getUpdateByExampleSelectiveMethodName(introspectedTable));
method.addParameter(new Parameter(parameterType, "record")); //$NON-NLS-1$
- method.addParameter(new Parameter(introspectedTable.getExampleType(),
- "example")); //$NON-NLS-1$
+ method.addParameter(new Parameter(
+ new FullyQualifiedJavaType(introspectedTable.getExampleType()), "example")); //$NON-NLS-1$
for (FullyQualifiedJavaType fqjt : daoTemplate.getCheckedExceptions()) {
method.addException(fqjt);
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=781254&r1=781253&r2=781254&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 Wed Jun 3 03:49:27 2009
@@ -75,9 +75,9 @@
private Method getMethodShell(Set<FullyQualifiedJavaType> importedTypes) {
FullyQualifiedJavaType parameterType;
if (introspectedTable.getRules().generateRecordWithBLOBsClass()) {
- parameterType = introspectedTable.getRecordWithBLOBsType();
+ parameterType = new FullyQualifiedJavaType(introspectedTable.getRecordWithBLOBsType());
} else {
- parameterType = introspectedTable.getBaseRecordType();
+ parameterType = new FullyQualifiedJavaType(introspectedTable.getBaseRecordType());
}
importedTypes.add(parameterType);
@@ -87,7 +87,8 @@
method.setReturnType(FullyQualifiedJavaType.getIntInstance());
method.setName(getDAOMethodNameCalculator().getUpdateByExampleWithBLOBsMethodName(introspectedTable));
method.addParameter(new Parameter(parameterType, "record")); //$NON-NLS-1$
- method.addParameter(new Parameter(introspectedTable.getExampleType(), "example")); //$NON-NLS-1$
+ method.addParameter(new Parameter(
+ new FullyQualifiedJavaType(introspectedTable.getExampleType()), "example")); //$NON-NLS-1$
for (FullyQualifiedJavaType fqjt : daoTemplate.getCheckedExceptions()) {
method.addException(fqjt);
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=781254&r1=781253&r2=781254&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 Wed Jun 3 03:49:27 2009
@@ -75,9 +75,9 @@
private Method getMethodShell(Set<FullyQualifiedJavaType> importedTypes) {
FullyQualifiedJavaType parameterType;
if (introspectedTable.getRules().generateBaseRecordClass()) {
- parameterType = introspectedTable.getBaseRecordType();
+ parameterType = new FullyQualifiedJavaType(introspectedTable.getBaseRecordType());
} else {
- parameterType = introspectedTable.getPrimaryKeyType();
+ parameterType = new FullyQualifiedJavaType(introspectedTable.getPrimaryKeyType());
}
importedTypes.add(parameterType);
@@ -87,7 +87,8 @@
method.setReturnType(FullyQualifiedJavaType.getIntInstance());
method.setName(getDAOMethodNameCalculator().getUpdateByExampleWithoutBLOBsMethodName(introspectedTable));
method.addParameter(new Parameter(parameterType, "record")); //$NON-NLS-1$
- method.addParameter(new Parameter(introspectedTable.getExampleType(), "example")); //$NON-NLS-1$
+ method.addParameter(new Parameter(
+ new FullyQualifiedJavaType(introspectedTable.getExampleType()), "example")); //$NON-NLS-1$
for (FullyQualifiedJavaType fqjt : daoTemplate.getCheckedExceptions()) {
method.addException(fqjt);
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=781254&r1=781253&r2=781254&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 Wed Jun 3 03:49:27 2009
@@ -72,9 +72,9 @@
FullyQualifiedJavaType parameterType;
if (introspectedTable.getRules().generateRecordWithBLOBsClass()) {
- parameterType = introspectedTable.getRecordWithBLOBsType();
+ parameterType = new FullyQualifiedJavaType(introspectedTable.getRecordWithBLOBsType());
} else {
- parameterType = introspectedTable.getBaseRecordType();
+ parameterType = new FullyQualifiedJavaType(introspectedTable.getBaseRecordType());
}
importedTypes.add(parameterType);
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=781254&r1=781253&r2=781254&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 Wed Jun 3 03:49:27 2009
@@ -72,9 +72,9 @@
FullyQualifiedJavaType parameterType;
if (introspectedTable.getRules().generateRecordWithBLOBsClass()) {
- parameterType = introspectedTable.getRecordWithBLOBsType();
+ parameterType = new FullyQualifiedJavaType(introspectedTable.getRecordWithBLOBsType());
} else {
- parameterType = introspectedTable.getBaseRecordType();
+ parameterType = new FullyQualifiedJavaType(introspectedTable.getBaseRecordType());
}
importedTypes.add(parameterType);
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=781254&r1=781253&r2=781254&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 Wed Jun 3 03:49:27 2009
@@ -70,7 +70,7 @@
private Method getMethodShell(Set<FullyQualifiedJavaType> importedTypes) {
FullyQualifiedJavaType parameterType =
- introspectedTable.getBaseRecordType();
+ new FullyQualifiedJavaType(introspectedTable.getBaseRecordType());
importedTypes.add(parameterType);
Method method = new Method();
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=781254&r1=781253&r2=781254&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 Wed Jun 3 03:49:27 2009
@@ -49,8 +49,7 @@
IbatorPlugin plugins = ibatorContext.getPlugins();
CommentGenerator commentGenerator = ibatorContext.getCommentGenerator();
- FullyQualifiedJavaType type = introspectedTable.getBaseRecordType();
- TopLevelClass topLevelClass = new TopLevelClass(type);
+ TopLevelClass topLevelClass = new TopLevelClass(introspectedTable.getBaseRecordType());
topLevelClass.setVisibility(JavaVisibility.PUBLIC);
commentGenerator.addJavaFileComment(topLevelClass);
@@ -111,7 +110,7 @@
private FullyQualifiedJavaType getSuperClass() {
FullyQualifiedJavaType superClass;
if (introspectedTable.getRules().generatePrimaryKeyClass()) {
- superClass = introspectedTable.getPrimaryKeyType();
+ superClass = new FullyQualifiedJavaType(introspectedTable.getPrimaryKeyType());
} else {
String rootClass = getRootClass();
if (rootClass != null) {
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=781254&r1=781253&r2=781254&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 Wed Jun 3 03:49:27 2009
@@ -60,7 +60,7 @@
Messages.getString("Progress.6", table.toString())); //$NON-NLS-1$
CommentGenerator commentGenerator = ibatorContext.getCommentGenerator();
- FullyQualifiedJavaType type = introspectedTable.getExampleType();
+ FullyQualifiedJavaType type = new FullyQualifiedJavaType(introspectedTable.getExampleType());
TopLevelClass topLevelClass = new TopLevelClass(type);
topLevelClass.setVisibility(JavaVisibility.PUBLIC);
commentGenerator.addJavaFileComment(topLevelClass);
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=781254&r1=781253&r2=781254&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 Wed Jun 3 03:49:27 2009
@@ -53,8 +53,7 @@
IbatorPlugin plugins = ibatorContext.getPlugins();
CommentGenerator commentGenerator = ibatorContext.getCommentGenerator();
- FullyQualifiedJavaType type = introspectedTable.getPrimaryKeyType();
- TopLevelClass topLevelClass = new TopLevelClass(type);
+ TopLevelClass topLevelClass = new TopLevelClass(introspectedTable.getPrimaryKeyType());
topLevelClass.setVisibility(JavaVisibility.PUBLIC);
commentGenerator.addJavaFileComment(topLevelClass);
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=781254&r1=781253&r2=781254&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 Wed Jun 3 03:49:27 2009
@@ -24,7 +24,6 @@
import org.apache.ibatis.ibator.api.IntrospectedColumn;
import org.apache.ibatis.ibator.api.dom.java.CompilationUnit;
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.JavaVisibility;
import org.apache.ibatis.ibator.api.dom.java.Method;
import org.apache.ibatis.ibator.api.dom.java.TopLevelClass;
@@ -53,18 +52,17 @@
IbatorPlugin plugins = ibatorContext.getPlugins();
CommentGenerator commentGenerator = ibatorContext.getCommentGenerator();
- FullyQualifiedJavaType type = introspectedTable.getRecordWithBLOBsType();
- TopLevelClass topLevelClass = new TopLevelClass(type);
+ TopLevelClass topLevelClass = new TopLevelClass(introspectedTable.getRecordWithBLOBsType());
topLevelClass.setVisibility(JavaVisibility.PUBLIC);
commentGenerator.addJavaFileComment(topLevelClass);
- String rootClass = getRootClass();
if (introspectedTable.getRules().generateBaseRecordClass()) {
topLevelClass.setSuperClass(introspectedTable.getBaseRecordType());
} else {
topLevelClass.setSuperClass(introspectedTable.getPrimaryKeyType());
}
+ String rootClass = getRootClass();
for (IntrospectedColumn introspectedColumn : introspectedTable.getBLOBColumns()) {
if (RootClassInfo.getInstance(rootClass, warnings).containsProperty(introspectedColumn)) {
continue;
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=781254&r1=781253&r2=781254&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 Wed Jun 3 03:49:27 2009
@@ -15,7 +15,6 @@
*/
package org.apache.ibatis.ibator.generator.ibatis2.sqlmap.elements;
-import org.apache.ibatis.ibator.api.dom.java.FullyQualifiedJavaType;
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;
@@ -35,13 +34,11 @@
public void addElements(XmlElement parentElement) {
XmlElement answer = new XmlElement("select"); //$NON-NLS-1$
- FullyQualifiedJavaType fqjt = introspectedTable.getExampleType();
-
answer
.addAttribute(new Attribute(
"id", introspectedTable.getCountByExampleStatementId())); //$NON-NLS-1$
answer.addAttribute(new Attribute(
- "parameterClass", fqjt.getFullyQualifiedName())); //$NON-NLS-1$
+ "parameterClass", introspectedTable.getExampleType())); //$NON-NLS-1$
answer.addAttribute(new Attribute(
"resultClass", "java.lang.Integer")); //$NON-NLS-1$ //$NON-NLS-2$
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=781254&r1=781253&r2=781254&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 Wed Jun 3 03:49:27 2009
@@ -15,7 +15,6 @@
*/
package org.apache.ibatis.ibator.generator.ibatis2.sqlmap.elements;
-import org.apache.ibatis.ibator.api.dom.java.FullyQualifiedJavaType;
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;
@@ -35,13 +34,11 @@
public void addElements(XmlElement parentElement) {
XmlElement answer = new XmlElement("delete"); //$NON-NLS-1$
- FullyQualifiedJavaType fqjt = introspectedTable.getExampleType();
-
answer
.addAttribute(new Attribute(
"id", introspectedTable.getDeleteByExampleStatementId())); //$NON-NLS-1$
answer.addAttribute(new Attribute(
- "parameterClass", fqjt.getFullyQualifiedName())); //$NON-NLS-1$
+ "parameterClass", introspectedTable.getExampleType())); //$NON-NLS-1$
ibatorContext.getCommentGenerator().addComment(answer);
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=781254&r1=781253&r2=781254&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 Wed Jun 3 03:49:27 2009
@@ -16,7 +16,6 @@
package org.apache.ibatis.ibator.generator.ibatis2.sqlmap.elements;
import org.apache.ibatis.ibator.api.IntrospectedColumn;
-import org.apache.ibatis.ibator.api.dom.java.FullyQualifiedJavaType;
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;
@@ -39,14 +38,14 @@
answer.addAttribute(new Attribute(
"id", introspectedTable.getDeleteByPrimaryKeyStatementId())); //$NON-NLS-1$
- FullyQualifiedJavaType parameterClass;
+ String parameterClass;
if (introspectedTable.getRules().generatePrimaryKeyClass()) {
parameterClass = introspectedTable.getPrimaryKeyType();
} else {
parameterClass = introspectedTable.getBaseRecordType();
}
answer.addAttribute(new Attribute("parameterClass", //$NON-NLS-1$
- parameterClass.getFullyQualifiedName()));
+ parameterClass));
ibatorContext.getCommentGenerator().addComment(answer);
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=781254&r1=781253&r2=781254&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 Wed Jun 3 03:49:27 2009
@@ -16,7 +16,6 @@
package org.apache.ibatis.ibator.generator.ibatis2.sqlmap.elements;
import org.apache.ibatis.ibator.api.IntrospectedColumn;
-import org.apache.ibatis.ibator.api.dom.java.FullyQualifiedJavaType;
import org.apache.ibatis.ibator.api.dom.xml.Attribute;
import org.apache.ibatis.ibator.api.dom.xml.XmlElement;
import org.apache.ibatis.ibator.config.PropertyRegistry;
@@ -44,7 +43,7 @@
answer.addAttribute(new Attribute("id", //$NON-NLS-1$
introspectedTable.getResultMapWithBLOBsId()));
- FullyQualifiedJavaType returnType;
+ String returnType;
if (introspectedTable.getRules().generateRecordWithBLOBsClass()) {
returnType = introspectedTable.getRecordWithBLOBsType();
} else {
@@ -54,7 +53,7 @@
}
answer.addAttribute(new Attribute("class", //$NON-NLS-1$
- returnType.getFullyQualifiedName()));
+ returnType));
StringBuilder sb = new StringBuilder();
sb.append(introspectedTable.getSqlMapNamespace());
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=781254&r1=781253&r2=781254&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 Wed Jun 3 03:49:27 2009
@@ -16,7 +16,6 @@
package org.apache.ibatis.ibator.generator.ibatis2.sqlmap.elements;
import org.apache.ibatis.ibator.api.IntrospectedColumn;
-import org.apache.ibatis.ibator.api.dom.java.FullyQualifiedJavaType;
import org.apache.ibatis.ibator.api.dom.xml.Attribute;
import org.apache.ibatis.ibator.api.dom.xml.XmlElement;
import org.apache.ibatis.ibator.config.PropertyRegistry;
@@ -42,7 +41,7 @@
answer.addAttribute(new Attribute("id", //$NON-NLS-1$
introspectedTable.getBaseResultMapId()));
- FullyQualifiedJavaType returnType;
+ String returnType;
if (introspectedTable.getRules().generateBaseRecordClass()) {
returnType = introspectedTable.getBaseRecordType();
} else {
@@ -50,7 +49,7 @@
}
answer.addAttribute(new Attribute("class", //$NON-NLS-1$
- returnType.getFullyQualifiedName()));
+ returnType));
ibatorContext.getCommentGenerator().addComment(answer);
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=781254&r1=781253&r2=781254&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 Wed Jun 3 03:49:27 2009
@@ -15,7 +15,6 @@
*/
package org.apache.ibatis.ibator.generator.ibatis2.sqlmap.elements;
-import org.apache.ibatis.ibator.api.dom.java.FullyQualifiedJavaType;
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;
@@ -35,15 +34,13 @@
@Override
public void addElements(XmlElement parentElement) {
- FullyQualifiedJavaType fqjt = introspectedTable.getExampleType();
-
XmlElement answer = new XmlElement("select"); //$NON-NLS-1$
answer.addAttribute(new Attribute(
"id", introspectedTable.getSelectByExampleWithBLOBsStatementId())); //$NON-NLS-1$
answer.addAttribute(new Attribute(
"resultMap", introspectedTable.getResultMapWithBLOBsId())); //$NON-NLS-1$
answer.addAttribute(new Attribute(
- "parameterClass", fqjt.getFullyQualifiedName())); //$NON-NLS-1$
+ "parameterClass", introspectedTable.getExampleType())); //$NON-NLS-1$
ibatorContext.getCommentGenerator().addComment(answer);
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=781254&r1=781253&r2=781254&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 Wed Jun 3 03:49:27 2009
@@ -15,7 +15,6 @@
*/
package org.apache.ibatis.ibator.generator.ibatis2.sqlmap.elements;
-import org.apache.ibatis.ibator.api.dom.java.FullyQualifiedJavaType;
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;
@@ -34,8 +33,6 @@
@Override
public void addElements(XmlElement parentElement) {
- FullyQualifiedJavaType fqjt = introspectedTable.getExampleType();
-
XmlElement answer = new XmlElement("select"); //$NON-NLS-1$
answer.addAttribute(new Attribute("id", //$NON-NLS-1$
@@ -44,7 +41,7 @@
.addAttribute(new Attribute(
"resultMap", introspectedTable.getBaseResultMapId())); //$NON-NLS-1$
answer.addAttribute(new Attribute(
- "parameterClass", fqjt.getFullyQualifiedName())); //$NON-NLS-1$
+ "parameterClass", introspectedTable.getExampleType())); //$NON-NLS-1$
ibatorContext.getCommentGenerator().addComment(answer);
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=781254&r1=781253&r2=781254&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 Wed Jun 3 03:49:27 2009
@@ -16,7 +16,6 @@
package org.apache.ibatis.ibator.generator.ibatis2.sqlmap.elements;
import org.apache.ibatis.ibator.api.IntrospectedColumn;
-import org.apache.ibatis.ibator.api.dom.java.FullyQualifiedJavaType;
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;
@@ -48,7 +47,7 @@
introspectedTable.getBaseResultMapId()));
}
- FullyQualifiedJavaType parameterType;
+ String parameterType;
if (introspectedTable.getRules().generatePrimaryKeyClass()) {
parameterType = introspectedTable.getPrimaryKeyType();
} else {
@@ -58,7 +57,7 @@
}
answer.addAttribute(new Attribute("parameterClass", //$NON-NLS-1$
- parameterType.getFullyQualifiedName()));
+ parameterType));
ibatorContext.getCommentGenerator().addComment(answer);
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=781254&r1=781253&r2=781254&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 Wed Jun 3 03:49:27 2009
@@ -16,7 +16,6 @@
package org.apache.ibatis.ibator.generator.ibatis2.sqlmap.elements;
import org.apache.ibatis.ibator.api.IntrospectedColumn;
-import org.apache.ibatis.ibator.api.dom.java.FullyQualifiedJavaType;
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;
@@ -41,7 +40,7 @@
answer.addAttribute(new Attribute(
"id", introspectedTable.getUpdateByPrimaryKeySelectiveStatementId())); //$NON-NLS-1$
- FullyQualifiedJavaType parameterType;
+ String parameterType;
if (introspectedTable.getRules().generateRecordWithBLOBsClass()) {
parameterType = introspectedTable.getRecordWithBLOBsType();
@@ -50,7 +49,7 @@
}
answer.addAttribute(new Attribute("parameterClass", //$NON-NLS-1$
- parameterType.getFullyQualifiedName()));
+ parameterType));
ibatorContext.getCommentGenerator().addComment(answer);
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=781254&r1=781253&r2=781254&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 Wed Jun 3 03:49:27 2009
@@ -19,7 +19,6 @@
import org.apache.ibatis.ibator.api.IntrospectedColumn;
import org.apache.ibatis.ibator.api.dom.OutputUtilities;
-import org.apache.ibatis.ibator.api.dom.java.FullyQualifiedJavaType;
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;
@@ -44,7 +43,7 @@
answer.addAttribute(new Attribute(
"id", introspectedTable.getUpdateByPrimaryKeyWithBLOBsStatementId())); //$NON-NLS-1$
- FullyQualifiedJavaType parameterType;
+ String parameterType;
if (introspectedTable.getRules().generateRecordWithBLOBsClass()) {
parameterType = introspectedTable.getRecordWithBLOBsType();
@@ -53,7 +52,7 @@
}
answer.addAttribute(new Attribute("parameterClass", //$NON-NLS-1$
- parameterType.getFullyQualifiedName()));
+ parameterType));
ibatorContext.getCommentGenerator().addComment(answer);
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=781254&r1=781253&r2=781254&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 Wed Jun 3 03:49:27 2009
@@ -43,7 +43,7 @@
answer.addAttribute(new Attribute(
"id", introspectedTable.getUpdateByPrimaryKeyStatementId())); //$NON-NLS-1$
answer.addAttribute(new Attribute("parameterClass", //$NON-NLS-1$
- introspectedTable.getBaseRecordType().getFullyQualifiedName()));
+ introspectedTable.getBaseRecordType()));
ibatorContext.getCommentGenerator().addComment(answer);
Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/DefaultCommentGenerator.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/DefaultCommentGenerator.java?rev=781254&r1=781253&r2=781254&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/DefaultCommentGenerator.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/DefaultCommentGenerator.java Wed Jun 3 03:49:27 2009
@@ -250,12 +250,17 @@
*/
public void addComment(XmlElement xmlElement) {
xmlElement.addElement(new TextElement("<!--")); //$NON-NLS-1$
+
+ StringBuilder sb = new StringBuilder();
+ sb.append(" WARNING - "); //$NON-NLS-1$
+ sb.append(MergeConstants.NEW_JAVA_ELEMENT_TAG);
+ xmlElement.addElement(new TextElement(sb.toString()));
xmlElement.addElement(new TextElement(
- " WARNING - This element is automatically generated by Apache iBATIS Ibator, do not modify.")); //$NON-NLS-1$
+ " This element is automatically generated by Apache iBATIS Ibator, do not modify.")); //$NON-NLS-1$
String s = getDateString();
if (s != null) {
- StringBuilder sb = new StringBuilder();
+ sb.setLength(0);
sb.append(" This element was generated on "); //$NON-NLS-1$
sb.append(s);
sb.append('.');
Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/XmlFileMergerJaxp.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/XmlFileMergerJaxp.java?rev=781254&r1=781253&r2=781254&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/XmlFileMergerJaxp.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/XmlFileMergerJaxp.java Wed Jun 3 03:49:27 2009
@@ -28,6 +28,7 @@
import org.apache.ibatis.ibator.config.MergeConstants;
import org.apache.ibatis.ibator.exception.ShellException;
import org.apache.ibatis.ibator.internal.util.messages.Messages;
+import org.w3c.dom.Comment;
import org.w3c.dom.Document;
import org.w3c.dom.DocumentType;
import org.w3c.dom.Element;
@@ -178,8 +179,30 @@
}
}
}
- }
+ if (rc == false) {
+ // check for new node format - if the first non-whitespace node
+ // is an XML comment, and the comment include "@ibatorgenerated",
+ // then it is an ibator node
+ NodeList children = node.getChildNodes();
+ int length = children.getLength();
+ for (int i = 0; i < length; i++) {
+ Node childNode = children.item(i);
+ if (isWhiteSpace(childNode)) {
+ continue;
+ } else if (childNode.getNodeType() == Node.COMMENT_NODE) {
+ Comment comment = (Comment) childNode;
+ if (comment.getData().indexOf(MergeConstants.NEW_JAVA_ELEMENT_TAG) != -1) {
+ rc = true;
+ break;
+ }
+ } else {
+ break;
+ }
+ }
+ }
+ }
+
return rc;
}
Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/rules/BaseIbatorRules.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/rules/BaseIbatorRules.java?rev=781254&r1=781253&r2=781254&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/rules/BaseIbatorRules.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/rules/BaseIbatorRules.java Wed Jun 3 03:49:27 2009
@@ -72,7 +72,7 @@
*/
public FullyQualifiedJavaType calculateAllFieldsClass() {
- FullyQualifiedJavaType answer;
+ String answer;
if (generateRecordWithBLOBsClass()) {
answer = introspectedTable.getRecordWithBLOBsType();
@@ -82,7 +82,7 @@
answer = introspectedTable.getPrimaryKeyType();
}
- return answer;
+ return new FullyQualifiedJavaType(answer);
}
/**
Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/plugins/RenameExampleClassPlugin.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/plugins/RenameExampleClassPlugin.java?rev=781254&r1=781253&r2=781254&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/plugins/RenameExampleClassPlugin.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/plugins/RenameExampleClassPlugin.java Wed Jun 3 03:49:27 2009
@@ -22,7 +22,6 @@
import org.apache.ibatis.ibator.api.IbatorPluginAdapter;
import org.apache.ibatis.ibator.api.IntrospectedTable;
-import org.apache.ibatis.ibator.api.dom.java.FullyQualifiedJavaType;
import org.apache.ibatis.ibator.internal.util.StringUtility;
import org.apache.ibatis.ibator.internal.util.messages.Messages;
@@ -93,12 +92,10 @@
@Override
public void initialized(IntrospectedTable introspectedTable) {
- FullyQualifiedJavaType oldType = introspectedTable.getExampleType();
+ String oldType = introspectedTable.getExampleType();
+ Matcher matcher = pattern.matcher(oldType);
+ oldType = matcher.replaceAll(replaceString);
- String typeName = oldType.getFullyQualifiedName();
- Matcher matcher = pattern.matcher(typeName);
- typeName = matcher.replaceAll(replaceString);
-
- introspectedTable.setExampleType(new FullyQualifiedJavaType(typeName));
+ introspectedTable.setExampleType(oldType);
}
}
Modified: ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/miscellaneous/MiscellaneousTests.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/miscellaneous/MiscellaneousTests.java?rev=781254&r1=781253&r2=781254&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/miscellaneous/MiscellaneousTests.java (original)
+++ ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/miscellaneous/MiscellaneousTests.java Wed Jun 3 03:49:27 2009
@@ -903,13 +903,13 @@
record.setSelect("select");
record.setInsert("insert");
- sqlMap.insert("ANOTHERAWFULTABLE.ibatorgenerated_insert", record);
+ sqlMap.insert("ANOTHERAWFULTABLE.insert", record);
Anotherawfultable key = new Anotherawfultable();
key.setId(5);
Anotherawfultable returnedRecord = (Anotherawfultable)
- sqlMap.queryForObject("ANOTHERAWFULTABLE.ibatorgenerated_selectByPrimaryKey",
+ sqlMap.queryForObject("ANOTHERAWFULTABLE.selectByPrimaryKey",
key);
assertEquals(record.getId(), returnedRecord.getId());