[Wonder-cvs] SF.net SVN: wonder:[9078] trunk/Wonder/Frameworks/Core/ERExtensions/Sources /com/webobjects/foundation/NSArray.java

[<ms...@us...>]

Revision: 9078
          http://wonder.svn.sourceforge.net/wonder/?rev=9078&view=rev
Author:   mschrag
Date:     2009-03-19 15:27:24 +0000 (Thu, 19 Mar 2009)

Log Message:
-----------
WONDER-141 NSArray<E>#subarrayWithRange(NSRange range) could return NSArray<E> instead of untyped NSArray

Modified Paths:
--------------
    trunk/Wonder/Frameworks/Core/ERExtensions/Sources/com/webobjects/foundation/NSArray.java

Modified: trunk/Wonder/Frameworks/Core/ERExtensions/Sources/com/webobjects/foundation/NSArray.java
===================================================================
--- trunk/Wonder/Frameworks/Core/ERExtensions/Sources/com/webobjects/foundation/NSArray.java	2009-03-19 15:23:18 UTC (rev 9077)
+++ trunk/Wonder/Frameworks/Core/ERExtensions/Sources/com/webobjects/foundation/NSArray.java	2009-03-19 15:27:24 UTC (rev 9078)
@@ -275,7 +275,7 @@
 		_count = rangeLength;
 	}
 
-	private NSArray(E objects[], int rangeLocation, int rangeLength, boolean checkForNull) {
+	protected NSArray(Object objects[], int rangeLocation, int rangeLength, boolean checkForNull) {
 		_recomputeHashCode = true;
 		initFromObjects(objects, rangeLocation, rangeLength, checkForNull);
 	}
@@ -599,12 +599,12 @@
 		}
 	}
 
-	public NSArray subarrayWithRange(NSRange range) {
+	public NSArray<E> subarrayWithRange(NSRange range) {
 		if (range == null) {
 			return EmptyArray;
 		}
 		else {
-			return new NSArray(objectsNoCopy(), range.location(), range.length(), false);
+			return new NSArray<E>(objectsNoCopy(), range.location(), range.length(), false);
 		}
 	}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.