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

Let's actually use them fancy little methods.

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4695 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2007-05-07 19:19:33 +00:00
parent 8df35549df
commit 2afd7b2e29
2 changed files with 82 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/presents/tools/InstrumentStreamableTask.java
+7 -6
View File
@@ -45,6 +45,7 @@ import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.types.Path;
import com.samskivert.io.StreamUtil;
import com.threerings.io.FieldMarshaller;
import com.threerings.io.Streamable;
/**
@@ -154,8 +155,6 @@ public class InstrumentStreamableTask extends Task
protected void processStreamable (File source, CtClass clazz)
throws NotFoundException
{
// System.err.println("Processing " + clazz.getName() + "...");
ArrayList<CtField> fields = new ArrayList<CtField>();
for (CtField field : clazz.getDeclaredFields()) {
int modifiers = field.getModifiers();
@@ -173,13 +172,13 @@ public class InstrumentStreamableTask extends Task
int added = 0;
for (CtField field : fields) {
String rname = "readField_" + field.getName();
String rname = FieldMarshaller.getReaderMethodName(field.getName());
if (!methods.contains(rname)) {
String reader =
"public void " + rname + " (com.threerings.io.ObjectInputStream ins) {\n" +
" " + field.getName() + " = " + getFieldReader(field) + ";\n" +
"}";
// System.err.println("Adding reader " + clazz.getName() + "." + rname);
// System.out.println("Adding reader " + clazz.getName() + "." + rname);
try {
clazz.addMethod(CtNewMethod.make(reader, clazz));
added++;
@@ -189,9 +188,10 @@ public class InstrumentStreamableTask extends Task
System.err.println(reader);
}
}
String wname = "writeField_" + field.getName();
String wname = FieldMarshaller.getWriterMethodName(field.getName());
if (!methods.contains(wname)) {
// System.err.println("Adding writer " + clazz.getName() + "." + wname);
// System.out.println("Adding writer " + clazz.getName() + "." + wname);
String writer =
"public void " + wname + " (com.threerings.io.ObjectOutputStream out) {\n" +
" out." + getFieldWriter(field) + ";\n" +
@@ -209,6 +209,7 @@ public class InstrumentStreamableTask extends Task
if (added > 0) {
try {
System.out.println("Instrumented '" + clazz.getName() + "'.");
clazz.writeFile(_outdir.getPath());
} catch (Exception e) {
System.err.println("Failed to write instrumented class [class=" + clazz +