Changeset 11281

Timestamp:

08/13/08 15:13:08 (15 years ago)

Author:

ehuelsmann

Message:

Eradicate last 'unchecked' warnings. (We now have a clean Java compile on Java 1.5.)

Location:

trunk/j/src/org/armedbear/lisp

Files:

• Mailbox.java (modified) (2 diffs)
• Primitives.java (modified) (2 diffs)
• RuntimeClass.java (modified) (4 diffs)
• ShellCommand.java (modified) (3 diffs)
• StandardGenericFunction.java (modified) (6 diffs)

trunk/j/src/org/armedbear/lisp/Mailbox.java

@@ -3 +3 @@
  *
  * Copyright (C) 2004-2007 Peter Graves, Andras Simon
- * $Id: Mailbox.java,v 1.12 2007-02-23 21:17:34 piso Exp $
+ * $Id: Mailbox.java,v 1.13 2008-08-13 15:13:06 ehuelsmann Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -27 +27 @@
 public final class Mailbox extends LispObject
 {
-  private LinkedList box = new LinkedList();
+  private LinkedList<LispObject> box = new LinkedList<LispObject>();
 
   public LispObject typeOf()

trunk/j/src/org/armedbear/lisp/Primitives.java

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2007 Peter Graves
- * $Id: Primitives.java,v 1.881 2007-09-17 18:14:48 piso Exp $
+ * $Id: Primitives.java,v 1.882 2008-08-13 15:13:06 ehuelsmann Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -3997 +3997 @@
             return NIL;
           }
-        ArrayList arrayList = new ArrayList();
+        ArrayList<LispObject> arrayList = new ArrayList<LispObject>();
         while (args != NIL)
           {

trunk/j/src/org/armedbear/lisp/RuntimeClass.java

@@ -3 +3 @@
  *
  * Copyright (C) 2004 Peter Graves
- * $Id: RuntimeClass.java,v 1.12 2007-02-23 21:17:34 piso Exp $
+ * $Id: RuntimeClass.java,v 1.13 2008-08-13 15:13:07 ehuelsmann Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -28 +28 @@
 public class RuntimeClass extends Lisp
 {
-    private static Map classes = new HashMap();
+    private static Map<String,RuntimeClass> classes = new HashMap<String,RuntimeClass>();
 
-    private Map methods = new HashMap();
+    private Map<String,Function> methods = new HashMap<String,Function>();
 
     // ### %jnew-runtime-class
@@ -42 +42 @@
             if (length < 3 || length % 2 != 1)
                 return error(new WrongNumberOfArgumentsException(this));
-      RuntimeClass rc = new RuntimeClass();
-      String className = args[0].getStringValue();
+        RuntimeClass rc = new RuntimeClass();
+        String className = args[0].getStringValue();
             for (int i = 1; i < length; i = i+2) {
                 String methodName = args[i].getStringValue();
                 rc.addLispMethod(methodName, (Function)args[i+1]);
-      }
+        }
             classes.put(className, rc);
-      return T;
+        return T;
         }
     };
@@ -89 +89 @@
         {
             String cn = className.getStringValue();
-      String pn = cn.substring(0,cn.lastIndexOf('.'));
-      byte[] cb = (byte[]) classBytes.javaInstance();
+        String pn = cn.substring(0,cn.lastIndexOf('.'));
+        byte[] cb = (byte[]) classBytes.javaInstance();
             try {
                 JavaClassLoader loader = JavaClassLoader.getPersistentInstance(pn);

trunk/j/src/org/armedbear/lisp/ShellCommand.java

@@ -3 +3 @@
  *
  * Copyright (C) 2000-2005 Peter Graves
- * $Id: ShellCommand.java,v 1.9 2007-02-23 21:17:34 piso Exp $
+ * $Id: ShellCommand.java,v 1.10 2008-08-13 15:13:08 ehuelsmann Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -83 +83 @@
                     }
                 } else if (Utilities.isPlatformWindows) {
-                    ArrayList list = new ArrayList();
+                    ArrayList<String> list = new ArrayList<String>();
                     list.add("cmd.exe");
                     list.add("/c");
@@ -134 +134 @@
 
     // Does not handle embedded single-quoted strings.
-    private static List tokenize(String s)
-    {
-        ArrayList list = new ArrayList();
+    private static List<String> tokenize(String s)
+    {
+        ArrayList<String> list = new ArrayList<String>();
         StringBuffer sb = new StringBuffer();
         boolean inQuote = false;

trunk/j/src/org/armedbear/lisp/StandardGenericFunction.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003-2006 Peter Graves
- * $Id: StandardGenericFunction.java,v 1.20 2007-02-23 21:17:34 piso Exp $
+ * $Id: StandardGenericFunction.java,v 1.21 2008-08-13 15:13:08 ehuelsmann Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -30 +30 @@
   private int numberOfRequiredArgs;
 
-  private HashMap cache;
+  private HashMap<CacheEntry,LispObject> cache;
+  private HashMap<LispObject,LispObject> slotCache;
 
   public StandardGenericFunction()
@@ -674 +675 @@
           }
         CacheEntry classes = new CacheEntry(array);
-        HashMap ht = gf.cache;
+        HashMap<CacheEntry,LispObject> ht = gf.cache;
         if (ht == null)
-            ht = gf.cache = new HashMap();
+            ht = gf.cache = new HashMap<CacheEntry,LispObject>();
         ht.put(classes, third);
         return third;
@@ -706 +707 @@
           }
         CacheEntry classes = new CacheEntry(array);
-        HashMap ht = gf.cache;
+        HashMap<CacheEntry,LispObject> ht = gf.cache;
         if (ht == null)
           return NIL;
@@ -733 +734 @@
         LispObject layout = second;
         LispObject location = third;
-        HashMap ht = gf.cache;
+        HashMap<LispObject,LispObject> ht = gf.slotCache;
         if (ht == null)
-          ht = gf.cache = new HashMap();
+          ht = gf.slotCache = new HashMap<LispObject,LispObject>();
         ht.put(layout, location);
         return third;
@@ -758 +759 @@
           }
         LispObject layout = second;
-        HashMap ht = gf.cache;
+        HashMap<LispObject,LispObject> ht = gf.slotCache;
         if (ht == null)
           return NIL;