summaryrefslogtreecommitdiff
path: root/java/test/Ice/inheritance/IB1I.java
diff options
context:
space:
mode:
authorMatthew Newhook <matthew@zeroc.com>2009-03-24 12:31:31 -0230
committerMatthew Newhook <matthew@zeroc.com>2009-03-24 12:31:31 -0230
commit4cc5d77c383b6c91c3af9fe44df9687bb9b15580 (patch)
tree64ce3d6cf35b15497de50f298f7225a8c72f64b6 /java/test/Ice/inheritance/IB1I.java
parentMerge commit 'origin/R3_3_branch' (diff)
downloadice-4cc5d77c383b6c91c3af9fe44df9687bb9b15580.tar.bz2
ice-4cc5d77c383b6c91c3af9fe44df9687bb9b15580.tar.xz
ice-4cc5d77c383b6c91c3af9fe44df9687bb9b15580.zip
Merged android-testsuite branch.
Diffstat (limited to 'java/test/Ice/inheritance/IB1I.java')
-rw-r--r--java/test/Ice/inheritance/IB1I.java16
1 files changed, 11 insertions, 5 deletions
diff --git a/java/test/Ice/inheritance/IB1I.java b/java/test/Ice/inheritance/IB1I.java
index 40c5bbe1074..442d335fae4 100644
--- a/java/test/Ice/inheritance/IB1I.java
+++ b/java/test/Ice/inheritance/IB1I.java
@@ -7,21 +7,27 @@
//
// **********************************************************************
-public final class IB1I extends Test.MB._IB1Disp
+package test.Ice.inheritance;
+
+import test.Ice.inheritance.Test.MA.IAPrx;
+import test.Ice.inheritance.Test.MB.IB1Prx;
+import test.Ice.inheritance.Test.MB._IB1Disp;
+
+public final class IB1I extends _IB1Disp
{
public
IB1I()
{
}
- public Test.MA.IAPrx
- iaop(Test.MA.IAPrx p, Ice.Current current)
+ public IAPrx
+ iaop(IAPrx 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;
}