Changeset 11278

Timestamp:

08/12/08 21:59:13 (15 years ago)

Author:

ehuelsmann

Message:

Reduce the number of "unchecked" warnings from 64 to 29.

Location:

trunk/j/src/org/armedbear/lisp

Files:

• Closure.java (modified) (14 diffs)
• JavaClassLoader.java (modified) (2 diffs)
• Lisp.java (modified) (3 diffs)
• LispThread.java (modified) (5 diffs)
• Package.java (modified) (9 diffs)
• SymbolHashTable.java (modified) (2 diffs)

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

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2008 Peter Graves
- * $Id: Closure.java,v 1.112 2008-02-20 18:30:25 piso Exp $
+ * $Id: Closure.java,v 1.113 2008-08-12 21:59:05 ehuelsmann Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -81 +81 @@
       {
         final int length = lambdaList.length();
-        ArrayList required = null;
-        ArrayList optional = null;
-        ArrayList keywords = null;
-        ArrayList aux = null;
+        ArrayList<Parameter> required = null;
+        ArrayList<Parameter> optional = null;
+        ArrayList<Parameter> keywords = null;
+        ArrayList<Parameter> aux = null;
         int state = STATE_REQUIRED;
         LispObject remaining = lambdaList;
@@ -95 +95 @@
                   {
                     if (aux == null)
-                      aux = new ArrayList();
+                      aux = new ArrayList<Parameter>();
                     aux.add(new Parameter((Symbol)obj, NIL, AUX));
                   }
@@ -153 +153 @@
                       {
                         if (optional == null)
-                          optional = new ArrayList();
+                          optional = new ArrayList<Parameter>();
                         optional.add(new Parameter((Symbol)obj, NIL, OPTIONAL));
                         if (maxArgs >= 0)
@@ -161 +161 @@
                       {
                         if (keywords == null)
-                          keywords = new ArrayList();
+                          keywords = new ArrayList<Parameter>();
                         keywords.add(new Parameter((Symbol)obj, NIL, KEYWORD));
                         if (maxArgs >= 0)
@@ -170 +170 @@
                         Debug.assertTrue(state == STATE_REQUIRED);
                         if (required == null)
-                          required = new ArrayList();
+                          required = new ArrayList<Parameter>();
                         required.add(new Parameter((Symbol)obj));
                         if (maxArgs >= 0)
@@ -185 +185 @@
                     Debug.assertTrue(initForm != null);
                     if (aux == null)
-                      aux = new ArrayList();
+                      aux = new ArrayList<Parameter>();
                     aux.add(new Parameter(sym, initForm, AUX));
                   }
@@ -194 +194 @@
                     LispObject svar = obj.cdr().cdr().car();
                     if (optional == null)
-                      optional = new ArrayList();
+                      optional = new ArrayList<Parameter>();
                     optional.add(new Parameter(sym, initForm, svar, OPTIONAL));
                     if (maxArgs >= 0)
@@ -226 +226 @@
                       }
                     if (keywords == null)
-                      keywords = new ArrayList();
+                      keywords = new ArrayList<Parameter>();
                     keywords.add(new Parameter(keyword, var, initForm, svar));
                     if (maxArgs >= 0)
@@ -294 +294 @@
   private final Symbol[] processVariables()
   {
-    ArrayList vars = new ArrayList();
+    ArrayList<Symbol> vars = new ArrayList<Symbol>();
     if (requiredParameters != null)
       {
@@ -306 +306 @@
             vars.add(optionalParameters[i].var);
             if (optionalParameters[i].svar != NIL)
-              vars.add(optionalParameters[i].svar);
+              vars.add((Symbol)optionalParameters[i].svar);
             if (!bindInitForms)
               if (!optionalParameters[i].initForm.constantp())
@@ -322 +322 @@
             vars.add(keywordParameters[i].var);
             if (keywordParameters[i].svar != NIL)
-              vars.add(keywordParameters[i].svar);
+              vars.add((Symbol)keywordParameters[i].svar);
             if (!bindInitForms)
               if (!keywordParameters[i].initForm.constantp())
@@ -335 +335 @@
   private final Symbol[] processDeclarations() throws ConditionThrowable
   {
-    ArrayList arrayList = null;
+    ArrayList<Symbol> arrayList = null;
     LispObject forms = body;
     while (forms != NIL)
@@ -353 +353 @@
                         Symbol var = checkSymbol(vars.car());
                         if (arrayList == null)
-                          arrayList = new ArrayList();
+                          arrayList = new ArrayList<Symbol>();
                         arrayList.add(var);
                         vars = vars.cdr();

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

@@ -3 +3 @@
  *
  * Copyright (C) 2003-2005 Peter Graves
- * $Id: JavaClassLoader.java,v 1.13 2005-10-15 16:13:20 piso Exp $
+ * $Id: JavaClassLoader.java,v 1.14 2008-08-12 21:59:07 ehuelsmann Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -40 +40 @@
     private static JavaClassLoader persistentInstance;
 
-    private static Set packages = Collections.synchronizedSet(new HashSet());
+    private static Set packages = Collections.synchronizedSet(new HashSet<String>());
 
     public JavaClassLoader()

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

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2007 Peter Graves <peter@armedbear.org>
- * $Id: Lisp.java,v 1.449 2007-10-03 12:11:52 piso Exp $
+ * $Id: Lisp.java,v 1.450 2008-08-12 21:59:07 ehuelsmann Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -1130 +1130 @@
           Debug.trace("bytesRemaining = " + bytesRemaining);
 
-        JavaClassLoader loader = new JavaClassLoader();
+        //JavaClassLoader loader = new JavaClassLoader();
         Class c =
-          loader.loadClassFromByteArray(null, bytes, 0, bytes.length);
+          (new JavaClassLoader()).loadClassFromByteArray(null, bytes, 0, bytes.length);
         if (c != null)
           {
@@ -1912 +1912 @@
 
   // The compiler's object table.
-  private static final Hashtable objectTable = new Hashtable();
+  private static final Hashtable<String,LispObject> objectTable =
+          new Hashtable<String,LispObject>();
 
   public static final LispObject recall(SimpleString key)

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

@@ -3 +3 @@
  *
  * Copyright (C) 2003-2007 Peter Graves
- * $Id: LispThread.java,v 1.92 2007-02-23 21:17:33 piso Exp $
+ * $Id: LispThread.java,v 1.93 2008-08-12 21:59:11 ehuelsmann Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -22 +22 @@
 package org.armedbear.lisp;
 
-import java.util.HashMap;
+import java.util.WeakHashMap;
 import java.util.Iterator;
 
@@ -31 +31 @@
     private static final Object lock = new Object();
 
-    private static HashMap map = new HashMap();
+    private static WeakHashMap<Thread,LispThread> map =
+       new WeakHashMap<Thread,LispThread>();
 
     private static Thread currentJavaThread;
@@ -58 +59 @@
     {
         synchronized (lock) {
-            HashMap m = (HashMap) map.clone();
+            WeakHashMap<Thread,LispThread> m = new WeakHashMap<Thread,LispThread>(map);
             m.put(javaThread, lispThread);
             map = m;
@@ -67 +68 @@
     {
         synchronized (lock) {
-            HashMap m = (HashMap) map.clone();
+            WeakHashMap<Thread,LispThread> m = new WeakHashMap<Thread,LispThread>(map);
             m.remove(javaThread);
             map = m;

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

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2007 Peter Graves <peter@armedbear.org>
- * $Id: Package.java,v 1.75 2007-05-11 00:26:15 piso Exp $
+ * $Id: Package.java,v 1.76 2008-08-12 21:59:11 ehuelsmann Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -37 +37 @@
     private final SymbolHashTable externalSymbols = new SymbolHashTable(16);
 
-    private HashMap shadowingSymbols;
-    private ArrayList nicknames;
+    private HashMap<String,Symbol> shadowingSymbols;
+    private ArrayList<String> nicknames;
     private LispObject useList = null;
-    private ArrayList usedByList = null;
+    private ArrayList<Package> usedByList = null;
 
     // Anonymous package.
@@ -147 +147 @@
         throws ConditionThrowable
     {
-        ArrayList arrayList = null;
+        ArrayList<String> arrayList = null;
         while (newNicks != NIL) {
             if (arrayList == null)
-                arrayList = new ArrayList();
+                arrayList = new ArrayList<String>();
             arrayList.add(javaString(newNicks.car()));
             newNicks = newNicks.cdr();
@@ -556 +556 @@
     {
         if (shadowingSymbols == null)
-            shadowingSymbols = new HashMap();
+            shadowingSymbols = new HashMap<String,Symbol>();
         final SimpleString s = new SimpleString(symbolName);
         Symbol symbol = externalSymbols.get(s);
@@ -613 +613 @@
         internalSymbols.put(symbol.name, symbol);
         if (shadowingSymbols == null)
-            shadowingSymbols = new HashMap();
+            shadowingSymbols = new HashMap<String,Symbol>();
         Debug.assertTrue(shadowingSymbols.get(symbolName) == null);
         shadowingSymbols.put(symbolName, symbol);
@@ -648 +648 @@
                 Debug.assertTrue(!pkg.usedByList.contains(this));
             if (pkg.usedByList == null)
-                pkg.usedByList = new ArrayList();
+                pkg.usedByList = new ArrayList<Package>();
             pkg.usedByList.add(this);
         }
@@ -682 +682 @@
                 return; // Nothing to do.
         } else
-            nicknames = new ArrayList();
+            nicknames = new ArrayList<String>();
 
         nicknames.add(s);
@@ -747 +747 @@
     }
 
-    public synchronized List getAccessibleSymbols()
-    {
-        ArrayList list = new ArrayList();
+    public synchronized List<Symbol> getAccessibleSymbols()
+    {
+        ArrayList<Symbol> list = new ArrayList<Symbol>();
         list.addAll(internalSymbols.getSymbols());
         list.addAll(externalSymbols.getSymbols());
@@ -757 +757 @@
                 while (usedPackages != NIL) {
                     Package pkg = (Package) usedPackages.car();
-                    List symbols = pkg.externalSymbols.getSymbols();
+                    List<Symbol> symbols = pkg.externalSymbols.getSymbols();
                     for (int i = 0; i < symbols.size(); i++) {
                         Symbol symbol = (Symbol) symbols.get(i);

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

@@ -3 +3 @@
  *
  * Copyright (C) 2004-2005 Peter Graves
- * $Id: SymbolHashTable.java,v 1.3 2005-11-07 02:29:50 piso Exp $
+ * $Id: SymbolHashTable.java,v 1.4 2008-08-12 21:59:13 ehuelsmann Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -197 +197 @@
     }
 
-    public List getSymbols()
-    {
-        ArrayList list = new ArrayList();
+    public List<Symbol> getSymbols()
+    {
+        ArrayList<Symbol> list = new ArrayList<Symbol>();
         for (int i = 0; i < buckets.length; i++) {
             HashEntry e = buckets[i];