Author: jgbutler
Date: Sun Dec 13 21:10:03 2009
New Revision: 890119
URL: http://svn.apache.org/viewvc?rev=890119&view=rev
Log:
[Ibator] minor updates to resolve some compiler warnings
Modified:
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/UpdateByExampleParmsInnerclassGenerator.java
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis3/model/ExampleGenerator.java
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/internal/util/ClassloaderUtility.java
ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/pom.xml
Modified:
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/UpdateByExampleParmsInnerclassGenerator.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/UpdateByExampleParmsInnerclassGenerator.java?rev=890119&r1=890118&r2=890119&view=diff
==============================================================================
---
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/UpdateByExampleParmsInnerclassGenerator.java
(original)
+++
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/UpdateByExampleParmsInnerclassGenerator.java
Sun Dec 13 21:10:03 2009
@@ -42,7 +42,7 @@
InnerClass innerClass = new InnerClass(
new FullyQualifiedJavaType("UpdateByExampleParms"));
//$NON-NLS-1$
- innerClass.setVisibility(JavaVisibility.PRIVATE);
+ innerClass.setVisibility(JavaVisibility.PROTECTED);
innerClass.setStatic(true);
innerClass.setSuperClass(introspectedTable.getExampleType());
ibatorContext.getCommentGenerator().addClassComment(innerClass,
introspectedTable);
Modified:
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis3/model/ExampleGenerator.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis3/model/ExampleGenerator.java?rev=890119&r1=890118&r2=890119&view=diff
==============================================================================
---
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis3/model/ExampleGenerator.java
(original)
+++
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis3/model/ExampleGenerator.java
Sun Dec 13 21:10:03 2009
@@ -241,7 +241,7 @@
method.addBodyLine("super();"); //$NON-NLS-1$
method.addBodyLine("this.condition = condition;"); //$NON-NLS-1$
method.addBodyLine("this.value = value;"); //$NON-NLS-1$
- method.addBodyLine("if (value instanceof List) {"); //$NON-NLS-1$
+ method.addBodyLine("if (value instanceof List<?>) {"); //$NON-NLS-1$
method.addBodyLine("this.listValue = true;"); //$NON-NLS-1$
method.addBodyLine("} else {"); //$NON-NLS-1$
method.addBodyLine("this.singleValue = true;"); //$NON-NLS-1$
Modified:
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/internal/util/ClassloaderUtility.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/internal/util/ClassloaderUtility.java?rev=890119&r1=890118&r2=890119&view=diff
==============================================================================
---
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/internal/util/ClassloaderUtility.java
(original)
+++
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/internal/util/ClassloaderUtility.java
Sun Dec 13 21:10:03 2009
@@ -53,7 +53,7 @@
}
try {
- urls.add(file.toURL());
+ urls.add(file.toURI().toURL());
} catch (MalformedURLException e) {
// this shouldn't happen, but just in case...
throw new RuntimeException(
Modified: ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/pom.xml
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/pom.xml?rev=890119&r1=890118&r2=890119&view=diff
==============================================================================
--- ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/pom.xml (original)
+++ ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/pom.xml Sun Dec 13
21:10:03 2009
@@ -72,7 +72,7 @@
<dependency>
<groupId>org.apache.ibatis</groupId>
<artifactId>ibatis-sqlmap</artifactId>
- <version>3.0-beta-5</version>
+ <version>3.0-beta-6</version>
</dependency>
<dependency>
<groupId>org.hsqldb</groupId>
