1 files changed, 14 insertions, 10 deletions
diff --git a/gnu/classpath/jdwp/processor/VirtualMachineCommandSet.java b/gnu/classpath/jdwp/processor/VirtualMachineCommandSet.java
index c476a04e9..ef0323568 100644
--- a/gnu/classpath/jdwp/processor/VirtualMachineCommandSet.java
+++ b/gnu/classpath/jdwp/processor/VirtualMachineCommandSet.java
@@ -1,6 +1,6 @@
 /* VirtualMachineCommandSet.java -- class to implement the VirtualMachine
    Command Set
-   Copyright (C) 2005, 2006, 2007 Free Software Foundation
+   Copyright (C) 2005, 2006, 2007, 2013 Free Software Foundation
 
 This file is part of GNU Classpath.
 
@@ -177,15 +177,17 @@ public class VirtualMachineCommandSet
     throws JdwpException, IOException
   {
     String sig = JdwpString.readString(bb);
-    ArrayList allMatchingClasses = new ArrayList();
+    ArrayList<Class<?>> allMatchingClasses = new ArrayList<Class<?>>();
 
     // This will be an Iterator over all loaded Classes
-    Collection classes = VMVirtualMachine.getAllLoadedClasses();
-    Iterator iter = classes.iterator ();
+    // VMWARN: Suppress warning until VM layer is upgraded to generics
+    @SuppressWarnings("unchecked")
+      Collection<Class<?>> classes = VMVirtualMachine.getAllLoadedClasses();
+    Iterator<Class<?>> iter = classes.iterator ();
 
     while (iter.hasNext())
       {
-        Class clazz = (Class) iter.next();
+        Class<?> clazz = iter.next();
         String clazzSig = Signature.computeClassSignature(clazz);
         if (clazzSig.equals(sig))
           allMatchingClasses.add(clazz);
@@ -194,7 +196,7 @@ public class VirtualMachineCommandSet
     os.writeInt(allMatchingClasses.size());
     for (int i = 0; i < allMatchingClasses.size(); i++)
       {
-        Class clazz = (Class) allMatchingClasses.get(i);
+        Class<?> clazz = allMatchingClasses.get(i);
         ReferenceTypeId id = idMan.getReferenceTypeId(clazz);
         id.writeTagged(os);
         int status = VMVirtualMachine.getClassStatus(clazz);
@@ -205,13 +207,15 @@ public class VirtualMachineCommandSet
   private void executeAllClasses(ByteBuffer bb, DataOutputStream os)
     throws JdwpException, IOException
   {
-    Collection classes = VMVirtualMachine.getAllLoadedClasses();
+    // VMWARN: Suppress warning until VM layer is upgraded to generics
+    @SuppressWarnings("unchecked")
+      Collection<Class<?>> classes = VMVirtualMachine.getAllLoadedClasses();
     os.writeInt(classes.size ());
 
-    Iterator iter = classes.iterator ();
+    Iterator<Class<?>> iter = classes.iterator ();
     while (iter.hasNext())
       {
-        Class clazz = (Class) iter.next();
+        Class<?> clazz = iter.next();
         ReferenceTypeId id = idMan.getReferenceTypeId(clazz);
         id.writeTagged(os);
         String sig = Signature.computeClassSignature(clazz);
@@ -419,7 +423,7 @@ public class VirtualMachineCommandSet
       }
 
     int classes = bb.getInt();
-    Class[] types = new Class[classes];
+    Class<?>[] types = new Class<?>[classes];
     byte[][] bytecodes = new byte[classes][];
     for (int i = 0; i < classes; ++i)
       {