From 4b61decebb7d22e9ca9b03a132e0352ebbb49de3 Mon Sep 17 00:00:00 2001 From: Dave Hoover Date: Wed, 7 Apr 2010 20:32:47 +0000 Subject: [PATCH] Remove trailing whitespace/unused imports git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6054 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- src/java/com/threerings/admin/data/ConfigObject.java | 2 -- src/java/com/threerings/bureau/data/BureauClientObject.java | 1 - src/java/com/threerings/io/ObjectInputStream.java | 4 ++-- src/java/com/threerings/presents/data/InvocationObject.java | 1 - src/java/com/threerings/presents/server/ClientManager.java | 2 +- 5 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/java/com/threerings/admin/data/ConfigObject.java b/src/java/com/threerings/admin/data/ConfigObject.java index c437b0995..73d0087ba 100644 --- a/src/java/com/threerings/admin/data/ConfigObject.java +++ b/src/java/com/threerings/admin/data/ConfigObject.java @@ -24,8 +24,6 @@ package com.threerings.admin.data; import java.lang.reflect.Field; import javax.swing.JPanel; -import javax.annotation.Generated; - import com.threerings.presents.dobj.DObject; import com.threerings.presents.util.PresentsContext; diff --git a/src/java/com/threerings/bureau/data/BureauClientObject.java b/src/java/com/threerings/bureau/data/BureauClientObject.java index fae1ff35e..3eb606409 100644 --- a/src/java/com/threerings/bureau/data/BureauClientObject.java +++ b/src/java/com/threerings/bureau/data/BureauClientObject.java @@ -21,7 +21,6 @@ package com.threerings.bureau.data; -import javax.annotation.Generated; import com.threerings.presents.data.ClientObject; /** diff --git a/src/java/com/threerings/io/ObjectInputStream.java b/src/java/com/threerings/io/ObjectInputStream.java index 0c1b1f818..c8188bbbb 100644 --- a/src/java/com/threerings/io/ObjectInputStream.java +++ b/src/java/com/threerings/io/ObjectInputStream.java @@ -319,11 +319,11 @@ public class ObjectInputStream extends DataInputStream // read precisely that many into a buffer byte[] bbuf = new byte[utflen]; in.read(bbuf); - + // decode the UTF-8 stream into a character buffer char[] cbuf = new char[utflen]; int read = new InputStreamReader(new ByteArrayInputStream(bbuf), "UTF-8").read(cbuf); - + // create and return the string given the number of decoded characters return String.copyValueOf(cbuf, 0, read); } diff --git a/src/java/com/threerings/presents/data/InvocationObject.java b/src/java/com/threerings/presents/data/InvocationObject.java index a889218f4..e68c2be00 100644 --- a/src/java/com/threerings/presents/data/InvocationObject.java +++ b/src/java/com/threerings/presents/data/InvocationObject.java @@ -21,7 +21,6 @@ package com.threerings.presents.data; -import javax.annotation.Generated; import com.threerings.presents.dobj.DObject; /** diff --git a/src/java/com/threerings/presents/server/ClientManager.java b/src/java/com/threerings/presents/server/ClientManager.java index 53f281679..e4263a5ed 100644 --- a/src/java/com/threerings/presents/server/ClientManager.java +++ b/src/java/com/threerings/presents/server/ClientManager.java @@ -279,7 +279,7 @@ public class ClientManager break; } } - + try { // create a client resolver instance which will create our client object, populate it // and notify the listeners