Author: jgbutler
Date: Thu Sep 28 13:01:28 2006
New Revision: 450998
URL: http://svn.apache.org/viewvc?view=rev&rev=450998
Log:
Abator - fix bug where trimStrings on JavaModelGenerator is not working
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/doc/ReleaseNotes.txt
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/db/ColumnDefinition.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
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/doc/ReleaseNotes.txt
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/doc/ReleaseNotes.txt?view=diff&rev=450998&r1=450997&r2=450998
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/doc/ReleaseNotes.txt
(original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/doc/ReleaseNotes.txt Thu
Sep 28 13:01:28 2006
@@ -4,6 +4,7 @@
has been added to the list, but there are no criteria set
2. Add "clear" method to generated example classes in the Java2/Java5
generator sets
+3. Fix bug - trimStrings on JavaModelGenerator not working
-------------------------------------------------------------------------------
Version 1.0.0:
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/db/ColumnDefinition.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/db/ColumnDefinition.java?view=diff&rev=450998&r1=450997&r2=450998
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/db/ColumnDefinition.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/db/ColumnDefinition.java
Thu Sep 28 13:01:28 2006
@@ -204,8 +204,8 @@
}
public boolean isStringColumn() {
- return resolvedJavaType.getFullyQualifiedJavaType() ==
- FullyQualifiedJavaType.getStringInstance();
+ return resolvedJavaType.getFullyQualifiedJavaType().equals(
+ FullyQualifiedJavaType.getStringInstance());
}
public boolean isJdbcCharacterColumn() {
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?view=diff&rev=450998&r1=450997&r2=450998
==============================================================================
---
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
Thu Sep 28 13:01:28 2006
@@ -855,7 +855,7 @@
}
method.setReturnType(returnType);
-
method.setName(methodNameCalculator.getSelectByExampleWithBLOBsMethodName(introspectedTable));
//$NON-NLS-1$
+
method.setName(methodNameCalculator.getSelectByExampleWithBLOBsMethodName(introspectedTable));
method.addParameter(new Parameter(type, "example")); //$NON-NLS-1$
Iterator iter = daoTemplate.getCheckedExceptions().iterator();
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?view=diff&rev=450998&r1=450997&r2=450998
==============================================================================
---
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
Thu Sep 28 13:01:28 2006
@@ -835,7 +835,7 @@
sb.append(iter.next());
sb.append(".size() > 0"); //$NON-NLS-1$
if (!iter.hasNext()) {
- sb.append(';'); //$NON-NLS-1$
+ sb.append(';');
}
method.addBodyLine(sb.toString());
}
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?view=diff&rev=450998&r1=450997&r2=450998
==============================================================================
---
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
Thu Sep 28 13:01:28 2006
@@ -198,7 +198,7 @@
sb.append(iter.next());
sb.append(".size() > 0"); //$NON-NLS-1$
if (!iter.hasNext()) {
- sb.append(';'); //$NON-NLS-1$
+ sb.append(';');
}
method.addBodyLine(sb.toString());
}
