diff options
| author | Mark Spruiell <mes@zeroc.com> | 2008-01-30 06:15:20 -0800 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2008-01-30 06:15:20 -0800 |
| commit | f3c3029ff651d294a1a0df0e79e72771307310fc (patch) | |
| tree | 1f061a96f5f46051b6daf45ccbdb63ebd2cdd746 /java/src/IceInternal/ValueWriter.java | |
| parent | Fixed and moved fixVersion.py/fixCopyright.py (diff) | |
| download | ice-f3c3029ff651d294a1a0df0e79e72771307310fc.tar.bz2 ice-f3c3029ff651d294a1a0df0e79e72771307310fc.tar.xz ice-f3c3029ff651d294a1a0df0e79e72771307310fc.zip | |
using Java5 types in Ice core; general cleanup
Diffstat (limited to 'java/src/IceInternal/ValueWriter.java')
| -rw-r--r-- | java/src/IceInternal/ValueWriter.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/java/src/IceInternal/ValueWriter.java b/java/src/IceInternal/ValueWriter.java index aab0b88c137..63efa63640a 100644 --- a/java/src/IceInternal/ValueWriter.java +++ b/java/src/IceInternal/ValueWriter.java @@ -18,7 +18,8 @@ public final class ValueWriter } private static void - writeValue(String name, java.lang.Object value, java.util.Map objectTable, IceUtilInternal.OutputBase out) + writeValue(String name, java.lang.Object value, java.util.Map<java.lang.Object, java.lang.Object> objectTable, + IceUtilInternal.OutputBase out) { if(value == null) { @@ -27,7 +28,7 @@ public final class ValueWriter } else { - Class c = value.getClass(); + Class<?> c = value.getClass(); if(c.equals(Byte.class) || c.equals(Short.class) || c.equals(Integer.class) || c.equals(Long.class) || c.equals(Double.class) || c.equals(Float.class) || c.equals(Boolean.class)) { @@ -99,7 +100,7 @@ public final class ValueWriter { if(objectTable == null) { - objectTable = new java.util.IdentityHashMap(); + objectTable = new java.util.IdentityHashMap<java.lang.Object, java.lang.Object>(); } objectTable.put(value, null); writeFields(name, value, c, objectTable, out); @@ -178,7 +179,8 @@ public final class ValueWriter } private static void - writeFields(String name, java.lang.Object obj, Class c, java.util.Map objectTable, IceUtilInternal.OutputBase out) + writeFields(String name, java.lang.Object obj, Class c, + java.util.Map<java.lang.Object, java.lang.Object> objectTable, IceUtilInternal.OutputBase out) { if(!c.equals(java.lang.Object.class)) { |