Code cleanup - @Override, serialization, @Deprecated annotations

idlj/src/main/java/com/sun/tools/corba/ee/idl/AttributeEntry.java

@@ -34,7 +34,6 @@ public class AttributeEntry extends MethodEntry
 {
   protected AttributeEntry ()
   {
-    super ();
   } // ctor
 
   protected AttributeEntry (AttributeEntry that)

idlj/src/main/java/com/sun/tools/corba/ee/idl/Compile.java

@@ -209,7 +209,7 @@ public Compile ()
     // <d41197> Reset static variables to allow parsing multiple sources.
     // DO NOT reset SymtabEntry.maxKey because it crashes IDLC.
     com.sun.tools.corba.ee.idl.ParseException.detected  = false;
-    com.sun.tools.corba.ee.idl.SymtabEntry.includeStack = (Stack<Boolean>) new java.util.Stack ();
+    com.sun.tools.corba.ee.idl.SymtabEntry.includeStack = new java.util.Stack ();
     com.sun.tools.corba.ee.idl.SymtabEntry.setEmit      = true;
     //SymtabEntry.maxKey     = -1;
     com.sun.tools.corba.ee.idl.Parser.repIDStack        = new java.util.Stack (); // <d56351>
@@ -295,7 +295,7 @@ protected void generate() {
                 com.sun.tools.corba.ee.idl.SymtabEntry entry = emitList.nextElement();
                 if (arguments.verbose) {
                     if (entry.generator() instanceof com.sun.tools.corba.ee.idl.Noop) {
-                        ; // Nothing will be generated, so don't say so.
+                         // Nothing will be generated, so don't say so.
                     } else if (entry.module().equals("")) {
                         System.out.println(com.sun.tools.corba.ee.idl.Util.getMessage("Compile.generating", entry.name()));
                     } else {
@@ -305,7 +305,7 @@ protected void generate() {
                 entry.generate(symbolTable, null);
                 if (arguments.verbose) {
                     if (entry.generator() instanceof com.sun.tools.corba.ee.idl.Noop) {
-                        ; // Nothing will be generated, so don't say so.
+                         // Nothing will be generated, so don't say so.
                     } else if (entry.module().equals("")) {
                         System.out.println(com.sun.tools.corba.ee.idl.Util.getMessage("Compile.genDone", entry.name()));
                     } else {

idlj/src/main/java/com/sun/tools/corba/ee/idl/ConstEntry.java

@@ -34,7 +34,6 @@ public class ConstEntry extends com.sun.tools.corba.ee.idl.SymtabEntry
 {
   protected ConstEntry ()
   {
-    super ();
   } // ctor
 
   protected ConstEntry (ConstEntry that)
@@ -61,6 +60,7 @@ else if (!name ().equals (""))
   } // ctor
 
   /** This is a shallow copy clone. */
+  @Override
   public Object clone ()
   {
     return new ConstEntry (this);
@@ -72,6 +72,7 @@ public Object clone ()
        a subclass of SymtabEntry.
       @param stream the stream to which the generator should sent its output.
       @see com.sun.tools.corba.ee.idl.SymtabEntry */
+  @Override
   public void generate (Hashtable symbolTable, PrintWriter stream)
   {
     constGen.generate (symbolTable, this, stream);
@@ -80,6 +81,7 @@ public void generate (Hashtable symbolTable, PrintWriter stream)
   /** Access the constant generator.
       @return an object which implements the ConstGen interface.
       @see com.sun.tools.corba.ee.idl.ConstGen */
+  @Override
   public com.sun.tools.corba.ee.idl.Generator generator ()
   {
     return constGen;

idlj/src/main/java/com/sun/tools/corba/ee/idl/DefaultSymtabFactory.java

@@ -28,156 +28,187 @@
  **/
 public class DefaultSymtabFactory implements SymtabFactory
 {
+  @Override
   public com.sun.tools.corba.ee.idl.AttributeEntry attributeEntry ()
   {
     return new com.sun.tools.corba.ee.idl.AttributeEntry();
   } // attributeEntry
 
+  @Override
   public com.sun.tools.corba.ee.idl.AttributeEntry attributeEntry (com.sun.tools.corba.ee.idl.InterfaceEntry container, com.sun.tools.corba.ee.idl.IDLID id)
   {
     return new com.sun.tools.corba.ee.idl.AttributeEntry(container, id);
   } // attributeEntry
 
+  @Override
   public com.sun.tools.corba.ee.idl.ConstEntry constEntry ()
   {
     return new com.sun.tools.corba.ee.idl.ConstEntry();
   } // constEntry
 
+  @Override
   public com.sun.tools.corba.ee.idl.ConstEntry constEntry (com.sun.tools.corba.ee.idl.SymtabEntry container, com.sun.tools.corba.ee.idl.IDLID id)
   {
     return new com.sun.tools.corba.ee.idl.ConstEntry(container, id);
   } // constEntry
 
+  @Override
   public com.sun.tools.corba.ee.idl.NativeEntry nativeEntry ()
   {
     return new com.sun.tools.corba.ee.idl.NativeEntry();
   } // interfaceEntry
 
+  @Override
   public com.sun.tools.corba.ee.idl.NativeEntry nativeEntry (com.sun.tools.corba.ee.idl.SymtabEntry container, com.sun.tools.corba.ee.idl.IDLID id)
   {
     return new com.sun.tools.corba.ee.idl.NativeEntry(container, id);
   } // interfaceEntry
 
+  @Override
   public com.sun.tools.corba.ee.idl.EnumEntry enumEntry ()
   {
     return new com.sun.tools.corba.ee.idl.EnumEntry();
   } // enumEntry
 
+  @Override
   public com.sun.tools.corba.ee.idl.EnumEntry enumEntry (com.sun.tools.corba.ee.idl.SymtabEntry container, com.sun.tools.corba.ee.idl.IDLID id)
   {
     return new com.sun.tools.corba.ee.idl.EnumEntry(container, id);
   } // enumEntry
 
+  @Override
   public com.sun.tools.corba.ee.idl.ExceptionEntry exceptionEntry ()
   {
     return new com.sun.tools.corba.ee.idl.ExceptionEntry();
   } // exceptionEntry
 
+  @Override
   public com.sun.tools.corba.ee.idl.ExceptionEntry exceptionEntry (com.sun.tools.corba.ee.idl.SymtabEntry container, com.sun.tools.corba.ee.idl.IDLID id)
   {
     return new com.sun.tools.corba.ee.idl.ExceptionEntry(container, id);
   } // exceptionEntry
 
+  @Override
   public com.sun.tools.corba.ee.idl.ForwardEntry forwardEntry ()
   {
     return new com.sun.tools.corba.ee.idl.ForwardEntry();
   } // forwardEntry
 
+  @Override
   public com.sun.tools.corba.ee.idl.ForwardEntry forwardEntry (com.sun.tools.corba.ee.idl.ModuleEntry container, com.sun.tools.corba.ee.idl.IDLID id)
   {
     return new com.sun.tools.corba.ee.idl.ForwardEntry(container, id);
   } // forwardEntry
 
+  @Override
   public com.sun.tools.corba.ee.idl.ForwardValueEntry forwardValueEntry ()
   {
     return new com.sun.tools.corba.ee.idl.ForwardValueEntry();
   } // forwardValueEntry
 
+  @Override
   public com.sun.tools.corba.ee.idl.ForwardValueEntry forwardValueEntry (com.sun.tools.corba.ee.idl.ModuleEntry container, com.sun.tools.corba.ee.idl.IDLID id)
   {
     return new com.sun.tools.corba.ee.idl.ForwardValueEntry(container, id);
   } // forwardValueEntry
 
+  @Override
   public com.sun.tools.corba.ee.idl.IncludeEntry includeEntry ()
   {
     return new com.sun.tools.corba.ee.idl.IncludeEntry();
   } // includeEntry
 
+  @Override
   public com.sun.tools.corba.ee.idl.IncludeEntry includeEntry (com.sun.tools.corba.ee.idl.SymtabEntry container)
   {
     return new com.sun.tools.corba.ee.idl.IncludeEntry(container);
   } // includeEntry
 
+  @Override
   public com.sun.tools.corba.ee.idl.InterfaceEntry interfaceEntry ()
   {
     return new com.sun.tools.corba.ee.idl.InterfaceEntry();
   } // interfaceEntry
 
+  @Override
   public com.sun.tools.corba.ee.idl.InterfaceEntry interfaceEntry (com.sun.tools.corba.ee.idl.ModuleEntry container, com.sun.tools.corba.ee.idl.IDLID id)
   {
     return new com.sun.tools.corba.ee.idl.InterfaceEntry(container, id);
   } // interfaceEntry
 
+  @Override
   public com.sun.tools.corba.ee.idl.ValueEntry valueEntry ()
   {
     return new com.sun.tools.corba.ee.idl.ValueEntry();
   } // valueEntry
 
+  @Override
   public com.sun.tools.corba.ee.idl.ValueEntry valueEntry (com.sun.tools.corba.ee.idl.ModuleEntry container, com.sun.tools.corba.ee.idl.IDLID id)
   {
     return new com.sun.tools.corba.ee.idl.ValueEntry(container, id);
   } // valueEntry
 
+  @Override
   public com.sun.tools.corba.ee.idl.ValueBoxEntry valueBoxEntry ()
   {
     return new com.sun.tools.corba.ee.idl.ValueBoxEntry();
   } // valueBoxEntry
 
+  @Override
   public com.sun.tools.corba.ee.idl.ValueBoxEntry valueBoxEntry (com.sun.tools.corba.ee.idl.ModuleEntry container, com.sun.tools.corba.ee.idl.IDLID id)
   {
     return new com.sun.tools.corba.ee.idl.ValueBoxEntry(container, id);
   } // valueBoxEntry
 
+  @Override
   public com.sun.tools.corba.ee.idl.MethodEntry methodEntry ()
   {
     return new com.sun.tools.corba.ee.idl.MethodEntry();
   } // methodEntry
 
+  @Override
   public com.sun.tools.corba.ee.idl.MethodEntry methodEntry (com.sun.tools.corba.ee.idl.InterfaceEntry container, com.sun.tools.corba.ee.idl.IDLID id)
   {
     return new com.sun.tools.corba.ee.idl.MethodEntry(container, id);
   } // methodEntry
 
+  @Override
   public com.sun.tools.corba.ee.idl.ModuleEntry moduleEntry ()
   {
     return new com.sun.tools.corba.ee.idl.ModuleEntry();
   } // moduleEntry
 
+  @Override
   public com.sun.tools.corba.ee.idl.ModuleEntry moduleEntry (com.sun.tools.corba.ee.idl.ModuleEntry container, com.sun.tools.corba.ee.idl.IDLID id)
   {
     return new com.sun.tools.corba.ee.idl.ModuleEntry(container, id);
   } // moduleEntry
 
+  @Override
   public com.sun.tools.corba.ee.idl.ParameterEntry parameterEntry ()
   {
     return new com.sun.tools.corba.ee.idl.ParameterEntry();
   } // parameterEntry
 
+  @Override
   public com.sun.tools.corba.ee.idl.ParameterEntry parameterEntry (com.sun.tools.corba.ee.idl.MethodEntry container, com.sun.tools.corba.ee.idl.IDLID id)
   {
     return new com.sun.tools.corba.ee.idl.ParameterEntry(container, id);
   } // parameterEntry
 
+  @Override
   public com.sun.tools.corba.ee.idl.PragmaEntry pragmaEntry ()
   {
     return new com.sun.tools.corba.ee.idl.PragmaEntry();
   } // pragmaEntry
 
+  @Override
   public com.sun.tools.corba.ee.idl.PragmaEntry pragmaEntry (com.sun.tools.corba.ee.idl.SymtabEntry container)
   {
     return new com.sun.tools.corba.ee.idl.PragmaEntry(container);
   } // pragmaEntry
 
+  @Override
   public com.sun.tools.corba.ee.idl.PrimitiveEntry primitiveEntry ()
   {
     return new com.sun.tools.corba.ee.idl.PrimitiveEntry();
@@ -189,51 +220,61 @@ public com.sun.tools.corba.ee.idl.PrimitiveEntry primitiveEntry ()
       For instance, when generating Java code, octet translates to byte, so
       there is an entry in Compile.overrideNames:  <"octet", "byte"> and a
       PrimitiveEntry in the symbol table for "byte". */
+  @Override
   public com.sun.tools.corba.ee.idl.PrimitiveEntry primitiveEntry (String name)
   {
     return new com.sun.tools.corba.ee.idl.PrimitiveEntry(name);
   } // primitiveEntry
 
+  @Override
   public com.sun.tools.corba.ee.idl.SequenceEntry sequenceEntry ()
   {
     return new com.sun.tools.corba.ee.idl.SequenceEntry();
   } // sequenceEntry
 
+  @Override
   public com.sun.tools.corba.ee.idl.SequenceEntry sequenceEntry (com.sun.tools.corba.ee.idl.SymtabEntry container, com.sun.tools.corba.ee.idl.IDLID id)
   {
     return new com.sun.tools.corba.ee.idl.SequenceEntry(container, id);
   } // sequenceEntry
 
+  @Override
   public com.sun.tools.corba.ee.idl.StringEntry stringEntry ()
   {
     return new com.sun.tools.corba.ee.idl.StringEntry();
   } // stringEntry
 
+  @Override
   public com.sun.tools.corba.ee.idl.StructEntry structEntry ()
   {
     return new com.sun.tools.corba.ee.idl.StructEntry();
   } // structEntry
 
+  @Override
   public com.sun.tools.corba.ee.idl.StructEntry structEntry (com.sun.tools.corba.ee.idl.SymtabEntry container, com.sun.tools.corba.ee.idl.IDLID id)
   {
     return new com.sun.tools.corba.ee.idl.StructEntry(container, id);
   } // structEntry
 
+  @Override
   public com.sun.tools.corba.ee.idl.TypedefEntry typedefEntry ()
   {
     return new com.sun.tools.corba.ee.idl.TypedefEntry();
   } // typedefEntry
 
+  @Override
   public com.sun.tools.corba.ee.idl.TypedefEntry typedefEntry (com.sun.tools.corba.ee.idl.SymtabEntry container, com.sun.tools.corba.ee.idl.IDLID id)
   {
     return new com.sun.tools.corba.ee.idl.TypedefEntry(container, id);
   } // typedefEntry
 
+  @Override
   public com.sun.tools.corba.ee.idl.UnionEntry unionEntry ()
   {
     return new com.sun.tools.corba.ee.idl.UnionEntry();
   } // unionEntry
 
+  @Override
   public com.sun.tools.corba.ee.idl.UnionEntry unionEntry (com.sun.tools.corba.ee.idl.SymtabEntry container, com.sun.tools.corba.ee.idl.IDLID id)
   {
     return new com.sun.tools.corba.ee.idl.UnionEntry(container, id);

idlj/src/main/java/com/sun/tools/corba/ee/idl/EnumEntry.java

@@ -34,7 +34,6 @@ public class EnumEntry extends com.sun.tools.corba.ee.idl.SymtabEntry
 {
   protected EnumEntry ()
   {
-    super ();
   } // ctor
 
   protected EnumEntry (EnumEntry that)

idlj/src/main/java/com/sun/tools/corba/ee/idl/ExceptionEntry.java

@@ -33,7 +33,6 @@ public class ExceptionEntry extends StructEntry
 {
   protected ExceptionEntry ()
   {
-    super ();
   } // ctor
 
   protected ExceptionEntry (ExceptionEntry that)
@@ -46,6 +45,7 @@ protected ExceptionEntry (com.sun.tools.corba.ee.idl.SymtabEntry that, com.sun.t
     super (that, clone);
    } // ctor
 
+  @Override
   public Object clone ()
   {
     return new ExceptionEntry (this);
@@ -57,6 +57,7 @@ public Object clone ()
        a subclass of SymtabEntry.
       @param stream the stream to which the generator should sent its output.
       @see com.sun.tools.corba.ee.idl.SymtabEntry */
+  @Override
   public void generate (Hashtable symbolTable, PrintWriter stream)
   {
     exceptionGen.generate (symbolTable, this, stream);
@@ -65,6 +66,7 @@ public void generate (Hashtable symbolTable, PrintWriter stream)
   /** Access the exception generator.
       @return an object which implements the ExceptionGen interface.
       @see com.sun.tools.corba.ee.idl.ExceptionGen */
+  @Override
   public com.sun.tools.corba.ee.idl.Generator generator ()
   {
     return exceptionGen;

idlj/src/main/java/com/sun/tools/corba/ee/idl/ForwardEntry.java

@@ -34,7 +34,6 @@ public class ForwardEntry extends com.sun.tools.corba.ee.idl.SymtabEntry impleme
 {
   protected ForwardEntry ()
   {
-    super ();
   } // ctor
 
   protected ForwardEntry (ForwardEntry that)

idlj/src/main/java/com/sun/tools/corba/ee/idl/ForwardValueEntry.java

@@ -32,7 +32,6 @@ public class ForwardValueEntry extends ForwardEntry
 {
   protected ForwardValueEntry ()
   {
-    super ();
   } // ctor
 
   protected ForwardValueEntry (ForwardValueEntry that)
@@ -45,6 +44,7 @@ protected ForwardValueEntry (com.sun.tools.corba.ee.idl.SymtabEntry that, com.su
     super (that, clone);
   } // ctor
 
+  @Override
   public Object clone ()
   {
     return new ForwardValueEntry (this);
@@ -56,6 +56,7 @@ public Object clone ()
        a subclass of SymtabEntry.
       @param stream the stream to which the generator should sent its output.
       @see com.sun.tools.corba.ee.idl.SymtabEntry */
+  @Override
   public void generate (Hashtable symbolTable, PrintWriter stream)
   {
     forwardValueGen.generate (symbolTable, this, stream);
@@ -64,6 +65,7 @@ public void generate (Hashtable symbolTable, PrintWriter stream)
   /** Access the interface generator.
       @return an object which implements the ForwardValueGen interface.
       @see com.sun.tools.corba.ee.idl.ValueGen */
+  @Override
   public com.sun.tools.corba.ee.idl.Generator generator ()
   {
      return forwardValueGen;