Use ClassUtil.isAssignableAs().
It works in thane now. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5922 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
@@ -27,7 +27,6 @@ import flash.utils.Dictionary;
|
|||||||
import com.threerings.util.ByteEnum;
|
import com.threerings.util.ByteEnum;
|
||||||
import com.threerings.util.ClassUtil;
|
import com.threerings.util.ClassUtil;
|
||||||
import com.threerings.util.Enum;
|
import com.threerings.util.Enum;
|
||||||
import com.threerings.util.env.Environment;
|
|
||||||
|
|
||||||
import com.threerings.io.streamers.ArrayStreamer;
|
import com.threerings.io.streamers.ArrayStreamer;
|
||||||
import com.threerings.io.streamers.ByteStreamer;
|
import com.threerings.io.streamers.ByteStreamer;
|
||||||
@@ -78,11 +77,11 @@ public class Streamer
|
|||||||
// But: the code is smaller, so that wins
|
// But: the code is smaller, so that wins
|
||||||
var clazz :Class = ClassUtil.getClassByName(Translations.getFromServer(jname));
|
var clazz :Class = ClassUtil.getClassByName(Translations.getFromServer(jname));
|
||||||
|
|
||||||
if (Environment.isAssignableAs(Enum, clazz)) {
|
if (ClassUtil.isAssignableAs(Enum, clazz)) {
|
||||||
streamer = Environment.isAssignableAs(ByteEnum, clazz) ?
|
streamer = ClassUtil.isAssignableAs(ByteEnum, clazz) ?
|
||||||
new ByteEnumStreamer(clazz, jname) : new EnumStreamer(clazz, jname);
|
new ByteEnumStreamer(clazz, jname) : new EnumStreamer(clazz, jname);
|
||||||
|
|
||||||
} else if (Environment.isAssignableAs(Streamable, clazz)) {
|
} else if (ClassUtil.isAssignableAs(Streamable, clazz)) {
|
||||||
streamer = new Streamer(clazz, jname);
|
streamer = new Streamer(clazz, jname);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -24,7 +24,6 @@ package com.threerings.io.streamers {
|
|||||||
import com.threerings.util.ClassUtil;
|
import com.threerings.util.ClassUtil;
|
||||||
import com.threerings.util.Enum;
|
import com.threerings.util.Enum;
|
||||||
import com.threerings.util.Log;
|
import com.threerings.util.Log;
|
||||||
import com.threerings.util.env.Environment;
|
|
||||||
|
|
||||||
import com.threerings.io.ArrayMask;
|
import com.threerings.io.ArrayMask;
|
||||||
import com.threerings.io.ObjectInputStream;
|
import com.threerings.io.ObjectInputStream;
|
||||||
@@ -156,7 +155,7 @@ public class ArrayStreamer extends Streamer
|
|||||||
}
|
}
|
||||||
|
|
||||||
// all enums are final, even if you forget to make your enum class final, you punk
|
// all enums are final, even if you forget to make your enum class final, you punk
|
||||||
if (Environment.isAssignableAs(Enum, type)) {
|
if (ClassUtil.isAssignableAs(Enum, type)) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user