diff options
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/Ice/ObjectHolder.java | 2 | ||||
| -rw-r--r-- | java/src/Ice/ObjectImpl.java | 2 | ||||
| -rw-r--r-- | java/src/IceInternal/BasicStream.java | 6 | ||||
| -rw-r--r-- | java/src/IceInternal/Patcher.java (renamed from java/src/Ice/Patcher.java) | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/java/src/Ice/ObjectHolder.java b/java/src/Ice/ObjectHolder.java index 593a50cb262..9d1ad91e088 100644 --- a/java/src/Ice/ObjectHolder.java +++ b/java/src/Ice/ObjectHolder.java @@ -27,7 +27,7 @@ public final class ObjectHolder this.value = value; } - public class Patcher implements Ice.Patcher + public class Patcher implements IceInternal.Patcher { public void patch(Ice.Object v) diff --git a/java/src/Ice/ObjectImpl.java b/java/src/Ice/ObjectImpl.java index e706207f4d7..551ae4de307 100644 --- a/java/src/Ice/ObjectImpl.java +++ b/java/src/Ice/ObjectImpl.java @@ -215,7 +215,7 @@ public class ObjectImpl implements Object, java.lang.Cloneable } } - private class Patcher implements Ice.Patcher + private class Patcher implements IceInternal.Patcher { Patcher(String key) { diff --git a/java/src/IceInternal/BasicStream.java b/java/src/IceInternal/BasicStream.java index 2d12cb7c093..29c568e3cda 100644 --- a/java/src/IceInternal/BasicStream.java +++ b/java/src/IceInternal/BasicStream.java @@ -1059,7 +1059,7 @@ public class BasicStream } public void - readObject(Ice.Patcher patcher) + readObject(IceInternal.Patcher patcher) { Ice.Object v = null; @@ -1310,9 +1310,9 @@ public class BasicStream for(java.util.Iterator i = patchlist.iterator(); i.hasNext(); ) { - Ice.Patcher p = (Ice.Patcher)i.next(); + IceInternal.Patcher p = (IceInternal.Patcher)i.next(); try - { + { p.patch(v); } catch(ClassCastException ex) diff --git a/java/src/Ice/Patcher.java b/java/src/IceInternal/Patcher.java index 08d9d03b056..11fdbf06adb 100644 --- a/java/src/Ice/Patcher.java +++ b/java/src/IceInternal/Patcher.java @@ -12,7 +12,7 @@ // // ********************************************************************** -package Ice; +package IceInternal; public interface Patcher { |