diff options
author | Mark Spruiell <mes@zeroc.com> | 2008-01-28 13:44:56 -0800 |
---|---|---|
committer | Mark Spruiell <mes@zeroc.com> | 2008-01-28 13:44:56 -0800 |
commit | 78a3798d14b42c48dc1c4ce8fda56571eb7536f3 (patch) | |
tree | 578f44b66d71977298eb68eee4b1ea9a720cfcc2 /java/test/Ice/slicing/objectsAMD/TestI.java | |
parent | removing VC71 (diff) | |
download | ice-78a3798d14b42c48dc1c4ce8fda56571eb7536f3.tar.bz2 ice-78a3798d14b42c48dc1c4ce8fda56571eb7536f3.tar.xz ice-78a3798d14b42c48dc1c4ce8fda56571eb7536f3.zip |
bug 1388 + Java5 fixes for bug 2551
Diffstat (limited to 'java/test/Ice/slicing/objectsAMD/TestI.java')
-rw-r--r-- | java/test/Ice/slicing/objectsAMD/TestI.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/java/test/Ice/slicing/objectsAMD/TestI.java b/java/test/Ice/slicing/objectsAMD/TestI.java index e9137e3bc20..035f2ec6a44 100644 --- a/java/test/Ice/slicing/objectsAMD/TestI.java +++ b/java/test/Ice/slicing/objectsAMD/TestI.java @@ -266,30 +266,30 @@ public final class TestI extends _TestIntfDisp } public void - dictionaryTest_async(AMD_TestIntf_dictionaryTest cb, java.util.Map bin, Ice.Current current) + dictionaryTest_async(AMD_TestIntf_dictionaryTest cb, java.util.Map<Integer, B> bin, Ice.Current current) { - java.util.Map bout = new java.util.HashMap(); + java.util.Map<Integer, B> bout = new java.util.HashMap<Integer, B>(); int i; for(i = 0; i < 10; ++i) { - B b = (B)bin.get(new Integer(i)); + B b = bin.get(i); D2 d2 = new D2(); d2.sb = b.sb; d2.pb = b.pb; d2.sd2 = "D2"; d2.pd2 = d2; - bout.put(new Integer(i * 10), d2); + bout.put(i * 10, d2); } - java.util.Map r = new java.util.HashMap(); + java.util.Map<Integer, B> r = new java.util.HashMap<Integer, B>(); for(i = 0; i < 10; ++i) { String s = "D1." + new Integer(i * 20).toString(); D1 d1 = new D1(); d1.sb = s; - d1.pb = (i == 0 ? (B)null : (B)r.get(new Integer((i - 1) * 20))); + d1.pb = (i == 0 ? null : r.get((i - 1) * 20)); d1.sd1 = s; d1.pd1 = d1; - r.put(new Integer(i * 20), d1); + r.put(i * 20, d1); } cb.ice_response(r, bout); } |