AfflictionNetworks/narya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated to call ObjectInputStream.readObject() and readField() the new way.

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6014 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Ray Greenwell
2010-01-13 00:14:46 +00:00
parent 4c009f7a5f
commit 3954ec5153
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/presents/tools/GenActionScriptTask.java
+6 -7
View File
@@ -252,17 +252,17 @@ public class GenActionScriptTask extends Task
protected String toReadObject (Class<?> type) protected String toReadObject (Class<?> type)
{ {
if (type.equals(String.class)) { if (type.equals(String.class)) {
return "(ins.readField(String) as String)"; return "ins.readField(String)";
} else if (type.equals(Integer.class) || } else if (type.equals(Integer.class) ||
type.equals(Short.class) || type.equals(Short.class) ||
type.equals(Byte.class)) { type.equals(Byte.class)) {
String name = ActionScriptSource.toSimpleName(type.getName()); String name = ActionScriptSource.toSimpleName(type.getName());
return "(ins.readField(" + name + ") as " + name + ").value"; return "ins.readField(" + name + ").value";
} else if (type.equals(Long.class)) { } else if (type.equals(Long.class)) {
String name = ActionScriptSource.toSimpleName(type.getName()); String name = ActionScriptSource.toSimpleName(type.getName());
return "(ins.readField(" + name + ") as " + name + ")"; return "ins.readField(" + name + ")";
} else if (type.equals(Boolean.TYPE)) { } else if (type.equals(Boolean.TYPE)) {
return "ins.readBoolean()"; return "ins.readBoolean()";
@@ -287,15 +287,14 @@ public class GenActionScriptTask extends Task
} else if (type.isArray()) { } else if (type.isArray()) {
if (Byte.TYPE.equals(type.getComponentType())) { if (Byte.TYPE.equals(type.getComponentType())) {
return "(ins.readField(ByteArray) as ByteArray)"; return "ins.readField(ByteArray)";
} else { } else {
return "(ins.readObject() as TypedArray)"; return "ins.readObject(TypedArray)";
} }
} else { } else {
return "(ins.readObject() as " + return "ins.readObject(" + ActionScriptSource.toSimpleName(type.getName()) + ")";
ActionScriptSource.toSimpleName(type.getName()) + ")";
} }
} }