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

Modified field marshalling code to work on any object rather than being

Browse Source 
DObject specific (because it didn't need to be).


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@911 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2002-02-01 23:26:49 +00:00
parent d925c5d1b4
commit ef9e0bc53f
15 changed files with 131 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/presents/io/StreamableFieldMarshaller.java
+6 -7
View File
@@ -1,5 +1,5 @@
//
// $Id: StreamableFieldMarshaller.java,v 1.1 2001/10/12 19:28:43 mdb Exp $
// $Id: StreamableFieldMarshaller.java,v 1.2 2002/02/01 23:26:49 mdb Exp $
package com.threerings.presents.dobj.io;
@@ -8,15 +8,14 @@ import java.io.DataOutputStream;
import java.io.IOException;
import java.lang.reflect.Field;
import com.threerings.presents.dobj.DObject;
import com.threerings.presents.io.Streamable;
public class StreamableFieldMarshaller implements FieldMarshaller
{
public void writeTo (DataOutputStream out, Field field, DObject dobj)
public void writeTo (DataOutputStream out, Field field, Object obj)
throws IOException, IllegalAccessException
{
Streamable value = (Streamable)field.get(dobj);
Streamable value = (Streamable)field.get(obj);
// we freak out if our streamable is null
if (value == null) {
throw new IllegalAccessException(
@@ -25,7 +24,7 @@ public class StreamableFieldMarshaller implements FieldMarshaller
value.writeTo(out);
}
public void readFrom (DataInputStream in, Field field, DObject dobj)
public void readFrom (DataInputStream in, Field field, Object obj)
throws IOException, IllegalAccessException
{
try {
@@ -34,11 +33,11 @@ public class StreamableFieldMarshaller implements FieldMarshaller
// unserialize it
value.readFrom(in);
// and set the value in the object
field.set(dobj, value);
field.set(obj, value);
} catch (InstantiationException ie) {
throw new IOException("Unable to instantiate streamable " +
"[field=" + field + ", object=" + dobj +
"[field=" + field + ", object=" + obj +
", error=" + ie + "]");
}
}