git://git.nikiroo.be
/
nikiroo-utils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix Base64 but breaks compat
[nikiroo-utils.git]
/
src
/
be
/
nikiroo
/
utils
/
serial
/
SerialUtils.java
diff --git
a/src/be/nikiroo/utils/serial/SerialUtils.java
b/src/be/nikiroo/utils/serial/SerialUtils.java
index a6a02a8e06205cb5996b0a94c1124056ce2cbf60..06fb765f7d085c8753fafea4abac859ef8ef4e9e 100644
(file)
--- a/
src/be/nikiroo/utils/serial/SerialUtils.java
+++ b/
src/be/nikiroo/utils/serial/SerialUtils.java
@@
-20,6
+20,8
@@
import java.util.UnknownFormatConversionException;
import be.nikiroo.utils.IOUtils;
import be.nikiroo.utils.Image;
import be.nikiroo.utils.StringUtils;
import be.nikiroo.utils.IOUtils;
import be.nikiroo.utils.Image;
import be.nikiroo.utils.StringUtils;
+import be.nikiroo.utils.streams.Base64InputStream;
+import be.nikiroo.utils.streams.Base64OutputStream;
import be.nikiroo.utils.streams.NextableInputStream;
import be.nikiroo.utils.streams.NextableInputStreamStep;
import be.nikiroo.utils.streams.NextableInputStream;
import be.nikiroo.utils.streams.NextableInputStreamStep;
@@
-80,9
+82,9
@@
public class SerialUtils {
try {
// TODO: bad escaping?
write(out, "B64:");
try {
// TODO: bad escaping?
write(out, "B64:");
- OutputStream
bout = StringUtils.base64(out,
-
false, fals
e);
- new Exporter(
bout
).append(item);
+ OutputStream
out64 = new Base64OutputStream(
+
out, tru
e);
+ new Exporter(
out64
).append(item);
} catch (NotSerializableException e) {
throw new UnknownFormatConversionException(e
.getMessage());
} catch (NotSerializableException e) {
throw new UnknownFormatConversionException(e
.getMessage());
@@
-165,7
+167,7
@@
public class SerialUtils {
protected void toStream(OutputStream out, Object value)
throws IOException {
Image img = (Image) value;
protected void toStream(OutputStream out, Object value)
throws IOException {
Image img = (Image) value;
- OutputStream encoded =
StringUtils.base64(out, false, fals
e);
+ OutputStream encoded =
new Base64OutputStream(out, tru
e);
try {
InputStream in = img.newInputStream();
try {
try {
InputStream in = img.newInputStream();
try {
@@
-188,7
+190,7
@@
public class SerialUtils {
protected Object fromStream(InputStream in) throws IOException {
try {
// Cannot close it!
protected Object fromStream(InputStream in) throws IOException {
try {
// Cannot close it!
- InputStream decoded =
StringUtils.unbase64
(in, false);
+ InputStream decoded =
new Base64InputStream
(in, false);
return new Image(decoded);
} catch (IOException e) {
throw new UnknownFormatConversionException(e.getMessage());
return new Image(decoded);
} catch (IOException e) {
throw new UnknownFormatConversionException(e.getMessage());