Merged android-testsuite branch.

1 files changed, 68 insertions, 34 deletions

diff --git a/java/test/Ice/operations/MyDerivedClassI.java b/java/test/Ice/operations/MyDerivedClassI.java
index 025b466dd58..7e7cdd60b4a 100644
--- a/java/test/Ice/operations/MyDerivedClassI.java
+++ b/java/test/Ice/operations/MyDerivedClassI.java
@@ -7,7 +7,41 @@
 //
 // **********************************************************************
 
-public final class MyDerivedClassI extends Test.MyDerivedClass
+package test.Ice.operations;
+import test.Ice.operations.Test.BoolSHolder;
+import test.Ice.operations.Test.BoolSSHolder;
+import test.Ice.operations.Test.ByteBoolDHolder;
+import test.Ice.operations.Test.ByteSHolder;
+import test.Ice.operations.Test.ByteSSHolder;
+import test.Ice.operations.Test.DoubleSHolder;
+import test.Ice.operations.Test.DoubleSSHolder;
+import test.Ice.operations.Test.FloatSHolder;
+import test.Ice.operations.Test.FloatSSHolder;
+import test.Ice.operations.Test.IntSHolder;
+import test.Ice.operations.Test.IntSSHolder;
+import test.Ice.operations.Test.LongFloatDHolder;
+import test.Ice.operations.Test.LongSHolder;
+import test.Ice.operations.Test.LongSSHolder;
+import test.Ice.operations.Test.MyClassPrx;
+import test.Ice.operations.Test.MyClassPrxHelper;
+import test.Ice.operations.Test.MyClassPrxHolder;
+import test.Ice.operations.Test.MyDerivedClass;
+import test.Ice.operations.Test.MyEnum;
+import test.Ice.operations.Test.MyEnumHolder;
+import test.Ice.operations.Test.MyStruct;
+import test.Ice.operations.Test.MyStructMyEnumDHolder;
+import test.Ice.operations.Test.ShortIntDHolder;
+import test.Ice.operations.Test.ShortSHolder;
+import test.Ice.operations.Test.ShortSSHolder;
+import test.Ice.operations.Test.StringMyEnumDHolder;
+import test.Ice.operations.Test.StringSHolder;
+import test.Ice.operations.Test.StringSSHolder;
+import test.Ice.operations.Test.StringSSSHolder;
+import test.Ice.operations.Test.StringStringDHolder;
+import test.Ice.operations.Test.Structure;
+import test.Ice.operations.Test.StructureHolder;
+
+public final class MyDerivedClassI extends MyDerivedClass
 {
     private static void
     test(boolean b)
@@ -40,7 +74,7 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
 
     public boolean[]
     opBoolS(boolean[] p1, boolean[] p2,
-            Test.BoolSHolder p3,
+            BoolSHolder p3,
             Ice.Current current)
     {
         p3.value = new boolean[p1.length + p2.length];
@@ -57,7 +91,7 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
 
     public boolean[][]
     opBoolSS(boolean[][] p1, boolean[][] p2,
-             Test.BoolSSHolder p3,
+             BoolSSHolder p3,
              Ice.Current current)
     {
         p3.value = new boolean[p1.length + p2.length][];
@@ -83,7 +117,7 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
 
     public java.util.Map<Byte, Boolean>
     opByteBoolD(java.util.Map p1, java.util.Map p2,
-                Test.ByteBoolDHolder p3,
+                ByteBoolDHolder p3,
                 Ice.Current current)
     {
         p3.value = p1;
@@ -95,7 +129,7 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
 
     public byte[]
     opByteS(byte[] p1, byte[] p2,
-            Test.ByteSHolder p3,
+            ByteSHolder p3,
             Ice.Current current)
     {
         p3.value = new byte[p1.length];
@@ -112,7 +146,7 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
 
     public byte[][]
     opByteSS(byte[][] p1, byte[][] p2,
-             Test.ByteSSHolder p3,
+             ByteSSHolder p3,
              Ice.Current current)
     {
         p3.value = new byte[p1.length][];
@@ -139,7 +173,7 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
 
     public double[]
     opFloatDoubleS(float[] p1, double[] p2,
-                   Test.FloatSHolder p3, Test.DoubleSHolder p4,
+                   FloatSHolder p3, DoubleSHolder p4,
                    Ice.Current current)
     {
         p3.value = p1;
@@ -159,7 +193,7 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
 
     public double[][]
     opFloatDoubleSS(float[][] p1, double[][] p2,
-                    Test.FloatSSHolder p3, Test.DoubleSSHolder p4,
+                    FloatSSHolder p3, DoubleSSHolder p4,
                     Ice.Current current)
     {
         p3.value = p1;
@@ -176,7 +210,7 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
 
     public java.util.Map<Long, Float>
     opLongFloatD(java.util.Map p1, java.util.Map p2,
-                 Test.LongFloatDHolder p3,
+                 LongFloatDHolder p3,
                  Ice.Current current)
     {
         p3.value = p1;
@@ -186,29 +220,29 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
         return r;
     }
 
-    public Test.MyClassPrx
-    opMyClass(Test.MyClassPrx p1,
-              Test.MyClassPrxHolder p2, Test.MyClassPrxHolder p3,
+    public MyClassPrx
+    opMyClass(MyClassPrx p1,
+              MyClassPrxHolder p2, MyClassPrxHolder p3,
               Ice.Current current)
     {
         p2.value = p1;
-        p3.value = Test.MyClassPrxHelper.uncheckedCast(
+        p3.value = MyClassPrxHelper.uncheckedCast(
             current.adapter.createProxy(current.adapter.getCommunicator().stringToIdentity("noSuchIdentity")));
-        return Test.MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(current.id));
+        return MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(current.id));
     }
 
-    public Test.MyEnum
-    opMyEnum(Test.MyEnum p1,
-             Test.MyEnumHolder p2,
+    public MyEnum
+    opMyEnum(MyEnum p1,
+             MyEnumHolder p2,
              Ice.Current current)
     {
         p2.value = p1;
-        return Test.MyEnum.enum3;
+        return MyEnum.enum3;
     }
 
     public java.util.Map<Short, Integer>
     opShortIntD(java.util.Map p1, java.util.Map p2,
-                Test.ShortIntDHolder p3,
+                ShortIntDHolder p3,
                 Ice.Current current)
     {
         p3.value = p1;
@@ -231,7 +265,7 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
 
     public long[]
     opShortIntLongS(short[] p1, int[] p2, long[] p3,
-                    Test.ShortSHolder p4, Test.IntSHolder p5, Test.LongSHolder p6,
+                    ShortSHolder p4, IntSHolder p5, LongSHolder p6,
                     Ice.Current current)
     {
         p4.value = p1;
@@ -248,7 +282,7 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
 
     public long[][]
     opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3,
-                     Test.ShortSSHolder p4, Test.IntSSHolder p5, Test.LongSSHolder p6,
+                     ShortSSHolder p4, IntSSHolder p5, LongSSHolder p6,
                      Ice.Current current)
     {
         p4.value = p1;
@@ -272,25 +306,25 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
         return p1 + " " + p2;
     }
 
-    public java.util.Map<String, Test.MyEnum>
+    public java.util.Map<String, MyEnum>
     opStringMyEnumD(java.util.Map p1, java.util.Map p2,
-                    Test.StringMyEnumDHolder p3,
+                    StringMyEnumDHolder p3,
                     Ice.Current current)
     {
         p3.value = p1;
-        java.util.Map<String, Test.MyEnum> r = new java.util.HashMap<String, Test.MyEnum>();
+        java.util.Map<String, MyEnum> r = new java.util.HashMap<String, MyEnum>();
         r.putAll(p1);
         r.putAll(p2);
         return r;
     }
 
-    public java.util.Map<Test.MyStruct, Test.MyEnum>
+    public java.util.Map<MyStruct, MyEnum>
     opMyStructMyEnumD(java.util.Map p1, java.util.Map p2,
-                    Test.MyStructMyEnumDHolder p3,
+                    MyStructMyEnumDHolder p3,
                     Ice.Current current)
     {
         p3.value = p1;
-        java.util.Map<Test.MyStruct, Test.MyEnum> r = new java.util.HashMap<Test.MyStruct, Test.MyEnum>();
+        java.util.Map<MyStruct, MyEnum> r = new java.util.HashMap<MyStruct, MyEnum>();
         r.putAll(p1);
         r.putAll(p2);
         return r;
@@ -331,7 +365,7 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
 
     public String[]
     opStringS(String[] p1, String[] p2,
-              Test.StringSHolder p3,
+              StringSHolder p3,
               Ice.Current current)
     {
         p3.value = new String[p1.length + p2.length];
@@ -348,7 +382,7 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
 
     public String[][]
     opStringSS(String[][] p1, String[][] p2,
-               Test.StringSSHolder p3,
+               StringSSHolder p3,
                Ice.Current current)
     {
         p3.value = new String[p1.length + p2.length][];
@@ -365,7 +399,7 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
 
     public String[][][]
     opStringSSS(String[][][] p1, String[][][] p2,
-               Test.StringSSSHolder p3,
+               StringSSSHolder p3,
                Ice.Current current)
     {
         p3.value = new String[p1.length + p2.length][][];
@@ -382,7 +416,7 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
 
     public java.util.Map<String, String>
     opStringStringD(java.util.Map p1, java.util.Map p2,
-                    Test.StringStringDHolder p3,
+                    StringStringDHolder p3,
                     Ice.Current current)
     {
         p3.value = p1;
@@ -392,9 +426,9 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
         return r;
     }
 
-    public Test.Structure
-    opStruct(Test.Structure p1, Test.Structure p2,
-             Test.StructureHolder p3,
+    public Structure
+    opStruct(Structure p1, Structure p2,
+             StructureHolder p3,
              Ice.Current current)
     {
         p3.value = p1;