2007-01-09 19:58:05 +00:00
|
|
|
/* EnumSet.java - Set of enum objects
|
|
|
|
Copyright (C) 2004, 2005 Free Software Foundation, Inc.
|
|
|
|
|
|
|
|
This file is part of GNU Classpath.
|
|
|
|
|
|
|
|
GNU Classpath is free software; you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
|
|
any later version.
|
|
|
|
|
|
|
|
GNU Classpath 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
|
|
|
|
General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with GNU Classpath; see the file COPYING. If not, write to the
|
|
|
|
Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
|
|
02110-1301 USA.
|
|
|
|
|
|
|
|
Linking this library statically or dynamically with other modules is
|
|
|
|
making a combined work based on this library. Thus, the terms and
|
|
|
|
conditions of the GNU General Public License cover the whole
|
|
|
|
combination.
|
|
|
|
|
|
|
|
As a special exception, the copyright holders of this library give you
|
|
|
|
permission to link this library with independent modules to produce an
|
|
|
|
executable, regardless of the license terms of these independent
|
|
|
|
modules, and to copy and distribute the resulting executable under
|
|
|
|
terms of your choice, provided that you also meet, for each linked
|
|
|
|
independent module, the terms and conditions of the license of that
|
|
|
|
module. An independent module is a module which is not derived from
|
|
|
|
or based on this library. If you modify this library, you may extend
|
|
|
|
this exception to your version of the library, but you are not
|
|
|
|
obligated to do so. If you do not wish to do so, delete this
|
|
|
|
exception statement from your version. */
|
|
|
|
|
|
|
|
|
|
|
|
package java.util;
|
|
|
|
|
|
|
|
import java.io.Serializable;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @author Tom Tromey (tromey@redhat.com)
|
|
|
|
* @author Andrew John Hughes (gnu_andrew@member.fsf.org)
|
re PR classpath/32844 (EnumSet causes code to be miscompiled)
2007-07-31 Dalibor Topic <robilad@kaffe.org>
PR 32844
* java/util/EnumSet.java:
Made class abstract per API spec.
(size, iterator, add, addAll, clear, contains,
containsAll, remove, removeAll, retainAll) Moved
into an anonymous inner class in of(T).
(allOf, noneOf, copyOf, of, range) Made more
implementation independent.
(of(T)) return an instance of an anonymous class
implementing EmptySet.
From-SVN: r127291
2007-08-08 08:00:32 +00:00
|
|
|
* @author Dalibor Topic (robilad@kaffe.org)
|
2007-01-09 19:58:05 +00:00
|
|
|
* @since 1.5
|
|
|
|
*/
|
|
|
|
|
re PR classpath/32844 (EnumSet causes code to be miscompiled)
2007-07-31 Dalibor Topic <robilad@kaffe.org>
PR 32844
* java/util/EnumSet.java:
Made class abstract per API spec.
(size, iterator, add, addAll, clear, contains,
containsAll, remove, removeAll, retainAll) Moved
into an anonymous inner class in of(T).
(allOf, noneOf, copyOf, of, range) Made more
implementation independent.
(of(T)) return an instance of an anonymous class
implementing EmptySet.
From-SVN: r127291
2007-08-08 08:00:32 +00:00
|
|
|
// FIXME: serialization is special, uses SerializationProxy.
|
|
|
|
// of(E e) is the 'bottom' method that creates a real EnumSet.
|
|
|
|
public abstract class EnumSet<T extends Enum<T>>
|
2007-01-09 19:58:05 +00:00
|
|
|
extends AbstractSet<T>
|
|
|
|
implements Cloneable, Serializable
|
|
|
|
{
|
|
|
|
private static final long serialVersionUID = 4782406773684236311L;
|
|
|
|
|
re PR classpath/32844 (EnumSet causes code to be miscompiled)
2007-07-31 Dalibor Topic <robilad@kaffe.org>
PR 32844
* java/util/EnumSet.java:
Made class abstract per API spec.
(size, iterator, add, addAll, clear, contains,
containsAll, remove, removeAll, retainAll) Moved
into an anonymous inner class in of(T).
(allOf, noneOf, copyOf, of, range) Made more
implementation independent.
(of(T)) return an instance of an anonymous class
implementing EmptySet.
From-SVN: r127291
2007-08-08 08:00:32 +00:00
|
|
|
// These fields could go into the anonymous inner class in of(E),
|
|
|
|
// complementOf would need to be refactored then, though.
|
2007-01-09 19:58:05 +00:00
|
|
|
BitSet store;
|
|
|
|
int cardinality;
|
|
|
|
Class<T> enumClass;
|
|
|
|
|
|
|
|
EnumSet()
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
public EnumSet<T> clone()
|
|
|
|
{
|
|
|
|
EnumSet<T> r;
|
|
|
|
|
|
|
|
try
|
|
|
|
{
|
|
|
|
r = (EnumSet<T>) super.clone();
|
|
|
|
}
|
|
|
|
catch (CloneNotSupportedException _)
|
|
|
|
{
|
|
|
|
/* Can't happen */
|
|
|
|
return null;
|
|
|
|
}
|
|
|
|
r.store = (BitSet) store.clone();
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
re PR classpath/32844 (EnumSet causes code to be miscompiled)
2007-07-31 Dalibor Topic <robilad@kaffe.org>
PR 32844
* java/util/EnumSet.java:
Made class abstract per API spec.
(size, iterator, add, addAll, clear, contains,
containsAll, remove, removeAll, retainAll) Moved
into an anonymous inner class in of(T).
(allOf, noneOf, copyOf, of, range) Made more
implementation independent.
(of(T)) return an instance of an anonymous class
implementing EmptySet.
From-SVN: r127291
2007-08-08 08:00:32 +00:00
|
|
|
public static <T extends Enum<T>> EnumSet<T> allOf(Class<T> eltType)
|
2007-01-09 19:58:05 +00:00
|
|
|
{
|
re PR classpath/32844 (EnumSet causes code to be miscompiled)
2007-07-31 Dalibor Topic <robilad@kaffe.org>
PR 32844
* java/util/EnumSet.java:
Made class abstract per API spec.
(size, iterator, add, addAll, clear, contains,
containsAll, remove, removeAll, retainAll) Moved
into an anonymous inner class in of(T).
(allOf, noneOf, copyOf, of, range) Made more
implementation independent.
(of(T)) return an instance of an anonymous class
implementing EmptySet.
From-SVN: r127291
2007-08-08 08:00:32 +00:00
|
|
|
// create an EnumSet from the list of values of the type
|
|
|
|
return copyOf(Arrays.asList(eltType.getEnumConstants()));
|
2007-01-09 19:58:05 +00:00
|
|
|
}
|
|
|
|
|
re PR classpath/32844 (EnumSet causes code to be miscompiled)
2007-07-31 Dalibor Topic <robilad@kaffe.org>
PR 32844
* java/util/EnumSet.java:
Made class abstract per API spec.
(size, iterator, add, addAll, clear, contains,
containsAll, remove, removeAll, retainAll) Moved
into an anonymous inner class in of(T).
(allOf, noneOf, copyOf, of, range) Made more
implementation independent.
(of(T)) return an instance of an anonymous class
implementing EmptySet.
From-SVN: r127291
2007-08-08 08:00:32 +00:00
|
|
|
public static <T extends Enum<T>> EnumSet<T> noneOf(Class<T> eltType)
|
2007-01-09 19:58:05 +00:00
|
|
|
{
|
re PR classpath/32844 (EnumSet causes code to be miscompiled)
2007-07-31 Dalibor Topic <robilad@kaffe.org>
PR 32844
* java/util/EnumSet.java:
Made class abstract per API spec.
(size, iterator, add, addAll, clear, contains,
containsAll, remove, removeAll, retainAll) Moved
into an anonymous inner class in of(T).
(allOf, noneOf, copyOf, of, range) Made more
implementation independent.
(of(T)) return an instance of an anonymous class
implementing EmptySet.
From-SVN: r127291
2007-08-08 08:00:32 +00:00
|
|
|
return complementOf(allOf(eltType));
|
|
|
|
}
|
2007-01-09 19:58:05 +00:00
|
|
|
|
re PR classpath/32844 (EnumSet causes code to be miscompiled)
2007-07-31 Dalibor Topic <robilad@kaffe.org>
PR 32844
* java/util/EnumSet.java:
Made class abstract per API spec.
(size, iterator, add, addAll, clear, contains,
containsAll, remove, removeAll, retainAll) Moved
into an anonymous inner class in of(T).
(allOf, noneOf, copyOf, of, range) Made more
implementation independent.
(of(T)) return an instance of an anonymous class
implementing EmptySet.
From-SVN: r127291
2007-08-08 08:00:32 +00:00
|
|
|
public static <T extends Enum<T>> EnumSet<T> copyOf(EnumSet<T> other)
|
|
|
|
{
|
|
|
|
return other.clone();
|
|
|
|
}
|
2007-01-09 19:58:05 +00:00
|
|
|
|
re PR classpath/32844 (EnumSet causes code to be miscompiled)
2007-07-31 Dalibor Topic <robilad@kaffe.org>
PR 32844
* java/util/EnumSet.java:
Made class abstract per API spec.
(size, iterator, add, addAll, clear, contains,
containsAll, remove, removeAll, retainAll) Moved
into an anonymous inner class in of(T).
(allOf, noneOf, copyOf, of, range) Made more
implementation independent.
(of(T)) return an instance of an anonymous class
implementing EmptySet.
From-SVN: r127291
2007-08-08 08:00:32 +00:00
|
|
|
public static <T extends Enum<T>> EnumSet<T> copyOf(Collection<T> other)
|
|
|
|
{
|
|
|
|
if (other instanceof EnumSet)
|
|
|
|
return copyOf((EnumSet<T>) other);
|
|
|
|
if (other.isEmpty())
|
|
|
|
throw new IllegalArgumentException("Collection is empty");
|
2007-01-09 19:58:05 +00:00
|
|
|
|
re PR classpath/32844 (EnumSet causes code to be miscompiled)
2007-07-31 Dalibor Topic <robilad@kaffe.org>
PR 32844
* java/util/EnumSet.java:
Made class abstract per API spec.
(size, iterator, add, addAll, clear, contains,
containsAll, remove, removeAll, retainAll) Moved
into an anonymous inner class in of(T).
(allOf, noneOf, copyOf, of, range) Made more
implementation independent.
(of(T)) return an instance of an anonymous class
implementing EmptySet.
From-SVN: r127291
2007-08-08 08:00:32 +00:00
|
|
|
EnumSet<T> r = null;
|
|
|
|
|
|
|
|
for (T val : other)
|
2007-01-09 19:58:05 +00:00
|
|
|
{
|
re PR classpath/32844 (EnumSet causes code to be miscompiled)
2007-07-31 Dalibor Topic <robilad@kaffe.org>
PR 32844
* java/util/EnumSet.java:
Made class abstract per API spec.
(size, iterator, add, addAll, clear, contains,
containsAll, remove, removeAll, retainAll) Moved
into an anonymous inner class in of(T).
(allOf, noneOf, copyOf, of, range) Made more
implementation independent.
(of(T)) return an instance of an anonymous class
implementing EmptySet.
From-SVN: r127291
2007-08-08 08:00:32 +00:00
|
|
|
if (r == null)
|
|
|
|
r = of(val);
|
|
|
|
else
|
|
|
|
r.add(val);
|
2007-01-09 19:58:05 +00:00
|
|
|
}
|
re PR classpath/32844 (EnumSet causes code to be miscompiled)
2007-07-31 Dalibor Topic <robilad@kaffe.org>
PR 32844
* java/util/EnumSet.java:
Made class abstract per API spec.
(size, iterator, add, addAll, clear, contains,
containsAll, remove, removeAll, retainAll) Moved
into an anonymous inner class in of(T).
(allOf, noneOf, copyOf, of, range) Made more
implementation independent.
(of(T)) return an instance of an anonymous class
implementing EmptySet.
From-SVN: r127291
2007-08-08 08:00:32 +00:00
|
|
|
|
|
|
|
return r;
|
2007-01-09 19:58:05 +00:00
|
|
|
}
|
|
|
|
|
re PR classpath/32844 (EnumSet causes code to be miscompiled)
2007-07-31 Dalibor Topic <robilad@kaffe.org>
PR 32844
* java/util/EnumSet.java:
Made class abstract per API spec.
(size, iterator, add, addAll, clear, contains,
containsAll, remove, removeAll, retainAll) Moved
into an anonymous inner class in of(T).
(allOf, noneOf, copyOf, of, range) Made more
implementation independent.
(of(T)) return an instance of an anonymous class
implementing EmptySet.
From-SVN: r127291
2007-08-08 08:00:32 +00:00
|
|
|
public static <T extends Enum<T>> EnumSet<T> complementOf(EnumSet<T> other)
|
2007-01-09 19:58:05 +00:00
|
|
|
{
|
re PR classpath/32844 (EnumSet causes code to be miscompiled)
2007-07-31 Dalibor Topic <robilad@kaffe.org>
PR 32844
* java/util/EnumSet.java:
Made class abstract per API spec.
(size, iterator, add, addAll, clear, contains,
containsAll, remove, removeAll, retainAll) Moved
into an anonymous inner class in of(T).
(allOf, noneOf, copyOf, of, range) Made more
implementation independent.
(of(T)) return an instance of an anonymous class
implementing EmptySet.
From-SVN: r127291
2007-08-08 08:00:32 +00:00
|
|
|
EnumSet<T> r = other.clone();
|
|
|
|
r.store.flip(0, r.store.size());
|
|
|
|
r.cardinality = r.store.size() - other.cardinality;
|
|
|
|
return r;
|
2007-01-09 19:58:05 +00:00
|
|
|
}
|
|
|
|
|
re PR classpath/32844 (EnumSet causes code to be miscompiled)
2007-07-31 Dalibor Topic <robilad@kaffe.org>
PR 32844
* java/util/EnumSet.java:
Made class abstract per API spec.
(size, iterator, add, addAll, clear, contains,
containsAll, remove, removeAll, retainAll) Moved
into an anonymous inner class in of(T).
(allOf, noneOf, copyOf, of, range) Made more
implementation independent.
(of(T)) return an instance of an anonymous class
implementing EmptySet.
From-SVN: r127291
2007-08-08 08:00:32 +00:00
|
|
|
public static <T extends Enum<T>> EnumSet<T> of(T first)
|
2007-01-09 19:58:05 +00:00
|
|
|
{
|
re PR classpath/32844 (EnumSet causes code to be miscompiled)
2007-07-31 Dalibor Topic <robilad@kaffe.org>
PR 32844
* java/util/EnumSet.java:
Made class abstract per API spec.
(size, iterator, add, addAll, clear, contains,
containsAll, remove, removeAll, retainAll) Moved
into an anonymous inner class in of(T).
(allOf, noneOf, copyOf, of, range) Made more
implementation independent.
(of(T)) return an instance of an anonymous class
implementing EmptySet.
From-SVN: r127291
2007-08-08 08:00:32 +00:00
|
|
|
EnumSet<T> r = new EnumSet<T>()
|
|
|
|
{
|
|
|
|
public boolean add(T val)
|
|
|
|
{
|
|
|
|
if (store.get(val.ordinal()))
|
|
|
|
return false;
|
|
|
|
|
|
|
|
store.set(val.ordinal());
|
|
|
|
++cardinality;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
public boolean addAll(Collection<? extends T> c)
|
2007-01-09 19:58:05 +00:00
|
|
|
{
|
re PR classpath/32844 (EnumSet causes code to be miscompiled)
2007-07-31 Dalibor Topic <robilad@kaffe.org>
PR 32844
* java/util/EnumSet.java:
Made class abstract per API spec.
(size, iterator, add, addAll, clear, contains,
containsAll, remove, removeAll, retainAll) Moved
into an anonymous inner class in of(T).
(allOf, noneOf, copyOf, of, range) Made more
implementation independent.
(of(T)) return an instance of an anonymous class
implementing EmptySet.
From-SVN: r127291
2007-08-08 08:00:32 +00:00
|
|
|
boolean result = false;
|
|
|
|
if (c instanceof EnumSet)
|
|
|
|
{
|
|
|
|
EnumSet<T> other = (EnumSet<T>) c;
|
|
|
|
if (enumClass == other.enumClass)
|
2007-01-09 19:58:05 +00:00
|
|
|
{
|
|
|
|
store.or(other.store);
|
|
|
|
int save = cardinality;
|
|
|
|
cardinality = store.cardinality();
|
|
|
|
result = save != cardinality;
|
|
|
|
}
|
re PR classpath/32844 (EnumSet causes code to be miscompiled)
2007-07-31 Dalibor Topic <robilad@kaffe.org>
PR 32844
* java/util/EnumSet.java:
Made class abstract per API spec.
(size, iterator, add, addAll, clear, contains,
containsAll, remove, removeAll, retainAll) Moved
into an anonymous inner class in of(T).
(allOf, noneOf, copyOf, of, range) Made more
implementation independent.
(of(T)) return an instance of an anonymous class
implementing EmptySet.
From-SVN: r127291
2007-08-08 08:00:32 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
for (T val : c)
|
2007-01-09 19:58:05 +00:00
|
|
|
{
|
|
|
|
if (add (val))
|
re PR classpath/32844 (EnumSet causes code to be miscompiled)
2007-07-31 Dalibor Topic <robilad@kaffe.org>
PR 32844
* java/util/EnumSet.java:
Made class abstract per API spec.
(size, iterator, add, addAll, clear, contains,
containsAll, remove, removeAll, retainAll) Moved
into an anonymous inner class in of(T).
(allOf, noneOf, copyOf, of, range) Made more
implementation independent.
(of(T)) return an instance of an anonymous class
implementing EmptySet.
From-SVN: r127291
2007-08-08 08:00:32 +00:00
|
|
|
result = true;
|
2007-01-09 19:58:05 +00:00
|
|
|
}
|
re PR classpath/32844 (EnumSet causes code to be miscompiled)
2007-07-31 Dalibor Topic <robilad@kaffe.org>
PR 32844
* java/util/EnumSet.java:
Made class abstract per API spec.
(size, iterator, add, addAll, clear, contains,
containsAll, remove, removeAll, retainAll) Moved
into an anonymous inner class in of(T).
(allOf, noneOf, copyOf, of, range) Made more
implementation independent.
(of(T)) return an instance of an anonymous class
implementing EmptySet.
From-SVN: r127291
2007-08-08 08:00:32 +00:00
|
|
|
}
|
|
|
|
return result;
|
2007-01-09 19:58:05 +00:00
|
|
|
}
|
|
|
|
|
re PR classpath/32844 (EnumSet causes code to be miscompiled)
2007-07-31 Dalibor Topic <robilad@kaffe.org>
PR 32844
* java/util/EnumSet.java:
Made class abstract per API spec.
(size, iterator, add, addAll, clear, contains,
containsAll, remove, removeAll, retainAll) Moved
into an anonymous inner class in of(T).
(allOf, noneOf, copyOf, of, range) Made more
implementation independent.
(of(T)) return an instance of an anonymous class
implementing EmptySet.
From-SVN: r127291
2007-08-08 08:00:32 +00:00
|
|
|
public void clear()
|
2007-01-09 19:58:05 +00:00
|
|
|
{
|
re PR classpath/32844 (EnumSet causes code to be miscompiled)
2007-07-31 Dalibor Topic <robilad@kaffe.org>
PR 32844
* java/util/EnumSet.java:
Made class abstract per API spec.
(size, iterator, add, addAll, clear, contains,
containsAll, remove, removeAll, retainAll) Moved
into an anonymous inner class in of(T).
(allOf, noneOf, copyOf, of, range) Made more
implementation independent.
(of(T)) return an instance of an anonymous class
implementing EmptySet.
From-SVN: r127291
2007-08-08 08:00:32 +00:00
|
|
|
store.clear();
|
|
|
|
cardinality = 0;
|
2007-01-09 19:58:05 +00:00
|
|
|
}
|
|
|
|
|
re PR classpath/32844 (EnumSet causes code to be miscompiled)
2007-07-31 Dalibor Topic <robilad@kaffe.org>
PR 32844
* java/util/EnumSet.java:
Made class abstract per API spec.
(size, iterator, add, addAll, clear, contains,
containsAll, remove, removeAll, retainAll) Moved
into an anonymous inner class in of(T).
(allOf, noneOf, copyOf, of, range) Made more
implementation independent.
(of(T)) return an instance of an anonymous class
implementing EmptySet.
From-SVN: r127291
2007-08-08 08:00:32 +00:00
|
|
|
public boolean contains(Object o)
|
2007-01-09 19:58:05 +00:00
|
|
|
{
|
re PR classpath/32844 (EnumSet causes code to be miscompiled)
2007-07-31 Dalibor Topic <robilad@kaffe.org>
PR 32844
* java/util/EnumSet.java:
Made class abstract per API spec.
(size, iterator, add, addAll, clear, contains,
containsAll, remove, removeAll, retainAll) Moved
into an anonymous inner class in of(T).
(allOf, noneOf, copyOf, of, range) Made more
implementation independent.
(of(T)) return an instance of an anonymous class
implementing EmptySet.
From-SVN: r127291
2007-08-08 08:00:32 +00:00
|
|
|
if (! (o instanceof Enum))
|
|
|
|
return false;
|
|
|
|
|
|
|
|
Enum<T> e = (Enum<T>) o;
|
|
|
|
if (e.getDeclaringClass() != enumClass)
|
2007-01-09 19:58:05 +00:00
|
|
|
return false;
|
re PR classpath/32844 (EnumSet causes code to be miscompiled)
2007-07-31 Dalibor Topic <robilad@kaffe.org>
PR 32844
* java/util/EnumSet.java:
Made class abstract per API spec.
(size, iterator, add, addAll, clear, contains,
containsAll, remove, removeAll, retainAll) Moved
into an anonymous inner class in of(T).
(allOf, noneOf, copyOf, of, range) Made more
implementation independent.
(of(T)) return an instance of an anonymous class
implementing EmptySet.
From-SVN: r127291
2007-08-08 08:00:32 +00:00
|
|
|
|
|
|
|
return store.get(e.ordinal());
|
2007-01-09 19:58:05 +00:00
|
|
|
}
|
|
|
|
|
re PR classpath/32844 (EnumSet causes code to be miscompiled)
2007-07-31 Dalibor Topic <robilad@kaffe.org>
PR 32844
* java/util/EnumSet.java:
Made class abstract per API spec.
(size, iterator, add, addAll, clear, contains,
containsAll, remove, removeAll, retainAll) Moved
into an anonymous inner class in of(T).
(allOf, noneOf, copyOf, of, range) Made more
implementation independent.
(of(T)) return an instance of an anonymous class
implementing EmptySet.
From-SVN: r127291
2007-08-08 08:00:32 +00:00
|
|
|
public boolean containsAll(Collection<?> c)
|
2007-01-09 19:58:05 +00:00
|
|
|
{
|
re PR classpath/32844 (EnumSet causes code to be miscompiled)
2007-07-31 Dalibor Topic <robilad@kaffe.org>
PR 32844
* java/util/EnumSet.java:
Made class abstract per API spec.
(size, iterator, add, addAll, clear, contains,
containsAll, remove, removeAll, retainAll) Moved
into an anonymous inner class in of(T).
(allOf, noneOf, copyOf, of, range) Made more
implementation independent.
(of(T)) return an instance of an anonymous class
implementing EmptySet.
From-SVN: r127291
2007-08-08 08:00:32 +00:00
|
|
|
if (c instanceof EnumSet)
|
|
|
|
{
|
|
|
|
EnumSet<T> other = (EnumSet<T>) c;
|
|
|
|
if (enumClass == other.enumClass)
|
|
|
|
return store.containsAll(other.store);
|
|
|
|
|
2007-01-09 19:58:05 +00:00
|
|
|
return false;
|
re PR classpath/32844 (EnumSet causes code to be miscompiled)
2007-07-31 Dalibor Topic <robilad@kaffe.org>
PR 32844
* java/util/EnumSet.java:
Made class abstract per API spec.
(size, iterator, add, addAll, clear, contains,
containsAll, remove, removeAll, retainAll) Moved
into an anonymous inner class in of(T).
(allOf, noneOf, copyOf, of, range) Made more
implementation independent.
(of(T)) return an instance of an anonymous class
implementing EmptySet.
From-SVN: r127291
2007-08-08 08:00:32 +00:00
|
|
|
}
|
|
|
|
return super.containsAll(c);
|
2007-01-09 19:58:05 +00:00
|
|
|
}
|
|
|
|
|
re PR classpath/32844 (EnumSet causes code to be miscompiled)
2007-07-31 Dalibor Topic <robilad@kaffe.org>
PR 32844
* java/util/EnumSet.java:
Made class abstract per API spec.
(size, iterator, add, addAll, clear, contains,
containsAll, remove, removeAll, retainAll) Moved
into an anonymous inner class in of(T).
(allOf, noneOf, copyOf, of, range) Made more
implementation independent.
(of(T)) return an instance of an anonymous class
implementing EmptySet.
From-SVN: r127291
2007-08-08 08:00:32 +00:00
|
|
|
public Iterator<T> iterator()
|
|
|
|
{
|
|
|
|
return new Iterator<T>()
|
|
|
|
{
|
|
|
|
int next = -1;
|
|
|
|
int count = 0;
|
2007-01-09 19:58:05 +00:00
|
|
|
|
re PR classpath/32844 (EnumSet causes code to be miscompiled)
2007-07-31 Dalibor Topic <robilad@kaffe.org>
PR 32844
* java/util/EnumSet.java:
Made class abstract per API spec.
(size, iterator, add, addAll, clear, contains,
containsAll, remove, removeAll, retainAll) Moved
into an anonymous inner class in of(T).
(allOf, noneOf, copyOf, of, range) Made more
implementation independent.
(of(T)) return an instance of an anonymous class
implementing EmptySet.
From-SVN: r127291
2007-08-08 08:00:32 +00:00
|
|
|
public boolean hasNext()
|
|
|
|
{
|
|
|
|
return count < cardinality;
|
|
|
|
}
|
2007-01-09 19:58:05 +00:00
|
|
|
|
re PR classpath/32844 (EnumSet causes code to be miscompiled)
2007-07-31 Dalibor Topic <robilad@kaffe.org>
PR 32844
* java/util/EnumSet.java:
Made class abstract per API spec.
(size, iterator, add, addAll, clear, contains,
containsAll, remove, removeAll, retainAll) Moved
into an anonymous inner class in of(T).
(allOf, noneOf, copyOf, of, range) Made more
implementation independent.
(of(T)) return an instance of an anonymous class
implementing EmptySet.
From-SVN: r127291
2007-08-08 08:00:32 +00:00
|
|
|
public T next()
|
|
|
|
{
|
|
|
|
next = store.nextSetBit(next + 1);
|
|
|
|
++count;
|
|
|
|
return enumClass.getEnumConstants()[next];
|
|
|
|
}
|
2007-01-09 19:58:05 +00:00
|
|
|
|
re PR classpath/32844 (EnumSet causes code to be miscompiled)
2007-07-31 Dalibor Topic <robilad@kaffe.org>
PR 32844
* java/util/EnumSet.java:
Made class abstract per API spec.
(size, iterator, add, addAll, clear, contains,
containsAll, remove, removeAll, retainAll) Moved
into an anonymous inner class in of(T).
(allOf, noneOf, copyOf, of, range) Made more
implementation independent.
(of(T)) return an instance of an anonymous class
implementing EmptySet.
From-SVN: r127291
2007-08-08 08:00:32 +00:00
|
|
|
public void remove()
|
2007-01-09 19:58:05 +00:00
|
|
|
{
|
re PR classpath/32844 (EnumSet causes code to be miscompiled)
2007-07-31 Dalibor Topic <robilad@kaffe.org>
PR 32844
* java/util/EnumSet.java:
Made class abstract per API spec.
(size, iterator, add, addAll, clear, contains,
containsAll, remove, removeAll, retainAll) Moved
into an anonymous inner class in of(T).
(allOf, noneOf, copyOf, of, range) Made more
implementation independent.
(of(T)) return an instance of an anonymous class
implementing EmptySet.
From-SVN: r127291
2007-08-08 08:00:32 +00:00
|
|
|
if (! store.get(next))
|
|
|
|
{
|
|
|
|
store.clear(next);
|
|
|
|
--cardinality;
|
|
|
|
}
|
2007-01-09 19:58:05 +00:00
|
|
|
}
|
re PR classpath/32844 (EnumSet causes code to be miscompiled)
2007-07-31 Dalibor Topic <robilad@kaffe.org>
PR 32844
* java/util/EnumSet.java:
Made class abstract per API spec.
(size, iterator, add, addAll, clear, contains,
containsAll, remove, removeAll, retainAll) Moved
into an anonymous inner class in of(T).
(allOf, noneOf, copyOf, of, range) Made more
implementation independent.
(of(T)) return an instance of an anonymous class
implementing EmptySet.
From-SVN: r127291
2007-08-08 08:00:32 +00:00
|
|
|
};
|
2007-01-09 19:58:05 +00:00
|
|
|
}
|
|
|
|
|
re PR classpath/32844 (EnumSet causes code to be miscompiled)
2007-07-31 Dalibor Topic <robilad@kaffe.org>
PR 32844
* java/util/EnumSet.java:
Made class abstract per API spec.
(size, iterator, add, addAll, clear, contains,
containsAll, remove, removeAll, retainAll) Moved
into an anonymous inner class in of(T).
(allOf, noneOf, copyOf, of, range) Made more
implementation independent.
(of(T)) return an instance of an anonymous class
implementing EmptySet.
From-SVN: r127291
2007-08-08 08:00:32 +00:00
|
|
|
public boolean remove(Object o)
|
|
|
|
{
|
|
|
|
if (! (o instanceof Enum))
|
|
|
|
return false;
|
2007-01-09 19:58:05 +00:00
|
|
|
|
re PR classpath/32844 (EnumSet causes code to be miscompiled)
2007-07-31 Dalibor Topic <robilad@kaffe.org>
PR 32844
* java/util/EnumSet.java:
Made class abstract per API spec.
(size, iterator, add, addAll, clear, contains,
containsAll, remove, removeAll, retainAll) Moved
into an anonymous inner class in of(T).
(allOf, noneOf, copyOf, of, range) Made more
implementation independent.
(of(T)) return an instance of an anonymous class
implementing EmptySet.
From-SVN: r127291
2007-08-08 08:00:32 +00:00
|
|
|
Enum<T> e = (Enum<T>) o;
|
|
|
|
if (e.getDeclaringClass() != enumClass)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
store.clear(e.ordinal());
|
|
|
|
--cardinality;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
public boolean removeAll(Collection<?> c)
|
|
|
|
{
|
|
|
|
if (c instanceof EnumSet)
|
|
|
|
{
|
|
|
|
EnumSet<T> other = (EnumSet<T>) c;
|
|
|
|
if (enumClass != other.enumClass)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
store.andNot(other.store);
|
|
|
|
int save = cardinality;
|
|
|
|
cardinality = store.cardinality();
|
|
|
|
return save != cardinality;
|
|
|
|
}
|
|
|
|
return super.removeAll(c);
|
|
|
|
}
|
|
|
|
|
|
|
|
public boolean retainAll(Collection<?> c)
|
|
|
|
{
|
|
|
|
if (c instanceof EnumSet)
|
|
|
|
{
|
|
|
|
EnumSet<T> other = (EnumSet<T>) c;
|
|
|
|
if (enumClass != other.enumClass)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
store.and(other.store);
|
|
|
|
int save = cardinality;
|
|
|
|
cardinality = store.cardinality();
|
|
|
|
return save != cardinality;
|
|
|
|
}
|
|
|
|
return super.retainAll(c);
|
|
|
|
}
|
|
|
|
|
|
|
|
public int size()
|
|
|
|
{
|
|
|
|
return cardinality;
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
// initialize the class
|
2007-01-09 19:58:05 +00:00
|
|
|
r.enumClass = first.getDeclaringClass();
|
|
|
|
r.store = new BitSet(r.enumClass.getEnumConstants().length);
|
re PR classpath/32844 (EnumSet causes code to be miscompiled)
2007-07-31 Dalibor Topic <robilad@kaffe.org>
PR 32844
* java/util/EnumSet.java:
Made class abstract per API spec.
(size, iterator, add, addAll, clear, contains,
containsAll, remove, removeAll, retainAll) Moved
into an anonymous inner class in of(T).
(allOf, noneOf, copyOf, of, range) Made more
implementation independent.
(of(T)) return an instance of an anonymous class
implementing EmptySet.
From-SVN: r127291
2007-08-08 08:00:32 +00:00
|
|
|
|
|
|
|
r.add(first);
|
2007-01-09 19:58:05 +00:00
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
public static <T extends Enum<T>> EnumSet<T> of(T first, T second)
|
|
|
|
{
|
re PR classpath/32844 (EnumSet causes code to be miscompiled)
2007-07-31 Dalibor Topic <robilad@kaffe.org>
PR 32844
* java/util/EnumSet.java:
Made class abstract per API spec.
(size, iterator, add, addAll, clear, contains,
containsAll, remove, removeAll, retainAll) Moved
into an anonymous inner class in of(T).
(allOf, noneOf, copyOf, of, range) Made more
implementation independent.
(of(T)) return an instance of an anonymous class
implementing EmptySet.
From-SVN: r127291
2007-08-08 08:00:32 +00:00
|
|
|
EnumSet<T> r = of(first);
|
|
|
|
r.add(second);
|
2007-01-09 19:58:05 +00:00
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
public static <T extends Enum<T>> EnumSet<T> of(T first, T second, T third)
|
|
|
|
{
|
re PR classpath/32844 (EnumSet causes code to be miscompiled)
2007-07-31 Dalibor Topic <robilad@kaffe.org>
PR 32844
* java/util/EnumSet.java:
Made class abstract per API spec.
(size, iterator, add, addAll, clear, contains,
containsAll, remove, removeAll, retainAll) Moved
into an anonymous inner class in of(T).
(allOf, noneOf, copyOf, of, range) Made more
implementation independent.
(of(T)) return an instance of an anonymous class
implementing EmptySet.
From-SVN: r127291
2007-08-08 08:00:32 +00:00
|
|
|
EnumSet<T> r = of(first, second);
|
|
|
|
r.add(third);
|
2007-01-09 19:58:05 +00:00
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
public static <T extends Enum<T>> EnumSet<T> of(T first, T second, T third,
|
|
|
|
T fourth)
|
|
|
|
{
|
re PR classpath/32844 (EnumSet causes code to be miscompiled)
2007-07-31 Dalibor Topic <robilad@kaffe.org>
PR 32844
* java/util/EnumSet.java:
Made class abstract per API spec.
(size, iterator, add, addAll, clear, contains,
containsAll, remove, removeAll, retainAll) Moved
into an anonymous inner class in of(T).
(allOf, noneOf, copyOf, of, range) Made more
implementation independent.
(of(T)) return an instance of an anonymous class
implementing EmptySet.
From-SVN: r127291
2007-08-08 08:00:32 +00:00
|
|
|
EnumSet<T> r = of(first, second, third);
|
|
|
|
r.add(fourth);
|
2007-01-09 19:58:05 +00:00
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
public static <T extends Enum<T>> EnumSet<T> of(T first, T second, T third,
|
|
|
|
T fourth, T fifth)
|
|
|
|
{
|
re PR classpath/32844 (EnumSet causes code to be miscompiled)
2007-07-31 Dalibor Topic <robilad@kaffe.org>
PR 32844
* java/util/EnumSet.java:
Made class abstract per API spec.
(size, iterator, add, addAll, clear, contains,
containsAll, remove, removeAll, retainAll) Moved
into an anonymous inner class in of(T).
(allOf, noneOf, copyOf, of, range) Made more
implementation independent.
(of(T)) return an instance of an anonymous class
implementing EmptySet.
From-SVN: r127291
2007-08-08 08:00:32 +00:00
|
|
|
EnumSet<T> r = of(first, second, third, fourth);
|
|
|
|
r.add(fifth);
|
2007-01-09 19:58:05 +00:00
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
public static <T extends Enum<T>> EnumSet<T> of(T first, T... rest)
|
|
|
|
{
|
re PR classpath/32844 (EnumSet causes code to be miscompiled)
2007-07-31 Dalibor Topic <robilad@kaffe.org>
PR 32844
* java/util/EnumSet.java:
Made class abstract per API spec.
(size, iterator, add, addAll, clear, contains,
containsAll, remove, removeAll, retainAll) Moved
into an anonymous inner class in of(T).
(allOf, noneOf, copyOf, of, range) Made more
implementation independent.
(of(T)) return an instance of an anonymous class
implementing EmptySet.
From-SVN: r127291
2007-08-08 08:00:32 +00:00
|
|
|
EnumSet<T> r = noneOf(first.getDeclaringClass());
|
|
|
|
r.add(first);
|
2007-01-09 19:58:05 +00:00
|
|
|
for (T val : rest)
|
re PR classpath/32844 (EnumSet causes code to be miscompiled)
2007-07-31 Dalibor Topic <robilad@kaffe.org>
PR 32844
* java/util/EnumSet.java:
Made class abstract per API spec.
(size, iterator, add, addAll, clear, contains,
containsAll, remove, removeAll, retainAll) Moved
into an anonymous inner class in of(T).
(allOf, noneOf, copyOf, of, range) Made more
implementation independent.
(of(T)) return an instance of an anonymous class
implementing EmptySet.
From-SVN: r127291
2007-08-08 08:00:32 +00:00
|
|
|
r.add(val);
|
2007-01-09 19:58:05 +00:00
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
public static <T extends Enum<T>> EnumSet<T> range(T from, T to)
|
|
|
|
{
|
|
|
|
if (from.compareTo(to) > 0)
|
|
|
|
throw new IllegalArgumentException();
|
re PR classpath/32844 (EnumSet causes code to be miscompiled)
2007-07-31 Dalibor Topic <robilad@kaffe.org>
PR 32844
* java/util/EnumSet.java:
Made class abstract per API spec.
(size, iterator, add, addAll, clear, contains,
containsAll, remove, removeAll, retainAll) Moved
into an anonymous inner class in of(T).
(allOf, noneOf, copyOf, of, range) Made more
implementation independent.
(of(T)) return an instance of an anonymous class
implementing EmptySet.
From-SVN: r127291
2007-08-08 08:00:32 +00:00
|
|
|
Class<T> type = from.getDeclaringClass();
|
|
|
|
EnumSet<T> r = noneOf(type);
|
|
|
|
|
|
|
|
T[] values = type.getEnumConstants();
|
|
|
|
// skip over values until start of range is found
|
|
|
|
int i = 0;
|
|
|
|
while (from != values[i])
|
|
|
|
i++;
|
|
|
|
|
|
|
|
// add values until end of range is found
|
|
|
|
while (to != values[i]) {
|
|
|
|
r.add(values[i]);
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
|
|
|
|
// add end of range
|
|
|
|
r.add(to);
|
|
|
|
|
2007-01-09 19:58:05 +00:00
|
|
|
return r;
|
|
|
|
}
|
|
|
|
}
|