You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by km...@apache.org on 2008/01/30 22:33:22 UTC
svn commit: r616909 - in
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne:
./ dba/oracle/ gen/ project/validator/ query/ remote/hessian/ tools/ util/
Author: kmenard
Date: Wed Jan 30 13:33:21 2008
New Revision: 616909
URL: http://svn.apache.org/viewvc?rev=616909&view=rev
Log:
More misc. code cleanups.
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/CayenneDataObject.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleLOBBatchAction.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/gen/ClassGenerationAction1_1.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/MappingNamesHelper.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/UpdateBatchQuery.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/hessian/HessianConfig.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/AntDataPortDelegate.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/NamePatternMatcher.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/Invocation.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/CayenneDataObject.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/CayenneDataObject.java?rev=616909&r1=616908&r2=616909&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/CayenneDataObject.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/CayenneDataObject.java Wed Jan 30 13:33:21 2008
@@ -679,7 +679,6 @@
if (failure != null) {
validationResult.addFailure(failure);
- continue;
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleLOBBatchAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleLOBBatchAction.java?rev=616909&r1=616908&r2=616909&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleLOBBatchAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleLOBBatchAction.java Wed Jan 30 13:33:21 2008
@@ -247,7 +247,7 @@
Method getBinaryStreamMethod = OracleAdapter.getOutputStreamFromBlobMethod();
try {
- OutputStream out = (OutputStream) getBinaryStreamMethod.invoke(blob, null);
+ OutputStream out = (OutputStream) getBinaryStreamMethod.invoke(blob);
try {
out.write(value);
out.flush();
@@ -275,7 +275,7 @@
Method getWriterMethod = OracleAdapter.getWriterFromClobMethod();
try {
- Writer out = (Writer) getWriterMethod.invoke(clob, null);
+ Writer out = (Writer) getWriterMethod.invoke(clob);
try {
out.write(value);
out.flush();
@@ -304,7 +304,7 @@
Method getWriterMethod = OracleAdapter.getWriterFromClobMethod();
try {
- Writer out = (Writer) getWriterMethod.invoke(clob, null);
+ Writer out = (Writer) getWriterMethod.invoke(clob);
try {
out.write(value);
out.flush();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/gen/ClassGenerationAction1_1.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/gen/ClassGenerationAction1_1.java?rev=616909&r1=616908&r2=616909&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/gen/ClassGenerationAction1_1.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/gen/ClassGenerationAction1_1.java Wed Jan 30 13:33:21 2008
@@ -132,7 +132,7 @@
@Override
public void setArtifactsGenerationMode(String mode) {
generator.setMode(mode);
- };
+ }
@Override
public void setContext(VelocityContext context) {
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/MappingNamesHelper.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/MappingNamesHelper.java?rev=616909&r1=616908&r2=616909&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/MappingNamesHelper.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/MappingNamesHelper.java Wed Jan 30 13:33:21 2008
@@ -49,10 +49,8 @@
// a property is considered invalid if there is a getter or a setter for it in
// java.lang.Object or CayenneDataObject
- static final Collection INVALID_JAVA_PROPERTIES = Arrays.asList(new Object[] {
- "class", "committedSnapshot", "currentSnapshot", "dataContext", "objectId",
- "persistenceState", "snapshotVersion"
- });
+ static final Collection INVALID_JAVA_PROPERTIES = Arrays.asList("class", "committedSnapshot", "currentSnapshot",
+ "dataContext", "objectId", "persistenceState", "snapshotVersion");
static final MappingNamesHelper sharedInstance = new MappingNamesHelper();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/UpdateBatchQuery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/UpdateBatchQuery.java?rev=616909&r1=616908&r2=616909&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/UpdateBatchQuery.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/UpdateBatchQuery.java Wed Jan 30 13:33:21 2008
@@ -167,7 +167,7 @@
* @since 1.1
*/
public Map getCurrentQualifier() {
- return (Map) qualifierSnapshots.get(batchIndex);
+ return qualifierSnapshots.get(batchIndex);
}
/**
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/hessian/HessianConfig.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/hessian/HessianConfig.java?rev=616909&r1=616908&r2=616909&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/hessian/HessianConfig.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/hessian/HessianConfig.java Wed Jan 30 13:33:21 2008
@@ -89,8 +89,7 @@
c.setAccessible(true);
}
- AbstractSerializerFactory object = (AbstractSerializerFactory) c
- .newInstance(null);
+ AbstractSerializerFactory object = (AbstractSerializerFactory) c.newInstance();
if (resolver != null) {
try {
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/AntDataPortDelegate.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/AntDataPortDelegate.java?rev=616909&r1=616908&r2=616909&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/AntDataPortDelegate.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/AntDataPortDelegate.java Wed Jan 30 13:33:21 2008
@@ -81,7 +81,6 @@
if (!passedDataMapFilter(entity.getDataMap())) {
it.remove();
- continue;
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/NamePatternMatcher.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/NamePatternMatcher.java?rev=616909&r1=616908&r2=616909&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/NamePatternMatcher.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/NamePatternMatcher.java Wed Jan 30 13:33:21 2008
@@ -75,11 +75,10 @@
+ "], reason: "
+ e.getMessage());
}
- continue;
}
}
- return (Pattern[]) patterns.toArray(new Pattern[patterns.size()]);
+ return patterns.toArray(new Pattern[patterns.size()]);
}
/**
@@ -120,7 +119,7 @@
patterns.add(buffer.toString());
}
- return (String[]) patterns.toArray(new String[patterns.size()]);
+ return patterns.toArray(new String[patterns.size()]);
}
else {
return new String[0];
@@ -175,7 +174,6 @@
if (!passedExcludeFilter(entity)) {
it.remove();
- continue;
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/Invocation.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/Invocation.java?rev=616909&r1=616908&r2=616909&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/Invocation.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/Invocation.java Wed Jan 30 13:33:21 2008
@@ -34,7 +34,7 @@
* @author Holger Hoffstaette
* @author Dirk Olmes
*/
-public class Invocation extends Object {
+public class Invocation {
private WeakReference _target;
private Method _method;