From 749ab8e1bbf9ce9d76cdd7c0f3ab46e3a96d0174 Mon Sep 17 00:00:00 2001 From: Charlie Groves Date: Fri, 24 Apr 2009 23:01:40 +0000 Subject: [PATCH] google-collect upgrade git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5745 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- src/java/com/threerings/io/Streamer.java | 2 +- src/java/com/threerings/presents/server/PresentsSession.java | 2 +- src/java/com/threerings/presents/server/ReportManager.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/java/com/threerings/io/Streamer.java b/src/java/com/threerings/io/Streamer.java index 448278044..11454f28e 100644 --- a/src/java/com/threerings/io/Streamer.java +++ b/src/java/com/threerings/io/Streamer.java @@ -463,7 +463,7 @@ public class Streamer // reflect on all the object's fields and remove all marked with NotStreamable List fields = Lists.newArrayList(); ClassUtil.getFields(target, fields); - _fields = Iterables.newArray(Iterables.filter(fields, _isStreamableFieldPred), Field.class); + _fields = Iterables.toArray(Iterables.filter(fields, _isStreamableFieldPred), Field.class); int fcount = _fields.length; // obtain field marshallers for all of our fields diff --git a/src/java/com/threerings/presents/server/PresentsSession.java b/src/java/com/threerings/presents/server/PresentsSession.java index dd179a684..fb0dc986b 100644 --- a/src/java/com/threerings/presents/server/PresentsSession.java +++ b/src/java/com/threerings/presents/server/PresentsSession.java @@ -251,7 +251,7 @@ public class PresentsSession */ protected void finishResolved (Name username, ClientObject clobj) { // let the client know that the rug has been yanked out from under their ass - Object[] args = new Object[] { Integer.valueOf(clobj.getOid()) }; + Object[] args = new Object[] { clobj.getOid() }; _clobj.postMessage(ClientObject.CLOBJ_CHANGED, args); // release our old client object; this will destroy it diff --git a/src/java/com/threerings/presents/server/ReportManager.java b/src/java/com/threerings/presents/server/ReportManager.java index 99ef9a762..e888fa70e 100644 --- a/src/java/com/threerings/presents/server/ReportManager.java +++ b/src/java/com/threerings/presents/server/ReportManager.java @@ -21,8 +21,8 @@ package com.threerings.presents.server; +import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; -import com.google.common.collect.Multimaps; import com.google.inject.Singleton; import com.samskivert.util.Interval; @@ -185,7 +185,7 @@ public class ReportManager protected long _lastReportStamp = _serverStartTime; /** Used to generate "state of server" reports. */ - protected Multimap _reporters = Multimaps.newArrayListMultimap(); + protected Multimap _reporters = ArrayListMultimap.create(); /** The frequency with which we generate "state of server" reports. */ protected static final long REPORT_INTERVAL = 15 * 60 * 1000L;