git://git.nikiroo.be
/
fanfix.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix img2aa, add justify wrappers
[fanfix.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 a1105a90d441352d71fa51faf5d56f8294f35318..fe62d283cdceb48afc530ce239dde40ac774f06e 100644
(file)
--- a/
src/be/nikiroo/utils/serial/SerialUtils.java
+++ b/
src/be/nikiroo/utils/serial/SerialUtils.java
@@
-1,6
+1,5
@@
package be.nikiroo.utils.serial;
package be.nikiroo.utils.serial;
-import java.awt.image.BufferedImage;
import java.io.IOException;
import java.io.NotSerializableException;
import java.lang.reflect.Array;
import java.io.IOException;
import java.io.NotSerializableException;
import java.lang.reflect.Array;
@@
-12,7
+11,7
@@
import java.util.HashMap;
import java.util.Map;
import java.util.UnknownFormatConversionException;
import java.util.Map;
import java.util.UnknownFormatConversionException;
-import be.nikiroo.utils.Image
Utils
;
+import be.nikiroo.utils.Image;
/**
* Small class to help with serialisation.
/**
* Small class to help with serialisation.
@@
-133,25
+132,21
@@
public class SerialUtils {
});
// Images (this is currently the only supported image type by default)
});
// Images (this is currently the only supported image type by default)
- customTypes.put("
java.awt.image.Buffered
Image", new CustomSerializer() {
+ customTypes.put("
be.nikiroo.utils.
Image", new CustomSerializer() {
@Override
protected String toString(Object value) {
@Override
protected String toString(Object value) {
- try {
- return ImageUtils.toBase64((BufferedImage) value);
- } catch (IOException e) {
- throw new UnknownFormatConversionException(e.getMessage());
- }
+ return ((Image) value).toBase64();
}
@Override
protected String getType() {
}
@Override
protected String getType() {
- return "
java.awt.image.Buffered
Image";
+ return "
be.nikiroo.utils.
Image";
}
@Override
protected Object fromString(String content) {
try {
}
@Override
protected Object fromString(String content) {
try {
- return
ImageUtils.fromBase64
(content);
+ return
new Image
(content);
} catch (IOException e) {
throw new UnknownFormatConversionException(e.getMessage());
}
} catch (IOException e) {
throw new UnknownFormatConversionException(e.getMessage());
}
@@
-527,6
+522,6
@@
public class SerialUtils {
}
}
}
}
- return builder.substring(1, builder.length() - 1)
.toString()
;
+ return builder.substring(1, builder.length() - 1);
}
}
}
}