summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Culkin <scorpress@gmail.com>2024-05-21 17:02:38 -0400
committerBenjamin Culkin <scorpress@gmail.com>2024-05-21 17:02:38 -0400
commita6e4cbb93c629905489de971e84e4914d5a25e2c (patch)
tree36979b566ee9c3142d649605c0d9345977daea22
parent2fb1a63378290d6ed13cc12c12c08901f6780c2d (diff)
Small tweaks
-rw-r--r--projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSArray.java16
-rw-r--r--projects/net.wotonomy.foundation/src/test/java/AllTests.java17
-rw-r--r--projects/net.wotonomy.ui.swing/src/main/java/net/wotonomy/ui/swing/components/AbsoluteLayout.java2
3 files changed, 11 insertions, 24 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())
diff --git a/projects/net.wotonomy.foundation/src/test/java/AllTests.java b/projects/net.wotonomy.foundation/src/test/java/AllTests.java
deleted file mode 100644
index 906dfac..0000000
--- a/projects/net.wotonomy.foundation/src/test/java/AllTests.java
+++ /dev/null
@@ -1,17 +0,0 @@
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllTests {
-
- public static void main(String[] args) {
- }
-
- public static Test suite() {
- TestSuite suite = new TestSuite("Test for default package");
- // $JUnit-BEGIN$
- suite.addTestSuite(net.wotonomy.foundation.AllTests.class);
- // $JUnit-END$
- return suite;
- }
-
-}
diff --git a/projects/net.wotonomy.ui.swing/src/main/java/net/wotonomy/ui/swing/components/AbsoluteLayout.java b/projects/net.wotonomy.ui.swing/src/main/java/net/wotonomy/ui/swing/components/AbsoluteLayout.java
index 579a595..5a1d71c 100644
--- a/projects/net.wotonomy.ui.swing/src/main/java/net/wotonomy/ui/swing/components/AbsoluteLayout.java
+++ b/projects/net.wotonomy.ui.swing/src/main/java/net/wotonomy/ui/swing/components/AbsoluteLayout.java
@@ -39,6 +39,8 @@ import java.io.Serializable;
* @version $Revision: 904 $
*/
public class AbsoluteLayout implements LayoutManager, Serializable {
+ private static final long serialVersionUID = 469161233110335084L;
+
public void addLayoutComponent(String name, Component comp) {
}