From 73e44953d7abcec9d70ad902e036d1ebdc3a8432 Mon Sep 17 00:00:00 2001
From: Par Winzell <zell@threerings.net>
Date: Tue, 7 Sep 2010 19:26:42 +0000
Subject: [PATCH] Argh. Java6->5 fixes.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6144 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .../crowd/chat/server/ChatChannelManager.java         |  5 ++---
 .../threerings/presents/peer/server/PeerManager.java  | 11 +++++------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/java/com/threerings/crowd/chat/server/ChatChannelManager.java b/src/java/com/threerings/crowd/chat/server/ChatChannelManager.java
index e93187a7c..f9187ad4e 100644
--- a/src/java/com/threerings/crowd/chat/server/ChatChannelManager.java
+++ b/src/java/com/threerings/crowd/chat/server/ChatChannelManager.java
@@ -108,8 +108,7 @@ public abstract class ChatChannelManager
         _peerMan.invokeNodeRequest (
             new ChatCollectionRequest(user), new NodeRequestsListener<List<ChatHistoryEntry>>()
         {
-            @Override public void requestsProcessed (
-                NodeRequestsResult<List<ChatHistoryEntry>> requestResult)
+            public void requestsProcessed (NodeRequestsResult<List<ChatHistoryEntry>> requestResult)
             {
                 ChatHistoryResult result = new ChatHistoryResult();
                 result.failedNodes = requestResult.getNodeErrors().keySet();
@@ -121,7 +120,7 @@ public abstract class ChatChannelManager
                 lner.requestCompleted(result);
             }
 
-            @Override public void requestFailed (String cause)
+            public void requestFailed (String cause)
             {
                 lner.requestFailed(new InvocationException(cause));
             }
diff --git a/src/java/com/threerings/presents/peer/server/PeerManager.java b/src/java/com/threerings/presents/peer/server/PeerManager.java
index d06396628..44f7c0434 100644
--- a/src/java/com/threerings/presents/peer/server/PeerManager.java
+++ b/src/java/com/threerings/presents/peer/server/PeerManager.java
@@ -497,7 +497,7 @@ public abstract class PeerManager
             }
         }
         if (nodes.isEmpty()) {
-            listener.requestsProcessed(new NodeRequestsResultImpl());
+            listener.requestsProcessed(new NodeRequestsResultImpl<T>());
             return;
         }
 
@@ -520,7 +520,7 @@ public abstract class PeerManager
                     nodes.remove(node);
                     if (nodes.isEmpty()) {
                         // if all nodes have responded, let caller know
-                        listener.requestsProcessed(new NodeRequestsResultImpl(results, failures));
+                        listener.requestsProcessed(new NodeRequestsResultImpl<T>(results, failures));
                     }
                 }
             });
@@ -1537,21 +1537,20 @@ public abstract class PeerManager
 
         public NodeRequestsResultImpl ()
         {
-            this(Collections.EMPTY_MAP, Collections.EMPTY_MAP);
+            _results = Maps.newHashMap();
+            _errors = Maps.newHashMap();
         }
 
-        @Override public Map<String, T> getNodeResults ()
+        public Map<String, T> getNodeResults ()
         {
             return _results;
         }
 
-        @Override
         public Map<String, String> getNodeErrors ()
         {
             return _errors;
         }
 
-        @Override
         public boolean wasDropped ()
         {
             return _results.isEmpty() && _errors.isEmpty();