diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2009-03-24 12:31:31 -0230 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2009-03-24 12:31:31 -0230 |
| commit | 4cc5d77c383b6c91c3af9fe44df9687bb9b15580 (patch) | |
| tree | 64ce3d6cf35b15497de50f298f7225a8c72f64b6 /java/test/Ice/inheritance/ICI.java | |
| parent | Merge commit 'origin/R3_3_branch' (diff) | |
| download | ice-4cc5d77c383b6c91c3af9fe44df9687bb9b15580.tar.bz2 ice-4cc5d77c383b6c91c3af9fe44df9687bb9b15580.tar.xz ice-4cc5d77c383b6c91c3af9fe44df9687bb9b15580.zip | |
Merged android-testsuite branch.
Diffstat (limited to 'java/test/Ice/inheritance/ICI.java')
| -rw-r--r-- | java/test/Ice/inheritance/ICI.java | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/java/test/Ice/inheritance/ICI.java b/java/test/Ice/inheritance/ICI.java index b940ee6719b..caa183f60b0 100644 --- a/java/test/Ice/inheritance/ICI.java +++ b/java/test/Ice/inheritance/ICI.java @@ -7,33 +7,41 @@ // // ********************************************************************** -public final class ICI extends Test.MA._ICDisp +package test.Ice.inheritance; + +import test.Ice.inheritance.Test.MA.IAPrx; +import test.Ice.inheritance.Test.MA.ICPrx; +import test.Ice.inheritance.Test.MA._ICDisp; +import test.Ice.inheritance.Test.MB.IB1Prx; +import test.Ice.inheritance.Test.MB.IB2Prx; + +public final class ICI extends _ICDisp { public ICI() { } - public Test.MA.IAPrx - iaop(Test.MA.IAPrx p, Ice.Current current) + public IAPrx + iaop(IAPrx p, Ice.Current current) { return p; } - public Test.MA.ICPrx - icop(Test.MA.ICPrx p, Ice.Current current) + public ICPrx + icop(ICPrx p, Ice.Current current) { return p; } - public Test.MB.IB1Prx - ib1op(Test.MB.IB1Prx p, Ice.Current current) + public IB1Prx + ib1op(IB1Prx p, Ice.Current current) { return p; } - public Test.MB.IB2Prx - ib2op(Test.MB.IB2Prx p, Ice.Current current) + public IB2Prx + ib2op(IB2Prx p, Ice.Current current) { return p; } |