2005-10-28 Audrius Meskauskas <AudriusA@Bioinformatics.org>

	* gnu/CORBA/holderFactory.java,
	gnu/CORBA/IOR_contructed_object.java,
	gnu/CORBA/IOR_Delegate.java,
	gnu/CORBA/Simple_delegate.java,
	gnu/CORBA/Restricted_ORB.java,
	gnu/CORBA/Functional_ORB.java,
	gnu/CORBA/Focused_ORB.java: Removed.
	* gnu/CORBA/HolderLocator.java
	gnu/CORBA/IorDelegate.java
	gnu/CORBA/IorObject.java
	gnu/CORBA/OrbFocused.java
	gnu/CORBA/OrbFunctional.java
	gnu/CORBA/OrbRestricted.java
	gnu/CORBA/SimpleDelegate.java: New files.
	* gnu/CORBA/CDR/cdrInput.java,
	gnu/CORBA/DynAn/abstractRecord.java,
	gnu/CORBA/DynAn/gnuDynAny.java,
	gnu/CORBA/DynAn/gnuDynAnyFactory.java,
	gnu/CORBA/DynAn/gnuDynArray.java,
	gnu/CORBA/DynAn/gnuDynValueBox.java,
	gnu/CORBA/GIOP/ErrorMessage.java,
	gnu/CORBA/NamingService/NameParser.java,
	gnu/CORBA/NamingService/NamingServiceTransient.java,
	gnu/CORBA/Poa/ForwardedServant.java,
	gnu/CORBA/Poa/ORB_1_4.java,
	gnu/CORBA/Poa/gnuServantObject.java,
	gnu/CORBA/StubLocator.java,
	gnu/CORBA/gnuAny.java,
	gnu/CORBA/gnuRequest.java,
	gnu/javax/rmi/CORBA/PortableRemoteObjectDelegateImpl.java,
	gnu/javax/rmi/CORBA/gnuRmiUtil.java,
	org/omg/CORBA/CompletionStatusHelper.java,
	org/omg/CORBA/DefinitionKindHelper.java,
	org/omg/CORBA/FieldNameHelper.java,
	org/omg/CORBA/IDLTypeHelper.java,
	org/omg/CORBA/IdentifierHelper.java,
	org/omg/CORBA/ORB.java,
	org/omg/CORBA/ParameterModeHelper.java,
	org/omg/CORBA/RepositoryIdHelper.java,
	org/omg/CORBA/SetOverrideTypeHelper.java,
	org/omg/CORBA/StringValueHelper.java,
	org/omg/CORBA/StructMemberHelper.java,
	org/omg/CORBA/UnionMemberHelper.java,
	org/omg/CORBA/ValueMemberHelper.java,
	org/omg/CORBA/VersionSpecHelper.java,
	org/omg/CORBA/VisibilityHelper.java,
	org/omg/CORBA/WStringValueHelper.java,
	org/omg/CORBA/_IDLTypeStub.java,
	org/omg/CosNaming/IstringHelper.java,
	org/omg/DynamicAny/FieldNameHelper.java,
	org/omg/PortableInterceptor/AdapterNameHelper.java,
	org/omg/PortableInterceptor/ORBIdHelper.java,
	org/omg/PortableInterceptor/ORBInitInfoPackage/ObjectIdHelper.java,
	org/omg/PortableInterceptor/ObjectIdHelper.java,
	org/omg/PortableInterceptor/ServerIdHelper.java:
	References updated.

1 files changed, 11 insertions, 11 deletions

diff --git a/gnu/CORBA/gnuRequest.java b/gnu/CORBA/gnuRequest.java
index 43d6ff589..2175aa2cf 100644
--- a/gnu/CORBA/gnuRequest.java
+++ b/gnu/CORBA/gnuRequest.java
@@ -295,8 +295,8 @@ public class gnuRequest extends Request implements Cloneable
     orb = an_orb;
 
     // Take the interceptor from the ORB.
-    if (orb instanceof Restricted_ORB)
-      m_interceptor = ((Restricted_ORB) orb).iClient;
+    if (orb instanceof OrbRestricted)
+      m_interceptor = ((OrbRestricted) orb).iClient;
 
     if (m_interceptor != null && orb instanceof ORB_1_4)
       {
@@ -514,8 +514,8 @@ public class gnuRequest extends Request implements Cloneable
                 try
                   {
                     ObjectImpl impl = (ObjectImpl) e.forward;
-                    Simple_delegate delegate =
-                      (Simple_delegate) impl._get_delegate();
+                    SimpleDelegate delegate =
+                      (SimpleDelegate) impl._get_delegate();
                     ior = delegate.getIor();
                   }
                 catch (Exception ex)
@@ -794,8 +794,8 @@ public class gnuRequest extends Request implements Cloneable
               {
                 try
                   {
-                    if (orb instanceof Functional_ORB)
-                      socket = ((Functional_ORB) orb).socketFactory.createClientSocket(
+                    if (orb instanceof OrbFunctional)
+                      socket = ((OrbFunctional) orb).socketFactory.createClientSocket(
                         ior.Internet.host, ior.Internet.port);
                     else
                       socket = new Socket(ior.Internet.host, ior.Internet.port);
@@ -840,9 +840,9 @@ public class gnuRequest extends Request implements Cloneable
             response_header.read(socketInput);
 
             byte[] r;
-            if (orb instanceof Functional_ORB)
+            if (orb instanceof OrbFunctional)
               {
-                Functional_ORB fo = (Functional_ORB) orb;
+                OrbFunctional fo = (OrbFunctional) orb;
                 r = response_header.readMessage(socketInput, socket,
                   fo.TOUT_WHILE_READING, fo.TOUT_AFTER_RECEIVING);
               }
@@ -868,7 +868,7 @@ public class gnuRequest extends Request implements Cloneable
           {
             if (socket != null && !socket.isClosed())
               {
-                socket.setSoTimeout(Functional_ORB.TANDEM_REQUESTS);
+                socket.setSoTimeout(OrbFunctional.TANDEM_REQUESTS);
                 SocketRepository.put_socket(key, socket);
               }
           }
@@ -1182,7 +1182,7 @@ public class gnuRequest extends Request implements Cloneable
    */
   public org.omg.CORBA.Object effective_target()
   {
-    return new IOR_contructed_object(orb, ior);
+    return new IorObject(orb, ior);
   }
 
   /**
@@ -1295,7 +1295,7 @@ public class gnuRequest extends Request implements Cloneable
       return m_forwarding_target;
 
     if (m_forward_ior != null)
-      return new IOR_contructed_object(orb, m_forward_ior);
+      return new IorObject(orb, m_forward_ior);
     else
       return null;
   }