Some error message clarification, added java.lang.String to Translations, some
widening. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4560 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
@@ -28,7 +28,6 @@ public class ObjectOutputStream
|
|||||||
var cname :String;
|
var cname :String;
|
||||||
if (obj is TypedArray) {
|
if (obj is TypedArray) {
|
||||||
cname = (obj as TypedArray).getJavaType();
|
cname = (obj as TypedArray).getJavaType();
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
cname = ClassUtil.getClassName(obj);
|
cname = ClassUtil.getClassName(obj);
|
||||||
}
|
}
|
||||||
@@ -47,8 +46,7 @@ public class ObjectOutputStream
|
|||||||
_classMap.put(cname, cmap);
|
_classMap.put(cname, cmap);
|
||||||
|
|
||||||
if (_nextCode > Short.MAX_VALUE) {
|
if (_nextCode > Short.MAX_VALUE) {
|
||||||
throw new Error("Too many unique classes written to " +
|
throw new Error("Too many unique classes written to ObjectOutputStream");
|
||||||
"ObjectOutputStream");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
writeShort(-cmap.code);
|
writeShort(-cmap.code);
|
||||||
|
|||||||
@@ -35,6 +35,7 @@ public class Translations
|
|||||||
|
|
||||||
// initialize some standard classes
|
// initialize some standard classes
|
||||||
addTranslation("Object", "java.lang.Object");
|
addTranslation("Object", "java.lang.Object");
|
||||||
|
addTranslation("String", "java.lang.String");
|
||||||
addTranslation("com.threerings.util.langBoolean", "java.lang.Boolean");
|
addTranslation("com.threerings.util.langBoolean", "java.lang.Boolean");
|
||||||
// handle lists
|
// handle lists
|
||||||
_fromServer.put("java.util.List", "[Ljava.lang.Object;");
|
_fromServer.put("java.util.List", "[Ljava.lang.Object;");
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ public class ArrayStreamer extends Streamer
|
|||||||
} else {
|
} else {
|
||||||
Log.getLog(this).warning("Other array types are " +
|
Log.getLog(this).warning("Other array types are " +
|
||||||
"currently not handled yet [jname=" + jname + "].");
|
"currently not handled yet [jname=" + jname + "].");
|
||||||
throw new Error("Unimplemented bit");
|
throw new Error("Don't know how to stream '" + jname + "' instances.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user