1 files changed, 9 insertions, 7 deletions

diff --git a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSArray.java b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSArray.java
index e79c206..175c3a1 100644
--- a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSArray.java
+++ b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSArray.java
@@ -41,11 +41,13 @@ import java.util.ListIterator;
  * @author $Author: cgruber $
  * @version $Revision: 929 $
  */
-public class NSArray implements List, Serializable {
+public class NSArray implements List<Object>, Serializable {
+	private static final long serialVersionUID = 3640615326084287961L;
+
 	/**
 	 * Actual list that backs this instance.
 	 */
-	List list;
+	List<Object> list;
 
 	/**
 	 * Return value when array index is not found.
@@ -62,7 +64,7 @@ public class NSArray implements List, Serializable {
 	 * an internal representation that is returned by a method of return type
 	 * NSArray.
 	 */
-	public static NSArray arrayBackedByList(List aList) {
+	public static NSArray arrayBackedByList(List<Object> aList) {
 		return new NSArray(aList, null);
 	}
 
@@ -80,7 +82,7 @@ public class NSArray implements List, Serializable {
 	 * @param ignored This parameter is entirely ignored, and is only there to
 	 *                distinguish the API.
 	 */
-	NSArray(List aList, Object ignored) // differentiates
+	NSArray(List<Object> aList, Object ignored) // differentiates
 	{
 		list = aList;
 	}
@@ -89,14 +91,14 @@ public class NSArray implements List, Serializable {
 	 * Constructor with a size hint, used by NSMutableArray.
 	 */
 	NSArray(int aSize) {
-		list = new ArrayList(aSize);
+		list = new ArrayList<>(aSize);
 	}
 
 	/**
 	 * Default constructor returns an empty array.
 	 */
 	public NSArray() {
-		list = new ArrayList();
+		list = new ArrayList<>();
 	}
 
 	/**
@@ -120,7 +122,7 @@ public class NSArray implements List, Serializable {
 	/**
 	 * Produces an array containing the objects in the specified collection.
 	 */
-	public NSArray(Collection aCollection) {
+	public NSArray(Collection<Object> aCollection) {
 		this();
 		Iterator i = aCollection.iterator();
 		while (i.hasNext())