1 files changed, 39 insertions, 46 deletions

diff --git a/guava/src/com/google/common/collect/ImmutableSetMultimap.java b/guava/src/com/google/common/collect/ImmutableSetMultimap.java
index 6eedf1a..04a6978 100644
--- a/guava/src/com/google/common/collect/ImmutableSetMultimap.java
+++ b/guava/src/com/google/common/collect/ImmutableSetMultimap.java
@@ -18,9 +18,9 @@ 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 com.google.common.annotations.GwtIncompatible;
-import com.google.common.base.Function;
 
 import java.io.IOException;
 import java.io.InvalidObjectException;
@@ -28,12 +28,10 @@ import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
 import java.util.Map.Entry;
+import java.util.TreeMap;
 
 import javax.annotation.Nullable;
 
@@ -53,10 +51,6 @@ 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 Mike Ward
  * @since 2.0 (imported from Google Collections Library)
  */
@@ -151,7 +145,7 @@ public class ImmutableSetMultimap<K, V>
    * Multimap for {@link ImmutableSetMultimap.Builder} that maintains key
    * and value orderings and performs better than {@link LinkedHashMultimap}.
    */
-  private static class BuilderMultimap<K, V> extends AbstractMapBasedMultimap<K, V> {
+  private static class BuilderMultimap<K, V> extends AbstractMultimap<K, V> {
     BuilderMultimap() {
       super(new LinkedHashMap<K, Collection<V>>());
     }
@@ -162,6 +156,23 @@ public class ImmutableSetMultimap<K, V>
   }
 
   /**
+   * Multimap for {@link ImmutableSetMultimap.Builder} that sorts keys and
+   * maintains value orderings.
+   */
+  private static class SortedKeyBuilderMultimap<K, V> 
+      extends AbstractMultimap<K, V> {
+    SortedKeyBuilderMultimap(
+        Comparator<? super K> keyComparator, Multimap<K, V> multimap) {
+      super(new TreeMap<K, Collection<V>>(keyComparator));
+      putAll(multimap);
+    }
+    @Override Collection<V> createCollection() {
+      return Sets.newLinkedHashSet();
+    }
+    private static final long serialVersionUID = 0;
+  }
+  
+  /**
    * A builder for creating immutable {@code SetMultimap} instances, especially
    * {@code public static final} multimaps ("constant multimaps"). Example:
    * <pre>   {@code
@@ -186,7 +197,7 @@ public class ImmutableSetMultimap<K, V>
      * generated by {@link ImmutableSetMultimap#builder}.
      */
     public Builder() {
-      builderMultimap = new BuilderMultimap<K, V>();
+      builderMultimap = new BuilderMultimap<K, V>();      
     }
 
     /**
@@ -235,25 +246,26 @@ public class ImmutableSetMultimap<K, V>
      *
      * @since 8.0
      */
-    @Override
+    @Beta @Override
     public Builder<K, V> orderKeysBy(Comparator<? super K> keyComparator) {
-      this.keyComparator = checkNotNull(keyComparator);
+      builderMultimap = new SortedKeyBuilderMultimap<K, V>(
+          checkNotNull(keyComparator), builderMultimap);
       return this;
     }
 
     /**
      * Specifies the ordering of the generated multimap's values for each key.
-     *
-     * <p>If this method is called, the sets returned by the {@code get()}
+     * 
+     * <p>If this method is called, the sets returned by the {@code get()} 
      * method of the generated multimap and its {@link Multimap#asMap()} view
      * are {@link ImmutableSortedSet} instances. However, serialization does not
      * preserve that property, though it does maintain the key and value
      * ordering.
-     *
+     * 
      * @since 8.0
      */
     // TODO: Make serialization behavior consistent.
-    @Override
+    @Beta @Override
     public Builder<K, V> orderValuesBy(Comparator<? super V> valueComparator) {
       super.orderValuesBy(valueComparator);
       return this;
@@ -263,23 +275,6 @@ public class ImmutableSetMultimap<K, V>
      * Returns a newly-created immutable set multimap.
      */
     @Override public ImmutableSetMultimap<K, V> build() {
-      if (keyComparator != null) {
-        Multimap<K, V> sortedCopy = new BuilderMultimap<K, V>();
-        List<Map.Entry<K, Collection<V>>> entries = Lists.newArrayList(
-            builderMultimap.asMap().entrySet());
-        Collections.sort(
-            entries,
-            Ordering.from(keyComparator).onResultOf(new Function<Entry<K, Collection<V>>, K>() {
-              @Override
-              public K apply(Entry<K, Collection<V>> entry) {
-                return entry.getKey();
-              }
-            }));
-        for (Map.Entry<K, Collection<V>> entry : entries) {
-          sortedCopy.putAll(entry.getKey(), entry.getValue());
-        }
-        builderMultimap = sortedCopy;
-      }
       return copyOf(builderMultimap, valueComparator);
     }
   }
@@ -302,7 +297,7 @@ public class ImmutableSetMultimap<K, V>
       Multimap<? extends K, ? extends V> multimap) {
     return copyOf(multimap, null);
   }
-
+  
   private static <K, V> ImmutableSetMultimap<K, V> copyOf(
       Multimap<? extends K, ? extends V> multimap,
       Comparator<? super V> valueComparator) {
@@ -328,7 +323,7 @@ public class ImmutableSetMultimap<K, V>
       K key = entry.getKey();
       Collection<? extends V> values = entry.getValue();
       ImmutableSet<V> set = (valueComparator == null)
-          ? ImmutableSet.copyOf(values)
+          ? ImmutableSet.copyOf(values) 
           : ImmutableSortedSet.copyOf(valueComparator, values);
       if (!set.isEmpty()) {
         builder.put(key, set);
@@ -343,10 +338,10 @@ public class ImmutableSetMultimap<K, V>
   // Returned by get() when values are sorted and a missing key is provided.
   private final transient ImmutableSortedSet<V> emptySet;
 
-  ImmutableSetMultimap(ImmutableMap<K, ImmutableSet<V>> map, int size,
+  ImmutableSetMultimap(ImmutableMap<K, ImmutableSet<V>> map, int size, 
       @Nullable Comparator<? super V> valueComparator) {
     super(map, size);
-    this.emptySet = (valueComparator == null)
+    this.emptySet = (valueComparator == null) 
         ? null : ImmutableSortedSet.<V>emptySet(valueComparator);
   }
 
@@ -375,13 +370,13 @@ public class ImmutableSetMultimap<K, V>
   /**
    * {@inheritDoc}
    *
-   * <p>Because an inverse of a set multimap cannot contain multiple pairs with
-   * the same key and value, this method returns an {@code ImmutableSetMultimap}
-   * rather than the {@code ImmutableMultimap} specified in the {@code
-   * ImmutableMultimap} class.
+   * <p>Because an inverse of a set multimap cannot contain multiple pairs with the same key and
+   * value, this method returns an {@code ImmutableSetMultimap} rather than the
+   * {@code ImmutableMultimap} specified in the {@code ImmutableMultimap} class.
    *
-   * @since 11.0
+   * @since 11
    */
+  @Beta
   public ImmutableSetMultimap<V, K> inverse() {
     ImmutableSetMultimap<V, K> result = inverse;
     return (result == null) ? (inverse = invert()) : result;
@@ -401,9 +396,8 @@ public class ImmutableSetMultimap<K, V>
    * Guaranteed to throw an exception and leave the multimap unmodified.
    *
    * @throws UnsupportedOperationException always
-   * @deprecated Unsupported operation.
    */
-  @Deprecated @Override public ImmutableSet<V> removeAll(Object key) {
+  @Override public ImmutableSet<V> removeAll(Object key) {
     throw new UnsupportedOperationException();
   }
 
@@ -411,9 +405,8 @@ public class ImmutableSetMultimap<K, V>
    * Guaranteed to throw an exception and leave the multimap unmodified.
    *
    * @throws UnsupportedOperationException always
-   * @deprecated Unsupported operation.
    */
-  @Deprecated @Override public ImmutableSet<V> replaceValues(
+  @Override public ImmutableSet<V> replaceValues(
       K key, Iterable<? extends V> values) {
     throw new UnsupportedOperationException();
   }