Enabled some debug logging when STREAM_DEBUG is activated. Removed custom

String marshaller as a StreamerMarshaller is used for String fields.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3651 542714f4-19e9-0310-aa3c-eee0fc999fb1

src/java/com/threerings/io/FieldMarshaller.java

@@ -1,5 +1,5 @@
 //
-// $Id: FieldMarshaller.java,v 1.8 2004/08/27 02:12:36 mdb Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -246,18 +246,6 @@ public abstract class FieldMarshaller
                 out.writeDouble(field.getDouble(source));
             }
         });
-        _marshallers.put(String.class, new FieldMarshaller() {
-            public void readField (
-                Field field, Object target, ObjectInputStream in)
-                throws Exception {
-                field.set(target, in.readUTF());
-            }
-            public void writeField (
-                Field field, Object source, ObjectOutputStream out)
-                throws Exception {
-                out.writeUTF((String)field.get(source));
-            }
-        });
         _marshallers.put(Date.class, new FieldMarshaller() {
             public void readField (
                 Field field, Object target, ObjectInputStream in)

src/java/com/threerings/io/Streamer.java

@@ -93,7 +93,9 @@ public class Streamer
             }
 
             // create a streamer for this class and cache it
-//             Log.info("Creating a streamer for '" + target.getName() + "'.");
+            if (ObjectInputStream.STREAM_DEBUG) {
+                Log.info("Creating a streamer for '" + target.getName() + "'.");
+            }
             stream = new Streamer(target);
             _streamers.put(target, stream);
         }
@@ -115,8 +117,10 @@ public class Streamer
         // if we're supposed to and one exists, use the writer method
         if (useWriter && _writer != null) {
             try {
-//                 Log.info("Writing with writer " +
+                if (ObjectInputStream.STREAM_DEBUG) {
-//                          "[class=" + _target.getName() + "].");
+                    Log.info("Writing with writer " +
+                             "[class=" + _target.getName() + "].");
+                }
                 _writer.invoke(object, new Object[] { out });
 
             } catch (Throwable t) {
@@ -187,8 +191,10 @@ public class Streamer
                 throw new IOException(errmsg);
             }
             try {
-//                 Log.info("Writing field [class=" + _target.getName() +
+                if (ObjectInputStream.STREAM_DEBUG) {
-//                          ", field=" + field.getName() + "].");
+                    Log.info("Writing field [class=" + _target.getName() +
+                             ", field=" + field.getName() + "].");
+                }
                 fm.writeField(field, object, out);
             } catch (Exception e) {
                 Log.logStackTrace(e);
@@ -414,8 +420,10 @@ public class Streamer
         _marshallers = new FieldMarshaller[fcount];
         for (int ii = 0; ii < fcount; ii++) {
             _marshallers[ii] = FieldMarshaller.getFieldMarshaller(_fields[ii]);
-//             Log.info("Using " + _marshallers[ii] + " for " +
+            if (ObjectInputStream.STREAM_DEBUG) {
-//                      _target.getName() + "." + _fields[ii].getName() + ".");
+                Log.info("Using " + _marshallers[ii] + " for " +
+                         _target.getName() + "." + _fields[ii].getName() + ".");
+            }
         }
 
         // look up the reader and writer methods