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/CBI.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/CBI.java')
| -rw-r--r-- | java/test/Ice/inheritance/CBI.java | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/java/test/Ice/inheritance/CBI.java b/java/test/Ice/inheritance/CBI.java index aad89291609..dc68704c3e9 100644 --- a/java/test/Ice/inheritance/CBI.java +++ b/java/test/Ice/inheritance/CBI.java @@ -7,21 +7,27 @@ // // ********************************************************************** -public final class CBI extends Test.MB.CB +package test.Ice.inheritance; + +import test.Ice.inheritance.Test.MA.CAPrx; +import test.Ice.inheritance.Test.MB.CB; +import test.Ice.inheritance.Test.MB.CBPrx; + +public final class CBI extends CB { public CBI() { } - public Test.MA.CAPrx - caop(Test.MA.CAPrx p, Ice.Current current) + public CAPrx + caop(CAPrx p, Ice.Current current) { return p; } - public Test.MB.CBPrx - cbop(Test.MB.CBPrx p, Ice.Current current) + public CBPrx + cbop(CBPrx p, Ice.Current current) { return p; } |