Author: jgbutler
Date: Mon Jul 24 15:22:31 2006
New Revision: 425204
URL: http://svn.apache.org/viewvc?rev=425204&view=rev
Log:
Abator refactoring and bug fixing
Added:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/FullyQualifiedTable.java
- copied, changed from r425193,
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/FullyQualifiedTable.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/TableType.java
- copied, changed from r418385,
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/rules/TableType.java
Removed:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/FullyQualifiedTable.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/rules/TableType.java
Modified:
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/api/JavaModelGenerator.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/SqlMapGenerator.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/dom/java/Field.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/dom/java/InnerClass.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/dom/java/InnerEnum.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/dom/java/Method.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/db/DatabaseIntrospector.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/AbstractDAOTemplate.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/rules/AbatorRules.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.doc/buildDoc.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.ui/.classpath
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/src/org/apache/ibatis/abator/ui/actions/RunAbatorAction.java
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/src/org/apache/ibatis/abator/ui/plugin/EclipseShellCallback.java
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/src/org/apache/ibatis/abator/ui/plugin/JavaFileMerger.java
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator/NOTICE
Copied:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/FullyQualifiedTable.java
(from r425193,
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/FullyQualifiedTable.java)
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/FullyQualifiedTable.java?p2=ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/FullyQualifiedTable.java&p1=ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/FullyQualifiedTable.java&r1=425193&r2=425204&rev=425204&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/FullyQualifiedTable.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/FullyQualifiedTable.java
Mon Jul 24 15:22:31 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.ibatis.abator.config;
+package org.apache.ibatis.abator.api;
import org.apache.ibatis.abator.internal.util.EqualsUtil;
import org.apache.ibatis.abator.internal.util.HashCodeUtil;
@@ -21,7 +21,6 @@
import org.apache.ibatis.abator.internal.util.StringUtility;
/**
- * TODO - move to the API package
* @author Jeff Butler
*/
public class FullyQualifiedTable {
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=425204&r1=425203&r2=425204&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 24 15:22:31 2006
@@ -18,10 +18,8 @@
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.ColumnDefinition;
-import org.apache.ibatis.abator.internal.rules.TableType;
/**
* Read only interface for dealing with introspected tables.
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/JavaModelGenerator.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/JavaModelGenerator.java?rev=425204&r1=425203&r2=425204&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/JavaModelGenerator.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/JavaModelGenerator.java
Mon Jul 24 15:22:31 2006
@@ -19,7 +19,6 @@
import java.util.Map;
import org.apache.ibatis.abator.api.dom.java.FullyQualifiedJavaType;
-import org.apache.ibatis.abator.config.FullyQualifiedTable;
/**
* This interface describes methods needed in any Java model generator.
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/SqlMapGenerator.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/SqlMapGenerator.java?rev=425204&r1=425203&r2=425204&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/SqlMapGenerator.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/SqlMapGenerator.java
Mon Jul 24 15:22:31 2006
@@ -18,8 +18,6 @@
import java.util.List;
import java.util.Map;
-import org.apache.ibatis.abator.config.FullyQualifiedTable;
-
/**
* This interface describes the operations that are required of an
* Sql Map Generator. An Sql Map Generator is a class that generates
Copied:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/TableType.java
(from r418385,
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/rules/TableType.java)
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/TableType.java?p2=ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/TableType.java&p1=ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/rules/TableType.java&r1=418385&r2=425204&rev=425204&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/rules/TableType.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/TableType.java
Mon Jul 24 15:22:31 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.ibatis.abator.internal.rules;
+package org.apache.ibatis.abator.api;
import org.apache.ibatis.abator.internal.db.ColumnDefinitions;
import org.apache.ibatis.abator.internal.util.messages.Messages;
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/dom/java/Field.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/dom/java/Field.java?rev=425204&r1=425203&r2=425204&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/dom/java/Field.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/dom/java/Field.java
Mon Jul 24 15:22:31 2006
@@ -18,8 +18,8 @@
import java.util.Date;
import java.util.Iterator;
+import org.apache.ibatis.abator.api.FullyQualifiedTable;
import org.apache.ibatis.abator.api.dom.OutputUtilities;
-import org.apache.ibatis.abator.config.FullyQualifiedTable;
/**
* @author Jeff Butler
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/dom/java/InnerClass.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/dom/java/InnerClass.java?rev=425204&r1=425203&r2=425204&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/dom/java/InnerClass.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/dom/java/InnerClass.java
Mon Jul 24 15:22:31 2006
@@ -22,8 +22,8 @@
import java.util.List;
import java.util.Set;
+import org.apache.ibatis.abator.api.FullyQualifiedTable;
import org.apache.ibatis.abator.api.dom.OutputUtilities;
-import org.apache.ibatis.abator.config.FullyQualifiedTable;
/**
* This class encapsulates the idea of an inner class - it has methods that
make
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/dom/java/InnerEnum.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/dom/java/InnerEnum.java?rev=425204&r1=425203&r2=425204&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/dom/java/InnerEnum.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/dom/java/InnerEnum.java
Mon Jul 24 15:22:31 2006
@@ -23,8 +23,8 @@
import java.util.List;
import java.util.Set;
+import org.apache.ibatis.abator.api.FullyQualifiedTable;
import org.apache.ibatis.abator.api.dom.OutputUtilities;
-import org.apache.ibatis.abator.config.FullyQualifiedTable;
/**
* This class encapsulates the idea of an inner enum - it has methods that make
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/dom/java/Method.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/dom/java/Method.java?rev=425204&r1=425203&r2=425204&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/dom/java/Method.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/dom/java/Method.java
Mon Jul 24 15:22:31 2006
@@ -21,8 +21,8 @@
import java.util.List;
import java.util.ListIterator;
+import org.apache.ibatis.abator.api.FullyQualifiedTable;
import org.apache.ibatis.abator.api.dom.OutputUtilities;
-import org.apache.ibatis.abator.config.FullyQualifiedTable;
import org.apache.ibatis.abator.internal.db.ColumnDefinition;
/**
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/db/DatabaseIntrospector.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/db/DatabaseIntrospector.java?rev=425204&r1=425203&r2=425204&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/db/DatabaseIntrospector.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/db/DatabaseIntrospector.java
Mon Jul 24 15:22:31 2006
@@ -25,10 +25,10 @@
import java.util.List;
import java.util.Map;
+import org.apache.ibatis.abator.api.FullyQualifiedTable;
import org.apache.ibatis.abator.api.JavaTypeResolver;
import org.apache.ibatis.abator.api.dom.java.FullyQualifiedJavaType;
import org.apache.ibatis.abator.config.ColumnOverride;
-import org.apache.ibatis.abator.config.FullyQualifiedTable;
import org.apache.ibatis.abator.config.GeneratedKey;
import org.apache.ibatis.abator.config.TableConfiguration;
import org.apache.ibatis.abator.exception.UnsupportedDataTypeException;
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=425204&r1=425203&r2=425204&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 24 15:22:31 2006
@@ -18,11 +18,11 @@
import java.util.Iterator;
+import org.apache.ibatis.abator.api.FullyQualifiedTable;
import org.apache.ibatis.abator.api.IntrospectedTable;
-import org.apache.ibatis.abator.config.FullyQualifiedTable;
+import org.apache.ibatis.abator.api.TableType;
import org.apache.ibatis.abator.config.GeneratedKey;
import org.apache.ibatis.abator.config.TableConfiguration;
-import org.apache.ibatis.abator.internal.rules.TableType;
/**
* @author Jeff Butler
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=425204&r1=425203&r2=425204&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 24 15:22:31 2006
@@ -23,6 +23,7 @@
import org.apache.ibatis.abator.api.DAOGenerator;
import org.apache.ibatis.abator.api.DAOMethodNameCalculator;
+import org.apache.ibatis.abator.api.FullyQualifiedTable;
import org.apache.ibatis.abator.api.GeneratedJavaFile;
import org.apache.ibatis.abator.api.IntrospectedTable;
import org.apache.ibatis.abator.api.JavaModelGenerator;
@@ -37,7 +38,6 @@
import org.apache.ibatis.abator.api.dom.java.Parameter;
import org.apache.ibatis.abator.api.dom.java.PrimitiveTypeWrapper;
import org.apache.ibatis.abator.api.dom.java.TopLevelClass;
-import org.apache.ibatis.abator.config.FullyQualifiedTable;
import org.apache.ibatis.abator.internal.AbatorObjectFactory;
import org.apache.ibatis.abator.internal.DefaultDAOMethodNameCalculator;
import org.apache.ibatis.abator.internal.ExtendedDAOMethodNameCalculator;
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=425204&r1=425203&r2=425204&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 24 15:22:31 2006
@@ -21,6 +21,7 @@
import java.util.List;
import java.util.Map;
+import org.apache.ibatis.abator.api.FullyQualifiedTable;
import org.apache.ibatis.abator.api.GeneratedJavaFile;
import org.apache.ibatis.abator.api.IntrospectedTable;
import org.apache.ibatis.abator.api.JavaModelGenerator;
@@ -32,7 +33,6 @@
import org.apache.ibatis.abator.api.dom.java.Method;
import org.apache.ibatis.abator.api.dom.java.Parameter;
import org.apache.ibatis.abator.api.dom.java.TopLevelClass;
-import org.apache.ibatis.abator.config.FullyQualifiedTable;
import org.apache.ibatis.abator.internal.db.ColumnDefinition;
import org.apache.ibatis.abator.internal.rules.AbatorRules;
import org.apache.ibatis.abator.internal.sqlmap.ExampleClause;
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/AbstractDAOTemplate.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/AbstractDAOTemplate.java?rev=425204&r1=425203&r2=425204&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/AbstractDAOTemplate.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/AbstractDAOTemplate.java
Mon Jul 24 15:22:31 2006
@@ -20,11 +20,11 @@
import java.util.Iterator;
import java.util.List;
+import org.apache.ibatis.abator.api.FullyQualifiedTable;
import org.apache.ibatis.abator.api.dom.java.Field;
import org.apache.ibatis.abator.api.dom.java.FullyQualifiedJavaType;
import org.apache.ibatis.abator.api.dom.java.Method;
import org.apache.ibatis.abator.api.dom.java.Parameter;
-import org.apache.ibatis.abator.config.FullyQualifiedTable;
/**
* @author Jeff Butler
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=425204&r1=425203&r2=425204&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 24 15:22:31 2006
@@ -23,6 +23,7 @@
import org.apache.ibatis.abator.api.DAOGenerator;
import org.apache.ibatis.abator.api.DAOMethodNameCalculator;
+import org.apache.ibatis.abator.api.FullyQualifiedTable;
import org.apache.ibatis.abator.api.GeneratedJavaFile;
import org.apache.ibatis.abator.api.IntrospectedTable;
import org.apache.ibatis.abator.api.JavaModelGenerator;
@@ -37,7 +38,6 @@
import org.apache.ibatis.abator.api.dom.java.Parameter;
import org.apache.ibatis.abator.api.dom.java.PrimitiveTypeWrapper;
import org.apache.ibatis.abator.api.dom.java.TopLevelClass;
-import org.apache.ibatis.abator.config.FullyQualifiedTable;
import org.apache.ibatis.abator.internal.AbatorObjectFactory;
import org.apache.ibatis.abator.internal.DefaultDAOMethodNameCalculator;
import org.apache.ibatis.abator.internal.ExtendedDAOMethodNameCalculator;
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=425204&r1=425203&r2=425204&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 24 15:22:31 2006
@@ -21,6 +21,7 @@
import java.util.List;
import java.util.Map;
+import org.apache.ibatis.abator.api.FullyQualifiedTable;
import org.apache.ibatis.abator.api.GeneratedJavaFile;
import org.apache.ibatis.abator.api.IntrospectedTable;
import org.apache.ibatis.abator.api.JavaModelGenerator;
@@ -33,7 +34,6 @@
import org.apache.ibatis.abator.api.dom.java.Method;
import org.apache.ibatis.abator.api.dom.java.Parameter;
import org.apache.ibatis.abator.api.dom.java.TopLevelClass;
-import org.apache.ibatis.abator.config.FullyQualifiedTable;
import org.apache.ibatis.abator.internal.db.ColumnDefinition;
import org.apache.ibatis.abator.internal.rules.AbatorRules;
import org.apache.ibatis.abator.internal.util.JavaBeansUtil;
@@ -750,9 +750,13 @@
.addBodyLine("criteriaWithBetweenValue = new ArrayList();");
//$NON-NLS-1$
answer.addMethod(method);
- Iterator iter = introspectedTable.getNonBLOBColumns();
+ Iterator iter = introspectedTable.getAllColumns();
while (iter.hasNext()) {
ColumnDefinition cd = (ColumnDefinition) iter.next();
+ if (cd.isBLOBColumn()) {
+ continue;
+ }
+
if (StringUtility.stringHasValue(cd.getTypeHandler())) {
addtypeHandledObjectsAndMethods(cd, method, answer);
}
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=425204&r1=425203&r2=425204&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 24 15:22:31 2006
@@ -17,6 +17,7 @@
import java.util.Iterator;
+import org.apache.ibatis.abator.api.FullyQualifiedTable;
import org.apache.ibatis.abator.api.IntrospectedTable;
import org.apache.ibatis.abator.api.dom.java.CompilationUnit;
import org.apache.ibatis.abator.api.dom.java.Field;
@@ -27,7 +28,6 @@
import org.apache.ibatis.abator.api.dom.java.Method;
import org.apache.ibatis.abator.api.dom.java.Parameter;
import org.apache.ibatis.abator.api.dom.java.TopLevelClass;
-import org.apache.ibatis.abator.config.FullyQualifiedTable;
import org.apache.ibatis.abator.internal.db.ColumnDefinition;
import org.apache.ibatis.abator.internal.rules.AbatorRules;
import org.apache.ibatis.abator.internal.util.JavaBeansUtil;
@@ -156,9 +156,13 @@
.addBodyLine("criteriaWithBetweenValue = new
ArrayList<Map<String, Object>>();"); //$NON-NLS-1$
answer.addMethod(method);
- Iterator iter = introspectedTable.getNonBLOBColumns();
+ Iterator iter = introspectedTable.getAllColumns();
while (iter.hasNext()) {
ColumnDefinition cd = (ColumnDefinition) iter.next();
+ if (cd.isBLOBColumn()) {
+ continue;
+ }
+
if (StringUtility.stringHasValue(cd.getTypeHandler())) {
addtypeHandledObjectsAndMethods(cd, method, answer);
}
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/rules/AbatorRules.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/rules/AbatorRules.java?rev=425204&r1=425203&r2=425204&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/rules/AbatorRules.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/rules/AbatorRules.java
Mon Jul 24 15:22:31 2006
@@ -16,6 +16,7 @@
package org.apache.ibatis.abator.internal.rules;
import org.apache.ibatis.abator.api.IntrospectedTable;
+import org.apache.ibatis.abator.api.TableType;
/**
* This class centralizes all the rules related to code generation - including
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=425204&r1=425203&r2=425204&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 24 15:22:31 2006
@@ -21,6 +21,7 @@
import java.util.List;
import java.util.Map;
+import org.apache.ibatis.abator.api.FullyQualifiedTable;
import org.apache.ibatis.abator.api.GeneratedXmlFile;
import org.apache.ibatis.abator.api.IntrospectedTable;
import org.apache.ibatis.abator.api.JavaModelGenerator;
@@ -31,7 +32,6 @@
import org.apache.ibatis.abator.api.dom.xml.Document;
import org.apache.ibatis.abator.api.dom.xml.TextElement;
import org.apache.ibatis.abator.api.dom.xml.XmlElement;
-import org.apache.ibatis.abator.config.FullyQualifiedTable;
import org.apache.ibatis.abator.config.GeneratedKey;
import org.apache.ibatis.abator.internal.db.ColumnDefinition;
import org.apache.ibatis.abator.internal.rules.AbatorRules;
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=425204&r1=425203&r2=425204&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 24 15:22:31 2006
@@ -21,6 +21,7 @@
import java.util.List;
import java.util.Map;
+import org.apache.ibatis.abator.api.FullyQualifiedTable;
import org.apache.ibatis.abator.api.GeneratedXmlFile;
import org.apache.ibatis.abator.api.IntrospectedTable;
import org.apache.ibatis.abator.api.JavaModelGenerator;
@@ -32,7 +33,6 @@
import org.apache.ibatis.abator.api.dom.xml.Document;
import org.apache.ibatis.abator.api.dom.xml.TextElement;
import org.apache.ibatis.abator.api.dom.xml.XmlElement;
-import org.apache.ibatis.abator.config.FullyQualifiedTable;
import org.apache.ibatis.abator.config.GeneratedKey;
import org.apache.ibatis.abator.internal.db.ColumnDefinition;
import org.apache.ibatis.abator.internal.rules.AbatorRules;
@@ -1078,9 +1078,13 @@
// 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.getNonBLOBColumns();
+ Iterator iter = introspectedTable.getAllColumns();
while (iter.hasNext()) {
ColumnDefinition cd = (ColumnDefinition) iter.next();
+ if (cd.isBLOBColumn()) {
+ continue;
+ }
+
if (StringUtility.stringHasValue(cd.getTypeHandler())) {
// name the property based on the column name, then
// add the type handler to the parameter declaration
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/buildDoc.xml
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/buildDoc.xml?rev=425204&r1=425203&r2=425204&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/buildDoc.xml
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/buildDoc.xml
Mon Jul 24 15:22:31 2006
@@ -38,6 +38,7 @@
</target>
<target name="refresh" depends="javadoc" if="eclipse.running">
+ <echo message="Refreshing the Eclipse Project..."/>
<eclipse.refreshLocal resource="org.apache.ibatis.abator.doc"/>
</target>
Modified:
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=425204&r1=425203&r2=425204&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/html/buildingFromSVN.html
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/html/buildingFromSVN.html
Mon Jul 24 15:22:31 2006
@@ -80,25 +80,6 @@
<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>
- </li>
</ol>
<h2>Debugging</h2>
@@ -158,7 +139,7 @@
</li>
<li>Select the "Java Project from Existing Ant Buildfile" wizard, press
"Next"</li>
<li>Browse to the "build.xml" file in the checked out project (for example
- /Abator/source/core/build\build.xml). Accept the default for the
+ /Abator/source/core/build/build.xml). Accept the default for the
other fields and press "Finish".</li>
<li>Wait for the workspace to build.</li>
</ol>
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/.classpath
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/.classpath?rev=425204&r1=425203&r2=425204&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/.classpath
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/.classpath
Mon Jul 24 15:22:31 2006
@@ -4,6 +4,6 @@
<classpathentry output="antbin" kind="src" path="antsrc"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry
sourcepath="/org.apache.ibatis.abator.core/abator-src.zip" kind="lib"
path="/org.apache.ibatis.abator.core/abator.jar"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/Sun
JDK 1.4.2"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
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=425204&r1=425203&r2=425204&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 24 15:22:31 2006
@@ -36,7 +36,6 @@
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IActionDelegate;
import org.eclipse.ui.IObjectActionDelegate;
import org.eclipse.ui.IWorkbenchPart;
@@ -57,9 +56,6 @@
public void setActivePart(IAction action, IWorkbenchPart targetPart) {
}
- /**
- * @see IActionDelegate#run(IAction)
- */
public void run(IAction action) {
Shell shell = new Shell();
@@ -91,9 +87,6 @@
}
}
- /**
- * @see IActionDelegate#selectionChanged(IAction, ISelection)
- */
public void selectionChanged(IAction action, ISelection selection) {
StructuredSelection ss = (StructuredSelection) selection;
AbatorConfigurationFileAdapter adapter =
(AbatorConfigurationFileAdapter) ss.getFirstElement();
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/src/org/apache/ibatis/abator/ui/plugin/EclipseShellCallback.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/plugin/EclipseShellCallback.java?rev=425204&r1=425203&r2=425204&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/src/org/apache/ibatis/abator/ui/plugin/EclipseShellCallback.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/src/org/apache/ibatis/abator/ui/plugin/EclipseShellCallback.java
Mon Jul 24 15:22:31 2006
@@ -35,12 +35,6 @@
import org.eclipse.jdt.core.IPackageFragment;
import org.eclipse.jdt.core.IPackageFragmentRoot;
import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.ToolFactory;
-import org.eclipse.jdt.core.formatter.CodeFormatter;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.text.edits.TextEdit;
/**
* @author Jeff Butler
@@ -103,7 +97,7 @@
source = merger.getMergedSource();
} else {
- source = formatJavaSource(newFile.getFormattedContent());
+ source = newFile.getFormattedContent();
}
return source;
@@ -123,28 +117,6 @@
// ignore
;
}
- }
-
- private String formatJavaSource(String unformattedSource) {
- CodeFormatter formatter = ToolFactory.createCodeFormatter(null);
- TextEdit te = formatter.format(CodeFormatter.K_COMPILATION_UNIT,
- unformattedSource, 0, unformattedSource.length(), 0, null);
-
- if (te == null) {
- // no edits to make
- return unformattedSource;
- }
-
- IDocument doc = new Document(unformattedSource);
- String formattedSource;
- try {
- te.apply(doc);
- formattedSource = doc.get();
- } catch (BadLocationException e) {
- formattedSource = unformattedSource;
- }
-
- return formattedSource;
}
private IJavaProject getJavaProject(String javaProjectName)
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/src/org/apache/ibatis/abator/ui/plugin/JavaFileMerger.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/plugin/JavaFileMerger.java?rev=425204&r1=425203&r2=425204&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/src/org/apache/ibatis/abator/ui/plugin/JavaFileMerger.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/src/org/apache/ibatis/abator/ui/plugin/JavaFileMerger.java
Mon Jul 24 15:22:31 2006
@@ -18,6 +18,7 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import java.util.StringTokenizer;
import org.apache.ibatis.abator.api.GeneratedJavaFile;
@@ -25,7 +26,6 @@
import org.apache.ibatis.abator.exception.ShellException;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Platform;
import org.eclipse.jdt.core.ICompilationUnit;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.dom.AST;
@@ -45,6 +45,7 @@
import org.eclipse.jdt.core.dom.TypeDeclaration;
import org.eclipse.jdt.core.dom.rewrite.ASTRewrite;
import org.eclipse.jdt.core.dom.rewrite.ListRewrite;
+import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.Document;
import org.eclipse.jface.text.IDocument;
@@ -181,10 +182,6 @@
}
public String getMergedSource() throws ShellException {
- if (Platform.inDebugMode()) {
- System.out.println("Starting Abator Java merge for file " +
generatedJavaFile.getFileName());
- }
-
ASTParser astParser = ASTParser.newParser(AST.JLS3);
ICompilationUnit icu =
JavaCore.createCompilationUnitFrom(existingFile);
@@ -282,7 +279,7 @@
astParser.setSource(generatedJavaFile.getFormattedContent()
.toCharArray());
CompilationUnit newCu = (CompilationUnit) astParser.createAST(null);
-
+
GatherNewItemsVisitor newVisitor = new GatherNewItemsVisitor();
newCu.accept(newVisitor);
@@ -299,7 +296,9 @@
listRewrite.insertAt((ASTNode) iter.next(), i++, null);
}
- textEdit = rewrite.rewriteAST(document, null);
+ Map options =
DefaultCodeFormatterConstants.getJavaConventionsSettings();
+
+ textEdit = rewrite.rewriteAST(document, options);
try {
textEdit.apply(document);
} catch (BadLocationException e) {
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator/NOTICE
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator/NOTICE?rev=425204&r1=425203&r2=425204&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator/NOTICE
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator/NOTICE
Mon Jul 24 15:22:31 2006
@@ -1,8 +1,2 @@
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
-
-This product includes software developed by
-The JDOM Project (http://www.jdom.org/).
-
-This product includes the EqualsUtil and HashCodeUtil classes
-from http://www.javapractices.com.
