Fixing bug#1844187: Number is an object in java, not in javascript

zhourenjian · zhourenjian · commit 04cf938fc5c2 · 2008-12-01T17:07:05.000Z
diff --git a/sources/net.sf.j2s.java.core/src/java/lang/Byte.js b/sources/net.sf.j2s.java.core/src/java/lang/Byte.js
@@ -2,7 +2,7 @@ Clazz.load (["java.lang.Comparable", "$.Number"], "java.lang.Byte", null, functi
 java.lang.Byte = Byte = function () {
 Clazz.instantialize (this, arguments);
 };
-Clazz.decorateAsType (Byte, "Byte", Number, Comparable);
+Clazz.decorateAsType (Byte, "Byte", Number, Comparable, null, true);
 Byte.prototype.valueOf = function () { return 0; };
 Byte.toString = Byte.prototype.toString = function () {
 	if (arguments.length != 0) {
diff --git a/sources/net.sf.j2s.java.core/src/java/lang/Class.js b/sources/net.sf.j2s.java.core/src/java/lang/Class.js
@@ -1719,20 +1719,20 @@ Clazz.declareAnonymous = function (prefix, name, clazzParent, interfacez,
 
 /* protected */
 Clazz.decorateAsType = function (clazzFun, qClazzName, clazzParent, 
-		interfacez, parentClazzInstance) {
+		interfacez, parentClazzInstance, inheritClazzFuns) {
 	clazzFun.__CLASS_NAME__ = qClazzName;
 	//if (qClazzName != "String" && qClazzName != "Object"
 	//		&& qClazzName != "Number" && qClazzName != "Date") {
 		clazzFun.prototype.__CLASS_NAME__ = qClazzName;
 	//}
 	clazzFun.equals = Clazz.innerFunctions.equals;
 	clazzFun.getName = Clazz.innerFunctions.getName;
-	/*
-	for (var i = 0; i < Clazz.innerFunctionNames.length; i++) {
-		var methodName = Clazz.innerFunctionNames[i];
-		clazzFun[methodName] = Clazz.innerFunctions[methodName];
+	if (inheritClazzFuns) {
+		for (var i = 0; i < Clazz.innerFunctionNames.length; i++) {
+			var methodName = Clazz.innerFunctionNames[i];
+			clazzFun[methodName] = Clazz.innerFunctions[methodName];
+		}
 	}
-	*/
 	if (parentClazzInstance != null) {
 		Clazz.inheritClass (clazzFun, clazzParent, parentClazzInstance);
 	} else if (clazzParent != null) {
diff --git a/sources/net.sf.j2s.java.core/src/java/lang/Double.js b/sources/net.sf.j2s.java.core/src/java/lang/Double.js
@@ -2,7 +2,7 @@ Clazz.load (["java.lang.Comparable", "$.Number"], "java.lang.Double", null, func
 java.lang.Double = Double = function () {
 Clazz.instantialize (this, arguments);
 };
-Clazz.decorateAsType (Double, "Double", Number, Comparable);
+Clazz.decorateAsType (Double, "Double", Number, Comparable, null, true);
 Double.prototype.valueOf = function () { return 0; };
 Double.toString = Double.prototype.toString = function () {
 	if (arguments.length != 0) {
diff --git a/sources/net.sf.j2s.java.core/src/java/lang/Float.js b/sources/net.sf.j2s.java.core/src/java/lang/Float.js
@@ -2,7 +2,7 @@ Clazz.load (["java.lang.Comparable", "$.Number"], "java.lang.Float", null, funct
 java.lang.Float = Float = function () {
 Clazz.instantialize (this, arguments);
 };
-Clazz.decorateAsType (Float, "Float", Number, Comparable);
+Clazz.decorateAsType (Float, "Float", Number, Comparable, null, true);
 Float.prototype.valueOf = function () { return 0; };
 Float.toString = Float.prototype.toString = function () {
 	if (arguments.length != 0) {
diff --git a/sources/net.sf.j2s.java.core/src/java/lang/Integer.js b/sources/net.sf.j2s.java.core/src/java/lang/Integer.js
@@ -2,7 +2,7 @@ Clazz.load (["java.lang.Comparable", "$.Number"], "java.lang.Integer", null, fun
 java.lang.Integer = Integer = function () {
 Clazz.instantialize (this, arguments);
 };
-Clazz.decorateAsType (Integer, "Integer", Number, Comparable);
+Clazz.decorateAsType (Integer, "Integer", Number, Comparable, null, true);
 Integer.prototype.valueOf = function () { return 0; };
 Integer.toString = Integer.prototype.toString = function () {
 	if (arguments.length != 0) {
diff --git a/sources/net.sf.j2s.java.core/src/java/lang/Long.js b/sources/net.sf.j2s.java.core/src/java/lang/Long.js
@@ -2,7 +2,7 @@ Clazz.load (["java.lang.Comparable", "$.Number"], "java.lang.Long", null, functi
 java.lang.Long = Long = function () {
 Clazz.instantialize (this, arguments);
 };
-Clazz.decorateAsType (Long, "Long", Number, Comparable);
+Clazz.decorateAsType (Long, "Long", Number, Comparable, null, true);
 Long.prototype.valueOf = function () { return 0; };
 Long.toString = Long.prototype.toString = function () {
 	if (arguments.length != 0) {
diff --git a/sources/net.sf.j2s.java.core/src/java/lang/Number.js b/sources/net.sf.j2s.java.core/src/java/lang/Number.js
@@ -1,6 +1,6 @@
 Clazz.load (["java.io.Serializable"], "java.lang.Number", null, function () {
 java.lang.Number = Number;
-//Clazz.decorateAsType (Number, "Number", null, java.io.Serializable);
+//Clazz.decorateAsType (Number, "Number", null, java.io.Serializable, null, true);
 Number.__CLASS_NAME__ = "Number";
 Clazz.implementOf (Number, java.io.Serializable);
 Number.equals = Clazz.innerFunctions.equals;
diff --git a/sources/net.sf.j2s.java.core/src/java/lang/Short.js b/sources/net.sf.j2s.java.core/src/java/lang/Short.js
@@ -2,7 +2,7 @@ Clazz.load (["java.lang.Comparable", "$.Number"], "java.lang.Short", null, funct
 java.lang.Short = Short = function () {
 Clazz.instantialize (this, arguments);
 };
-Clazz.decorateAsType (Short, "Short", Number, Comparable);
+Clazz.decorateAsType (Short, "Short", Number, Comparable, null, true);
 Short.prototype.valueOf = function () { return 0; };
 Short.toString = Short.prototype.toString = function () {
 	if (arguments.length != 0) {
