src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueGen24.java

*** 71,118 ****
    public ValueGen24 ()
    {
    } // ctor
  
    /**
!    * <d62023> - delete constructor; helper is abstract
     **/
    protected void writeConstructor ()
    {
    } // writeConstructor
  
    /**
!    * <d62023> - delete write_value from non-boxed helpers
     *          - delete _write from non-boxed helpers
     **/
    public void helperWrite (SymtabEntry entry, PrintWriter stream)
    {
      // REVISIT: Abstract/Custom??
      // per Simon mail 5/17/99
      stream.println ("    ((org.omg.CORBA_2_3.portable.OutputStream) ostream).write_value (value, id ());");
    } // helperWrite
  
    /**
!    * <d62023>
     **/
    public void helperRead (String entryName, SymtabEntry entry, PrintWriter stream)
    {
      // REVISIT: Abstract/Custom??
      // per Simon mail 5/17/99
      stream.println ("    return (" + entryName + ")((org.omg.CORBA_2_3.portable.InputStream) istream).read_value (id ());");
    } // helperRead
  
    /**
!    * <d62023> - suppress initializers from mapped value; now generated in
     *    the Helper class and Factory class
     **/
    protected void writeInitializers ()
    {
          // override to do nothing
    } // writeInitializers
  
    /**
!    * <d62023> - Goes in mapped class, not Helper
     **/
    protected void writeTruncatable () // <d60929>
    {
      if (!v.isAbstract ()) {
         stream.println ("  private static String[] _truncatable_ids = {");
--- 71,118 ----
    public ValueGen24 ()
    {
    } // ctor
  
    /**
!    * {@literal <d62023>} - delete constructor; helper is abstract
     **/
    protected void writeConstructor ()
    {
    } // writeConstructor
  
    /**
!    * {@literal <d62023>} - delete write_value from non-boxed helpers
     *          - delete _write from non-boxed helpers
     **/
    public void helperWrite (SymtabEntry entry, PrintWriter stream)
    {
      // REVISIT: Abstract/Custom??
      // per Simon mail 5/17/99
      stream.println ("    ((org.omg.CORBA_2_3.portable.OutputStream) ostream).write_value (value, id ());");
    } // helperWrite
  
    /**
!    * {@literal <d62023>}
     **/
    public void helperRead (String entryName, SymtabEntry entry, PrintWriter stream)
    {
      // REVISIT: Abstract/Custom??
      // per Simon mail 5/17/99
      stream.println ("    return (" + entryName + ")((org.omg.CORBA_2_3.portable.InputStream) istream).read_value (id ());");
    } // helperRead
  
    /**
!    * {@literal <d62023>} - suppress initializers from mapped value; now generated in
     *    the Helper class and Factory class
     **/
    protected void writeInitializers ()
    {
          // override to do nothing
    } // writeInitializers
  
    /**
!    * {@literal <d62023>} - Goes in mapped class, not Helper
     **/
    protected void writeTruncatable () // <d60929>
    {
      if (!v.isAbstract ()) {
         stream.println ("  private static String[] _truncatable_ids = {");
*** 153,163 ****
          stream.print( name ) ;
      }
    }
  
    /**
!    * <d62023> CustomMarshal -> CustomValue for custom valuetypes
     *          mapped class is abstract
     **/
    protected void writeHeading ()
    {
      ImplStreamWriter isw = new ImplStreamWriter() ;
--- 153,163 ----
          stream.print( name ) ;
      }
    }
  
    /**
!    * {@literal <d62023> CustomMarshal ->} CustomValue for custom valuetypes
     *          mapped class is abstract
     **/
    protected void writeHeading ()
    {
      ImplStreamWriter isw = new ImplStreamWriter() ;
*** 215,225 ****
      stream.println ();
      stream.println ("{");
    } // writeHeading
  
    /**
!    * <d62023> - private state maps to protected, not default
     **/
    protected void writeMembers ()
    {
      // if the value type contains no data members, a null return is expected
      if (v.state () == null)
--- 215,225 ----
      stream.println ();
      stream.println ("{");
    } // writeHeading
  
    /**
!    * {@literal <d62023>} - private state maps to protected, not default
     **/
    protected void writeMembers ()
    {
      // if the value type contains no data members, a null return is expected
      if (v.state () == null)
*** 243,253 ****
      }
      stream.println();
    } // writeMembers
  
    /**
!    * <d62023> Methods need to be abstract
     *          writeStreamable
     **/
    protected void writeMethods ()
    {
      // contained vector contains methods, attributes, const, enums, exceptions,
--- 243,253 ----
      }
      stream.println();
    } // writeMembers
  
    /**
!    * {@literal <d62023>} Methods need to be abstract
     *          writeStreamable
     **/
    protected void writeMethods ()
    {
      // contained vector contains methods, attributes, const, enums, exceptions,
*** 292,302 ****
    if (!(v.isCustom () || v.isAbstract ()))
        writeStreamableMethods ();
    } // writeMethods
  
    /**
!    * <d62023> Call super._read()
     **/
    public int read (int index, String indent, String name, SymtabEntry entry, PrintWriter stream)
    {
      // First do the state members from concrete parent hierarchy
      Vector vParents = ((ValueEntry) entry).derivedFrom ();
--- 292,302 ----
    if (!(v.isCustom () || v.isAbstract ()))
        writeStreamableMethods ();
    } // writeMethods
  
    /**
!    * {@literal <d62023>} Call super._read()
     **/
    public int read (int index, String indent, String name, SymtabEntry entry, PrintWriter stream)
    {
      // First do the state members from concrete parent hierarchy
      Vector vParents = ((ValueEntry) entry).derivedFrom ();
*** 333,343 ****
  
      return index;
    } // read
  
    /**
!    * <d62023> Call super._write()
     **/
    public int write (int index, String indent, String name, SymtabEntry entry, PrintWriter stream)
    {
      // First do the state members from concrete parent hierarchy
      Vector vParents = ((ValueEntry)entry).derivedFrom ();
--- 333,343 ----
  
      return index;
    } // read
  
    /**
!    * {@literal <d62023>} Call super._write()
     **/
    public int write (int index, String indent, String name, SymtabEntry entry, PrintWriter stream)
    {
      // First do the state members from concrete parent hierarchy
      Vector vParents = ((ValueEntry)entry).derivedFrom ();
*** 372,382 ****
  
      return index;
    } // write
  
    /**
!    * <62023> - generate factory interface and default factory
     **/
    public void generate (Hashtable symbolTable, ValueEntry v, PrintWriter str)
    {
      this.symbolTable = symbolTable;
      this.v = v;
--- 372,382 ----
  
      return index;
    } // write
  
    /**
!    * {@literal <62023>} - generate factory interface and default factory
     **/
    public void generate (Hashtable symbolTable, ValueEntry v, PrintWriter str)
    {
      this.symbolTable = symbolTable;
      this.v = v;