1 files changed, 36 insertions, 1 deletions

diff --git a/java/test/Ice/operations/TieMyDerivedClassI.java b/java/test/Ice/operations/TieMyDerivedClassI.java
index 4903d5dc924..cbd7a833f15 100644
--- a/java/test/Ice/operations/TieMyDerivedClassI.java
+++ b/java/test/Ice/operations/TieMyDerivedClassI.java
@@ -26,7 +26,6 @@ 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._MyDerivedClassOperations;
 import test.Ice.operations.Test.MyEnum;
 import test.Ice.operations.Test.MyEnumHolder;
@@ -55,12 +54,14 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations
         }
     }
 
+    @Override
     public void
     shutdown(Ice.Current current)
     {
         current.adapter.getCommunicator().shutdown();
     }
 
+    @Override
     public void
     delay(int ms, Ice.Current current)
     {
@@ -73,12 +74,14 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations
         }
     }
 
+    @Override
     public void
     opVoid(Ice.Current current)
     {
         test(current.mode == Ice.OperationMode.Normal);
     }
 
+    @Override
     public boolean
     opBool(boolean p1, boolean p2,
            Ice.BooleanHolder p3,
@@ -88,6 +91,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations
         return p2;
     }
 
+    @Override
     public boolean[]
     opBoolS(boolean[] p1, boolean[] p2,
             BoolSHolder p3,
@@ -105,6 +109,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations
         return r;
     }
 
+    @Override
     public boolean[][]
     opBoolSS(boolean[][] p1, boolean[][] p2,
              BoolSSHolder p3,
@@ -122,6 +127,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations
         return r;
     }
 
+    @Override
     public byte
     opByte(byte p1, byte p2,
            Ice.ByteHolder p3,
@@ -131,6 +137,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations
         return p1;
     }
 
+    @Override
     public java.util.Map<Byte, Boolean>
     opByteBoolD(java.util.Map<Byte, Boolean> p1, java.util.Map<Byte, Boolean> p2, ByteBoolDHolder p3,
                 Ice.Current current)
@@ -142,6 +149,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations
         return r;
     }
 
+    @Override
     public byte[]
     opByteS(byte[] p1, byte[] p2,
             ByteSHolder p3,
@@ -159,6 +167,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations
         return r;
     }
 
+    @Override
     public byte[][]
     opByteSS(byte[][] p1, byte[][] p2,
              ByteSSHolder p3,
@@ -176,6 +185,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations
         return r;
     }
 
+    @Override
     public double
     opFloatDouble(float p1, double p2,
                   Ice.FloatHolder p3, Ice.DoubleHolder p4,
@@ -186,6 +196,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations
         return p2;
     }
 
+    @Override
     public double[]
     opFloatDoubleS(float[] p1, double[] p2,
                    FloatSHolder p3, DoubleSHolder p4,
@@ -206,6 +217,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations
         return r;
     }
 
+    @Override
     public double[][]
     opFloatDoubleSS(float[][] p1, double[][] p2,
                     FloatSSHolder p3, DoubleSSHolder p4,
@@ -223,6 +235,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations
         return r;
     }
 
+    @Override
     public java.util.Map<Long, Float>
     opLongFloatD(java.util.Map<Long, Float> p1, java.util.Map<Long, Float> p2, LongFloatDHolder p3,
                  Ice.Current current)
@@ -234,6 +247,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations
         return r;
     }
 
+    @Override
     public MyClassPrx
     opMyClass(MyClassPrx p1,
               MyClassPrxHolder p2, MyClassPrxHolder p3,
@@ -245,6 +259,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations
         return MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(current.id));
     }
 
+    @Override
     public MyEnum
     opMyEnum(MyEnum p1,
              MyEnumHolder p2,
@@ -254,6 +269,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations
         return MyEnum.enum3;
     }
 
+    @Override
     public java.util.Map<Short, Integer>
     opShortIntD(java.util.Map<Short, Integer> p1, java.util.Map<Short, Integer> p2, ShortIntDHolder p3,
                 Ice.Current current)
@@ -265,6 +281,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations
         return r;
     }
 
+    @Override
     public long
     opShortIntLong(short p1, int p2, long p3,
                    Ice.ShortHolder p4, Ice.IntHolder p5, Ice.LongHolder p6,
@@ -276,6 +293,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations
         return p3;
     }
 
+    @Override
     public long[]
     opShortIntLongS(short[] p1, int[] p2, long[] p3,
                     ShortSHolder p4, IntSHolder p5, LongSHolder p6,
@@ -293,6 +311,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations
         return p3;
     }
 
+    @Override
     public long[][]
     opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3,
                      ShortSSHolder p4, IntSSHolder p5, LongSSHolder p6,
@@ -310,6 +329,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations
         return p3;
     }
 
+    @Override
     public String
     opString(String p1, String p2,
              Ice.StringHolder p3,
@@ -319,6 +339,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations
         return p1 + " " + p2;
     }
 
+    @Override
     public java.util.Map<String, MyEnum>
     opStringMyEnumD(java.util.Map<String, MyEnum> p1, java.util.Map<String, MyEnum> p2, StringMyEnumDHolder p3,
                     Ice.Current current)
@@ -330,6 +351,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations
         return r;
     }
 
+    @Override
     public java.util.Map<MyEnum, String>
     opMyEnumStringD(java.util.Map<MyEnum, String> p1, java.util.Map<MyEnum, String> p2, MyEnumStringDHolder p3,
                     Ice.Current current)
@@ -341,6 +363,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations
         return r;
     }
 
+    @Override
     public java.util.Map<MyStruct, MyEnum>
     opMyStructMyEnumD(java.util.Map<MyStruct, MyEnum> p1, java.util.Map<MyStruct, MyEnum> p2, MyStructMyEnumDHolder p3,
                       Ice.Current current)
@@ -352,6 +375,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations
         return r;
     }
 
+    @Override
     public int[]
     opIntS(int[] s, Ice.Current current)
     {
@@ -363,17 +387,20 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations
         return r;
     }
 
+    @Override
     public void
     opByteSOneway(byte[] s, Ice.Current current)
     {
     }
 
+    @Override
     public java.util.Map<String, String>
     opContext(Ice.Current current)
     {
         return current.ctx;
     }
 
+    @Override
     public void
     opDoubleMarshaling(double p1, double[] p2, Ice.Current current)
     {
@@ -385,6 +412,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations
         }
     }
 
+    @Override
     public String[]
     opStringS(String[] p1, String[] p2,
               StringSHolder p3,
@@ -402,6 +430,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations
         return r;
     }
 
+    @Override
     public String[][]
     opStringSS(String[][] p1, String[][] p2,
                StringSSHolder p3,
@@ -419,6 +448,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations
         return r;
     }
 
+    @Override
     public String[][][]
     opStringSSS(String[][][] p1, String[][][] p2,
                StringSSSHolder p3,
@@ -436,6 +466,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations
         return r;
     }
 
+    @Override
     public java.util.Map<String, String>
     opStringStringD(java.util.Map<String, String> p1, java.util.Map<String, String> p2, StringStringDHolder p3,
                     Ice.Current current)
@@ -447,6 +478,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations
         return r;
     }
 
+    @Override
     public Structure
     opStruct(Structure p1, Structure p2,
              StructureHolder p3,
@@ -457,18 +489,21 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations
         return p2;
     }
 
+    @Override
     public void
     opIdempotent(Ice.Current current)
     {
         test(current.mode == Ice.OperationMode.Idempotent);
     }
 
+    @Override
     public void
     opNonmutating(Ice.Current current)
     {
         test(current.mode == Ice.OperationMode.Nonmutating);
     }
 
+    @Override
     public void
     opDerived(Ice.Current current)
     {