google-collect upgrade

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5745 542714f4-19e9-0310-aa3c-eee0fc999fb1

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

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<String, Reporter> _reporters = Multimaps.newArrayListMultimap();
+    protected Multimap<String, Reporter> _reporters = ArrayListMultimap.create();
 
     /** The frequency with which we generate "state of server" reports. */
     protected static final long REPORT_INTERVAL = 15 * 60 * 1000L;