Changeset 11279

Timestamp:

08/13/08 06:33:36 (15 years ago)

Author:

ehuelsmann

Message:

Reduce 'unchecked' warnings to 23.

Location:

trunk/j/src/org/armedbear/lisp

Files:

• JHandler.java (modified) (5 diffs)
• JProxy.java (modified) (3 diffs)
• Java.java (modified) (3 diffs)
• JavaClassLoader.java (modified) (2 diffs)

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

@@ -3 +3 @@
  *
  * Copyright (C) 2003-2005 Andras Simon, Peter Graves
- * $Id: JHandler.java,v 1.10 2007-02-23 21:17:33 piso Exp $
+ * $Id: JHandler.java,v 1.11 2008-08-13 06:33:36 ehuelsmann Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -28 +28 @@
 public final class JHandler extends Lisp
 {
-    private static final Map table = new WeakHashMap();
+    private static final Map<Object,Map<String,Entry>> table =
+       new WeakHashMap<Object,Map<String,Entry>>();
 
     public static void callLisp (String s, Object o)
@@ -52 +53 @@
     {
         if (table.containsKey(o)) {
-            Map entryTable =  (Map)table.get(o);
+            Map<String,Entry> entryTable =  (Map<String,Entry>)table.get(o);
             if (entryTable.containsKey(s)) {
                 Function f = ((Entry)entryTable.get(s)).getHandler();
@@ -87 +88 @@
             if (args.length != 5)
                 return error(new WrongNumberOfArgumentsException(this));
-            Map entryTable = null;
+            Map<String,Entry> entryTable = null;
             Object object = args[0].javaInstance();
             String event = ((Symbol)args[1]).getName();
             if (!table.containsKey(object)) {
-                entryTable = new HashMap();
+                entryTable = new HashMap<String,Entry>();
                 table.put(object,entryTable);
             } else {
-                entryTable = (Map)table.get(object);
+                entryTable = (Map<String,Entry>)table.get(object);
             }
             Entry entry = new Entry((Function) args[2], args[3], event, entryTable);
@@ -109 +110 @@
         LispObject data;
         int count = -1;
-        Map entryTable;
+        Map<String,Entry> entryTable;
         String event;
 
-        public Entry (Function handler, LispObject data, String event, Map entryTable)
+        public Entry (Function handler, LispObject data, String event,
+                      Map<String,Entry> entryTable)
         {
             this.entryTable = entryTable;

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

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2005 Peter Graves, Andras Simon
- * $Id: JProxy.java,v 1.9 2007-02-23 21:17:33 piso Exp $
+ * $Id: JProxy.java,v 1.10 2008-08-13 06:33:36 ehuelsmann Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -31 +31 @@
 public final class JProxy extends Lisp
 {
-  private static final Map table = new WeakHashMap();
+  private static final Map<Object,Entry> table = new WeakHashMap<Object,Entry>();
 
   // ### %jnew-proxy interface &rest method-names-and-defs
@@ -43 +43 @@
         if (length < 3 || length % 2 != 1)
           return error(new WrongNumberOfArgumentsException(this));
-        Map lispDefinedMethods = new HashMap();
+        Map<String,Function> lispDefinedMethods = new HashMap<String,Function>();
         for (int i = 1; i < length; i += 2)
           lispDefinedMethods.put(args[i].getStringValue(),

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

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2006 Peter Graves, Andras Simon
- * $Id: Java.java,v 1.72 2007-02-23 21:17:33 piso Exp $
+ * $Id: Java.java,v 1.73 2008-08-13 06:33:36 ehuelsmann Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -33 +33 @@
 public final class Java extends Lisp
 {
-    private static final Map registeredExceptions = new HashMap();
+    private static final Map<Class,Symbol> registeredExceptions =
+       new HashMap<Class,Symbol>();
 
     private static final LispClass java_exception = LispClass.findClass(Symbol.JAVA_EXCEPTION);
@@ -54 +55 @@
             if ((symbol instanceof Symbol) && isJavaException(LispClass.findClass((Symbol) symbol))) {
                 registeredExceptions.put(classForName(className.getStringValue()),
-                                         symbol);
+                                         (Symbol)symbol);
                 return T;
             }

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

@@ -3 +3 @@
  *
  * Copyright (C) 2003-2005 Peter Graves
- * $Id: JavaClassLoader.java,v 1.14 2008-08-12 21:59:07 ehuelsmann Exp $
+ * $Id: JavaClassLoader.java,v 1.15 2008-08-13 06:33:36 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<String>());
+    private static Set<String> packages = Collections.synchronizedSet(new HashSet<String>());
 
     public JavaClassLoader()