diff options
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/Ice/Object.java | 20 | ||||
| -rw-r--r-- | java/src/IceInternal/BasicStream.java | 2 | ||||
| -rw-r--r-- | java/src/IceXML/StreamI.java | 2 |
3 files changed, 7 insertions, 17 deletions
diff --git a/java/src/Ice/Object.java b/java/src/Ice/Object.java index 0d7f5ecaef2..2f627066b51 100644 --- a/java/src/Ice/Object.java +++ b/java/src/Ice/Object.java @@ -37,21 +37,15 @@ public class Object return hashCode(); } - public static String[] __classIds = + public static String[] __ids = { "::Ice::Object" }; - public String[] - __getClassIds() - { - return __classIds; - } - public boolean ice_isA(String s, Current current) { - return s.equals("::Ice::Object"); + return s.equals(__ids[0]); } public static IceInternal.DispatchStatus @@ -81,11 +75,7 @@ public class Object public String[] ice_ids(Current current) { - // - // Note in general this must be __ids, not __classIds since - // __classIds is only classes and not interfaces. - // - return __classIds; + return __ids; } public static IceInternal.DispatchStatus @@ -100,7 +90,7 @@ public class Object public String ice_id(Current current) { - return __classIds[0]; + return __ids[0]; } public static IceInternal.DispatchStatus @@ -133,7 +123,7 @@ public class Object public static String ice_staticId() { - return __classIds[0]; + return __ids[0]; } private static String[] __all = diff --git a/java/src/IceInternal/BasicStream.java b/java/src/IceInternal/BasicStream.java index 9b18cfbc0bf..4d01e49ddc6 100644 --- a/java/src/IceInternal/BasicStream.java +++ b/java/src/IceInternal/BasicStream.java @@ -833,7 +833,7 @@ public class BasicStream } int num = _writeEncapsStack.objectsWritten.size(); _writeEncapsStack.objectsWritten.put(v, new Integer(num)); - writeString(v.__getClassIds()[0]); + writeString(v.ice_id(null)); v.__write(this); } else diff --git a/java/src/IceXML/StreamI.java b/java/src/IceXML/StreamI.java index fb96eeea338..8235978beb6 100644 --- a/java/src/IceXML/StreamI.java +++ b/java/src/IceXML/StreamI.java @@ -1179,7 +1179,7 @@ public class StreamI implements Ice.Stream // Convert the type-id to the equivalent schema type // definition name. // - typeId = obj.__getClassIds()[0]; + typeId = obj.ice_id(null); final String xsdPrefix = "_internal."; final String xsdSuffix = "Type"; |