summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorMichi Henning <michi@zeroc.com>2007-12-28 16:00:57 +1000
committerMichi Henning <michi@zeroc.com>2007-12-28 16:00:57 +1000
commitb604f7b867c2214f71df217e982282ac6883a0e5 (patch)
tree66e80bd564accc05ab1a1d18f5aef897f3cc235c /java
parentMerge branch 'master' of ssh://cvs.zeroc.com/home/git/ice (diff)
downloadice-b604f7b867c2214f71df217e982282ac6883a0e5.tar.bz2
ice-b604f7b867c2214f71df217e982282ac6883a0e5.tar.xz
ice-b604f7b867c2214f71df217e982282ac6883a0e5.zip
Removed remnants of LocalObjectImpl (Bug 2157).
Diffstat (limited to 'java')
-rw-r--r--java/demo/Freeze/library/BookFactory.java2
-rw-r--r--java/demo/Freeze/phonebook/ContactFactory.java2
-rw-r--r--java/demo/Ice/value/ObjectFactory.java2
-rw-r--r--java/demo/book/evictor/EvictorBase.java4
-rw-r--r--java/demo/book/freeze_filesystem/NodeFactory.java2
-rw-r--r--java/demo/book/freeze_filesystem/NodeInitializer.java2
-rw-r--r--java/test/Freeze/complex/Complex/ObjectFactoryI.java2
-rw-r--r--java/test/Freeze/evictor/RemoteEvictorI.java2
-rw-r--r--java/test/Freeze/evictor/Server.java2
-rw-r--r--java/test/Freeze/oldevictor/RemoteEvictorI.java2
-rw-r--r--java/test/Freeze/oldevictor/Server.java4
-rw-r--r--java/test/Glacier2/attack/ServantLocatorI.java2
-rw-r--r--java/test/Ice/adapterDeactivation/ServantLocatorI.java2
-rw-r--r--java/test/Ice/exceptions/DummyLogger.java2
-rw-r--r--java/test/Ice/exceptions/ObjectFactoryI.java2
-rw-r--r--java/test/Ice/exceptions/ServantLocatorI.java2
-rw-r--r--java/test/Ice/exceptionsAMD/DummyLogger.java2
-rw-r--r--java/test/Ice/objects/Client.java2
-rw-r--r--java/test/Ice/objects/Server.java2
-rw-r--r--java/test/Ice/package/AllTests.java2
-rw-r--r--java/test/Ice/servantLocator/ServantLocatorI.java2
-rw-r--r--java/test/Ice/servantLocatorAMD/ServantLocatorI.java2
-rw-r--r--java/test/Ice/stream/Client.java6
23 files changed, 27 insertions, 27 deletions
diff --git a/java/demo/Freeze/library/BookFactory.java b/java/demo/Freeze/library/BookFactory.java
index 56f729549ee..bdc6fa9b92b 100644
--- a/java/demo/Freeze/library/BookFactory.java
+++ b/java/demo/Freeze/library/BookFactory.java
@@ -7,7 +7,7 @@
//
// **********************************************************************
-class BookFactory extends Ice.LocalObjectImpl implements Ice.ObjectFactory
+class BookFactory implements Ice.ObjectFactory
{
public Ice.Object
create(String type)
diff --git a/java/demo/Freeze/phonebook/ContactFactory.java b/java/demo/Freeze/phonebook/ContactFactory.java
index 180fc68cc5d..f53f312156e 100644
--- a/java/demo/Freeze/phonebook/ContactFactory.java
+++ b/java/demo/Freeze/phonebook/ContactFactory.java
@@ -7,7 +7,7 @@
//
// **********************************************************************
-class ContactFactory extends Ice.LocalObjectImpl implements Ice.ObjectFactory
+class ContactFactory implements Ice.ObjectFactory
{
public Ice.Object
create(String type)
diff --git a/java/demo/Ice/value/ObjectFactory.java b/java/demo/Ice/value/ObjectFactory.java
index d0626d969e0..504c6ebddf2 100644
--- a/java/demo/Ice/value/ObjectFactory.java
+++ b/java/demo/Ice/value/ObjectFactory.java
@@ -7,7 +7,7 @@
//
// **********************************************************************
-class ObjectFactory extends Ice.LocalObjectImpl implements Ice.ObjectFactory
+class ObjectFactory implements Ice.ObjectFactory
{
public Ice.Object
create(String type)
diff --git a/java/demo/book/evictor/EvictorBase.java b/java/demo/book/evictor/EvictorBase.java
index 57fc8d248ce..ed471738e95 100644
--- a/java/demo/book/evictor/EvictorBase.java
+++ b/java/demo/book/evictor/EvictorBase.java
@@ -1,6 +1,6 @@
package Evictor;
-public abstract class EvictorBase extends Ice.LocalObjectImpl implements Ice.ServantLocator
+public abstract class EvictorBase implements Ice.ServantLocator
{
public
EvictorBase()
@@ -86,7 +86,7 @@ public abstract class EvictorBase extends Ice.LocalObjectImpl implements Ice.Ser
evictServants();
}
- private class EvictorEntry extends Ice.LocalObjectImpl
+ private class EvictorEntry
{
Ice.Object servant;
java.lang.Object userCookie;
diff --git a/java/demo/book/freeze_filesystem/NodeFactory.java b/java/demo/book/freeze_filesystem/NodeFactory.java
index 5711943a9fe..56841340460 100644
--- a/java/demo/book/freeze_filesystem/NodeFactory.java
+++ b/java/demo/book/freeze_filesystem/NodeFactory.java
@@ -9,7 +9,7 @@
import Filesystem.*;
-public class NodeFactory extends Ice.LocalObjectImpl implements Ice.ObjectFactory
+public class NodeFactory implements Ice.ObjectFactory
{
public Ice.Object
create(String type)
diff --git a/java/demo/book/freeze_filesystem/NodeInitializer.java b/java/demo/book/freeze_filesystem/NodeInitializer.java
index c246f6e2b09..35874f5bb01 100644
--- a/java/demo/book/freeze_filesystem/NodeInitializer.java
+++ b/java/demo/book/freeze_filesystem/NodeInitializer.java
@@ -9,7 +9,7 @@
import Filesystem.*;
-public class NodeInitializer extends Ice.LocalObjectImpl implements Freeze.ServantInitializer
+public class NodeInitializer implements Freeze.ServantInitializer
{
public void
initialize(Ice.ObjectAdapter adapter, Ice.Identity id, String facet, Ice.Object obj)
diff --git a/java/test/Freeze/complex/Complex/ObjectFactoryI.java b/java/test/Freeze/complex/Complex/ObjectFactoryI.java
index 32fe08f7c9b..981f4be5079 100644
--- a/java/test/Freeze/complex/Complex/ObjectFactoryI.java
+++ b/java/test/Freeze/complex/Complex/ObjectFactoryI.java
@@ -9,7 +9,7 @@
package Complex;
-public class ObjectFactoryI extends Ice.LocalObjectImpl implements Ice.ObjectFactory
+public class ObjectFactoryI implements Ice.ObjectFactory
{
public Ice.Object
create(String type)
diff --git a/java/test/Freeze/evictor/RemoteEvictorI.java b/java/test/Freeze/evictor/RemoteEvictorI.java
index cdcf5076fbb..e00b1809f0b 100644
--- a/java/test/Freeze/evictor/RemoteEvictorI.java
+++ b/java/test/Freeze/evictor/RemoteEvictorI.java
@@ -9,7 +9,7 @@
public final class RemoteEvictorI extends Test._RemoteEvictorDisp
{
- static class Initializer extends Ice.LocalObjectImpl implements Freeze.ServantInitializer
+ static class Initializer implements Freeze.ServantInitializer
{
public void
initialize(Ice.ObjectAdapter adapter, Ice.Identity ident, String facet, Ice.Object servant)
diff --git a/java/test/Freeze/evictor/Server.java b/java/test/Freeze/evictor/Server.java
index 10934af94af..7f3230504bd 100644
--- a/java/test/Freeze/evictor/Server.java
+++ b/java/test/Freeze/evictor/Server.java
@@ -9,7 +9,7 @@
public class Server
{
- static class AccountFactory extends Ice.LocalObjectImpl implements Ice.ObjectFactory
+ static class AccountFactory implements Ice.ObjectFactory
{
public Ice.Object
create(String type)
diff --git a/java/test/Freeze/oldevictor/RemoteEvictorI.java b/java/test/Freeze/oldevictor/RemoteEvictorI.java
index acb52e18697..22d598f4228 100644
--- a/java/test/Freeze/oldevictor/RemoteEvictorI.java
+++ b/java/test/Freeze/oldevictor/RemoteEvictorI.java
@@ -9,7 +9,7 @@
public final class RemoteEvictorI extends Test._RemoteEvictorDisp
{
- static class Initializer extends Ice.LocalObjectImpl implements Freeze.ServantInitializer
+ static class Initializer implements Freeze.ServantInitializer
{
public void
initialize(Ice.ObjectAdapter adapter, Ice.Identity ident, String facet, Ice.Object servant)
diff --git a/java/test/Freeze/oldevictor/Server.java b/java/test/Freeze/oldevictor/Server.java
index 2d67a88cd7f..61fc75209a7 100644
--- a/java/test/Freeze/oldevictor/Server.java
+++ b/java/test/Freeze/oldevictor/Server.java
@@ -9,7 +9,7 @@
public class Server
{
- static class ServantFactory extends Ice.LocalObjectImpl implements Ice.ObjectFactory
+ static class ServantFactory implements Ice.ObjectFactory
{
public Ice.Object
create(String type)
@@ -26,7 +26,7 @@ public class Server
}
}
- static class FacetFactory extends Ice.LocalObjectImpl implements Ice.ObjectFactory
+ static class FacetFactory implements Ice.ObjectFactory
{
public Ice.Object
create(String type)
diff --git a/java/test/Glacier2/attack/ServantLocatorI.java b/java/test/Glacier2/attack/ServantLocatorI.java
index a78a2d64ecf..70eca00fa12 100644
--- a/java/test/Glacier2/attack/ServantLocatorI.java
+++ b/java/test/Glacier2/attack/ServantLocatorI.java
@@ -9,7 +9,7 @@
import Test.*;
-public final class ServantLocatorI extends Ice.LocalObjectImpl implements Ice.ServantLocator
+public final class ServantLocatorI implements Ice.ServantLocator
{
ServantLocatorI()
{
diff --git a/java/test/Ice/adapterDeactivation/ServantLocatorI.java b/java/test/Ice/adapterDeactivation/ServantLocatorI.java
index 1e3a02a6ea3..4e486dc38dd 100644
--- a/java/test/Ice/adapterDeactivation/ServantLocatorI.java
+++ b/java/test/Ice/adapterDeactivation/ServantLocatorI.java
@@ -9,7 +9,7 @@
import Test.*;
-public final class ServantLocatorI extends Ice.LocalObjectImpl implements Ice.ServantLocator
+public final class ServantLocatorI implements Ice.ServantLocator
{
public
ServantLocatorI()
diff --git a/java/test/Ice/exceptions/DummyLogger.java b/java/test/Ice/exceptions/DummyLogger.java
index 94f27c6e241..ddee00b63a7 100644
--- a/java/test/Ice/exceptions/DummyLogger.java
+++ b/java/test/Ice/exceptions/DummyLogger.java
@@ -7,7 +7,7 @@
//
// **********************************************************************
-public final class DummyLogger extends Ice.LocalObjectImpl implements Ice.Logger
+public final class DummyLogger implements Ice.Logger
{
public void
print(String message)
diff --git a/java/test/Ice/exceptions/ObjectFactoryI.java b/java/test/Ice/exceptions/ObjectFactoryI.java
index 093970573b3..2acae20db95 100644
--- a/java/test/Ice/exceptions/ObjectFactoryI.java
+++ b/java/test/Ice/exceptions/ObjectFactoryI.java
@@ -7,7 +7,7 @@
//
// **********************************************************************
-public final class ObjectFactoryI extends Ice.LocalObjectImpl implements Ice.ObjectFactory
+public final class ObjectFactoryI implements Ice.ObjectFactory
{
public Ice.Object create(String s)
{
diff --git a/java/test/Ice/exceptions/ServantLocatorI.java b/java/test/Ice/exceptions/ServantLocatorI.java
index e7985fcfacc..242ae02b751 100644
--- a/java/test/Ice/exceptions/ServantLocatorI.java
+++ b/java/test/Ice/exceptions/ServantLocatorI.java
@@ -7,7 +7,7 @@
//
// **********************************************************************
-public final class ServantLocatorI extends Ice.LocalObjectImpl implements Ice.ServantLocator
+public final class ServantLocatorI implements Ice.ServantLocator
{
public Ice.Object locate(Ice.Current curr, Ice.LocalObjectHolder cookie)
{
diff --git a/java/test/Ice/exceptionsAMD/DummyLogger.java b/java/test/Ice/exceptionsAMD/DummyLogger.java
index 94f27c6e241..ddee00b63a7 100644
--- a/java/test/Ice/exceptionsAMD/DummyLogger.java
+++ b/java/test/Ice/exceptionsAMD/DummyLogger.java
@@ -7,7 +7,7 @@
//
// **********************************************************************
-public final class DummyLogger extends Ice.LocalObjectImpl implements Ice.Logger
+public final class DummyLogger implements Ice.Logger
{
public void
print(String message)
diff --git a/java/test/Ice/objects/Client.java b/java/test/Ice/objects/Client.java
index bc218c9423a..fbfd48d5634 100644
--- a/java/test/Ice/objects/Client.java
+++ b/java/test/Ice/objects/Client.java
@@ -11,7 +11,7 @@ import Test.*;
public class Client
{
- private static class MyObjectFactory extends Ice.LocalObjectImpl implements Ice.ObjectFactory
+ private static class MyObjectFactory implements Ice.ObjectFactory
{
public Ice.Object
create(String type)
diff --git a/java/test/Ice/objects/Server.java b/java/test/Ice/objects/Server.java
index 571db344dba..1fa1a8ef76d 100644
--- a/java/test/Ice/objects/Server.java
+++ b/java/test/Ice/objects/Server.java
@@ -9,7 +9,7 @@
public class Server
{
- private static class MyObjectFactory extends Ice.LocalObjectImpl implements Ice.ObjectFactory
+ private static class MyObjectFactory implements Ice.ObjectFactory
{
public Ice.Object
create(String type)
diff --git a/java/test/Ice/package/AllTests.java b/java/test/Ice/package/AllTests.java
index 7c78065ffbf..797a8ee9a2c 100644
--- a/java/test/Ice/package/AllTests.java
+++ b/java/test/Ice/package/AllTests.java
@@ -18,7 +18,7 @@ public class AllTests
}
}
- private static class TestFactory extends Ice.LocalObjectImpl implements Ice.ObjectFactory
+ private static class TestFactory implements Ice.ObjectFactory
{
public Ice.Object
create(String type)
diff --git a/java/test/Ice/servantLocator/ServantLocatorI.java b/java/test/Ice/servantLocator/ServantLocatorI.java
index 9535ed85b00..e43f4a224ca 100644
--- a/java/test/Ice/servantLocator/ServantLocatorI.java
+++ b/java/test/Ice/servantLocator/ServantLocatorI.java
@@ -10,7 +10,7 @@
import Test.*;
import Ice.*;
-public final class ServantLocatorI extends Ice.LocalObjectImpl implements Ice.ServantLocator
+public final class ServantLocatorI implements Ice.ServantLocator
{
public
ServantLocatorI(String category)
diff --git a/java/test/Ice/servantLocatorAMD/ServantLocatorI.java b/java/test/Ice/servantLocatorAMD/ServantLocatorI.java
index 9535ed85b00..e43f4a224ca 100644
--- a/java/test/Ice/servantLocatorAMD/ServantLocatorI.java
+++ b/java/test/Ice/servantLocatorAMD/ServantLocatorI.java
@@ -10,7 +10,7 @@
import Test.*;
import Ice.*;
-public final class ServantLocatorI extends Ice.LocalObjectImpl implements Ice.ServantLocator
+public final class ServantLocatorI implements Ice.ServantLocator
{
public
ServantLocatorI(String category)
diff --git a/java/test/Ice/stream/Client.java b/java/test/Ice/stream/Client.java
index 21761e32170..5106111da8a 100644
--- a/java/test/Ice/stream/Client.java
+++ b/java/test/Ice/stream/Client.java
@@ -50,7 +50,7 @@ public class Client
boolean called = false;
}
- private static class TestObjectFactory extends Ice.LocalObjectImpl implements Ice.ObjectFactory
+ private static class TestObjectFactory implements Ice.ObjectFactory
{
public Ice.Object
create(String type)
@@ -69,7 +69,7 @@ public class Client
{
};
- private static class MyInterfaceFactory extends Ice.LocalObjectImpl implements Ice.ObjectFactory
+ private static class MyInterfaceFactory implements Ice.ObjectFactory
{
public Ice.Object
create(String type)
@@ -95,7 +95,7 @@ public class Client
Ice.Object obj;
}
- private static class MyClassFactoryWrapper extends Ice.LocalObjectImpl implements Ice.ObjectFactory
+ private static class MyClassFactoryWrapper implements Ice.ObjectFactory
{
MyClassFactoryWrapper()
{
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 21:18:11 +0000