/*
 * Copyright (C) 2010 Herve Quiroz
 *
 * This library is free software; you can redistribute it and/or modify it under
 * the terms of the GNU Lesser General Public License as published by the Free
 * Software Foundation; either version 2.1 of the License, or (at your option)
 * any later version.
 * 
 * This library is distributed in the hope that it will be useful, but WITHOUT
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
 * details.
 * 
 * You should have received a copy of the GNU Lesser General Public License
 * along with this library; if not, write to the Free Software Foundation, Inc.,
 * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 
 */
package org.trancecode.collection;

import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;

import java.util.Set;

/**
 * Utility methods related to {@link Set}.
 * 
 * @author Herve Quiroz
 */
public final class TcSets
{
    public static <T> ImmutableSet<T> immutableSet(final Iterable<T> set, final T element)
    {
        return ImmutableSet.copyOf(Iterables.concat(set, ImmutableSet.of(element)));
    }

    public static <T> ImmutableSet<T> immutableSet(final Set<T> set1, final Set<T> set2)
    {
        Preconditions.checkNotNull(set1);
        Preconditions.checkNotNull(set2);

        if (set1.isEmpty())
        {
            return ImmutableSet.copyOf(set2);
        }

        if (set2.isEmpty())
        {
            return ImmutableSet.copyOf(set1);
        }

        return ImmutableSet.copyOf(Iterables.concat(set1, set2));
    }

    private TcSets()
    {
        // No instantiation
    }
}

@@ -940,18 +940,58 @@
 ct.I
-terables;%0A
+mmutableSet.Builder;%0A%0Aimport java.util.Collection;
 %0Aimp
@@ -1226,72 +1226,332 @@
     
-return ImmutableSet.copyOf(Iterables.concat(set, ImmutableSet.of
+Preconditions.checkNotNull(set);%0A        Preconditions.checkNotNull(element);%0A%0A        if (set instanceof Collection && ((Collection%3C?%3E) set).contains(element))%0A        %7B%0A            return ImmutableSet.copyOf(set);%0A        %7D%0A%0A        final Builder%3CT%3E builder = ImmutableSet.builder();%0A        return builder.addAll(set).add
 (ele
@@ -1555,17 +1555,23 @@
 element)
-)
+.build(
 );%0A    %7D
@@ -1954,63 +1954,114 @@
     
-return ImmutableSet.copyOf(Iterables.concat(set1, set2)
+final Builder%3CT%3E builder = ImmutableSet.builder();%0A        return builder.addAll(set1).addAll(set2).build(
 );%0A 

Improve TcSets utility methods