diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-05-09 23:30:40 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-05-09 23:30:40 +0000 |
| commit | f1ec1d13db4b92ed4554555b413c758917b027fa (patch) | |
| tree | 95b86eb6b7646b14ccefb7d3068a11094b9d78c1 /vm/reference/gnu/java/lang | |
| parent | 16e862d18eaf06a8bb7b112ed0fabf1da0c19738 (diff) | |
| download | classpath-f1ec1d13db4b92ed4554555b413c758917b027fa.tar.gz | |
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.
Diffstat (limited to 'vm/reference/gnu/java/lang')
| -rw-r--r-- | vm/reference/gnu/java/lang/VMCPStringBuilder.java | 13 | ||||
| -rw-r--r-- | vm/reference/gnu/java/lang/management/VMMemoryMXBeanImpl.java | 7 |
2 files changed, 14 insertions, 6 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(); |