WebSVN - OpenConcerto - Diff - Rev 149 and 177 - /trunk/OpenConcerto/src/org/openconcerto/utils/cc/IncludeExclude.java

 import org.openconcerto.utils.CollectionUtils;
 import org.openconcerto.utils.CompareUtils;
 import org.openconcerto.utils.Tuple2;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
     @SuppressWarnings("unchecked")
     public static <T> IncludeExclude<T> getFull() {
         return (IncludeExclude<T>) FULL;
+    }
+    @SafeVarargs
+    public static <T> IncludeExclude<T> getNormalized(final T... includes) {
+        return getNormalized(Arrays.asList(includes));
+    }
     public static <T> IncludeExclude<T> getNormalized(final Collection<? extends T> includes) {
         return getNormalized(includes, Collections.<T> emptySet());
+    }
     public static <T> IncludeExclude<T> getNormalized(final Collection<? extends T> includes, final Collection<? extends T> excludes) {
+     *
      * @param s an object to test.
      * @return <code>true</code> if is in include and not in exclude.
      */
     public final boolean isIncluded(final T s) {
+        // "if" order is irrelevant since those methods use getNormal() and it can't be both "all"
+        // and "none".
         if (this.isAllIncluded())
             return true;
         else if (this.isNoneIncluded())
             return false;
         else
      * Whether this includes all objects.
+     *
      * @return <code>true</code> if {@link #isIncluded(Object)} always return <code>true</code>
      */
     public final boolean isAllIncluded() {
+        // use normalized value to avoid ambiguous "include all" and "exclude all"
         return this.normal == FULL;
+    }
     /**
      * Whether this includes no objects.
+     *
      * @return <code>true</code> if {@link #isIncluded(Object)} always return <code>false</code>
      */
     public final boolean isNoneIncluded() {
+        // use normalized value to avoid ambiguous "include all" and "exclude all"
         return this.normal == EMPTY;
+    }
     /**
      * The one and only object included by this.
             return sole.get1();
         else
             return ifNoSole;
+    }
+    @SafeVarargs
+    public final IncludeExclude<T> include(final T... items) {
+        return this.include(Arrays.asList(items));
+    }
     public final IncludeExclude<T> include(final Collection<? extends T> items) {
         if (this.areAllIncluded(items))
             return this;
         else if (this.excludes == null)
             throw new IllegalStateException("Cannot include an item when excluding all");
+        }
         return new IncludeExclude<T>(newIncludes, newExcludes, false, false);
+    }
+    @SafeVarargs
+    public final IncludeExclude<T> exclude(final T... items) {
+        return this.exclude(Arrays.asList(items));
+    }
     public final IncludeExclude<T> exclude(final Collection<? extends T> items) {
         if (this.areNoneIncluded(items))
             return this;
         assert this.excludes != null : "!areNoneIncluded() but this.excludes == null";

Dépôt officiel du code source de l'ERP OpenConcerto

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/utils/cc/IncludeExclude.java - Rev 149 → 177