Bug 3045 - move getInstance() to IceInternal

9 files changed, 37 insertions, 24 deletions

diff --git a/java/src/Freeze/ObjectStore.java b/java/src/Freeze/ObjectStore.java
index 230863042e4..1bf9f3ee1db 100644
--- a/java/src/Freeze/ObjectStore.java
+++ b/java/src/Freeze/ObjectStore.java
@@ -311,7 +311,7 @@ class ObjectStore implements IceUtil.Store
     static byte[]
     marshalKey(Ice.Identity v, Ice.Communicator communicator)
     {
-        IceInternal.BasicStream os = new IceInternal.BasicStream(Ice.Util.getInstance(communicator));
+        IceInternal.BasicStream os = new IceInternal.BasicStream(IceInternal.Util.getInstance(communicator));
         v.__write(os);
         IceInternal.Buffer buf = os.prepareWrite();
         byte[] r = new byte[buf.size()];
@@ -322,7 +322,7 @@ class ObjectStore implements IceUtil.Store
     static Ice.Identity
     unmarshalKey(byte[] b, Ice.Communicator communicator)
     {
-        IceInternal.BasicStream is = new IceInternal.BasicStream(Ice.Util.getInstance(communicator));
+        IceInternal.BasicStream is = new IceInternal.BasicStream(IceInternal.Util.getInstance(communicator));
         is.resize(b.length, true);
         IceInternal.Buffer buf = is.getBuffer();
         buf.b.position(0);
@@ -336,7 +336,7 @@ class ObjectStore implements IceUtil.Store
     static byte[]
     marshalValue(ObjectRecord v, Ice.Communicator communicator)
     {
-        IceInternal.BasicStream os = new IceInternal.BasicStream(Ice.Util.getInstance(communicator));
+        IceInternal.BasicStream os = new IceInternal.BasicStream(IceInternal.Util.getInstance(communicator));
         os.startWriteEncaps();
         v.__write(os);
         os.writePendingObjects();
@@ -350,7 +350,7 @@ class ObjectStore implements IceUtil.Store
     static ObjectRecord
     unmarshalValue(byte[] b, Ice.Communicator communicator)
     {
-        IceInternal.BasicStream is = new IceInternal.BasicStream(Ice.Util.getInstance(communicator));
+        IceInternal.BasicStream is = new IceInternal.BasicStream(IceInternal.Util.getInstance(communicator));
         is.sliceObjects(false);
         is.resize(b.length, true);
         IceInternal.Buffer buf = is.getBuffer();
diff --git a/java/src/Ice/CommunicatorI.java b/java/src/Ice/CommunicatorI.java
index 7a04fd05d7b..bf1225bc23f 100644
--- a/java/src/Ice/CommunicatorI.java
+++ b/java/src/Ice/CommunicatorI.java
@@ -232,9 +232,9 @@ public final class CommunicatorI implements Communicator
     }
 
     //
-    // For use by Util.getInstance()
+    // For use by IceInternal.Util.getInstance()
     //
-    IceInternal.Instance
+    public IceInternal.Instance
     getInstance()
     {
         return _instance;
diff --git a/java/src/Ice/InputStreamI.java b/java/src/Ice/InputStreamI.java
index cbed1636c37..e2136ef9cd7 100644
--- a/java/src/Ice/InputStreamI.java
+++ b/java/src/Ice/InputStreamI.java
@@ -16,7 +16,7 @@ public class InputStreamI implements InputStream
     {
         _communicator = communicator;
 
-        _is = new IceInternal.BasicStream(Util.getInstance(communicator));
+        _is = new IceInternal.BasicStream(IceInternal.Util.getInstance(communicator));
         _is.closure(this);
         _is.resize(data.length, true);
         IceInternal.Buffer buf = _is.getBuffer();
diff --git a/java/src/Ice/LoggerPlugin.java b/java/src/Ice/LoggerPlugin.java
index af812915924..3e0bbc6c94c 100644
--- a/java/src/Ice/LoggerPlugin.java
+++ b/java/src/Ice/LoggerPlugin.java
@@ -28,7 +28,7 @@ public class LoggerPlugin implements Ice.Plugin
             throw ex;
         }
 
-        IceInternal.Instance instance = Util.getInstance(communicator);
+        IceInternal.Instance instance = IceInternal.Util.getInstance(communicator);
         instance.setLogger(logger);
     }
 
diff --git a/java/src/Ice/OutputStreamI.java b/java/src/Ice/OutputStreamI.java
index 7cd54936769..c8bb53ffd4d 100644
--- a/java/src/Ice/OutputStreamI.java
+++ b/java/src/Ice/OutputStreamI.java
@@ -14,7 +14,7 @@ public class OutputStreamI implements OutputStream
     public
     OutputStreamI(Communicator communicator)
     {
-        this(communicator, new IceInternal.BasicStream(Util.getInstance(communicator)));
+        this(communicator, new IceInternal.BasicStream(IceInternal.Util.getInstance(communicator)));
     }
 
     public
diff --git a/java/src/Ice/Util.java b/java/src/Ice/Util.java
index 99ae9a1a691..e8a88d6d6a9 100644
--- a/java/src/Ice/Util.java
+++ b/java/src/Ice/Util.java
@@ -104,19 +104,6 @@ public final class Util
         return initialize(new InitializationData());
     }
 
-    public static IceInternal.Instance
-    getInstance(Communicator communicator)
-    {
-        CommunicatorI p = (CommunicatorI)communicator;
-        return p.getInstance();
-    }
-
-    public static IceInternal.ProtocolPluginFacade
-    getProtocolPluginFacade(Communicator communicator)
-    {
-        return new IceInternal.ProtocolPluginFacadeI(communicator);
-    }
-
     public static Identity
     stringToIdentity(String s)
     {
diff --git a/java/src/IceInternal/ProtocolPluginFacadeI.java b/java/src/IceInternal/ProtocolPluginFacadeI.java
index a21f7d11fd0..c02c4282c1d 100644
--- a/java/src/IceInternal/ProtocolPluginFacadeI.java
+++ b/java/src/IceInternal/ProtocolPluginFacadeI.java
@@ -15,7 +15,7 @@ public class ProtocolPluginFacadeI implements ProtocolPluginFacade
     ProtocolPluginFacadeI(Ice.Communicator communicator)
     {
         _communicator = communicator;
-        _instance = Ice.Util.getInstance(communicator);
+        _instance = Util.getInstance(communicator);
     }
 
     //
diff --git a/java/src/IceInternal/Util.java b/java/src/IceInternal/Util.java
new file mode 100644
index 00000000000..fbfc49e1c0f
--- /dev/null
+++ b/java/src/IceInternal/Util.java
@@ -0,0 +1,26 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2009 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+package IceInternal;
+
+public final class Util
+{
+    public static Instance
+    getInstance(Ice.Communicator communicator)
+    {
+        Ice.CommunicatorI p = (Ice.CommunicatorI)communicator;
+        return p.getInstance();
+    }
+
+    public static ProtocolPluginFacade
+    getProtocolPluginFacade(Ice.Communicator communicator)
+    {
+        return new ProtocolPluginFacadeI(communicator);
+    }
+}
diff --git a/java/src/IceSSL/Instance.java b/java/src/IceSSL/Instance.java
index efa1256ad48..6954f235a74 100644
--- a/java/src/IceSSL/Instance.java
+++ b/java/src/IceSSL/Instance.java
@@ -18,7 +18,7 @@ class Instance
     Instance(Ice.Communicator communicator)
     {
         _logger = communicator.getLogger();
-        _facade = Ice.Util.getProtocolPluginFacade(communicator);
+        _facade = IceInternal.Util.getProtocolPluginFacade(communicator);
         _securityTraceLevel = communicator.getProperties().getPropertyAsIntWithDefault("IceSSL.Trace.Security", 0);
         _securityTraceCategory = "Security";
         _trustManager = new TrustManager(communicator);