procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Import GNU Classpath (20121202).

Browse source 
2012-12-19  Matthias Klose  <doko@ubuntu.com>

        Import GNU Classpath (20121202).

        * Regenerate class and header files.
        * Regenerate auto* files.
        * sources.am, gcj/javaprims.h: Regenerate.
        * gnu/java/nio/FileLockImpl.java (close): New override.

From-SVN: r194618
This commit is contained in:
Matthias Klose 2012-12-19 17:03:15 +00:00
parent baeb2e1647
commit a1906e8bbf
454 changed files with 5224 additions and 2925 deletions
Download patch file Download diff file Expand all files Collapse all files

32
libjava/classpath/java/util/Collections.java
View file

@ -120,10 +120,10 @@ public class Collections
* @return an empty parameterized set.
* @since 1.5
*/
@SuppressWarnings("unchecked")
public static final <T> Set<T> emptySet()
{
/* FIXME: Could this be optimized? */
return new EmptySet<T>();
return (Set<T>) EMPTY_SET;
}
/**
@ -161,6 +161,7 @@ public class Collections
* @return A non-iterating iterator.
*/
// This is really cheating! I think it's perfectly valid, though.
@SuppressWarnings("unchecked")
public Iterator<T> iterator()
{
return (Iterator<T>) EMPTY_LIST.iterator();
@ -196,7 +197,7 @@ public class Collections
*/
public boolean equals(Object o)
{
return o instanceof Set && ((Set) o).isEmpty();
return o instanceof Set<?> && ((Set<?>) o).isEmpty();
}
/**
@ -288,10 +289,10 @@ public class Collections
* @return an empty parameterized list.
* @since 1.5
*/
@SuppressWarnings("unchecked")
public static final <T> List<T> emptyList()
{
/* FIXME: Could this be optimized? */
return new EmptyList<T>();
return (List<T>) EMPTY_LIST;
}
/**
@ -369,7 +370,7 @@ public class Collections
*/
public boolean equals(Object o)
{
return o instanceof List && ((List) o).isEmpty();
return o instanceof List<?> && ((List<?>) o).isEmpty();
}
/**
@ -480,10 +481,10 @@ public class Collections
* @return an empty parameterized map.
* @since 1.5
*/
@SuppressWarnings("unchecked")
public static final <K,V> Map<K,V> emptyMap()
{
/* FIXME: Could this be optimized? */
return new EmptyMap<K,V>();
return (Map<K,V>) EMPTY_MAP;
}
/**
@ -511,9 +512,10 @@ public class Collections
* There are no entries.
* @return The empty set.
*/
@SuppressWarnings("unchecked")
public Set<Map.Entry<K, V>> entrySet()
{
return EMPTY_SET;
return (Set<Map.Entry<K, V>>) EMPTY_SET;
}
// The remaining methods are optional, but provide a performance
@ -546,7 +548,7 @@ public class Collections
*/
public boolean equals(Object o)
{
return o instanceof Map && ((Map) o).isEmpty();
return o instanceof Map<?,?> && ((Map<?,?>) o).isEmpty();
}
/**
@ -572,9 +574,10 @@ public class Collections
* No entries.
* @return The empty set.
*/
@SuppressWarnings("unchecked")
public Set<K> keySet()
{
return EMPTY_SET;
return (Set<K>) EMPTY_SET;
}
/**
@ -601,9 +604,10 @@ public class Collections
* Collection, will work. Besides, that's what the JDK uses!
* @return The empty set.
*/
@SuppressWarnings("unchecked")
public Collection<V> values()
{
return EMPTY_SET;
return (Collection<V>) EMPTY_SET;
}
/**
@ -1854,7 +1858,7 @@ public class Collections
public List<T> subList(int from, int to)
{
if (from == to && (to == 0 || to == 1))
return EMPTY_LIST;
return emptyList();
if (from == 0 && to == 1)
return this;
if (from > to)
@ -2480,7 +2484,7 @@ public class Collections
* @throws ArrayStoreException if the type of any element of the
* collection is not a subtype of the element type of a.
*/
public <T> T[] toArray(T[] a)
public <E> E[] toArray(E[] a)
{
synchronized (mutex)
{