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 2006/07/17 21:38:01 UTC
svn commit: r422812 - in /ibatis/trunk/java/mapper/mapper2/tools/abator:
core/build/ core/htmldoc/configreference/
core/src/org/apache/ibatis/abator/api/
core/src/org/apache/ibatis/abator/internal/db/
core/src/org/apache/ibatis/abator/internal/java/ co...
Author: jgbutler
Date: Mon Jul 17 12:38:00 2006
New Revision: 422812
URL: http://svn.apache.org/viewvc?rev=422812&view=rev
Log:
More Abator 0.7.0 Updates
Added:
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.core/buildAbator.xml
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/html/buildingFromSVN.html
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/html/importWizard.gif (with props)
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/build.xml
ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/version.properties
ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/configreference/daoGenerator.html
ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/configreference/javaModelGenerator.html
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/IntrospectedTable.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/db/IntrospectedTableImpl.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/DAOGeneratorBaseImpl.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/JavaModelGeneratorDefaultImpl.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/BaseDAOGenerator.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/model/JavaModelGeneratorJava2Impl.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/model/JavaModelGeneratorJava5Impl.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/sqlmap/SqlMapGeneratorDefaultImpl.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/sqlmap/SqlMapGeneratorIterateImpl.java
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.core/abator-src.zip
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.core/abator.jar
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/toc.xml
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/src/org/apache/ibatis/abator/ui/actions/RunAbatorAction.java
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/build.xml
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/build.xml?rev=422812&r1=422811&r2=422812&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/build.xml (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/build.xml Mon Jul 17 12:38:00 2006
@@ -4,9 +4,9 @@
version.properties file (the "version" property).
-->
- <property name="src.dir" value="../src" />
- <property name="doc.dir" value="../doc" />
- <property name="html.doc.dir" value="../htmldoc" />
+ <property name="src.dir" value="${basedir}/../src" />
+ <property name="doc.dir" value="${basedir}/../doc" />
+ <property name="html.doc.dir" value="${basedir}/../htmldoc" />
<property name="deploy.dir" value="${basedir}/deploy" />
<property name="deploy.files" value="${deploy.dir}/files" />
<property name="work.dir" value="${basedir}/work" />
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/version.properties
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/version.properties?rev=422812&r1=422811&r2=422812&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/version.properties (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/version.properties Mon Jul 17 12:38:00 2006
@@ -1,4 +1,4 @@
#Abator build version info
-#Sat Jun 03 10:34:02 CDT 2006
-version=0.6.5
-buildNum=125
+#Mon Jul 17 13:25:31 CDT 2006
+version=0.7.0
+buildNum=135
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/configreference/daoGenerator.html
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/configreference/daoGenerator.html?rev=422812&r1=422811&r2=422812&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/configreference/daoGenerator.html (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/configreference/daoGenerator.html Mon Jul 17 12:38:00 2006
@@ -177,7 +177,7 @@
<td valign="top">rootInterface</td>
<td>This property can be used to specify a super interface for all generated
DAO interface objects.
- <p><b>Important:</b>Abator does not verify that the interface exists, or is a
+ <p><b>Important:</b> Abator does not verify that the interface exists, or is a
valid Java interface.</p>
<p>If specified, the value of this property should be a fully qualified
interface name (like com.mycompany.MyRootInterface).</p></td>
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/configreference/javaModelGenerator.html
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/configreference/javaModelGenerator.html?rev=422812&r1=422811&r2=422812&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/configreference/javaModelGenerator.html (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/configreference/javaModelGenerator.html Mon Jul 17 12:38:00 2006
@@ -97,7 +97,7 @@
Java model objects. Abator will specify this value as the super class
of the primary key object, if the table has a primary key, or the
record object otherwise.
- <p><b>Important:</b>Abator does not verify that the class exists, or is a
+ <p><b>Important:</b> Abator does not verify that the class exists, or is a
valid Java class. The generated classes may override elements in this
class without warning.</p>
<p>If specified, the value of this property should be a fully qualified
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/IntrospectedTable.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/IntrospectedTable.java?rev=422812&r1=422811&r2=422812&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/IntrospectedTable.java (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/IntrospectedTable.java Mon Jul 17 12:38:00 2006
@@ -16,9 +16,11 @@
package org.apache.ibatis.abator.api;
+import java.util.Iterator;
+
import org.apache.ibatis.abator.config.FullyQualifiedTable;
import org.apache.ibatis.abator.config.GeneratedKey;
-import org.apache.ibatis.abator.internal.db.ColumnDefinitions;
+import org.apache.ibatis.abator.internal.db.ColumnDefinition;
import org.apache.ibatis.abator.internal.rules.TableType;
/**
@@ -29,7 +31,6 @@
*/
public interface IntrospectedTable {
FullyQualifiedTable getTable();
- ColumnDefinitions getColumnDefinitions();
TableType getTableType();
boolean isSelectByExampleStatementEnabled();
boolean isDeleteByExampleStatementEnabled();
@@ -40,4 +41,61 @@
String getSelectByExampleQueryId();
String getSelectByPrimaryKeyQueryId();
GeneratedKey getGeneratedKey();
+
+ ColumnDefinition getColumn(String columnName);
+
+ /**
+ * Returns an iterator containing every column in the table except for
+ * BLOB columns.
+ *
+ * @return iterator of ColumnDefinition objects
+ */
+ Iterator getNonBLOBColumns();
+
+ /**
+ * Returns an iterator containing every BLOB column in the table
+ * (may be empty if the table doesn't have BLOBs).
+ *
+ * @return iterator of ColumnDefinition objects
+ */
+ Iterator getBLOBColumns();
+
+ /**
+ * Returns an iterator containing every column in the table
+ *
+ * @return iterator of ColumnDefinition objects
+ */
+ Iterator getAllColumns();
+
+ /**
+ * Returns an iterator containing every column in the table's
+ * primary key (may be empty if the table doesn't have a primary key)
+ *
+ * @return iterator of ColumnDefinition objects
+ */
+ Iterator getPrimaryKeyColumns();
+
+ /**
+ * Returns an iterator containing every column in the table
+ * that is not in the primary key (including BLOB columns)
+ *
+ * @return iterator of ColumnDefinition objects
+ */
+ Iterator getNonPrimaryKeyColumns();
+
+ /**
+ * Returns true if any of the columns in the table are JDBC Dates
+ * (as opposed to timestamps).
+ *
+ * @return
+ */
+ boolean hasJDBCDateColumns();
+
+ /**
+ * Returns true if any of the columns in the table are JDBC Times
+ * (as opposed to timestamps).
+ *
+ * @return
+ */
+ boolean hasJDBCTimeColumns();
}
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/db/IntrospectedTableImpl.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/db/IntrospectedTableImpl.java?rev=422812&r1=422811&r2=422812&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/db/IntrospectedTableImpl.java (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/db/IntrospectedTableImpl.java Mon Jul 17 12:38:00 2006
@@ -16,6 +16,8 @@
package org.apache.ibatis.abator.internal.db;
+import java.util.Iterator;
+
import org.apache.ibatis.abator.api.IntrospectedTable;
import org.apache.ibatis.abator.config.FullyQualifiedTable;
import org.apache.ibatis.abator.config.GeneratedKey;
@@ -50,13 +52,6 @@
}
/* (non-Javadoc)
- * @see org.apache.ibatis.abator.api.IntrospectedTable#getColumnDefinitions()
- */
- public ColumnDefinitions getColumnDefinitions() {
- return columnDefinitions;
- }
-
- /* (non-Javadoc)
* @see org.apache.ibatis.abator.api.IntrospectedTable#getTableType()
*/
public TableType getTableType() {
@@ -124,5 +119,37 @@
*/
public GeneratedKey getGeneratedKey() {
return tableConfiguration.getGeneratedKey();
+ }
+
+ public Iterator getAllColumns() {
+ return columnDefinitions.getAllColumns().iterator();
+ }
+
+ public Iterator getBLOBColumns() {
+ return columnDefinitions.getBLOBColumns().iterator();
+ }
+
+ public ColumnDefinition getColumn(String columnName) {
+ return columnDefinitions.getColumn(columnName);
+ }
+
+ public Iterator getNonBLOBColumns() {
+ return columnDefinitions.getNonBLOBColumns().iterator();
+ }
+
+ public Iterator getNonPrimaryKeyColumns() {
+ return columnDefinitions.getNonPrimaryKeyColumns().iterator();
+ }
+
+ public Iterator getPrimaryKeyColumns() {
+ return columnDefinitions.getPrimaryKey().iterator();
+ }
+
+ public boolean hasJDBCDateColumns() {
+ return columnDefinitions.hasJDBCDateColumns();
+ }
+
+ public boolean hasJDBCTimeColumns() {
+ return columnDefinitions.hasJDBCTimeColumns();
}
}
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/DAOGeneratorBaseImpl.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/DAOGeneratorBaseImpl.java?rev=422812&r1=422811&r2=422812&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/DAOGeneratorBaseImpl.java (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/DAOGeneratorBaseImpl.java Mon Jul 17 12:38:00 2006
@@ -478,8 +478,7 @@
FullyQualifiedJavaType returnType;
if (introspectedTable.getGeneratedKey() != null) {
- ColumnDefinition cd = introspectedTable.getColumnDefinitions()
- .getColumn(introspectedTable.getGeneratedKey().getColumn());
+ ColumnDefinition cd = introspectedTable.getColumn(introspectedTable.getGeneratedKey().getColumn());
if (cd == null) {
// the specified column doesn't exist, so don't do the generated
// key
@@ -978,7 +977,7 @@
method.addBodyLine("Map parms = new HashMap();"); //$NON-NLS-1$
- Iterator iter = introspectedTable.getColumnDefinitions().getAllColumns().iterator();
+ Iterator iter = introspectedTable.getAllColumns();
while (iter.hasNext()) {
ColumnDefinition cd = (ColumnDefinition) iter.next();
StringBuffer sb = new StringBuffer();
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/JavaModelGeneratorDefaultImpl.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/JavaModelGeneratorDefaultImpl.java?rev=422812&r1=422811&r2=422812&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/JavaModelGeneratorDefaultImpl.java (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/JavaModelGeneratorDefaultImpl.java Mon Jul 17 12:38:00 2006
@@ -16,7 +16,6 @@
package org.apache.ibatis.abator.internal.java;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -137,7 +136,7 @@
* the generated fields and methods will be added to this object
*/
protected void generateClassParts(FullyQualifiedTable table,
- Collection columnDefinitions, TopLevelClass topLevelClass) {
+ Iterator columnDefinitions, TopLevelClass topLevelClass) {
boolean trimStrings = "true".equalsIgnoreCase((String) properties //$NON-NLS-1$
.get("trimStrings")); //$NON-NLS-1$
@@ -146,9 +145,8 @@
Field field;
Method method;
- Iterator iter = columnDefinitions.iterator();
- while (iter.hasNext()) {
- ColumnDefinition cd = (ColumnDefinition) iter.next();
+ while (columnDefinitions.hasNext()) {
+ ColumnDefinition cd = (ColumnDefinition) columnDefinitions.next();
FullyQualifiedJavaType fqjt = cd.getResolvedJavaType()
.getFullyQualifiedJavaType();
@@ -314,8 +312,7 @@
method.addBodyLine("return combineTypeOr;"); //$NON-NLS-1$
topLevelClass.addMethod(method);
- iter = introspectedTable.getColumnDefinitions().getAllColumns()
- .iterator();
+ iter = introspectedTable.getAllColumns();
while (iter.hasNext()) {
ColumnDefinition cd = (ColumnDefinition) iter.next();
@@ -380,8 +377,7 @@
answer.addImportedType(fqjt);
}
- generateClassParts(table, introspectedTable.getColumnDefinitions()
- .getPrimaryKey(), answer);
+ generateClassParts(table, introspectedTable.getPrimaryKeyColumns(), answer);
return answer;
}
@@ -410,8 +406,7 @@
}
}
- generateClassParts(table, introspectedTable.getColumnDefinitions()
- .getNonBLOBColumns(), answer);
+ generateClassParts(table, introspectedTable.getNonBLOBColumns(), answer);
return answer;
}
@@ -437,8 +432,7 @@
answer.setSuperClass(getRecordType(table));
}
- generateClassParts(table, introspectedTable.getColumnDefinitions()
- .getBLOBColumns(), answer);
+ generateClassParts(table, introspectedTable.getBLOBColumns(), answer);
return answer;
}
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/BaseDAOGenerator.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/BaseDAOGenerator.java?rev=422812&r1=422811&r2=422812&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/BaseDAOGenerator.java (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/BaseDAOGenerator.java Mon Jul 17 12:38:00 2006
@@ -455,8 +455,7 @@
FullyQualifiedJavaType returnType;
if (introspectedTable.getGeneratedKey() != null) {
- ColumnDefinition cd = introspectedTable.getColumnDefinitions()
- .getColumn(
+ ColumnDefinition cd = introspectedTable.getColumn(
introspectedTable.getGeneratedKey().getColumn());
if (cd == null) {
// the specified column doesn't exist, so don't do the generated
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/model/JavaModelGeneratorJava2Impl.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/model/JavaModelGeneratorJava2Impl.java?rev=422812&r1=422811&r2=422812&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/model/JavaModelGeneratorJava2Impl.java (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/model/JavaModelGeneratorJava2Impl.java Mon Jul 17 12:38:00 2006
@@ -16,7 +16,6 @@
package org.apache.ibatis.abator.internal.java.model;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -137,7 +136,7 @@
* the generated fields and methods will be added to this object
*/
protected void generateClassParts(FullyQualifiedTable table,
- Collection columnDefinitions, TopLevelClass topLevelClass) {
+ Iterator columnDefinitions, TopLevelClass topLevelClass) {
boolean trimStrings = "true".equalsIgnoreCase((String) properties //$NON-NLS-1$
.get("trimStrings")); //$NON-NLS-1$
@@ -146,9 +145,8 @@
Field field;
Method method;
- Iterator iter = columnDefinitions.iterator();
- while (iter.hasNext()) {
- ColumnDefinition cd = (ColumnDefinition) iter.next();
+ while (columnDefinitions.hasNext()) {
+ ColumnDefinition cd = (ColumnDefinition) columnDefinitions.next();
FullyQualifiedJavaType fqjt = cd.getResolvedJavaType()
.getFullyQualifiedJavaType();
@@ -264,8 +262,7 @@
answer.addImportedType(fqjt);
}
- generateClassParts(table, introspectedTable.getColumnDefinitions()
- .getPrimaryKey(), answer);
+ generateClassParts(table, introspectedTable.getPrimaryKeyColumns(), answer);
return answer;
}
@@ -295,8 +292,7 @@
}
}
- generateClassParts(table, introspectedTable.getColumnDefinitions()
- .getNonBLOBColumns(), answer);
+ generateClassParts(table, introspectedTable.getNonBLOBColumns(), answer);
return answer;
}
@@ -322,8 +318,7 @@
answer.setSuperClass(getRecordType(table));
}
- generateClassParts(table, introspectedTable.getColumnDefinitions()
- .getBLOBColumns(), answer);
+ generateClassParts(table, introspectedTable.getBLOBColumns(), answer);
return answer;
}
@@ -755,8 +750,7 @@
.addBodyLine("criteriaWithBetweenValue = new ArrayList();"); //$NON-NLS-1$
answer.addMethod(method);
- Iterator iter = introspectedTable.getColumnDefinitions()
- .getNonBLOBColumns().iterator();
+ Iterator iter = introspectedTable.getNonBLOBColumns();
while (iter.hasNext()) {
ColumnDefinition cd = (ColumnDefinition) iter.next();
if (StringUtility.stringHasValue(cd.getTypeHandler())) {
@@ -903,7 +897,7 @@
FullyQualifiedJavaType listOfDates = FullyQualifiedJavaType
.getNewListInstance();
- if (introspectedTable.getColumnDefinitions().hasJDBCDateColumns()) {
+ if (introspectedTable.hasJDBCDateColumns()) {
topLevelClass.addImportedType(FullyQualifiedJavaType
.getDateInstance());
topLevelClass.addImportedType(FullyQualifiedJavaType
@@ -964,7 +958,7 @@
answer.addMethod(method);
}
- if (introspectedTable.getColumnDefinitions().hasJDBCTimeColumns()) {
+ if (introspectedTable.hasJDBCTimeColumns()) {
topLevelClass.addImportedType(FullyQualifiedJavaType
.getDateInstance());
topLevelClass.addImportedType(FullyQualifiedJavaType
@@ -1025,8 +1019,7 @@
answer.addMethod(method);
}
- iter = introspectedTable.getColumnDefinitions().getAllColumns()
- .iterator();
+ iter = introspectedTable.getAllColumns();
while (iter.hasNext()) {
ColumnDefinition cd = (ColumnDefinition) iter.next();
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/model/JavaModelGeneratorJava5Impl.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/model/JavaModelGeneratorJava5Impl.java?rev=422812&r1=422811&r2=422812&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/model/JavaModelGeneratorJava5Impl.java (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/model/JavaModelGeneratorJava5Impl.java Mon Jul 17 12:38:00 2006
@@ -156,8 +156,7 @@
.addBodyLine("criteriaWithBetweenValue = new ArrayList<Map<String, Object>>();"); //$NON-NLS-1$
answer.addMethod(method);
- Iterator iter = introspectedTable.getColumnDefinitions()
- .getNonBLOBColumns().iterator();
+ Iterator iter = introspectedTable.getNonBLOBColumns();
while (iter.hasNext()) {
ColumnDefinition cd = (ColumnDefinition) iter.next();
if (StringUtility.stringHasValue(cd.getTypeHandler())) {
@@ -317,7 +316,7 @@
.getNewListInstance();
listOfDates.addTypeArgument(FullyQualifiedJavaType.getDateInstance());
- if (introspectedTable.getColumnDefinitions().hasJDBCDateColumns()) {
+ if (introspectedTable.hasJDBCDateColumns()) {
topLevelClass.addImportedType(FullyQualifiedJavaType
.getDateInstance());
topLevelClass.addImportedType(FullyQualifiedJavaType
@@ -378,7 +377,7 @@
answer.addMethod(method);
}
- if (introspectedTable.getColumnDefinitions().hasJDBCTimeColumns()) {
+ if (introspectedTable.hasJDBCTimeColumns()) {
topLevelClass.addImportedType(FullyQualifiedJavaType
.getDateInstance());
topLevelClass.addImportedType(FullyQualifiedJavaType
@@ -439,8 +438,7 @@
answer.addMethod(method);
}
- iter = introspectedTable.getColumnDefinitions().getAllColumns()
- .iterator();
+ iter = introspectedTable.getAllColumns();
while (iter.hasNext()) {
ColumnDefinition cd = (ColumnDefinition) iter.next();
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/sqlmap/SqlMapGeneratorDefaultImpl.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/sqlmap/SqlMapGeneratorDefaultImpl.java?rev=422812&r1=422811&r2=422812&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/sqlmap/SqlMapGeneratorDefaultImpl.java (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/sqlmap/SqlMapGeneratorDefaultImpl.java Mon Jul 17 12:38:00 2006
@@ -277,7 +277,7 @@
answer.addComment();
- Iterator iter = introspectedTable.getColumnDefinitions().getAllColumns().iterator();
+ Iterator iter = introspectedTable.getAllColumns();
while (iter.hasNext()) {
ColumnDefinition cd = (ColumnDefinition) iter.next();
if (cd.isBLOBColumn()) {
@@ -336,7 +336,7 @@
answer.addComment();
- Iterator iter = introspectedTable.getColumnDefinitions().getAllColumns().iterator();
+ Iterator iter = introspectedTable.getAllColumns();
while (iter.hasNext()) {
ColumnDefinition cd = (ColumnDefinition) iter.next();
if (!cd.isBLOBColumn()) {
@@ -405,8 +405,7 @@
GeneratedKey gk = introspectedTable.getGeneratedKey();
if (gk != null && !gk.isIdentity()) {
- ColumnDefinition cd = introspectedTable.getColumnDefinitions()
- .getColumn(gk.getColumn());
+ ColumnDefinition cd = introspectedTable.getColumn(gk.getColumn());
// if the column is null, then it's a configuration error. The
// warning has already been reported
if (cd != null) {
@@ -427,7 +426,7 @@
ColumnDefinition identityColumn = null;
boolean comma = false;
- Iterator iter = introspectedTable.getColumnDefinitions().getAllColumns().iterator();
+ Iterator iter = introspectedTable.getAllColumns();
while (iter.hasNext()) {
ColumnDefinition cd = (ColumnDefinition) iter.next();
@@ -491,7 +490,7 @@
sb.setLength(0);
sb.append("set "); //$NON-NLS-1$
- Iterator iter = introspectedTable.getColumnDefinitions().getNonPrimaryKeyColumns().iterator();
+ Iterator iter = introspectedTable.getNonPrimaryKeyColumns();
while (iter.hasNext()) {
ColumnDefinition cd = (ColumnDefinition) iter.next();
@@ -513,7 +512,7 @@
}
boolean and = false;
- iter = introspectedTable.getColumnDefinitions().getPrimaryKey().iterator();
+ iter = introspectedTable.getPrimaryKeyColumns();
while (iter.hasNext()) {
ColumnDefinition cd = (ColumnDefinition) iter.next();
@@ -565,7 +564,7 @@
sb.setLength(0);
sb.append("set "); //$NON-NLS-1$
- Iterator iter = introspectedTable.getColumnDefinitions().getNonBLOBColumns().iterator();
+ Iterator iter = introspectedTable.getNonBLOBColumns();
while (iter.hasNext()) {
ColumnDefinition cd = (ColumnDefinition) iter.next();
@@ -587,7 +586,7 @@
}
boolean and = false;
- iter = introspectedTable.getColumnDefinitions().getPrimaryKey().iterator();
+ iter = introspectedTable.getPrimaryKeyColumns();
while (iter.hasNext()) {
ColumnDefinition cd = (ColumnDefinition) iter.next();
@@ -633,7 +632,7 @@
answer.addElement(new TextElement(sb.toString()));
boolean and = false;
- Iterator iter = introspectedTable.getColumnDefinitions().getPrimaryKey().iterator();
+ Iterator iter = introspectedTable.getPrimaryKeyColumns();
while (iter.hasNext()) {
ColumnDefinition cd = (ColumnDefinition) iter.next();
@@ -729,7 +728,7 @@
comma = true;
}
- Iterator iter = introspectedTable.getColumnDefinitions().getAllColumns().iterator();
+ Iterator iter = introspectedTable.getAllColumns();
while (iter.hasNext()) {
ColumnDefinition cd = (ColumnDefinition) iter.next();
if (comma) {
@@ -749,7 +748,7 @@
answer.addElement(new TextElement(sb.toString()));
boolean and = false;
- iter = introspectedTable.getColumnDefinitions().getPrimaryKey().iterator();
+ iter = introspectedTable.getPrimaryKeyColumns();
while (iter.hasNext()) {
ColumnDefinition cd = (ColumnDefinition) iter.next();
@@ -1007,7 +1006,7 @@
XmlElement dynamicElement = new XmlElement("dynamic"); //$NON-NLS-1$
dynamicElement.addAttribute(new Attribute("prepend", "where")); //$NON-NLS-1$ //$NON-NLS-2$
- Iterator iter = introspectedTable.getColumnDefinitions().getAllColumns().iterator();
+ Iterator iter = introspectedTable.getAllColumns();
while (iter.hasNext()) {
ColumnDefinition cd = (ColumnDefinition) iter.next();
@@ -1074,7 +1073,7 @@
comma = true;
}
- Iterator iter = introspectedTable.getColumnDefinitions().getAllColumns().iterator();
+ Iterator iter = introspectedTable.getAllColumns();
while (iter.hasNext()) {
ColumnDefinition cd = (ColumnDefinition) iter.next();
@@ -1143,7 +1142,7 @@
comma = true;
}
- Iterator iter = introspectedTable.getColumnDefinitions().getAllColumns().iterator();
+ Iterator iter = introspectedTable.getAllColumns();
while (iter.hasNext()) {
ColumnDefinition cd = (ColumnDefinition) iter.next();
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/sqlmap/SqlMapGeneratorIterateImpl.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/sqlmap/SqlMapGeneratorIterateImpl.java?rev=422812&r1=422811&r2=422812&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/sqlmap/SqlMapGeneratorIterateImpl.java (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/sqlmap/SqlMapGeneratorIterateImpl.java Mon Jul 17 12:38:00 2006
@@ -283,8 +283,7 @@
answer.addComment();
- Iterator iter = introspectedTable.getColumnDefinitions()
- .getAllColumns().iterator();
+ Iterator iter = introspectedTable.getAllColumns();
while (iter.hasNext()) {
ColumnDefinition cd = (ColumnDefinition) iter.next();
if (cd.isBLOBColumn()) {
@@ -342,8 +341,7 @@
answer.addComment();
- Iterator iter = introspectedTable.getColumnDefinitions()
- .getAllColumns().iterator();
+ Iterator iter = introspectedTable.getAllColumns();
while (iter.hasNext()) {
ColumnDefinition cd = (ColumnDefinition) iter.next();
if (!cd.isBLOBColumn()) {
@@ -409,8 +407,7 @@
GeneratedKey gk = introspectedTable.getGeneratedKey();
if (gk != null && !gk.isIdentity()) {
- ColumnDefinition cd = introspectedTable.getColumnDefinitions()
- .getColumn(gk.getColumn());
+ ColumnDefinition cd = introspectedTable.getColumn(gk.getColumn());
// if the column is null, then it's a configuration error. The
// warning has already been reported
if (cd != null) {
@@ -430,8 +427,7 @@
ColumnDefinition identityColumn = null;
boolean comma = false;
- Iterator iter = introspectedTable.getColumnDefinitions()
- .getAllColumns().iterator();
+ Iterator iter = introspectedTable.getAllColumns();
while (iter.hasNext()) {
ColumnDefinition cd = (ColumnDefinition) iter.next();
@@ -495,8 +491,7 @@
sb.setLength(0);
sb.append("set "); //$NON-NLS-1$
- Iterator iter = introspectedTable.getColumnDefinitions()
- .getNonPrimaryKeyColumns().iterator();
+ Iterator iter = introspectedTable.getNonPrimaryKeyColumns();
while (iter.hasNext()) {
ColumnDefinition cd = (ColumnDefinition) iter.next();
@@ -518,8 +513,7 @@
}
boolean and = false;
- iter = introspectedTable.getColumnDefinitions().getPrimaryKey()
- .iterator();
+ iter = introspectedTable.getPrimaryKeyColumns();
while (iter.hasNext()) {
ColumnDefinition cd = (ColumnDefinition) iter.next();
@@ -571,8 +565,7 @@
sb.setLength(0);
sb.append("set "); //$NON-NLS-1$
- Iterator iter = introspectedTable.getColumnDefinitions()
- .getNonBLOBColumns().iterator();
+ Iterator iter = introspectedTable.getNonBLOBColumns();
while (iter.hasNext()) {
ColumnDefinition cd = (ColumnDefinition) iter.next();
@@ -594,8 +587,7 @@
}
boolean and = false;
- iter = introspectedTable.getColumnDefinitions().getPrimaryKey()
- .iterator();
+ iter = introspectedTable.getPrimaryKeyColumns();
while (iter.hasNext()) {
ColumnDefinition cd = (ColumnDefinition) iter.next();
@@ -643,8 +635,7 @@
answer.addElement(new TextElement(sb.toString()));
boolean and = false;
- Iterator iter = introspectedTable.getColumnDefinitions()
- .getPrimaryKey().iterator();
+ Iterator iter = introspectedTable.getPrimaryKeyColumns();
while (iter.hasNext()) {
ColumnDefinition cd = (ColumnDefinition) iter.next();
@@ -746,8 +737,7 @@
comma = true;
}
- Iterator iter = introspectedTable.getColumnDefinitions()
- .getAllColumns().iterator();
+ Iterator iter = introspectedTable.getAllColumns();
while (iter.hasNext()) {
ColumnDefinition cd = (ColumnDefinition) iter.next();
if (comma) {
@@ -767,8 +757,7 @@
answer.addElement(new TextElement(sb.toString()));
boolean and = false;
- iter = introspectedTable.getColumnDefinitions().getPrimaryKey()
- .iterator();
+ iter = introspectedTable.getPrimaryKeyColumns();
while (iter.hasNext()) {
ColumnDefinition cd = (ColumnDefinition) iter.next();
@@ -1089,7 +1078,7 @@
// if any of the columns have a user defined type handler, then we need
// to add additional inner iterate elements that specify the type handler
- Iterator iter = introspectedTable.getColumnDefinitions().getNonBLOBColumns().iterator();
+ Iterator iter = introspectedTable.getNonBLOBColumns();
while (iter.hasNext()) {
ColumnDefinition cd = (ColumnDefinition) iter.next();
if (StringUtility.stringHasValue(cd.getTypeHandler())) {
@@ -1242,8 +1231,7 @@
comma = true;
}
- Iterator iter = introspectedTable.getColumnDefinitions()
- .getAllColumns().iterator();
+ Iterator iter = introspectedTable.getAllColumns();
while (iter.hasNext()) {
ColumnDefinition cd = (ColumnDefinition) iter.next();
@@ -1318,8 +1306,7 @@
comma = true;
}
- Iterator iter = introspectedTable.getColumnDefinitions()
- .getAllColumns().iterator();
+ Iterator iter = introspectedTable.getAllColumns();
while (iter.hasNext()) {
ColumnDefinition cd = (ColumnDefinition) iter.next();
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.core/abator-src.zip
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.core/abator-src.zip?rev=422812&r1=422811&r2=422812&view=diff
==============================================================================
Binary files - no diff available.
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.core/abator.jar
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.core/abator.jar?rev=422812&r1=422811&r2=422812&view=diff
==============================================================================
Binary files - no diff available.
Added: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.core/buildAbator.xml
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.core/buildAbator.xml?rev=422812&view=auto
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.core/buildAbator.xml (added)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.core/buildAbator.xml Mon Jul 17 12:38:00 2006
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project default="copyFiles">
+
+ <target name="compile">
+ <!-- call the build.xml file in the regular distribution to build the core jars -->
+ <ant dir="../../core/build"/>
+ </target>
+
+ <target name="copyFiles" depends="compile">
+ <!-- now copy the new JARs into this plugin dir -->
+ <copy todir="." file="../../core/build/deploy/files/abator.jar" />
+ <copy todir="." file="../../core/build/deploy/files/abator-src.zip" />
+ </target>
+</project>
Added: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/html/buildingFromSVN.html
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/html/buildingFromSVN.html?rev=422812&view=auto
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/html/buildingFromSVN.html (added)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/html/buildingFromSVN.html Mon Jul 17 12:38:00 2006
@@ -0,0 +1,59 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+<head>
+ <title>Building and Debugging the Plugins from Source</title>
+</head>
+<body>
+<h1>Building and Debugging the Plugins from Source</h1>
+<p>The following instructions show how to build the Abator plugins from the latest source
+in the Subversion repository. We assume that you are somewhat familiar with Subversion
+and the Eclipse plug-in development environment (PDE). These instructions also assume
+you are using Eclipse version 3.2. Things are similar in Eclipse 3.1. The plug-in
+code is not supported in versions of Eclipse prior to version 3.1.</p>
+<ol>
+ <li>Checkout the latest source code from Subversion
+ <ol type="a">
+ <li>Create a local directory where the source will be stored (for example
+ /Abator/source)</li>
+ <li>Check out the source tree from the Subversion repository at
+ <a href="http://svn.apache.org/repos/asf/ibatis/trunk/java/mapper/mapper2/tools/abator">
+ http://svn.apache.org/repos/asf/ibatis/trunk/java/mapper/mapper2/tools/abator</a></li>
+ </ol>
+ </li>
+ <li>Create a new Eclipse workspace directory (for example /EclipseWorkspaces/Abator)</li>
+ <li>Start Eclipse and point it to the new workspace directory</li>
+ <li>Import the plug-in projects into the workspace
+ <ol type="a">
+ <li>Start the Eclipse project import wizard
+ (File>Import>General>Existing Projects into Workspace)
+ </li>
+ <li>Set the root directory to the "eclipse" sub-directory of the directory where
+ you did the SVN checkout (for example, /Abator/source/eclipse)</li>
+ <li>Select the four projects under the directory, do not copy the projects into
+ your workspace. The filled out wizard looks like this: <br />
+ <p><img src="importWizard.gif"/></p>
+ </li>
+ <li>Press "Finish", wait for the workspace to build.</li>
+ </ol>
+ </li>
+ <li>Note that there may be errors in the build depending on which JDK you have installed
+ (for the official release, Abator is compiled with JDK 1.4.2).
+ If you see an error stating that <code>java.lang.Object</code> cannot be resolved,
+ then follow these steps to fix the problem:
+ <ol type="a">
+ <li>Right click on the project "org.apache.ibatis.abator.ui", then select "Properties"</li>
+ <li>Select "Java Build Path" in the left pane</li>
+ <li>Select the "Libraries" tab in the right pane, then highlight the
+ "JRE System Library" entry (there will also be the word "unbound" in the
+ entry), press the "Remove" button</li>
+ <li>Press the "Add Library..." button</li>
+ <li>Select "JRE System Library" from the dialog, press "Next"</li>
+ <li>Select an installed JRE (the default is fine as long as it is JDK 1.4 or better),
+ press "Finish"</li>
+ <li>Press "OK" to close the properties dialog. The workspace will rebuild and
+ the errors should be removed. You may see warnings in the workspace, but you
+ can ignore them</li>
+ </ol>
+</ol>
+</body>
+</html>
Added: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/html/importWizard.gif
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/html/importWizard.gif?rev=422812&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/html/importWizard.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/toc.xml
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/toc.xml?rev=422812&r1=422811&r2=422812&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/toc.xml (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/toc.xml Mon Jul 17 12:38:00 2006
@@ -7,6 +7,7 @@
<topic label="Using the Eclipse User Interface" href="html/eclipseui.html"/>
<topic label="Plugin Future Roadmap" href="html/roadmap.html"/>
<topic label="Plugin Release Notes" href="html/releasenotes.html"/>
+ <topic label="Building the Plugins from Subversion" href="html/buildingFromSVN.html"/>
</topic>
<topic label="Core Abator Documentation">
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/src/org/apache/ibatis/abator/ui/actions/RunAbatorAction.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/src/org/apache/ibatis/abator/ui/actions/RunAbatorAction.java?rev=422812&r1=422811&r2=422812&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/src/org/apache/ibatis/abator/ui/actions/RunAbatorAction.java (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/src/org/apache/ibatis/abator/ui/actions/RunAbatorAction.java Mon Jul 17 12:38:00 2006
@@ -20,7 +20,6 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.ibatis.abator.exception.GenerationRuntimeException;
import org.apache.ibatis.abator.ui.content.AbatorConfigurationFileAdapter;
import org.apache.ibatis.abator.ui.plugin.AbatorUIPlugin;
import org.eclipse.core.resources.IFile;
@@ -117,10 +116,6 @@
if (exceptionToHandle instanceof InterruptedException) {
status = new Status(IStatus.CANCEL, AbatorUIPlugin.getPluginId(),
IStatus.CANCEL, "Cancelled by User", exceptionToHandle);
- } else if (exceptionToHandle instanceof GenerationRuntimeException) {
- status = new Status(IStatus.ERROR, AbatorUIPlugin.getPluginId(),
- IStatus.ERROR, exceptionToHandle.getMessage(),
- exceptionToHandle);
} else if (exceptionToHandle instanceof CoreException) {
status = ((CoreException) exceptionToHandle).getStatus();
} else {