Fixed bug that once java.lang.reflect.Array was declared in java.util.AbstractCollection

jossonsmith · jossonsmith · commit de5af3af8dfd · 2006-08-10T18:10:10.000Z
diff --git a/sources/net.sf.j2s.java.core/src/java/lang/reflect/Array.java b/sources/net.sf.j2s.java.core/src/java/lang/reflect/Array.java
@@ -16,6 +16,11 @@
  * conversion would occur.
  *
  * @author Nakul Saraiya
+ * 
+ * @j2sPrefix
+ * Array.getComponentType = function () {
+ * 	return Object;
+ * };
  */
 public final
 class Array {
@@ -46,6 +51,13 @@ private Array() {}
      * @exception IllegalArgumentException if componentType is Void.TYPE
      * @exception NegativeArraySizeException if the specified <code>length</code> 
      * is negative
+     * 
+     * @j2sNativeSrc
+     * return Clazz.newArray (length); 
+     * // return new Array (length);
+     * @j2sNative
+     * return Clazz.newArray (b); 
+     * // return new Array (b);
      */
     public static Object newInstance(Class componentType, int length)
 	throws NegativeArraySizeException {
@@ -84,6 +96,8 @@ public static Object newInstance(Class componentType, int length)
      * is Void.TYPE.
      * @exception NegativeArraySizeException if any of the components in
      * the specified <code>dimensions</code> argument is negative.
+     * 
+     * @j2sIgnore
      */
     public static Object newInstance(Class componentType, int[] dimensions)
 	throws IllegalArgumentException, NegativeArraySizeException {
diff --git a/sources/net.sf.j2s.java.core/src/java/package.js b/sources/net.sf.j2s.java.core/src/java/package.js
@@ -1,6 +1,8 @@
 (function () {
 	ClazzLoader.registerPackages ("java", [
 			"io", "lang", "lang.reflect", "util"]);
+			
+	window["reflect"] = java.lang.reflect;
 
 	var base = ClazzLoader.getClasspathFor ("java.*");
 	
diff --git a/sources/net.sf.j2s.java.core/src/java/util/AbstractCollection.java b/sources/net.sf.j2s.java.core/src/java/util/AbstractCollection.java
@@ -38,18 +38,6 @@
  * @version 1.24, 01/18/03
  * @see Collection
  * @since 1.2
- * 
- * @j2sPrefix
-java.lang.reflect.Array = {
-	newInstance : function (type, size) {
-		return new Array (size);
-	}
-};
-Array.getComponentType = function () {
-	return Object;
-};
-
-@j2sIgnoreImport java.lang.reflect.Array
  */
 
 public abstract class AbstractCollection implements Collection {
