From 83157e579bc3058557f0fd43d916d13d6e30e720 Mon Sep 17 00:00:00 2001 From: Ray Greenwell Date: Wed, 14 Jul 2010 19:36:08 +0000 Subject: [PATCH] Prefer guava to samskivert. git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@952 ed5b42cb-e716-0410-a449-f6a68f950b19 --- src/java/com/threerings/cast/builder/BuilderModel.java | 5 ++--- src/java/com/threerings/cast/util/CastUtil.java | 5 ++--- src/java/com/threerings/jme/tools/ModelDef.java | 4 ++-- src/java/com/threerings/jme/tools/ModelViewer.java | 4 ++-- src/java/com/threerings/jme/util/ShaderCache.java | 4 ++-- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/java/com/threerings/cast/builder/BuilderModel.java b/src/java/com/threerings/cast/builder/BuilderModel.java index cec43d9e..6cd8e890 100644 --- a/src/java/com/threerings/cast/builder/BuilderModel.java +++ b/src/java/com/threerings/cast/builder/BuilderModel.java @@ -27,11 +27,10 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; +import com.google.common.collect.Iterators; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import com.samskivert.util.CollectionUtil; - import com.threerings.cast.ComponentClass; import com.threerings.cast.ComponentRepository; @@ -121,7 +120,7 @@ public class BuilderModel protected void gatherComponentInfo (ComponentRepository crepo) { // get the list of all component classes - CollectionUtil.addAll(_classes, crepo.enumerateComponentClasses()); + Iterators.addAll(_classes, crepo.enumerateComponentClasses()); for (int ii = 0; ii < _classes.size(); ii++) { // get the list of components available for this class diff --git a/src/java/com/threerings/cast/util/CastUtil.java b/src/java/com/threerings/cast/util/CastUtil.java index b75f858b..8d2756c6 100644 --- a/src/java/com/threerings/cast/util/CastUtil.java +++ b/src/java/com/threerings/cast/util/CastUtil.java @@ -24,9 +24,9 @@ package com.threerings.cast.util; import java.util.ArrayList; import java.util.Iterator; +import com.google.common.collect.Iterators; import com.google.common.collect.Lists; -import com.samskivert.util.CollectionUtil; import com.samskivert.util.RandomUtil; import com.threerings.cast.CharacterDescriptor; @@ -79,8 +79,7 @@ public class CastUtil // get the components available for this class ArrayList choices = Lists.newArrayList(); - Iterator iter = crepo.enumerateComponentIds(cclass); - CollectionUtil.addAll(choices, iter); + Iterators.addAll(choices, crepo.enumerateComponentIds(cclass)); // choose a random component if (choices.size() > 0) { diff --git a/src/java/com/threerings/jme/tools/ModelDef.java b/src/java/com/threerings/jme/tools/ModelDef.java index c4c270a5..3e2f30a6 100644 --- a/src/java/com/threerings/jme/tools/ModelDef.java +++ b/src/java/com/threerings/jme/tools/ModelDef.java @@ -34,6 +34,7 @@ import java.util.Map; import java.util.Properties; import java.util.Set; +import com.google.common.base.Objects; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; @@ -48,7 +49,6 @@ import com.jme.scene.Node; import com.jme.scene.Spatial; import com.jme.util.geom.BufferUtils; -import com.samskivert.util.ObjectUtil; import com.samskivert.util.PropertiesUtil; import com.samskivert.util.StringUtil; import com.samskivert.util.Tuple; @@ -185,7 +185,7 @@ public class ModelDef } TriMeshDef omesh = (TriMeshDef)other; return solid == omesh.solid && transparent == omesh.transparent && - ObjectUtil.equals(texture, omesh.texture) && + Objects.equal(texture, omesh.texture) && PropertiesUtil.getSubProperties(props, name).equals( PropertiesUtil.getSubProperties(props, omesh.name)); } diff --git a/src/java/com/threerings/jme/tools/ModelViewer.java b/src/java/com/threerings/jme/tools/ModelViewer.java index 4ce35f74..57d96e82 100644 --- a/src/java/com/threerings/jme/tools/ModelViewer.java +++ b/src/java/com/threerings/jme/tools/ModelViewer.java @@ -69,6 +69,7 @@ import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import javax.swing.filechooser.FileFilter; +import com.google.common.base.Objects; import com.google.common.collect.Maps; import com.jme.bounding.BoundingBox; @@ -99,7 +100,6 @@ import com.jmex.effects.particles.ParticleGeometry; import com.samskivert.swing.GroupLayout; import com.samskivert.swing.Spacer; -import com.samskivert.util.ObjectUtil; import com.samskivert.util.PrefsConfig; import com.samskivert.util.StringUtil; @@ -657,7 +657,7 @@ public class ModelViewer extends JmeCanvasApp public void setSelected (ButtonModel model, boolean b) { super.setSelected(model, b); String variant = model.getActionCommand(); - if (b && !ObjectUtil.equals(variant, _variant)) { + if (b && !Objects.equal(variant, _variant)) { setVariant(model.getActionCommand()); } } diff --git a/src/java/com/threerings/jme/util/ShaderCache.java b/src/java/com/threerings/jme/util/ShaderCache.java index 267d365f..63d77716 100644 --- a/src/java/com/threerings/jme/util/ShaderCache.java +++ b/src/java/com/threerings/jme/util/ShaderCache.java @@ -35,6 +35,7 @@ import java.util.HashSet; import org.lwjgl.opengl.ARBShaderObjects; +import com.google.common.base.Objects; import com.google.common.collect.Maps; import com.google.common.collect.Sets; @@ -45,7 +46,6 @@ import com.jme.util.ShaderUniform; import com.jme.util.geom.BufferUtils; import com.samskivert.util.ArrayUtil; -import com.samskivert.util.ObjectUtil; import com.threerings.resource.ResourceManager; @@ -241,7 +241,7 @@ public class ShaderCache public boolean equals (Object obj) { ShaderKey okey = (ShaderKey)obj; - return ObjectUtil.equals(vert, okey.vert) && ObjectUtil.equals(frag, okey.frag) && + return Objects.equal(vert, okey.vert) && Objects.equal(frag, okey.frag) && defs.equals(okey.defs); }