From df42b4a01307908766d0385802bd989e7841b836 Mon Sep 17 00:00:00 2001 From: Dave Hoover Date: Wed, 8 Oct 2008 18:51:22 +0000 Subject: [PATCH] Overrides & whitespace. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5421 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../bureau/util/BureauLogRedirector.java | 2 +- .../threerings/presents/server/PresentsClient.java | 14 +++++++------- .../presents/server/VariableThrottle.java | 5 +++-- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/java/com/threerings/bureau/util/BureauLogRedirector.java b/src/java/com/threerings/bureau/util/BureauLogRedirector.java index d1231f37d..c083a5d29 100644 --- a/src/java/com/threerings/bureau/util/BureauLogRedirector.java +++ b/src/java/com/threerings/bureau/util/BureauLogRedirector.java @@ -47,7 +47,7 @@ public class BureauLogRedirector _bureauId = bureauId; _reader = new BufferedReader(new InputStreamReader(input)); Thread thread = new Thread(bureauId) { - public void run () { + @Override public void run () { copyLoop(); }}; thread.setDaemon(true); diff --git a/src/java/com/threerings/presents/server/PresentsClient.java b/src/java/com/threerings/presents/server/PresentsClient.java index c1746dc19..0ab1035a9 100644 --- a/src/java/com/threerings/presents/server/PresentsClient.java +++ b/src/java/com/threerings/presents/server/PresentsClient.java @@ -325,7 +325,7 @@ public class PresentsClient // clear out the client object so that we know the session is over _clobj = null; - + // Cancel overflow processing if (_overflow != null) { _overflow.stop(); @@ -416,7 +416,7 @@ public class PresentsClient handleThrottleExceeded(); } - + dispatch(message); } @@ -446,7 +446,7 @@ public class PresentsClient dispatch(_overflow.dequeue()); } } - + protected void dispatch (UpstreamMessage message) { // we dispatch to a message dispatcher that is specialized for the particular class of @@ -1082,7 +1082,7 @@ public class PresentsClient client.safeEndSession(); } } - + /** * Contains information about message overflow. */ @@ -1090,7 +1090,7 @@ public class PresentsClient { /** Maxmimum size of queue before disconnection. */ public int limit; - + /** * Starts processing the overflowed messages every so often. */ @@ -1098,7 +1098,7 @@ public class PresentsClient { if (_interval == null) { _interval = new Interval(_omgr) { - public void expired () { + @Override public void expired () { handleOverflowMessages(); } }; @@ -1147,7 +1147,7 @@ public class PresentsClient /** Previously throttled messages waiting to be sent. */ protected LinkedList _queue = new LinkedList(); } - + @Inject protected ClientManager _clmgr; @Inject protected ConnectionManager _conmgr; @Inject protected PresentsDObjectMgr _omgr; diff --git a/src/java/com/threerings/presents/server/VariableThrottle.java b/src/java/com/threerings/presents/server/VariableThrottle.java index 8766ae55d..a8a43684d 100644 --- a/src/java/com/threerings/presents/server/VariableThrottle.java +++ b/src/java/com/threerings/presents/server/VariableThrottle.java @@ -35,7 +35,7 @@ public class VariableThrottle extends Throttle { super(operations, period); } - + /** * Updates the number of operations for this throttle to a new maximum, retaining the current * history of operations if the limit is being increased and truncating the oldest operations @@ -61,7 +61,8 @@ public class VariableThrottle extends Throttle } _ops = ops; } - + + @Override public String toString () { return "VariableThrottle [" + _ops.length + " per " + _period + "ms]";