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

Argh. Java6->5 fixes.

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6144 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Par Winzell
2010-09-07 19:26:42 +00:00
parent 59588467f7
commit 73e44953d7
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/crowd/chat/server/ChatChannelManager.java
+2 -3
View File
@@ -108,8 +108,7 @@ public abstract class ChatChannelManager
_peerMan.invokeNodeRequest ( _peerMan.invokeNodeRequest (
new ChatCollectionRequest(user), new NodeRequestsListener<List<ChatHistoryEntry>>() new ChatCollectionRequest(user), new NodeRequestsListener<List<ChatHistoryEntry>>()
{ {
@Override public void requestsProcessed ( public void requestsProcessed (NodeRequestsResult<List<ChatHistoryEntry>> requestResult)
NodeRequestsResult<List<ChatHistoryEntry>> requestResult)
{ {
ChatHistoryResult result = new ChatHistoryResult(); ChatHistoryResult result = new ChatHistoryResult();
result.failedNodes = requestResult.getNodeErrors().keySet(); result.failedNodes = requestResult.getNodeErrors().keySet();
@@ -121,7 +120,7 @@ public abstract class ChatChannelManager
lner.requestCompleted(result); lner.requestCompleted(result);
} }
@Override public void requestFailed (String cause) public void requestFailed (String cause)
{ {
lner.requestFailed(new InvocationException(cause)); lner.requestFailed(new InvocationException(cause));
} }
src/java/com/threerings/presents/peer/server/PeerManager.java
+5 -6
View File
@@ -497,7 +497,7 @@ public abstract class PeerManager
} }
} }
if (nodes.isEmpty()) { if (nodes.isEmpty()) {
listener.requestsProcessed(new NodeRequestsResultImpl()); listener.requestsProcessed(new NodeRequestsResultImpl<T>());
return; return;
} }
@@ -520,7 +520,7 @@ public abstract class PeerManager
nodes.remove(node); nodes.remove(node);
if (nodes.isEmpty()) { if (nodes.isEmpty()) {
// if all nodes have responded, let caller know // 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 () 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; return _results;
} }
@Override
public Map<String, String> getNodeErrors () public Map<String, String> getNodeErrors ()
{ {
return _errors; return _errors;
} }
@Override
public boolean wasDropped () public boolean wasDropped ()
{ {
return _results.isEmpty() && _errors.isEmpty(); return _results.isEmpty() && _errors.isEmpty();