diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/CHANGES | 4 | ||||
| -rw-r--r-- | java/demo/Ice/invoke/Client.java | 4 | ||||
| -rw-r--r-- | java/demo/Ice/invoke/PrinterI.java | 4 | ||||
| -rw-r--r-- | java/test/Ice/stream/Client.java | 8 |
4 files changed, 12 insertions, 8 deletions
diff --git a/java/CHANGES b/java/CHANGES index e0648e82fd7..d23603a1e4a 100644 --- a/java/CHANGES +++ b/java/CHANGES @@ -1,6 +1,10 @@ Changes since version 3.0.1 --------------------------- +- Generating new streaming functions for Slice struct and enum types. + The ice_write and ice_read member functions replace their internal + equivalents (__write and __read). + - Added ability to configure Ice thread start/stop hooks through InitializationData. diff --git a/java/demo/Ice/invoke/Client.java b/java/demo/Ice/invoke/Client.java index e9546117961..2a4d19a711e 100644 --- a/java/demo/Ice/invoke/Client.java +++ b/java/demo/Ice/invoke/Client.java @@ -124,7 +124,7 @@ public class Client extends Ice.Application // Marshal the in parameter. // Ice.OutputStream out = Ice.Util.createOutputStream(communicator()); - Demo.Color.green.__write(out); + Demo.Color.green.ice_write(out); // // Invoke operation. @@ -145,7 +145,7 @@ public class Client extends Ice.Application Demo.Structure s = new Demo.Structure(); s.name = "red"; s.value = Demo.Color.red; - s.__write(out); + s.ice_write(out); // // Invoke operation. diff --git a/java/demo/Ice/invoke/PrinterI.java b/java/demo/Ice/invoke/PrinterI.java index d7a52dc357d..b0921ca75fe 100644 --- a/java/demo/Ice/invoke/PrinterI.java +++ b/java/demo/Ice/invoke/PrinterI.java @@ -65,7 +65,7 @@ public class PrinterI extends Ice.Blobject } else if(current.operation.equals("printEnum")) { - Demo.Color c = Demo.Color.__read(in); + Demo.Color c = Demo.Color.ice_read(in); in.destroy(); System.out.println("Printing enum " + c); return true; @@ -73,7 +73,7 @@ public class PrinterI extends Ice.Blobject else if(current.operation.equals("printStruct")) { Demo.Structure s = new Demo.Structure(); - s.__read(in); + s.ice_read(in); in.destroy(); System.out.println("Printing struct: name=" + s.name + ", value=" + s.value); return true; diff --git a/java/test/Ice/stream/Client.java b/java/test/Ice/stream/Client.java index d11e99559ae..5f0a2dfea93 100644 --- a/java/test/Ice/stream/Client.java +++ b/java/test/Ice/stream/Client.java @@ -172,10 +172,10 @@ public class Client { out = Ice.Util.createOutputStream(communicator); - Test.MyEnum.enum3.__write(out); + Test.MyEnum.enum3.ice_write(out); byte[] data = out.finished(); in = Ice.Util.createInputStream(communicator, data); - test(Test.MyEnum.__read(in) == Test.MyEnum.enum3); + test(Test.MyEnum.ice_read(in) == Test.MyEnum.enum3); out.destroy(); in.destroy(); } @@ -193,11 +193,11 @@ public class Client s.str = "7"; s.e = Test.MyEnum.enum2; s.p = Test.MyClassPrxHelper.uncheckedCast(communicator.stringToProxy("test:default")); - s.__write(out); + s.ice_write(out); byte[] data = out.finished(); in = Ice.Util.createInputStream(communicator, data); Test.SmallStruct s2 = new Test.SmallStruct(); - s2.__read(in); + s2.ice_read(in); test(s2.equals(s)); out.destroy(); in.destroy(); |