Streaming fixups on the path towards getting things working in beta3.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4105 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
@@ -56,11 +56,11 @@ public class ObjectInputStream
|
||||
Log.warning("OMG, cannot stream " + cname);
|
||||
return null;
|
||||
}
|
||||
Log.debug("Got streamer (" + streamer + ")");
|
||||
// Log.debug("Got streamer (" + streamer + ")");
|
||||
|
||||
cmap = new ClassMapping(code, cname, streamer);
|
||||
_classMap[code] = cmap;
|
||||
Log.debug("Created mapping for (" + code + "): " + cname);
|
||||
// Log.debug("Created mapping for (" + code + "): " + cname);
|
||||
|
||||
} else {
|
||||
Log.debug("Read known code: " + code);
|
||||
|
||||
@@ -70,7 +70,7 @@ public class Streamer
|
||||
initStreamers();
|
||||
|
||||
// see if we have a streamer for it
|
||||
Log.debug("getStreamer/existing");
|
||||
// Log.debug("getStreamer/existing");
|
||||
for each (var streamer :Streamer in _streamers) {
|
||||
if (streamer.getJavaClassName() === jname) {
|
||||
return streamer;
|
||||
@@ -78,7 +78,7 @@ public class Streamer
|
||||
}
|
||||
|
||||
// see if it's an array that we unstream using an ArrayStreamer
|
||||
Log.debug("getStreamer/array");
|
||||
// Log.debug("getStreamer/array");
|
||||
if (jname.charAt(0) === "[") {
|
||||
var streamer :Streamer = new ArrayStreamer(jname);
|
||||
_streamers.push(streamer);
|
||||
@@ -86,18 +86,21 @@ public class Streamer
|
||||
}
|
||||
|
||||
// otherwise see if it represents a Streamable
|
||||
Log.debug("getStreamer/Class:Streamable");
|
||||
// Log.debug("getStreamer/Class:Streamable");
|
||||
var clazz :Class = ClassUtil.getClassByName(
|
||||
Translations.getFromServer(jname));
|
||||
Log.debug("getStreamer/Class:Streamable2");
|
||||
// Log.debug("getStreamer/Class:Streamable2");
|
||||
if (ClassUtil.isAssignableAs(Streamable, clazz)) {
|
||||
return null; // it's streamable
|
||||
}
|
||||
|
||||
// TEMP: workaround for fucked-up bug!!! FUCK ACTIONSCRIPT!
|
||||
if (clazz == StreamableArrayList) {
|
||||
return null; // it's streamable, yes it is
|
||||
// TEMP: workaround for fucked-up bug!!!
|
||||
// The isAssignableAs (above) does not work right now, so we assume
|
||||
// ALL classes are streamable, to get things working.
|
||||
if (true) {
|
||||
return null;
|
||||
}
|
||||
// END: hacky temp
|
||||
|
||||
return BAD_STREAMER;
|
||||
}
|
||||
|
||||
@@ -18,24 +18,27 @@ public class ArrayStreamer extends Streamer
|
||||
{
|
||||
super(TypedArray, jname);
|
||||
|
||||
if (jname.charAt(1) === "[") {
|
||||
var secondChar :String = jname.charAt(1);
|
||||
|
||||
if (secondChar === "[") {
|
||||
// if we're a multi-dimensional array then we need a delegate
|
||||
_delegate = Streamer.getStreamerByJavaName(jname.substring(1));
|
||||
_isFinal = true; // it just is
|
||||
|
||||
} else {
|
||||
if (jname.charAt(1) === "L") {
|
||||
// form is "[L<class>;"
|
||||
var baseClass :String = jname.substring(2, jname.length - 1);
|
||||
baseClass = Translations.getFromServer(baseClass);
|
||||
_elementType = ClassUtil.getClassByName(baseClass);
|
||||
_isFinal = ClassUtil.isFinal(_elementType);
|
||||
} else if (secondChar === "L") {
|
||||
// form is "[L<class>;"
|
||||
var baseClass :String = jname.substring(2, jname.length - 1);
|
||||
baseClass = Translations.getFromServer(baseClass);
|
||||
_elementType = ClassUtil.getClassByName(baseClass);
|
||||
_isFinal = ClassUtil.isFinal(_elementType);
|
||||
|
||||
} else {
|
||||
com.threerings.presents.Log.warning("Other array types are currently not handled yet " +
|
||||
"[jname=" + jname + "].");
|
||||
throw new Error("Unimplemented bit");
|
||||
}
|
||||
} else if (secondChar === "I") {
|
||||
_elementType = int;
|
||||
|
||||
} else {
|
||||
com.threerings.presents.Log.warning("Other array types are " +
|
||||
"currently not handled yet [jname=" + jname + "].");
|
||||
throw new Error("Unimplemented bit");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -57,7 +60,12 @@ public class ArrayStreamer extends Streamer
|
||||
{
|
||||
var arr :Array = (obj as Array);
|
||||
out.writeInt(arr.length);
|
||||
if (_isFinal) {
|
||||
if (_elementType == int) {
|
||||
for (var ii :int = 0; ii < arr.length; ii++) {
|
||||
out.writeInt(arr[ii] as int);
|
||||
}
|
||||
|
||||
} else if (_isFinal) {
|
||||
var mask :ArrayMask = new ArrayMask(arr.length);
|
||||
for (var ii :int = 0; ii < arr.length; ii++) {
|
||||
if (arr[ii] != null) {
|
||||
@@ -84,7 +92,12 @@ public class ArrayStreamer extends Streamer
|
||||
:void
|
||||
{
|
||||
var arr :Array = (obj as Array);
|
||||
if (_isFinal) {
|
||||
if (_elementType == int) {
|
||||
for (var ii :int = 0; ii < arr.length; ii++) {
|
||||
arr[ii] = ins.readInt();
|
||||
}
|
||||
|
||||
} else if (_isFinal) {
|
||||
var mask :ArrayMask = new ArrayMask();
|
||||
mask.readFrom(ins);
|
||||
for (var ii :int = 0; ii < length; ii++) {
|
||||
|
||||
Reference in New Issue
Block a user