Merged gcj-eclipse branch to trunk.

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

6 files changed, 24 insertions, 43 deletions

diff --git a/libjava/classpath/gnu/CORBA/NamingService/Binding_iterator_impl.java b/libjava/classpath/gnu/CORBA/NamingService/Binding_iterator_impl.java
index 79d787083ca..108ca270d21 100644
--- a/libjava/classpath/gnu/CORBA/NamingService/Binding_iterator_impl.java
+++ b/libjava/classpath/gnu/CORBA/NamingService/Binding_iterator_impl.java
@@ -1,5 +1,5 @@
 /* Binding_iterator.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package gnu.CORBA.NamingService;
 
+import gnu.CORBA.SafeForDirectCalls;
+
 import org.omg.CosNaming.Binding;
 import org.omg.CosNaming.BindingHolder;
 import org.omg.CosNaming.BindingListHolder;
@@ -51,7 +53,7 @@ import org.omg.CosNaming._BindingIteratorImplBase;
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
 public class Binding_iterator_impl
-  extends _BindingIteratorImplBase
+  extends _BindingIteratorImplBase implements SafeForDirectCalls
 {
   /**
    * The value, returned by the {@link #next_one} when there
diff --git a/libjava/classpath/gnu/CORBA/NamingService/Ext.java b/libjava/classpath/gnu/CORBA/NamingService/Ext.java
index ee27e68cd79..d339cb194e6 100644
--- a/libjava/classpath/gnu/CORBA/NamingService/Ext.java
+++ b/libjava/classpath/gnu/CORBA/NamingService/Ext.java
@@ -1,5 +1,5 @@
 /* TransientContextExt.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package gnu.CORBA.NamingService;
 
+import gnu.CORBA.SafeForDirectCalls;
+
 import org.omg.CORBA.NO_IMPLEMENT;
 import org.omg.CORBA.Object;
 import org.omg.CORBA.portable.Delegate;
@@ -61,7 +63,7 @@ import org.omg.CosNaming._NamingContextExtImplBase;
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
 public class Ext
-  extends _NamingContextExtImplBase
+  extends _NamingContextExtImplBase implements SafeForDirectCalls
 {
   /**
    * The older version of the naming context, where all relevant calls
diff --git a/libjava/classpath/gnu/CORBA/NamingService/NameParser.java b/libjava/classpath/gnu/CORBA/NamingService/NameParser.java
index c750b2eb4c0..aa922b96a54 100644
--- a/libjava/classpath/gnu/CORBA/NamingService/NameParser.java
+++ b/libjava/classpath/gnu/CORBA/NamingService/NameParser.java
@@ -193,9 +193,6 @@ public class NameParser
 
     boolean corbaname;
 
-    // The alternative addresses, if given.
-    ArrayList alt_addr = new ArrayList();
-
     // The version numbers with default values.
     int major = 1;
     int minor = 0;
diff --git a/libjava/classpath/gnu/CORBA/NamingService/NameTransformer.java b/libjava/classpath/gnu/CORBA/NamingService/NameTransformer.java
index 0e0782a5756..d717b9d4011 100644
--- a/libjava/classpath/gnu/CORBA/NamingService/NameTransformer.java
+++ b/libjava/classpath/gnu/CORBA/NamingService/NameTransformer.java
@@ -1,5 +1,5 @@
 /* NameTransformer.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -75,10 +75,6 @@ public class NameTransformer
     ArrayList components = new ArrayList();
     StringTokenizer st = new StringTokenizer(a_name, "./\\", true);
 
-    String id;
-    String kind;
-    String next;
-
     // Create the buffer array, reserving the last element for null.
     String[] n = new String[ st.countTokens() + 1 ];
 
diff --git a/libjava/classpath/gnu/CORBA/NamingService/NamingServiceTransient.java b/libjava/classpath/gnu/CORBA/NamingService/NamingServiceTransient.java
index 3669879f22a..a8cd0b313b3 100644
--- a/libjava/classpath/gnu/CORBA/NamingService/NamingServiceTransient.java
+++ b/libjava/classpath/gnu/CORBA/NamingService/NamingServiceTransient.java
@@ -85,35 +85,26 @@ public class NamingServiceTransient
   }
 
   /**
-   * Start the naming service on the current host at the given port. The
-   * parameter -org.omg.CORBA.ORBInitialPort NNN or -ORBInitialPort NNN, if
-   * present, specifies the port, on that the service must be started. If this
-   * key is not specified, the service starts at the port 900.
+   * Start the naming service on the current host at the given port.
    * 
-   * The parameter -ior FILE_NAME, if present, forces to store the ior string of
-   * this naming service to the specified file.
-   * 
-   * @param args the parameter string.
+   * @param portArgument the port on which the service will be
+   * started, or -1 to use the default port, 900
+   * @param fileArgument if non-null, store the IOR string of this
+   * naming service in a file by this name
    */
-  public static void main(String[] args)
+  public static void start(int portArgument, String fileArgument)
   {
     int port = PORT;
-    String iorf = null;
+
+    if (portArgument > -1)
+      port = portArgument;
+
+    String iorf = fileArgument;
     try
       {
         // Create and initialize the ORB
         final OrbFunctional orb = new OrbFunctional();
 
-        if (args.length > 1)
-          for (int i = 0; i < args.length - 1; i++)
-            {
-              if (args[i].endsWith("ORBInitialPort"))
-                port = Integer.parseInt(args[i + 1]);
-
-              if (args[i].equals("-ior"))
-                iorf = args[i + 1];
-            }
-
         OrbFunctional.setPort(port);
 
         // Create the servant and register it with the ORB
@@ -133,15 +124,6 @@ public class NamingServiceTransient
             p.close();
           }
 
-        System.out.println("GNU Classpath transient naming service "
-          + "started at " + iorr.Internet.host + ":" + iorr.Internet.port
-          + " key 'NameService'.\n\n"
-          + "Copyright (C) 2006 Free Software Foundation\n"
-          + "This tool comes with ABSOLUTELY NO WARRANTY. "
-          + "This is free software, and you are\nwelcome to "
-          + "redistribute it under conditions, defined in "
-          + "GNU Classpath license.\n\n" + ior);
-
         new Thread()
         {
           public void run()
@@ -154,7 +136,7 @@ public class NamingServiceTransient
     catch (Exception e)
       {
         System.err.println("ERROR: " + e);
-        e.printStackTrace(System.out);
+        e.printStackTrace(System.err);
       }
 
     // Restore the default value for allocating ports for the subsequent
diff --git a/libjava/classpath/gnu/CORBA/NamingService/TransientContext.java b/libjava/classpath/gnu/CORBA/NamingService/TransientContext.java
index c2d8275e001..cec87931e28 100644
--- a/libjava/classpath/gnu/CORBA/NamingService/TransientContext.java
+++ b/libjava/classpath/gnu/CORBA/NamingService/TransientContext.java
@@ -54,6 +54,8 @@ import org.omg.CosNaming.NamingContextPackage.NotFound;
 import org.omg.CosNaming.NamingContextPackage.NotFoundReason;
 import org.omg.CosNaming._NamingContextImplBase;
 
+import gnu.CORBA.SafeForDirectCalls;
+
 import java.util.Iterator;
 import java.util.Map;
 
@@ -69,7 +71,7 @@ import java.util.Map;
  */
 public class TransientContext
   extends _NamingContextImplBase
-  implements NamingContext, NamingContextOperations
+  implements NamingContext, NamingContextOperations, SafeForDirectCalls
 {
   /**
    * Use serial version UID for interoperability.