Changed LocalObject mapping

18 files changed, 29 insertions, 24 deletions

diff --git a/java/src/Freeze/BackgroundSaveEvictorI.java b/java/src/Freeze/BackgroundSaveEvictorI.java
index ca740cfa1b7..dc27914731f 100644
--- a/java/src/Freeze/BackgroundSaveEvictorI.java
+++ b/java/src/Freeze/BackgroundSaveEvictorI.java
@@ -845,7 +845,7 @@ class BackgroundSaveEvictorI extends EvictorI implements BackgroundSaveEvictor,
     }
 
     public void
-    finished(Ice.Current current, Ice.Object servant, Ice.LocalObject cookie)
+    finished(Ice.Current current, Ice.Object servant, java.lang.Object cookie)
     {
         _deactivateController.lock();
         try
@@ -1475,7 +1475,7 @@ class BackgroundSaveEvictorI extends EvictorI implements BackgroundSaveEvictor,
         return obj;
     }
     
-    static private class EvictorElement extends Ice.LocalObjectImpl
+    static private class EvictorElement
     {
         EvictorElement(Ice.Identity identity, ObjectStore store)
         {
diff --git a/java/src/Freeze/ConnectionI.java b/java/src/Freeze/ConnectionI.java
index 517cc831da8..c7688465c70 100755
--- a/java/src/Freeze/ConnectionI.java
+++ b/java/src/Freeze/ConnectionI.java
@@ -9,7 +9,7 @@
 
 package Freeze;
 
-class ConnectionI extends Ice.LocalObjectImpl implements Connection
+class ConnectionI implements Connection
 {
 
     public Transaction
diff --git a/java/src/Freeze/EvictorElement.java b/java/src/Freeze/EvictorElement.java
index ec60c14c4ba..19a55b7e533 100644
--- a/java/src/Freeze/EvictorElement.java
+++ b/java/src/Freeze/EvictorElement.java
@@ -9,7 +9,7 @@
 
 package Freeze;
 
-class EvictorElement extends Ice.LocalObjectImpl
+class EvictorElement
 {
     //
     // Clean object; can become modified or destroyed
diff --git a/java/src/Freeze/EvictorI.java b/java/src/Freeze/EvictorI.java
index 0d029e81477..2c836e1ca07 100644
--- a/java/src/Freeze/EvictorI.java
+++ b/java/src/Freeze/EvictorI.java
@@ -9,7 +9,7 @@
 
 package Freeze;
 
-abstract class EvictorI extends Ice.LocalObjectImpl implements Evictor
+abstract class EvictorI implements Evictor
 {
     //
     // The deactivate controller is used by the implementation of all public
diff --git a/java/src/Freeze/EvictorIteratorI.java b/java/src/Freeze/EvictorIteratorI.java
index c96a1fdd7ce..da7e98b5c6d 100644
--- a/java/src/Freeze/EvictorIteratorI.java
+++ b/java/src/Freeze/EvictorIteratorI.java
@@ -9,7 +9,7 @@
 
 package Freeze;
 
-class EvictorIteratorI extends Ice.LocalObjectImpl implements EvictorIterator
+class EvictorIteratorI implements EvictorIterator
 {
     public boolean
     hasNext()
diff --git a/java/src/Freeze/TransactionI.java b/java/src/Freeze/TransactionI.java
index 3c97a843426..ea6bdc96d9e 100755
--- a/java/src/Freeze/TransactionI.java
+++ b/java/src/Freeze/TransactionI.java
@@ -9,7 +9,7 @@
 
 package Freeze;
 
-class TransactionI extends Ice.LocalObjectImpl implements Transaction
+class TransactionI implements Transaction
 {
     public void
     commit()
diff --git a/java/src/Freeze/TransactionalEvictorI.java b/java/src/Freeze/TransactionalEvictorI.java
index 087c2e5a115..51fe332290c 100644
--- a/java/src/Freeze/TransactionalEvictorI.java
+++ b/java/src/Freeze/TransactionalEvictorI.java
@@ -220,7 +220,7 @@ class TransactionalEvictorI extends EvictorI implements TransactionalEvictor
     
     
     public void
-    finished(Ice.Current current, Ice.Object servant, Ice.LocalObject cookieObj)
+    finished(Ice.Current current, Ice.Object servant, java.lang.Object cookieObj)
     {        
         //
         // Nothing to do
diff --git a/java/src/Ice/CommunicatorI.java b/java/src/Ice/CommunicatorI.java
index 2d0064c318f..87ee92d8508 100644
--- a/java/src/Ice/CommunicatorI.java
+++ b/java/src/Ice/CommunicatorI.java
@@ -9,7 +9,7 @@
 
 package Ice;
 
-public final class CommunicatorI extends LocalObjectImpl implements Communicator
+public final class CommunicatorI implements Communicator
 {
     public void
     destroy()
diff --git a/java/src/Ice/ImplicitContextI.java b/java/src/Ice/ImplicitContextI.java
index 6cb2f1de1c5..6558b3df143 100644
--- a/java/src/Ice/ImplicitContextI.java
+++ b/java/src/Ice/ImplicitContextI.java
@@ -12,7 +12,7 @@ package Ice;
 //
 // The base class for all ImplicitContext implementations
 //
-public abstract class ImplicitContextI extends LocalObjectImpl implements ImplicitContext
+public abstract class ImplicitContextI implements ImplicitContext
 {
     public static ImplicitContextI create(String kind)
     {
diff --git a/java/src/Ice/LocalObject.java b/java/src/Ice/LocalObject.java
index ea2638e1f43..53b10988a84 100644
--- a/java/src/Ice/LocalObject.java
+++ b/java/src/Ice/LocalObject.java
@@ -9,11 +9,14 @@
 
 package Ice;
 
+ /**
+  * @deprecated This interface is deprecated; you should use a plain java.lang.Object
+  **/
 public interface LocalObject
 {
-    // boolean equals(java.lang.Object rhs);
+    boolean equals(java.lang.Object rhs);
 
-    // java.lang.Object clone() throws java.lang.CloneNotSupportedException;
+    java.lang.Object clone() throws java.lang.CloneNotSupportedException;
 
-    // int ice_hash();
+    int ice_hash();
 }
diff --git a/java/src/Ice/LocalObjectHolder.java b/java/src/Ice/LocalObjectHolder.java
index d76613d4a42..dfca5cc43e3 100644
--- a/java/src/Ice/LocalObjectHolder.java
+++ b/java/src/Ice/LocalObjectHolder.java
@@ -17,10 +17,10 @@ public final class LocalObjectHolder
     }
 
     public
-    LocalObjectHolder(LocalObject value)
+    LocalObjectHolder(java.lang.Object value)
     {
         this.value = value;
     }
 
-    public LocalObject value;
+    public java.lang.Object value;
 }
diff --git a/java/src/Ice/LocalObjectImpl.java b/java/src/Ice/LocalObjectImpl.java
index 1c10922c988..fb53ba9dc00 100644
--- a/java/src/Ice/LocalObjectImpl.java
+++ b/java/src/Ice/LocalObjectImpl.java
@@ -9,11 +9,13 @@
 
 package Ice;
 
+ /**
+  * @deprecated This class is deprecated; you should use a plain java.lang.Object
+  **/
 public abstract class LocalObjectImpl implements LocalObject, java.lang.Cloneable
 {
     public java.lang.Object
-    clone()
-        throws java.lang.CloneNotSupportedException
+    clone() throws java.lang.CloneNotSupportedException
     {
         return super.clone();
     }
diff --git a/java/src/Ice/LoggerI.java b/java/src/Ice/LoggerI.java
index a2e51765d67..32c84d65bc9 100644
--- a/java/src/Ice/LoggerI.java
+++ b/java/src/Ice/LoggerI.java
@@ -9,7 +9,7 @@
 
 package Ice;
 
-public class LoggerI extends LocalObjectImpl implements Logger
+public class LoggerI implements Logger
 {
     public 
     LoggerI(String prefix)
diff --git a/java/src/Ice/ObjectAdapterI.java b/java/src/Ice/ObjectAdapterI.java
index 86fc9f0b6c6..2026e900e77 100644
--- a/java/src/Ice/ObjectAdapterI.java
+++ b/java/src/Ice/ObjectAdapterI.java
@@ -9,7 +9,7 @@
 
 package Ice;
 
-public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapter
+public final class ObjectAdapterI implements ObjectAdapter
 {
     public String
     getName()
diff --git a/java/src/Ice/PluginManagerI.java b/java/src/Ice/PluginManagerI.java
index e88bb3cc129..386008b489f 100644
--- a/java/src/Ice/PluginManagerI.java
+++ b/java/src/Ice/PluginManagerI.java
@@ -9,7 +9,7 @@
 
 package Ice;
 
-public final class PluginManagerI extends LocalObjectImpl implements PluginManager
+public final class PluginManagerI implements PluginManager
 {
     private static String _kindOfObject = "plugin";
 
diff --git a/java/src/Ice/PropertiesI.java b/java/src/Ice/PropertiesI.java
index 259244cceea..412b86579cf 100644
--- a/java/src/Ice/PropertiesI.java
+++ b/java/src/Ice/PropertiesI.java
@@ -9,7 +9,7 @@
 
 package Ice;
 
-public final class PropertiesI extends LocalObjectImpl implements Properties
+public final class PropertiesI implements Properties
 {
     class PropertyValue
     {
diff --git a/java/src/Ice/SysLoggerI.java b/java/src/Ice/SysLoggerI.java
index 74e813f7ee2..2466c80882c 100644
--- a/java/src/Ice/SysLoggerI.java
+++ b/java/src/Ice/SysLoggerI.java
@@ -14,7 +14,7 @@ import java.net.DatagramSocket;
 import java.net.InetAddress;
 import java.io.IOException;
 
-public final class SysLoggerI extends LocalObjectImpl implements Logger
+public final class SysLoggerI implements Logger
 {
     public 
     SysLoggerI(String ident)
diff --git a/java/src/IceInternal/BasicStream.java b/java/src/IceInternal/BasicStream.java
index e5c4b44d8bf..372b9875f33 100644
--- a/java/src/IceInternal/BasicStream.java
+++ b/java/src/IceInternal/BasicStream.java
@@ -1968,7 +1968,7 @@ public class BasicStream
         }
     }
 
-    private static final class DynamicObjectFactory extends Ice.LocalObjectImpl implements Ice.ObjectFactory
+    private static final class DynamicObjectFactory implements Ice.ObjectFactory
     {
         DynamicObjectFactory(Class c)
         {
@@ -2047,7 +2047,7 @@ public class BasicStream
         return factory;
     }
 
-    private static final class DynamicUserExceptionFactory extends Ice.LocalObjectImpl
+    private static final class DynamicUserExceptionFactory
         implements UserExceptionFactory
     {
         DynamicUserExceptionFactory(Class c)