Java port

1 files changed, 36 insertions, 9 deletions

diff --git a/java/src/Ice/OutputStream.java b/java/src/Ice/OutputStream.java
index 8ed1d4f105e..e86c20983a7 100644
--- a/java/src/Ice/OutputStream.java
+++ b/java/src/Ice/OutputStream.java
@@ -175,26 +175,53 @@ public interface OutputStream
     void writeObject(Ice.Object v);
 
     /**
-     * Writes a Slice type ID to the stream.
+     * Writes a user exception to the stream.
      *
-     * @param id The Slice type ID to write.
+     * @param id The user exception to write.
      **/
-    void writeTypeId(String id);
+    void writeException(UserException ex);
 
     /**
-     * Writes a user exception to the stream.
+     * Select the format to be used for classes and exceptions.
      *
-     * @param id The user exception to write.
+     * @param format Specify the compact or sliced format.
      **/
-    void writeException(UserException ex);
+    void format(FormatType format);
 
     /**
-     * Writes the start of a slice to the stream.
+     * Marks the start of an Ice object.
+     *
+     * @param slicedData Preserved slices for this object, or null.
+     **/
+    void startObject(SlicedData slicedData);
+
+    /**
+     * Marks the end of an Ice object.
+     **/
+    void endObject();
+
+    /**
+     * Marks the start of a user exception.
+     *
+     * @param slicedData Preserved slices for this exception, or null.
+     **/
+    void startException(SlicedData slicedData);
+
+    /**
+     * Marks the end of a user exception.
+     **/
+    void endException();
+
+    /**
+     * Marks the start of a new slice for an Ice object or user exception.
+     *
+     * @param typeId The Slice type ID corresponding to this slice.
+     * @param last True if this is the last slice, false otherwise.
      **/
-    void startSlice();
+    void startSlice(String typeId, boolean last);
 
     /**
-     * Ends the previous slice.
+     * Marks the end of a slice for an Ice object or user exception.
      **/
     void endSlice();