commit 2c19a57a29edc52a5a85af409b90980ea8119ebb
author Googler <noreply@google.com> Thu Jul 16 08:38:49 2015 +0000
committer Philipp Wollermann <philwo@google.com> Fri Jul 17 13:16:55 2015 +0000
tree 2e470c3e20e0fdc5a4debb06cd98151c321adbc7
parent c1405ef97a7be32edb0b798fb7554b2ee19894f8

Replaced other occurrences of Objects#toStringHelper with MoreObjects#toStringHelper

--
MOS_MIGRATED_REVID=98383075

src/main/java/com/google/devtools/build/skyframe/BuildingState.java

diff --git a/src/main/java/com/google/devtools/build/skyframe/BuildingState.java b/src/main/java/com/google/devtools/build/skyframe/BuildingState.java
index 01cbf8f..a1acb5c 100644
--- a/src/main/java/com/google/devtools/build/skyframe/BuildingState.java
+++ b/src/main/java/com/google/devtools/build/skyframe/BuildingState.java
@@ -13,7 +13,7 @@
 // limitations under the License.
 package com.google.devtools.build.skyframe;
 
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
@@ -407,9 +407,8 @@
   }
 
   @Override
-  @SuppressWarnings("deprecation")
   public String toString() {
-    return Objects.toStringHelper(this)  // MoreObjects is not in Guava
+    return MoreObjects.toStringHelper(this)
         .add("evaluating", evaluating)
         .add("dirtyState", dirtyState)
         .add("signaledDeps", signaledDeps)

src/main/java/com/google/devtools/build/skyframe/EvaluationResult.java

diff --git a/src/main/java/com/google/devtools/build/skyframe/EvaluationResult.java b/src/main/java/com/google/devtools/build/skyframe/EvaluationResult.java
index 92738b0..aa081a3 100644
--- a/src/main/java/com/google/devtools/build/skyframe/EvaluationResult.java
+++ b/src/main/java/com/google/devtools/build/skyframe/EvaluationResult.java
@@ -13,7 +13,7 @@
 // limitations under the License.
 package com.google.devtools.build.skyframe;
 
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterables;
@@ -127,9 +127,8 @@
   }
 
   @Override
-  @SuppressWarnings("deprecation")
   public String toString() {
-    return Objects.toStringHelper(this)  // MoreObjects is not in Guava
+    return MoreObjects.toStringHelper(this)
         .add("hasError", hasError)
         .add("errorMap", errorMap)
         .add("resultMap", resultMap)

src/main/java/com/google/devtools/build/skyframe/InMemoryNodeEntry.java

diff --git a/src/main/java/com/google/devtools/build/skyframe/InMemoryNodeEntry.java b/src/main/java/com/google/devtools/build/skyframe/InMemoryNodeEntry.java
index ed28f4e..16dbe24 100644
--- a/src/main/java/com/google/devtools/build/skyframe/InMemoryNodeEntry.java
+++ b/src/main/java/com/google/devtools/build/skyframe/InMemoryNodeEntry.java
@@ -14,7 +14,7 @@
 package com.google.devtools.build.skyframe;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
@@ -408,9 +408,8 @@
   }
 
   @Override
-  @SuppressWarnings("deprecation")
   public String toString() {
-    return Objects.toStringHelper(this)  // MoreObjects is not in Guava
+    return MoreObjects.toStringHelper(this)
         .add("value", value)
         .add("version", version)
         .add("directDeps", directDeps == null ? null : GroupedList.create(directDeps))

src/main/java/com/google/devtools/build/skyframe/ReverseDepsUtil.java

diff --git a/src/main/java/com/google/devtools/build/skyframe/ReverseDepsUtil.java b/src/main/java/com/google/devtools/build/skyframe/ReverseDepsUtil.java
index 13d8c4b..b5b295b 100644
--- a/src/main/java/com/google/devtools/build/skyframe/ReverseDepsUtil.java
+++ b/src/main/java/com/google/devtools/build/skyframe/ReverseDepsUtil.java
@@ -13,7 +13,7 @@
 // limitations under the License.
 package com.google.devtools.build.skyframe;
 
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
@@ -190,9 +190,8 @@
     setReverseDepsToRemove(container, null);
   }
 
-  @SuppressWarnings("deprecation")
   String toString(T container) {
-    return Objects.toStringHelper("ReverseDeps") // MoreObjects is not in Guava
+    return MoreObjects.toStringHelper("ReverseDeps")
         .add("reverseDeps", getReverseDepsObject(container))
         .add("singleReverseDep", isSingleReverseDep(container))
         .add("reverseDepsToRemove", getReverseDepsToRemove(container))