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:
Ray Greenwell
2009-08-21 22:45:36 +00:00
parent 655b70b0e2
commit 44480ada4a
2 changed files with 4 additions and 6 deletions
+3 -4
View File
@@ -27,7 +27,6 @@ import flash.utils.Dictionary;
import com.threerings.util.ByteEnum;
import com.threerings.util.ClassUtil;
import com.threerings.util.Enum;
import com.threerings.util.env.Environment;
import com.threerings.io.streamers.ArrayStreamer;
import com.threerings.io.streamers.ByteStreamer;
@@ -78,11 +77,11 @@ public class Streamer
// But: the code is smaller, so that wins
var clazz :Class = ClassUtil.getClassByName(Translations.getFromServer(jname));
if (Environment.isAssignableAs(Enum, clazz)) {
streamer = Environment.isAssignableAs(ByteEnum, clazz) ?
if (ClassUtil.isAssignableAs(Enum, clazz)) {
streamer = ClassUtil.isAssignableAs(ByteEnum, clazz) ?
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);
} else {
@@ -24,7 +24,6 @@ package com.threerings.io.streamers {
import com.threerings.util.ClassUtil;
import com.threerings.util.Enum;
import com.threerings.util.Log;
import com.threerings.util.env.Environment;
import com.threerings.io.ArrayMask;
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
if (Environment.isAssignableAs(Enum, type)) {
if (ClassUtil.isAssignableAs(Enum, type)) {
return true;
}