2006-08-14 Mark Wielaard <mark@klomp.org>

       Imported GNU Classpath 0.92
       * HACKING: Add more importing hints. Update automake version
       requirement.

       * configure.ac (gconf-peer): New enable AC argument.
       Add --disable-gconf-peer and --enable-default-preferences-peer
       to classpath configure when gconf is disabled.
       * scripts/makemake.tcl: Set gnu/java/util/prefs/gconf and
       gnu/java/awt/dnd/peer/gtk to bc. Classify
       gnu/java/security/Configuration.java as generated source file.

       * gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java,
       gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java,
       gnu/java/lang/management/VMClassLoadingMXBeanImpl.java,
       gnu/java/lang/management/VMRuntimeMXBeanImpl.java,
       gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java,
       gnu/java/lang/management/VMThreadMXBeanImpl.java,
       gnu/java/lang/management/VMMemoryMXBeanImpl.java,
       gnu/java/lang/management/VMCompilationMXBeanImpl.java: New VM stub
       classes.
       * java/lang/management/VMManagementFactory.java: Likewise.
       * java/net/VMURLConnection.java: Likewise.
       * gnu/java/nio/VMChannel.java: Likewise.

       * java/lang/Thread.java (getState): Add stub implementation.
       * java/lang/Class.java (isEnum): Likewise.
       * java/lang/Class.h (isEnum): Likewise.

       * gnu/awt/xlib/XToolkit.java (getClasspathTextLayoutPeer): Removed.

       * javax/naming/spi/NamingManager.java: New override for StackWalker
       functionality.

       * configure, sources.am, Makefile.in, gcj/Makefile.in,
       include/Makefile.in, testsuite/Makefile.in: Regenerated.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@116139 138bc75d-0d04-0410-961f-82ee72b054a4

12 files changed, 69 insertions, 147 deletions

diff --git a/libjava/classpath/org/omg/PortableInterceptor/AdapterManagerIdHelper.java b/libjava/classpath/org/omg/PortableInterceptor/AdapterManagerIdHelper.java
index f3f7e64416a..936e6bc1b81 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/AdapterManagerIdHelper.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/AdapterManagerIdHelper.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package org.omg.PortableInterceptor;
 
+import gnu.CORBA.OrbRestricted;
+
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
 import org.omg.CORBA.ORB;
@@ -57,15 +59,14 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class AdapterManagerIdHelper
 {
   /**
-   * Create the AdapterManagerId typecode (alias of CORBA long (java int),
-   * named "AdapterManagerId").
+   * Create the AdapterManagerId typecode (alias of CORBA long (java int), named
+   * "AdapterManagerId").
    */
   public static TypeCode type()
   {
-    ORB orb = ORB.init();
+    ORB orb = OrbRestricted.Singleton;
     return orb.create_alias_tc(id(), "AdapterManagerId",
-                               orb.get_primitive_tc(TCKind.tk_long)
-                              );
+                               orb.get_primitive_tc(TCKind.tk_long));
   }
 
   /**
diff --git a/libjava/classpath/org/omg/PortableInterceptor/AdapterNameHelper.java b/libjava/classpath/org/omg/PortableInterceptor/AdapterNameHelper.java
index 1cda311b23d..05844560a9a 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/AdapterNameHelper.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/AdapterNameHelper.java
@@ -61,11 +61,6 @@ public abstract class AdapterNameHelper
 {
   
   /**
-   * The cached typecode, computed once.
-   */
-  static TypeCode typecode;
-  
-  /**
    * Extract the adapter name (<code>String[]</code>) from the given {@link Any}.
    *
    * @param a an Any to extract the array from.
@@ -114,26 +109,22 @@ public abstract class AdapterNameHelper
   }
 
   /**
-   * Creates and returns a new instance of the TypeCode,
-   * corresponding the adapter name.
+   * Creates and returns a new instance of the TypeCode, corresponding the
+   * adapter name.
    * 
    * @return the alias of the string sequence, named "AdapterName".
    */
   public static TypeCode type()
   {
-    if (typecode == null)
-      {
-        ORB orb = OrbRestricted.Singleton;
-        
-        TypeCode component = orb.create_string_tc(0);
-        typecode = orb.create_alias_tc(id(), "AdapterName", component);
-      }
-    return typecode;
+    ORB orb = OrbRestricted.Singleton;
+
+    TypeCode component = orb.create_string_tc(0);
+    return orb.create_alias_tc(id(), "AdapterName", component);
   }
 
   /**
    * Writes the <code>String[]</code> into the given stream.
-   *
+   * 
    * @param output the CORBA output stream to write.
    * @param value the value that must be written.
    */
diff --git a/libjava/classpath/org/omg/PortableInterceptor/AdapterStateHelper.java b/libjava/classpath/org/omg/PortableInterceptor/AdapterStateHelper.java
index ceb7ac8d52a..f0522caac0f 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/AdapterStateHelper.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/AdapterStateHelper.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package org.omg.PortableInterceptor;
 
+import gnu.CORBA.OrbRestricted;
+
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
 import org.omg.CORBA.ORB;
@@ -62,7 +64,7 @@ public abstract class AdapterStateHelper
    */
   public static TypeCode type()
   {
-    ORB orb = ORB.init();
+    ORB orb = OrbRestricted.Singleton;
     return orb.create_alias_tc(id(), "AdapterState",
                                orb.get_primitive_tc(TCKind.tk_short)
                               );
diff --git a/libjava/classpath/org/omg/PortableInterceptor/CurrentHelper.java b/libjava/classpath/org/omg/PortableInterceptor/CurrentHelper.java
index df3bcaef72b..e453f601021 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/CurrentHelper.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/CurrentHelper.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package org.omg.PortableInterceptor;
 
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_PARAM;
@@ -57,20 +58,11 @@ import org.omg.PortableServer.ServantActivator;
 public abstract class CurrentHelper
 {
   /**
-   * The cached {@link Current} typecode, computed once.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Get the type code of the {@link Current}.
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        typeCode = ORB.init().create_interface_tc(id(), "Current");
-      }
-    return typeCode;
+    return OrbRestricted.Singleton.create_interface_tc(id(), "Current");
   }
 
   /**
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ForwardRequestHelper.java b/libjava/classpath/org/omg/PortableInterceptor/ForwardRequestHelper.java
index 5db56d74560..8aa19a991a1 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ForwardRequestHelper.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ForwardRequestHelper.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package org.omg.PortableInterceptor;
 
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 import gnu.CORBA.Interceptor.ForwardRequestHolder;
 
 import org.omg.CORBA.Any;
@@ -58,32 +59,23 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class ForwardRequestHelper
 {
   /**
-   * The cached typecode value, computed only once.
-   */
-  private static TypeCode typeCode;
-
-  /**
-       * Create the ForwardRequest typecode (structure, named "ForwardRequest"). The
+   * Create the ForwardRequest typecode (structure, named "ForwardRequest"). The
    * typecode states that the structure contains the following fields: forward.
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        ORB orb = ORB.init();
-        StructMember[] members = new StructMember[ 1 ];
+    ORB orb = OrbRestricted.Singleton;
+    StructMember[] members = new StructMember[1];
 
-        TypeCode field = ObjectHelper.type();
-        members [ 0 ] = new StructMember("forward", field, null);
-        typeCode = orb.create_exception_tc(id(), "ForwardRequest", members);
-      }
-    return typeCode;
+    TypeCode field = ObjectHelper.type();
+    members[0] = new StructMember("forward", field, null);
+    return orb.create_exception_tc(id(), "ForwardRequest", members);
   }
 
   /**
    * Insert the ForwardRequest into the given Any. This method uses the
    * ForwardRequestHolder.
-   *
+   * 
    * @param any the Any to insert into.
    * @param that the ForwardRequest to insert.
    */
diff --git a/libjava/classpath/org/omg/PortableInterceptor/IORInterceptor_3_0Helper.java b/libjava/classpath/org/omg/PortableInterceptor/IORInterceptor_3_0Helper.java
index 565242477d9..926974f1ab8 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/IORInterceptor_3_0Helper.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/IORInterceptor_3_0Helper.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package org.omg.PortableInterceptor;
 
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -60,18 +61,12 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class IORInterceptor_3_0Helper
 {
   /**
-   * The cached {@link IORInterceptor_3_0} typecode, computed once.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Get the type code of the {@link IORInterceptor_3_0}.
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      typeCode = ORB.init().create_interface_tc(id(), "IORInterceptor_3_0");
-    return typeCode;
+    return OrbRestricted.Singleton.create_interface_tc(id(), 
+      "IORInterceptor_3_0");
   }
 
   /**
diff --git a/libjava/classpath/org/omg/PortableInterceptor/InvalidSlotHelper.java b/libjava/classpath/org/omg/PortableInterceptor/InvalidSlotHelper.java
index 98b2596771f..28558a000db 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/InvalidSlotHelper.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/InvalidSlotHelper.java
@@ -40,6 +40,7 @@ package org.omg.PortableInterceptor;
 
 import gnu.CORBA.EmptyExceptionHolder;
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -57,22 +58,13 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class InvalidSlotHelper
 {
   /**
-   * The cached typecode value, computed only once.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Create the InvalidSlot typecode (structure, named "InvalidSlot").
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        ORB orb = ORB.init();
-        StructMember[] members = new StructMember[ 0 ];
-        typeCode = orb.create_exception_tc(id(), "InvalidSlot", members);
-      }
-    return typeCode;
+    ORB orb = OrbRestricted.Singleton;
+    StructMember[] members = new StructMember[0];
+    return orb.create_exception_tc(id(), "InvalidSlot", members);
   }
 
   /*
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHelper.java b/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHelper.java
index 648e9679b42..2d9740a855e 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHelper.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHelper.java
@@ -57,36 +57,25 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class DuplicateNameHelper
 {
   /**
-   * The cached typecode value, computed only once.
-   */
-  private static TypeCode typeCode;
-
-  /**
-   * Create the DuplicateName typecode (structure,
-   * named "DuplicateName").
-   * The typecode states that the structure contains the
-   * following fields: name.
+   * Create the DuplicateName typecode (structure, named "DuplicateName"). The
+   * typecode states that the structure contains the following fields: name.
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        ORB orb = ORB.init();
-        StructMember[] members = new StructMember[ 1 ];
+    ORB orb = OrbRestricted.Singleton;
+    StructMember[] members = new StructMember[1];
 
-        TypeCode field;
+    TypeCode field;
 
-        field = orb.get_primitive_tc(TCKind.tk_string);
-        members [ 0 ] = new StructMember("name", field, null);
-        typeCode = orb.create_exception_tc(id(), "DuplicateName", members);
-      }
-    return typeCode;
+    field = orb.get_primitive_tc(TCKind.tk_string);
+    members[0] = new StructMember("name", field, null);
+    return orb.create_exception_tc(id(), "DuplicateName", members);
   }
 
   /**
-   * Insert the DuplicateName into the given Any.
-   * This method uses the DuplicateNameHolder.
-   *
+   * Insert the DuplicateName into the given Any. This method uses the
+   * DuplicateNameHolder.
+   * 
    * @param any the Any to insert into.
    * @param that the DuplicateName to insert.
    */
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.java b/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.java
index f89f9d4c6db..a87a3b747fd 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.java
@@ -40,6 +40,7 @@ package org.omg.PortableInterceptor.ORBInitInfoPackage;
 
 import gnu.CORBA.EmptyExceptionHolder;
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -58,28 +59,18 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class InvalidNameHelper
 {
   /**
-   * The cached typecode value, computed only once.
-   */
-  private static TypeCode typeCode;
-
-  /**
-   * Create the InvalidName typecode (structure,
-   * named "InvalidName").
+   * Create the InvalidName typecode (structure, named "InvalidName").
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        ORB orb = ORB.init();
-        StructMember[] members = new StructMember[ 0 ];
-        typeCode = orb.create_exception_tc(id(), "InvalidName", members);
-      }
-    return typeCode;
+    ORB orb = OrbRestricted.Singleton;
+    StructMember[] members = new StructMember[0];
+    return orb.create_exception_tc(id(), "InvalidName", members);
   }
 
   /**
    * Insert the InvalidName into the given Any.
-   *
+   * 
    * @param any the Any to insert into.
    * @param that the InvalidName to insert.
    */
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceFactoryHelper.java b/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceFactoryHelper.java
index 55ee0be18fc..72c864811f7 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceFactoryHelper.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceFactoryHelper.java
@@ -40,6 +40,7 @@ package org.omg.PortableInterceptor;
 
 import gnu.CORBA.CDR.Vio;
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -60,24 +61,16 @@ import org.omg.CORBA.VM_ABSTRACT;
 public abstract class ObjectReferenceFactoryHelper
 {
   /**
-   * The cached {@link ObjectReferenceFactory} typecode, computed once.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Get the type code of the {@link ObjectReferenceFactory}.
-   *
-   * @return value type code with the agreed id, named
-   * "ObjectReferenceFactory", abstract, no members, no base type.
+   * 
+   * @return value type code with the agreed id, named "ObjectReferenceFactory",
+   *         abstract, no members, no base type.
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      typeCode =
-        ORB.init().create_value_tc(id(), "ObjectReferenceFactory",
-          VM_ABSTRACT.value, null, new ValueMember[ 0 ]
-        );
-    return typeCode;
+    return OrbRestricted.Singleton.create_value_tc(id(), "ObjectReferenceFactory",
+                                      VM_ABSTRACT.value, null,
+                                      new ValueMember[0]);
   }
 
   /**
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceTemplateHelper.java b/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceTemplateHelper.java
index 258a73ae8a1..014c11308c2 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceTemplateHelper.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceTemplateHelper.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package org.omg.PortableInterceptor;
 
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -58,24 +59,16 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class ObjectReferenceTemplateHelper
 {
   /**
-   * The cached {@link ObjectReferenceTemplate} typecode, computed once.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Get the type code of the {@link ObjectReferenceTemplate}.
-   *
-   * @return value type type code, named ObjectReferenceTemplate,
-   * no members, abstract.
+   * 
+   * @return value type type code, named ObjectReferenceTemplate, no members,
+   *         abstract.
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      typeCode =
-        ORB.init().create_value_tc(id(), "ObjectReferenceTemplate",
-          VM_ABSTRACT.value, null, new ValueMember[ 0 ]
-        );
-    return typeCode;
+    return OrbRestricted.Singleton.create_value_tc(id(), "ObjectReferenceTemplate",
+                                      VM_ABSTRACT.value, null,
+                                      new ValueMember[0]);
   }
 
   /**
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceTemplateSeqHelper.java b/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceTemplateSeqHelper.java
index c4f09896f97..e84f3e6be5d 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceTemplateSeqHelper.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceTemplateSeqHelper.java
@@ -57,11 +57,6 @@ import org.omg.CORBA.portable.Streamable;
 public abstract class ObjectReferenceTemplateSeqHelper
 {
   /**
-   * The type code, computed once.
-   */
-  static TypeCode typecode;
-
-  /**
    * Extract the <code>ObjectReferenceTemplate[]</code> from the given
    * {@link Any}. This implementation expects the {@link Any} to hold the
    * instance of {@link ObjectReferenceTemplateSeqHolder} that is returned by
@@ -142,15 +137,11 @@ public abstract class ObjectReferenceTemplateSeqHelper
    */
   public static TypeCode type()
   {
-    if (typecode == null)
-      {
-        GeneralTypeCode t = new GeneralTypeCode(TCKind.tk_sequence);
-        t.setId(id());
-        t.setLength(0);
-        t.setContentType(ObjectReferenceTemplateHelper.type());
-        typecode = t;
-      }
-    return typecode;
+    GeneralTypeCode t = new GeneralTypeCode(TCKind.tk_sequence);
+    t.setId(id());
+    t.setLength(0);
+    t.setContentType(ObjectReferenceTemplateHelper.type());
+    return t;
   }
 
   /**