[Nice-commit] Nice/stdlib/nice/lang java.nice,1.46,1.47

[<ar...@us...>]

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

Modified Files:
	java.nice 
Log Message:
Few retypings for parametric classes.

Index: java.nice
===================================================================
RCS file: /cvsroot/nice/Nice/stdlib/nice/lang/java.nice,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** java.nice	28 Nov 2003 18:02:52 -0000	1.46
--- java.nice	13 Dec 2003 22:46:55 -0000	1.47
***************
*** 179,182 ****
--- 179,186 ----
  <K,V> HashMap<K,V> HashMap(int,float) = native new HashMap(int,float);
  <K,K0,V,V0 | K0 <: K, V0 <: V> HashMap<K,V> HashMap(Map<K0,V0>) = native new HashMap(Map);
+ <K,V> WeakHashMap<K,V> WeakHashMap() = native new WeakHashMap();
+ <K,V> WeakHashMap<K,V> WeakHashMap(int) = native new WeakHashMap(int);
+ <K,V> WeakHashMap<K,V> WeakHashMap(int,float) = native new WeakHashMap(int,float);
+ <K,K0,V,V0 | K0 <: K, V0 <: V> WeakHashMap<K,V> WeakHashMap(Map<K0,V0>) = native new WeakHashMap(Map);
  <K,V> IdentityHashMap<K,V> IdentityHashMap() = native new IdentityHashMap();
  <K,V> IdentityHashMap<K,V> IdentityHashMap(int) = native new IdentityHashMap(int);
***************
*** 229,233 ****
  class TreeSet<T> extends AbstractSet<T> implements SortedSet<T> = native java.util.TreeSet;
  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>) = 
--- 233,236 ----
***************
*** 345,348 ****
--- 348,363 ----
  <T> List<T> asList(T[]) = native List Arrays.asList(Object[]);
  
+ // Properties 
+ class Properties<String K, String V> extends Hashtable<K,V> = native java.util.Properties;
+ Properties<String, String> Properties() = native new Properties();
+ Properties<String, String> Properties(Properties<String, String>) = native new Properties(Properties);
+ ?String getProperty(Properties<String, String>, String) = native String Properties.getProperty(String);
+ <T | T <: ?String> T getProperty(Properties<String, String>, String, T) = native String Properties.getProperty(String, String);
+ void list(Properties<String, String>, PrintStream) = native void Properties.list(PrintStream);
+ void list(Properties<String, String>, PrintWriter) = native void Properties.list(PrintWriter);
+ void load(Properties<String, String>, InputStream) = native void Properties.load(InputStream);
+ ?String setProperty(Properties<String, String>, String, String) = native Object Properties.setProperty(String, String);
+ void store(Properties<String, String>, OutputStream, String) = native void Properties.store(OutputStream, String);
+ 
  /* StringTokenizer inherits from Enumeration, which makes it 
     wrongly parameterized. We ignore that inheritance.
***************
*** 366,369 ****
--- 381,385 ----
  <T,U | T <: U > SoftReference<T> SoftReference(T, ReferenceQueue<U>) = native new SoftReference(Object, ReferenceQueue);
  <T,U | T <: U > PhantomReference<T> PhantomReference(T, ReferenceQueue<U>) = native new PhantomReference(Object, ReferenceQueue);
+ <T> ReferenceQueue<T> ReferenceQueue() = native new ReferenceQueue();
  
  <T> void clear(Reference<T>) = native void Reference.clear();