Moved UserExceptionFactory from Ice to IceInternal namespace/package.

4 files changed, 12 insertions, 13 deletions

diff --git a/java/src/Ice/CommunicatorI.java b/java/src/Ice/CommunicatorI.java
index df1fda37f88..d4da913b664 100644
--- a/java/src/Ice/CommunicatorI.java
+++ b/java/src/Ice/CommunicatorI.java
@@ -157,7 +157,7 @@ final class CommunicatorI extends LocalObjectImpl implements Communicator
     }
 
     public synchronized void
-    addUserExceptionFactory(UserExceptionFactory factory, String id)
+    addUserExceptionFactory(IceInternal.UserExceptionFactory factory, String id)
     {
         if(_destroyed)
         {
@@ -176,7 +176,7 @@ final class CommunicatorI extends LocalObjectImpl implements Communicator
         _instance.userExceptionFactoryManager().remove(id);
     }
 
-    public synchronized UserExceptionFactory
+    public synchronized IceInternal.UserExceptionFactory
     findUserExceptionFactory(String id)
     {
         if(_destroyed)
diff --git a/java/src/IceInternal/BasicStream.java b/java/src/IceInternal/BasicStream.java
index d7b5d5d3f6b..79081979771 100644
--- a/java/src/IceInternal/BasicStream.java
+++ b/java/src/IceInternal/BasicStream.java
@@ -1212,7 +1212,7 @@ public class BasicStream
             //
             // Look for a factory for this ID.
             //
-	    Ice.UserExceptionFactory factory = _instance.userExceptionFactoryManager().find(id);
+	    UserExceptionFactory factory = _instance.userExceptionFactoryManager().find(id);
 	    if(factory == null)
 	    {
 		factory = loadUserExceptionFactory(id);
@@ -1532,7 +1532,7 @@ public class BasicStream
     }
 
     private static final class DynamicUserExceptionFactory extends Ice.LocalObjectImpl
-        implements Ice.UserExceptionFactory
+        implements UserExceptionFactory
     {
         DynamicUserExceptionFactory(Class c)
         {
@@ -1567,10 +1567,10 @@ public class BasicStream
         private Class _class;
     }
 
-    private Ice.UserExceptionFactory
+    private UserExceptionFactory
     loadUserExceptionFactory(String id)
     {
-        Ice.UserExceptionFactory factory = null;
+        UserExceptionFactory factory = null;
 
         try
         {
diff --git a/java/src/Ice/UserExceptionFactory.java b/java/src/IceInternal/UserExceptionFactory.java
index de751aba06d..b66574b1084 100644
--- a/java/src/Ice/UserExceptionFactory.java
+++ b/java/src/IceInternal/UserExceptionFactory.java
@@ -12,12 +12,12 @@
 //
 // **********************************************************************
 
-package Ice;
+package IceInternal;
 
 public interface UserExceptionFactory
 {
     void createAndThrow()
-        throws UserException;
+        throws Ice.UserException;
 
     void destroy();
 }
diff --git a/java/src/IceInternal/UserExceptionFactoryManager.java b/java/src/IceInternal/UserExceptionFactoryManager.java
index c51d5341f60..ab5f51304cc 100644
--- a/java/src/IceInternal/UserExceptionFactoryManager.java
+++ b/java/src/IceInternal/UserExceptionFactoryManager.java
@@ -17,7 +17,7 @@ package IceInternal;
 public final class UserExceptionFactoryManager
 {
     public synchronized void
-    add(Ice.UserExceptionFactory factory, String id)
+    add(UserExceptionFactory factory, String id)
     {
         Object o = _factoryMap.get(id);
 	if(o != null)
@@ -44,10 +44,10 @@ public final class UserExceptionFactoryManager
         _factoryMap.remove(id);
     }
 
-    public synchronized Ice.UserExceptionFactory
+    public synchronized UserExceptionFactory
     find(String id)
     {
-        return (Ice.UserExceptionFactory)_factoryMap.get(id);
+        return (UserExceptionFactory)_factoryMap.get(id);
     }
 
     //
@@ -63,8 +63,7 @@ public final class UserExceptionFactoryManager
         java.util.Iterator i = _factoryMap.values().iterator();
         while(i.hasNext())
         {
-            Ice.UserExceptionFactory factory =
-                (Ice.UserExceptionFactory)i.next();
+            UserExceptionFactory factory = (UserExceptionFactory)i.next();
             factory.destroy();
         }
         _factoryMap.clear();