[Nice-commit] Nice/stdlib/nice/lang java.nice,1.32,1.33

[<bo...@us...>]

Update of /cvsroot/nice/Nice/stdlib/nice/lang
In directory sc8-pr-cvs1:/tmp/cvs-serv18652/stdlib/nice/lang

Modified Files:
	java.nice 
Log Message:
Added missing retyped classes and interfaces. Corrected typos.

Uncommented all retypings for the java.util classes.


Index: java.nice
===================================================================
RCS file: /cvsroot/nice/Nice/stdlib/nice/lang/java.nice,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** java.nice	29 Aug 2003 19:25:24 -0000	1.32
--- java.nice	30 Aug 2003 21:41:52 -0000	1.33
***************
*** 172,183 ****
  <T> void removeAllElements(Vector<T>) = native void Vector.removeAllElements();
  
- /*
  <T> AbstractCollection<T> AbstractCollection() = native new AbstractCollection();
  <T> AbstractList<T> AbstractList() = native new AbstractList();
  <T> AbstractSequentialList<T> AbstractSequentialList() = native new AbstractSequentialList();
  <T> AbstractSet<T> AbstractSet() = native new AbstractSet();
! <T> AbstractMap<K,V> AbstractMap() = native new AbstractMap();
  <T> ArrayList<T> ArrayList() = native new ArrayList();        
! <T> ArrayList<T> ArrayArrayList(int) = native new ArrayList(int);
  <T,U | U <: T> ArrayList<T> ArrayList(Collection<U>) = native new ArrayList(Collection);
  <T> LinkedList<T> LinkedList() = native new LinkedList();
--- 172,182 ----
  <T> void removeAllElements(Vector<T>) = native void Vector.removeAllElements();
  
  <T> AbstractCollection<T> AbstractCollection() = native new AbstractCollection();
  <T> AbstractList<T> AbstractList() = native new AbstractList();
  <T> AbstractSequentialList<T> AbstractSequentialList() = native new AbstractSequentialList();
  <T> AbstractSet<T> AbstractSet() = native new AbstractSet();
! <K,V> AbstractMap<K,V> AbstractMap() = native new AbstractMap();
  <T> ArrayList<T> ArrayList() = native new ArrayList();        
! <T> ArrayList<T> ArrayList(int) = native new ArrayList(int);
  <T,U | U <: T> ArrayList<T> ArrayList(Collection<U>) = native new ArrayList(Collection);
  <T> LinkedList<T> LinkedList() = native new LinkedList();
***************
*** 212,218 ****
  <K,K0,V,V0 | K0 <: K, V0 <: V> TreeMap<K,V> TreeMap(Map<K0,V0>) = native new TreeMap(Map);
  <K,V> TreeMap<K,V> TreeMap(SortedMap<K,V>) = native new TreeMap(SortedMap);
! */
! /*
  interface Collection<T> = native java.util.Collection;
  interface List<T> extends Collection<T> = native java.util.List;
  interface Set<T> extends Collection<T> = native java.util.Set;
--- 211,217 ----
  <K,K0,V,V0 | K0 <: K, V0 <: V> TreeMap<K,V> TreeMap(Map<K0,V0>) = native new TreeMap(Map);
  <K,V> TreeMap<K,V> TreeMap(SortedMap<K,V>) = native new TreeMap(SortedMap);
! 
  interface Collection<T> = native java.util.Collection;
+ interface Comparator<T> = native java.util.Comparator;
  interface List<T> extends Collection<T> = native java.util.List;
  interface Set<T> extends Collection<T> = native java.util.Set;
***************
*** 223,227 ****
  interface SortedMap<K,V> extends Map<T> = native java.util.SortedMap;
  interface Map$Entry<K,V> = native java.util.Map.Entry;
! class AbstractCollection<T> = native java.util.AbstractCollection;
  class AbstractList<T> extends AbstractCollection<T> implements List<T> = native java.util.AbstractList;
  class AbstractSequentialList<T> extends AbstractList<T> = native java.util.AbstractSequentialList;
--- 222,226 ----
  interface SortedMap<K,V> extends Map<T> = native java.util.SortedMap;
  interface Map$Entry<K,V> = native java.util.Map.Entry;
! class AbstractCollection<T> implements Collection<T> = native java.util.AbstractCollection;
  class AbstractList<T> extends AbstractCollection<T> implements List<T> = native java.util.AbstractList;
  class AbstractSequentialList<T> extends AbstractList<T> = native java.util.AbstractSequentialList;
***************
*** 229,232 ****
--- 228,232 ----
  class AbstractMap<K,V> implements Map<K,V> = native java.util.AbstractMap;
  class ArrayList<T> extends AbstractList<T> = native java.util.ArrayList;
+ class Dictionary<K,V> = native java.util.Dictionary;
  class HashMap<K,V> extends AbstractMap<K,V> = native java.util.HashMap;
  class HashSet<T> extends AbstractSet<T> = native java.util.HashSet;
***************
*** 238,242 ****
  class Vector<T> extends AbstractList<T> = native java.util.Vector;
  class WeakHashMap<K,V> extends AbstractMap<K,V> = native java.util.WeakHashMap;
- */
  
  <T> Iterator<T> iterator(Collection<T>) = 
--- 238,241 ----
***************
*** 330,333 ****
--- 329,334 ----
  <T,U | T <: U> T min(Collection<T>, Comparator<U>) = 
    native Object Collections.max(Collection, Comparator);
+ <T> void sort(List<T>, Comparator<T>) = 
+   native void Collections.sort(List, Comparator);
  
  <T,U,V | U <: T, V <: T> boolean Arrays_equals(U[], V[]) =