2008-05-10 Andrew John Hughes <gnu_andrew@member.fsf.org>

	* vm/reference/gnu/java/lang/VMCPStringBuilder.java,
	* vm/reference/gnu/java/lang/management/VMMemoryMXBeanImpl.java,
	* vm/reference/java/net/VMNetworkInterface.java:
	Remove use of 1.5 language constructs.

3 files changed, 17 insertions, 9 deletions

diff --git a/vm/reference/gnu/java/lang/VMCPStringBuilder.java b/vm/reference/gnu/java/lang/VMCPStringBuilder.java
index 925f5643d..aafac7f24 100644
--- a/vm/reference/gnu/java/lang/VMCPStringBuilder.java
+++ b/vm/reference/gnu/java/lang/VMCPStringBuilder.java
@@ -53,14 +53,16 @@ final class VMCPStringBuilder
   /**
    * The package-private constructor for String objects without copying.
    */
-  private static final Constructor<String> cons;
+  private static final Constructor cons;
 
   static
   {
     try
       {
-	cons = String.class.getDeclaredConstructor(char[].class, Integer.TYPE,
-						   Integer.TYPE, Boolean.TYPE);
+	cons = String.class.getDeclaredConstructor(new Class[] { char[].class,
+								 Integer.TYPE,
+								 Integer.TYPE,
+								 Boolean.TYPE });
 	cons.setAccessible(true);
       }
     catch (NoSuchMethodException e)
@@ -85,7 +87,10 @@ final class VMCPStringBuilder
   {
     try
       {
-	return cons.newInstance(value, startIndex, count, true);
+	return (String)
+	  cons.newInstance(new Object[] { value, Integer.valueOf(startIndex),
+					  Integer.valueOf(count),
+					  Boolean.valueOf(true) });
       }
     catch (InstantiationException e)
       {
diff --git a/vm/reference/gnu/java/lang/management/VMMemoryMXBeanImpl.java b/vm/reference/gnu/java/lang/management/VMMemoryMXBeanImpl.java
index b9073319c..eade26374 100644
--- a/vm/reference/gnu/java/lang/management/VMMemoryMXBeanImpl.java
+++ b/vm/reference/gnu/java/lang/management/VMMemoryMXBeanImpl.java
@@ -42,6 +42,7 @@ import java.lang.management.MemoryPoolMXBean;
 import java.lang.management.MemoryType;
 import java.lang.management.MemoryUsage;
 
+import java.util.Iterator;
 import java.util.List;
 
 /**
@@ -121,9 +122,11 @@ final class VMMemoryMXBeanImpl
    */
   private static MemoryUsage getUsage(MemoryType type) {
     long init = 0, committed = 0, used = 0, max = 0;
-    List<MemoryPoolMXBean> pools = ManagementFactory.getMemoryPoolMXBeans();
-    for (MemoryPoolMXBean pool: pools)
+    Iterator pools =
+      ManagementFactory.getMemoryPoolMXBeans().iterator();
+    while (pools.hasNext())
       {
+	MemoryPoolMXBean pool = (MemoryPoolMXBean) pools.next();
 	if (pool.getType() == type)
 	  {
 	    MemoryUsage usage = pool.getUsage();
diff --git a/vm/reference/java/net/VMNetworkInterface.java b/vm/reference/java/net/VMNetworkInterface.java
index e28e6161a..34db6b626 100644
--- a/vm/reference/java/net/VMNetworkInterface.java
+++ b/vm/reference/java/net/VMNetworkInterface.java
@@ -57,12 +57,12 @@ import java.util.Set;
 final class VMNetworkInterface
 {
   String name;
-  Set<InetAddress> addresses;
+  Set addresses;
 
   VMNetworkInterface(String name)
   {
     this.name = name;
-    addresses = new HashSet<InetAddress>();
+    addresses = new HashSet();
   }
   
   /**
@@ -71,7 +71,7 @@ final class VMNetworkInterface
    */
   public VMNetworkInterface()
   {
-    addresses = new HashSet<InetAddress>();
+    addresses = new HashSet();
     try
       {
         addresses.add(InetAddress.getByName("0.0.0.0"));