Author: mgentry
Date: Tue Apr 16 13:06:23 2013
New Revision: 1468403
URL: http://svn.apache.org/r1468403
Log:
Fix for CAY-1809: Remove 'final' modifier from Cayenne, HessianUtil,
PropertyComparator, ConversionUtil, and LinkedDeque
Modified:
cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/Cayenne.java
cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/PropertyComparator.java
cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/hessian/service/HessianUtil.java
cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/ConversionUtil.java
cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/concurrentlinkedhashmap/LinkedDeque.java
Modified:
cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/Cayenne.java
URL:
http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/Cayenne.java?rev=1468403&r1=1468402&r2=1468403&view=diff
==============================================================================
---
cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/Cayenne.java
(original)
+++
cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/Cayenne.java
Tue Apr 16 13:06:23 2013
@@ -46,7 +46,7 @@ import org.apache.cayenne.reflect.Proper
*
* @since 3.1 its predecessor was called DataObjectUtils
*/
-public final class Cayenne {
+public class Cayenne {
/**
* A special property denoting a size of the to-many collection, when
encountered at
Modified:
cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/PropertyComparator.java
URL:
http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/PropertyComparator.java?rev=1468403&r1=1468402&r2=1468403&view=diff
==============================================================================
---
cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/PropertyComparator.java
(original)
+++
cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/PropertyComparator.java
Tue Apr 16 13:06:23 2013
@@ -24,7 +24,7 @@ import java.util.Map.Entry;
/**
* @since 3.1
*/
-final class PropertyComparator implements
+class PropertyComparator implements
Comparator<Entry<String, Property>> {
static final Comparator<Entry<String, Property>> comparator = new
PropertyComparator();
Modified:
cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/hessian/service/HessianUtil.java
URL:
http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/hessian/service/HessianUtil.java?rev=1468403&r1=1468402&r2=1468403&view=diff
==============================================================================
---
cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/hessian/service/HessianUtil.java
(original)
+++
cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/hessian/service/HessianUtil.java
Tue Apr 16 13:06:23 2013
@@ -35,7 +35,7 @@ import com.caucho.hessian.io.HessianOutp
*
* @since 1.2
*/
-public final class HessianUtil {
+public class HessianUtil {
/**
* A utility method that clones an object using Hessian
serialization/deserialization
Modified:
cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/ConversionUtil.java
URL:
http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/ConversionUtil.java?rev=1468403&r1=1468402&r2=1468403&view=diff
==============================================================================
---
cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/ConversionUtil.java
(original)
+++
cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/ConversionUtil.java
Tue Apr 16 13:06:23 2013
@@ -30,7 +30,7 @@ import org.apache.cayenne.exp.Expression
*
* @since 1.1
*/
-public final class ConversionUtil {
+public class ConversionUtil {
public static int toInt(Object object, int defaultValue) {
if (object == null) {
Modified:
cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/concurrentlinkedhashmap/LinkedDeque.java
URL:
http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/concurrentlinkedhashmap/LinkedDeque.java?rev=1468403&r1=1468402&r2=1468403&view=diff
==============================================================================
---
cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/concurrentlinkedhashmap/LinkedDeque.java
(original)
+++
cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/concurrentlinkedhashmap/LinkedDeque.java
Tue Apr 16 13:06:23 2013
@@ -56,7 +56,7 @@ import java.util.NoSuchElementException;
*
* @param <E> the type of elements held in this collection
*/
-final class LinkedDeque<E extends Linked<E>> extends AbstractCollection<E> {
+class LinkedDeque<E extends Linked<E>> extends AbstractCollection<E> {
// This class provides a doubly-linked list that is optimized for the
virtual
// machine. The first and last elements are manipulated instead of a
slightly
