diff options
| author | Mark Spruiell <mes@zeroc.com> | 2008-01-30 09:03:26 -0800 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2008-01-30 09:03:26 -0800 |
| commit | ae9c2dd53558ccd9515068b6e0a7e2c8fd2ccf4a (patch) | |
| tree | dd321ccb431c6975820f174ff8273961a989ad7e /java/test/Ice/operations/MyDerivedClassI.java | |
| parent | Merge commit 'origin/master' into bug1388 (diff) | |
| download | ice-ae9c2dd53558ccd9515068b6e0a7e2c8fd2ccf4a.tar.bz2 ice-ae9c2dd53558ccd9515068b6e0a7e2c8fd2ccf4a.tar.xz ice-ae9c2dd53558ccd9515068b6e0a7e2c8fd2ccf4a.zip | |
deprecate Java2 mapping; Java bug fixes
Diffstat (limited to 'java/test/Ice/operations/MyDerivedClassI.java')
| -rw-r--r-- | java/test/Ice/operations/MyDerivedClassI.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/java/test/Ice/operations/MyDerivedClassI.java b/java/test/Ice/operations/MyDerivedClassI.java index 3f3da413448..0e0ed9de44a 100644 --- a/java/test/Ice/operations/MyDerivedClassI.java +++ b/java/test/Ice/operations/MyDerivedClassI.java @@ -82,7 +82,7 @@ public final class MyDerivedClassI extends Test.MyDerivedClass } public java.util.Map<Byte, Boolean> - opByteBoolD(java.util.Map<Byte, Boolean> p1, java.util.Map<Byte, Boolean> p2, + opByteBoolD(java.util.Map p1, java.util.Map p2, Test.ByteBoolDHolder p3, Ice.Current current) { @@ -175,7 +175,7 @@ public final class MyDerivedClassI extends Test.MyDerivedClass } public java.util.Map<Long, Float> - opLongFloatD(java.util.Map<Long, Float> p1, java.util.Map<Long, Float> p2, + opLongFloatD(java.util.Map p1, java.util.Map p2, Test.LongFloatDHolder p3, Ice.Current current) { @@ -207,7 +207,7 @@ public final class MyDerivedClassI extends Test.MyDerivedClass } public java.util.Map<Short, Integer> - opShortIntD(java.util.Map<Short, Integer> p1, java.util.Map<Short, Integer> p2, + opShortIntD(java.util.Map p1, java.util.Map p2, Test.ShortIntDHolder p3, Ice.Current current) { @@ -272,8 +272,8 @@ public final class MyDerivedClassI extends Test.MyDerivedClass return p1 + " " + p2; } - public java.util.Map<String, Test.MyEnum> - opStringMyEnumD(java.util.Map<String, Test.MyEnum> p1, java.util.Map<String, Test.MyEnum> p2, + public java.util.Map + opStringMyEnumD(java.util.Map p1, java.util.Map p2, Test.StringMyEnumDHolder p3, Ice.Current current) { @@ -369,7 +369,7 @@ public final class MyDerivedClassI extends Test.MyDerivedClass } public java.util.Map<String, String> - opStringStringD(java.util.Map<String, String> p1, java.util.Map<String, String> p2, + opStringStringD(java.util.Map p1, java.util.Map p2, Test.StringStringDHolder p3, Ice.Current current) { |