more amd stuff

1 files changed, 69 insertions, 44 deletions

diff --git a/java/test/Ice/operations/MyDerivedClassI.java b/java/test/Ice/operations/MyDerivedClassI.java
index 59f6a766d1e..99b404b6487 100644
--- a/java/test/Ice/operations/MyDerivedClassI.java
+++ b/java/test/Ice/operations/MyDerivedClassI.java
@@ -21,15 +21,29 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
         _identity = identity;
     }
 
+    public void
+    shutdown(Ice.Current current)
+    {
+        _adapter.getCommunicator().shutdown();
+    }
+
+    public void
+    opVoid(Ice.Current current)
+    {
+    }
+
     public boolean
-    opBool(boolean p1, boolean p2, Ice.BooleanHolder p3, Ice.Current current)
+    opBool(boolean p1, boolean p2,
+	   Ice.BooleanHolder p3,
+	   Ice.Current current)
     {
         p3.value = p1;
         return p2;
     }
 
     public boolean[]
-    opBoolS(boolean[] p1, boolean[] p2, Test.BoolSHolder p3,
+    opBoolS(boolean[] p1, boolean[] p2,
+	    Test.BoolSHolder p3,
             Ice.Current current)
     {
         p3.value = new boolean[p1.length + p2.length];
@@ -45,7 +59,8 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
     }
 
     public boolean[][]
-    opBoolSS(boolean[][] p1, boolean[][] p2, Test.BoolSSHolder p3,
+    opBoolSS(boolean[][] p1, boolean[][] p2,
+	     Test.BoolSSHolder p3,
              Ice.Current current)
     {
         p3.value = new boolean[p1.length + p2.length][];
@@ -61,14 +76,17 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
     }
 
     public byte
-    opByte(byte p1, byte p2, Ice.ByteHolder p3, Ice.Current current)
+    opByte(byte p1, byte p2,
+	   Ice.ByteHolder p3,
+	   Ice.Current current)
     {
         p3.value = (byte)(p1 ^ p2);
         return p1;
     }
 
     public java.util.Map
-    opByteBoolD(java.util.Map p1, java.util.Map p2, Test.ByteBoolDHolder p3,
+    opByteBoolD(java.util.Map p1, java.util.Map p2,
+		Test.ByteBoolDHolder p3,
                 Ice.Current current)
     {
         p3.value = p1;
@@ -79,7 +97,9 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
     }
 
     public byte[]
-    opByteS(byte[] p1, byte[] p2, Test.ByteSHolder p3, Ice.Current current)
+    opByteS(byte[] p1, byte[] p2,
+	    Test.ByteSHolder p3,
+	    Ice.Current current)
     {
         p3.value = new byte[p1.length];
         for(int i = 0; i < p1.length; i++)
@@ -94,7 +114,8 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
     }
 
     public byte[][]
-    opByteSS(byte[][] p1, byte[][] p2, Test.ByteSSHolder p3,
+    opByteSS(byte[][] p1, byte[][] p2,
+	     Test.ByteSSHolder p3,
              Ice.Current current)
     {
         p3.value = new byte[p1.length][];
@@ -110,8 +131,9 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
     }
 
     public double
-    opFloatDouble(float p1, double p2, Ice.FloatHolder p3,
-                  Ice.DoubleHolder p4, Ice.Current current)
+    opFloatDouble(float p1, double p2,
+		  Ice.FloatHolder p3, Ice.DoubleHolder p4,
+		  Ice.Current current)
     {
         p3.value = p1;
         p4.value = p2;
@@ -119,8 +141,9 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
     }
 
     public double[]
-    opFloatDoubleS(float[] p1, double[] p2, Test.FloatSHolder p3,
-                   Test.DoubleSHolder p4, Ice.Current current)
+    opFloatDoubleS(float[] p1, double[] p2,
+		   Test.FloatSHolder p3, Test.DoubleSHolder p4,
+		   Ice.Current current)
     {
         p3.value = p1;
         p4.value = new double[p2.length];
@@ -138,8 +161,9 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
     }
 
     public double[][]
-    opFloatDoubleSS(float[][] p1, double[][] p2, Test.FloatSSHolder p3,
-                    Test.DoubleSSHolder p4, Ice.Current current)
+    opFloatDoubleSS(float[][] p1, double[][] p2,
+		    Test.FloatSSHolder p3, Test.DoubleSSHolder p4,
+		    Ice.Current current)
     {
         p3.value = p1;
         p4.value = new double[p2.length][];
@@ -154,7 +178,8 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
     }
 
     public java.util.Map
-    opLongFloatD(java.util.Map p1, java.util.Map p2, Test.LongFloatDHolder p3,
+    opLongFloatD(java.util.Map p1, java.util.Map p2,
+		 Test.LongFloatDHolder p3,
                  Ice.Current current)
     {
         p3.value = p1;
@@ -165,25 +190,28 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
     }
 
     public Test.MyClassPrx
-    opMyClass(Test.MyClassPrx p1, Test.MyClassPrxHolder p2,
-              Test.MyClassPrxHolder p3, Ice.Current current)
+    opMyClass(Test.MyClassPrx p1,
+	      Test.MyClassPrxHolder p2, Test.MyClassPrxHolder p3,
+	      Ice.Current current)
     {
         p2.value = p1;
         p3.value = Test.MyClassPrxHelper.uncheckedCast(
-            _adapter.createProxy(Ice.Util.stringToIdentity("noSuchIdentity")));
-        return Test.MyClassPrxHelper.uncheckedCast(
-            _adapter.createProxy(_identity));
+	    _adapter.createProxy(Ice.Util.stringToIdentity("noSuchIdentity")));
+        return Test.MyClassPrxHelper.uncheckedCast(_adapter.createProxy(_identity));
     }
 
     public Test.MyEnum
-    opMyEnum(Test.MyEnum p1, Test.MyEnumHolder p2, Ice.Current current)
+    opMyEnum(Test.MyEnum p1,
+	     Test.MyEnumHolder p2,
+	     Ice.Current current)
     {
         p2.value = p1;
         return Test.MyEnum.enum3;
     }
 
     public java.util.Map
-    opShortIntD(java.util.Map p1, java.util.Map p2, Test.ShortIntDHolder p3,
+    opShortIntD(java.util.Map p1, java.util.Map p2,
+		Test.ShortIntDHolder p3,
                 Ice.Current current)
     {
         p3.value = p1;
@@ -194,8 +222,9 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
     }
 
     public long
-    opShortIntLong(short p1, int p2, long p3, Ice.ShortHolder p4,
-                   Ice.IntHolder p5, Ice.LongHolder p6, Ice.Current current)
+    opShortIntLong(short p1, int p2, long p3,
+		   Ice.ShortHolder p4, Ice.IntHolder p5, Ice.LongHolder p6,
+		   Ice.Current current)
     {
         p4.value = p1;
         p5.value = p2;
@@ -204,8 +233,8 @@ 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,
+    opShortIntLongS(short[] p1, int[] p2, long[] p3,
+		    Test.ShortSHolder p4, Test.IntSHolder p5, Test.LongSHolder p6,
                     Ice.Current current)
     {
         p4.value = p1;
@@ -222,8 +251,8 @@ 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, Ice.Current current)
+                     Test.ShortSSHolder p4, Test.IntSSHolder p5, Test.LongSSHolder p6,
+		     Ice.Current current)
     {
         p4.value = p1;
         p5.value = new int[p2.length][];
@@ -238,7 +267,9 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
     }
 
     public String
-    opString(String p1, String p2, Ice.StringHolder p3, Ice.Current current)
+    opString(String p1, String p2,
+	     Ice.StringHolder p3,
+	     Ice.Current current)
     {
         p3.value = p2 + " " + p1;
         return p1 + " " + p2;
@@ -246,7 +277,8 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
 
     public java.util.Map
     opStringMyEnumD(java.util.Map p1, java.util.Map p2,
-                    Test.StringMyEnumDHolder p3, Ice.Current current)
+                    Test.StringMyEnumDHolder p3,
+		    Ice.Current current)
     {
         p3.value = p1;
         java.util.Map r = new java.util.HashMap();
@@ -256,7 +288,8 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
     }
 
     public String[]
-    opStringS(String[] p1, String[] p2, Test.StringSHolder p3,
+    opStringS(String[] p1, String[] p2,
+	      Test.StringSHolder p3,
               Ice.Current current)
     {
         p3.value = new String[p1.length + p2.length];
@@ -272,7 +305,8 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
     }
 
     public String[][]
-    opStringSS(String[][] p1, String[][] p2, Test.StringSSHolder p3,
+    opStringSS(String[][] p1, String[][] p2,
+	       Test.StringSSHolder p3,
                Ice.Current current)
     {
         p3.value = new String[p1.length + p2.length][];
@@ -289,7 +323,8 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
 
     public java.util.Map
     opStringStringD(java.util.Map p1, java.util.Map p2,
-                    Test.StringStringDHolder p3, Ice.Current current)
+                    Test.StringStringDHolder p3,
+		    Ice.Current current)
     {
         p3.value = p1;
         java.util.Map r = new java.util.HashMap();
@@ -299,7 +334,8 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
     }
 
     public Test.Structure
-    opStruct(Test.Structure p1, Test.Structure p2, Test.StructureHolder p3,
+    opStruct(Test.Structure p1, Test.Structure p2,
+	     Test.StructureHolder p3,
              Ice.Current current)
     {
         p3.value = p1;
@@ -308,17 +344,6 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
     }
 
     public void
-    opVoid(Ice.Current current)
-    {
-    }
-
-    public void
-    shutdown(Ice.Current current)
-    {
-        _adapter.getCommunicator().shutdown();
-    }
-
-    public void
     opDerived(Ice.Current current)
     {
     }