Merged android-testsuite branch.

1 files changed, 26 insertions, 15 deletions

diff --git a/java/test/Ice/inheritance/CDI.java b/java/test/Ice/inheritance/CDI.java
index e3280bc6676..7af364672c8 100644
--- a/java/test/Ice/inheritance/CDI.java
+++ b/java/test/Ice/inheritance/CDI.java
@@ -7,51 +7,62 @@
 //
 // **********************************************************************
 
-public final class CDI extends Test.MA.CD
+package test.Ice.inheritance;
+
+import test.Ice.inheritance.Test.MA.CAPrx;
+import test.Ice.inheritance.Test.MA.CCPrx;
+import test.Ice.inheritance.Test.MA.CD;
+import test.Ice.inheritance.Test.MA.CDPrx;
+import test.Ice.inheritance.Test.MA.IAPrx;
+import test.Ice.inheritance.Test.MB.CBPrx;
+import test.Ice.inheritance.Test.MB.IB1Prx;
+import test.Ice.inheritance.Test.MB.IB2Prx;
+
+public final class CDI extends CD
 {
     public
     CDI()
     {
     }
 
-    public Test.MA.CAPrx
-    caop(Test.MA.CAPrx p, Ice.Current current)
+    public CAPrx
+    caop(CAPrx p, Ice.Current current)
     {
         return p;
     }
 
-    public Test.MA.CCPrx
-    ccop(Test.MA.CCPrx p, Ice.Current current)
+    public CCPrx
+    ccop(CCPrx p, Ice.Current current)
     {
         return p;
     }
 
-    public Test.MA.CDPrx
-    cdop(Test.MA.CDPrx p, Ice.Current current)
+    public CDPrx
+    cdop(CDPrx p, Ice.Current current)
     {
         return p;
     }
 
-    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.CBPrx
-    cbop(Test.MB.CBPrx p, Ice.Current current)
+    public CBPrx
+    cbop(CBPrx 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;
     }