am 84fb43aa: Merge "Revert "Upgraded Guava to unmodified v14.0.1""

* commit '84fb43aa6a1e752487f2624055ff26b1b6b7c043':
  Revert "Upgraded Guava to unmodified v14.0.1"

1 files changed, 15 insertions, 21 deletions

diff --git a/guava/src/com/google/common/collect/ImmutableTable.java b/guava/src/com/google/common/collect/ImmutableTable.java
index 8296a83..debd49b 100644
--- a/guava/src/com/google/common/collect/ImmutableTable.java
+++ b/guava/src/com/google/common/collect/ImmutableTable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 The Guava Authors
+ * Copyright (C) 2009 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@ package com.google.common.collect;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import com.google.common.annotations.Beta;
 import com.google.common.annotations.GwtCompatible;
 
 import java.util.Comparator;
@@ -34,13 +35,10 @@ import javax.annotation.Nullable;
  * it has no public or protected constructors. Thus, instances of this class are
  * guaranteed to be immutable.
  *
- * <p>See the Guava User Guide article on <a href=
- * "http://code.google.com/p/guava-libraries/wiki/ImmutableCollectionsExplained">
- * immutable collections</a>.
- *
- * @author Gregory Kick
+ * @author gak@google.com (Gregory Kick)
  * @since 11.0
  */
+@Beta
 @GwtCompatible
 // TODO(gak): make serializable
 public abstract class ImmutableTable<R, C, V> implements Table<R, C, V> {
@@ -72,7 +70,7 @@ public abstract class ImmutableTable<R, C, V> implements Table<R, C, V> {
    */
   public static final <R, C, V> ImmutableTable<R, C, V> copyOf(
       Table<? extends R, ? extends C, ? extends V> table) {
-    if (table instanceof ImmutableTable) {
+    if (table instanceof ImmutableTable<?, ?, ?>) {
       @SuppressWarnings("unchecked")
       ImmutableTable<R, C, V> parameterizedTable
           = (ImmutableTable<R, C, V>) table;
@@ -106,7 +104,7 @@ public abstract class ImmutableTable<R, C, V> implements Table<R, C, V> {
 
   /**
    * Returns a new builder. The generated builder is equivalent to the builder
-   * created by the {@link Builder#ImmutableTable.Builder()} constructor.
+   * created by the {@link Builder#Builder()} constructor.
    */
   public static final <R, C, V> Builder<R, C, V> builder() {
     return new Builder<R, C, V>();
@@ -256,8 +254,8 @@ public abstract class ImmutableTable<R, C, V> implements Table<R, C, V> {
   /**
    * {@inheritDoc}
    *
-   * <p>The value {@code Map<R, V>} instances in the returned map are
-   * {@link ImmutableMap} instances as well.
+   * <p>The value {@code Map<R, V>}s in the returned map are
+   * {@link ImmutableMap}s as well.
    */
   @Override public abstract ImmutableMap<C, Map<R, V>> columnMap();
 
@@ -273,8 +271,8 @@ public abstract class ImmutableTable<R, C, V> implements Table<R, C, V> {
   /**
    * {@inheritDoc}
    *
-   * <p>The value {@code Map<C, V>} instances in the returned map are
-   * {@link ImmutableMap} instances as well.
+   * <p>The value {@code Map<C, V>}s in the returned map are
+   * {@link ImmutableMap}s as well.
    */
   @Override public abstract ImmutableMap<R, Map<C, V>> rowMap();
 
@@ -282,9 +280,8 @@ public abstract class ImmutableTable<R, C, V> implements Table<R, C, V> {
    * Guaranteed to throw an exception and leave the table unmodified.
    *
    * @throws UnsupportedOperationException always
-   * @deprecated Unsupported operation.
    */
-  @Deprecated @Override public final void clear() {
+  @Override public final void clear() {
     throw new UnsupportedOperationException();
   }
 
@@ -292,9 +289,8 @@ public abstract class ImmutableTable<R, C, V> implements Table<R, C, V> {
    * Guaranteed to throw an exception and leave the table unmodified.
    *
    * @throws UnsupportedOperationException always
-   * @deprecated Unsupported operation.
    */
-  @Deprecated @Override public final V put(R rowKey, C columnKey, V value) {
+  @Override public final V put(R rowKey, C columnKey, V value) {
     throw new UnsupportedOperationException();
   }
 
@@ -302,9 +298,8 @@ public abstract class ImmutableTable<R, C, V> implements Table<R, C, V> {
    * Guaranteed to throw an exception and leave the table unmodified.
    *
    * @throws UnsupportedOperationException always
-   * @deprecated Unsupported operation.
    */
-  @Deprecated @Override public final void putAll(
+  @Override public final void putAll(
       Table<? extends R, ? extends C, ? extends V> table) {
     throw new UnsupportedOperationException();
   }
@@ -313,16 +308,15 @@ public abstract class ImmutableTable<R, C, V> implements Table<R, C, V> {
    * Guaranteed to throw an exception and leave the table unmodified.
    *
    * @throws UnsupportedOperationException always
-   * @deprecated Unsupported operation.
    */
-  @Deprecated @Override public final V remove(Object rowKey, Object columnKey) {
+  @Override public final V remove(Object rowKey, Object columnKey) {
     throw new UnsupportedOperationException();
   }
 
   @Override public boolean equals(@Nullable Object obj) {
     if (obj == this) {
       return true;
-    } else if (obj instanceof Table) {
+    } else if (obj instanceof Table<?, ?, ?>) {
       Table<?, ?, ?> that = (Table<?, ?, ?>) obj;
       return this.cellSet().equals(that.cellSet());
     } else {