X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fserial%2FSerialUtils.java;h=c222bc3e3d6334a76dcf03ad133a846609aed0b0;hb=cd0c27d2e457ea19fcd9def879e1534a528292c2;hp=7bf1b17a3a651a4f41f5f8cd072be1cd160dfca3;hpb=ce0974c4b695f842fa7ec81f3c53d016d1959854;p=fanfix.git
diff --git a/src/be/nikiroo/utils/serial/SerialUtils.java b/src/be/nikiroo/utils/serial/SerialUtils.java
index 7bf1b17..c222bc3 100644
--- a/src/be/nikiroo/utils/serial/SerialUtils.java
+++ b/src/be/nikiroo/utils/serial/SerialUtils.java
@@ -1,14 +1,18 @@
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.lang.reflect.Constructor;
import java.lang.reflect.Field;
-import java.util.ArrayList;
+import java.lang.reflect.Modifier;
import java.util.HashMap;
import java.util.Map;
import java.util.UnknownFormatConversionException;
+import be.nikiroo.utils.ImageUtils;
+
/**
* Small class to help with serialisation.
*
@@ -22,7 +26,6 @@ public class SerialUtils {
static {
customTypes = new HashMap();
- // TODO: add "default" custom serialisers if any (Bitmap?)
// Array types:
customTypes.put("[]", new CustomSerializer() {
@@ -79,6 +82,32 @@ public class SerialUtils {
}
}
});
+
+ // Images (this is currently the only supported image type by default)
+ customTypes.put("java.awt.image.BufferedImage", new CustomSerializer() {
+ @Override
+ protected String toString(Object value) {
+ try {
+ return ImageUtils.toBase64((BufferedImage) value);
+ } catch (IOException e) {
+ throw new UnknownFormatConversionException(e.getMessage());
+ }
+ }
+
+ @Override
+ protected String getType() {
+ return "java.awt.image.BufferedImage";
+ }
+
+ @Override
+ protected Object fromString(String content) {
+ try {
+ return ImageUtils.fromBase64(content);
+ } catch (IOException e) {
+ throw new UnknownFormatConversionException(e.getMessage());
+ }
+ }
+ });
}
/**
@@ -188,8 +217,12 @@ public class SerialUtils {
for (Field field : fields) {
field.setAccessible(true);
- if (field.getName().startsWith("this$")) {
+ if (field.getName().startsWith("this$")
+ || field.isSynthetic()
+ || (field.getModifiers() & Modifier.STATIC) == Modifier.STATIC) {
// Do not keep this links of nested classes
+ // Do not keep synthetic fields
+ // Do not keep final fields
continue;
}
@@ -244,6 +277,10 @@ public class SerialUtils {
builder.append(value).append('F');
} else if (value instanceof Double) {
builder.append(value).append('d');
+ } else if (value instanceof Enum) {
+ String type = value.getClass().getCanonicalName();
+ builder.append(type).append(".").append(((Enum>) value).name())
+ .append(";");
} else {
return false;
}
@@ -262,10 +299,9 @@ public class SerialUtils {
String type = CustomSerializer.typeOf(encodedValue);
if (customTypes.containsKey(type)) {
return customTypes.get(type).decode(encodedValue);
- } else {
- throw new UnknownFormatConversionException(
- "Unknown custom type: " + type);
}
+ throw new UnknownFormatConversionException("Unknown custom type: "
+ + type);
} else if (encodedValue.equals("NULL") || encodedValue.equals("null")) {
return null;
} else if (encodedValue.endsWith("\"")) {
@@ -286,6 +322,8 @@ public class SerialUtils {
return Float.parseFloat(cut);
} else if (encodedValue.endsWith("d")) {
return Double.parseDouble(cut);
+ } else if (encodedValue.endsWith(";")) {
+ return decodeEnum(encodedValue);
} else {
return Integer.parseInt(encodedValue);
}
@@ -341,6 +379,22 @@ public class SerialUtils {
return clazz;
}
+ @SuppressWarnings({ "unchecked", "rawtypes" })
+ private static Enum> decodeEnum(String escaped) {
+ // escaped: be.xxx.EnumType.VALUE;
+ int pos = escaped.lastIndexOf(".");
+ String type = escaped.substring(0, pos);
+ String name = escaped.substring(pos + 1, escaped.length() - 1);
+
+ try {
+ return Enum.valueOf((Class) getClass(type), name);
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new UnknownFormatConversionException("Unknown enum: <" + type
+ + "> " + name);
+ }
+ }
+
// aa bb -> "aa\tbb"
private static void encodeString(StringBuilder builder, String raw) {
builder.append('\"');