X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fserial%2FExporter.java;h=2470bde4dace9f6dd0ca73f61373991a4cbd4283;hb=d46b7b96f94e88a776bcd2dfd756549ffb300cc9;hp=dc96d973226fbcaaf09331ae8f0b6ac3d68ada98;hpb=3f27754118de06bdfedce5574957a9bc9557a8dc;p=fanfix.git

diff --git a/src/be/nikiroo/utils/serial/Exporter.java b/src/be/nikiroo/utils/serial/Exporter.java
index dc96d97..2470bde 100644
--- a/src/be/nikiroo/utils/serial/Exporter.java
+++ b/src/be/nikiroo/utils/serial/Exporter.java
@@ -2,11 +2,10 @@ package be.nikiroo.utils.serial;
 
 import java.io.IOException;
 import java.io.NotSerializableException;
+import java.io.OutputStream;
 import java.util.HashMap;
 import java.util.Map;
 
-import be.nikiroo.utils.StringUtils;
-
 /**
  * A simple class to serialise objects to {@link String}.
  * <p>
@@ -17,14 +16,22 @@ import be.nikiroo.utils.StringUtils;
  */
 public class Exporter {
 	private Map<Integer, Object> map;
-	private StringBuilder builder;
+	private OutputStream out;
 
 	/**
 	 * Create a new {@link Exporter}.
+	 * 
+	 * @param out
+	 *            export the data to this stream
 	 */
-	public Exporter() {
+	public Exporter(OutputStream out) {
+		if (out == null) {
+			throw new NullPointerException(
+					"Cannot create an be.nikiroo.utils.serials.Exporter that will export to NULL");
+		}
+
+		this.out = out;
 		map = new HashMap<Integer, Object>();
-		builder = new StringBuilder();
 	}
 
 	/**
@@ -42,98 +49,12 @@ public class Exporter {
 	 *             if the object cannot be serialised (in this case, the
 	 *             {@link Exporter} can contain bad, most probably not
 	 *             importable data)
+	 * @throws IOException
+	 *             in case of I/O error
 	 */
-	public Exporter append(Object o) throws NotSerializableException {
-		SerialUtils.append(builder, o, map);
+	public Exporter append(Object o) throws NotSerializableException,
+			IOException {
+		SerialUtils.append(out, o, map);
 		return this;
 	}
-
-	/**
-	 * Clear the current content.
-	 */
-	public void clear() {
-		builder.setLength(0);
-		map.clear();
-	}
-
-	/**
-	 * Append the exported items in a serialised form into the given
-	 * {@link StringBuilder}.
-	 * 
-	 * @param toBuilder
-	 *            the {@link StringBuilder}
-	 * @param b64
-	 *            TRUE to have BASE64-coded content, FALSE to have raw content,
-	 *            NULL to let the system decide
-	 * @param zip
-	 *            TRUE to zip the BASE64 output if the output is indeed in
-	 *            BASE64 format, FALSE not to
-	 */
-	public void appendTo(StringBuilder toBuilder, Boolean b64, boolean zip) {
-		if (b64 == null && builder.length() < 128) {
-			b64 = false;
-		}
-
-		if (b64 == null || b64) {
-			try {
-				String zipped = StringUtils.base64(builder.toString(), zip);
-				if (b64 != null || zipped.length() < builder.length() - 4) {
-					toBuilder.append(zip ? "ZIP:" : "B64:");
-					toBuilder.append(zipped);
-					return;
-				}
-			} catch (IOException e) {
-				throw new RuntimeException(
-						"Base64 conversion of data failed, maybe not enough memory?",
-						e);
-			}
-		}
-
-		toBuilder.append(builder);
-	}
-
-	/**
-	 * The exported items in a serialised form.
-	 * 
-	 * @deprecated use {@link Exporter#toString(Boolean, boolean)} instead
-	 * 
-	 * @param zip
-	 *            TRUE to have zipped (and BASE64-coded) content, FALSE to have
-	 *            raw content, NULL to let the system decide
-	 * 
-	 * @return the items currently in this {@link Exporter}
-	 */
-	@Deprecated
-	public String toString(Boolean zip) {
-		return toString(zip, zip == null || zip);
-	}
-
-	/**
-	 * The exported items in a serialised form.
-	 * 
-	 * @param b64
-	 *            TRUE to have BASE64-coded content, FALSE to have raw content,
-	 *            NULL to let the system decide
-	 * @param zip
-	 *            TRUE to zip the BASE64 output if the output is indeed in
-	 *            BASE64 format, FALSE not to
-	 * 
-	 * @return the items currently in this {@link Exporter}
-	 */
-	public String toString(Boolean b64, boolean zip) {
-		StringBuilder toBuilder = new StringBuilder();
-		appendTo(toBuilder, b64, zip);
-		return toBuilder.toString();
-	}
-
-	/**
-	 * The exported items in a serialised form (possibly BASE64-coded, possibly
-	 * zipped).
-	 * 
-	 * @return the items currently in this {@link Exporter}
-	 */
-	@Override
-	public String toString() {
-		return toString(null, true);
-	}
 }
\ No newline at end of file