1. valueOf, paseXXX Boxing solved!

soheil_h_y · soheil_h_y · commit 82949c8eda25 · 2006-11-15T14:51:39.000Z
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
@@ -21,7 +21,7 @@ this.valueOf = function () {
 }, "Number");
 Clazz.makeConstructor (Double, 
 function (s) {
-var value = Double.parseDouble (s, 10);
+var value = Double.parseDouble (s);
 this.valueOf = function () {
 	return value;
 };
@@ -53,9 +53,21 @@ var doubleVal = parseFloat (s);
 if(isNaN(doubleVal)){
 throw  new NumberFormatException ("Not a Number : " + s);
 }
-return new Double(doubleVal);
+return doubleVal;
 }, "String");
-Double.$valueOf = Double.parseDouble = Double.prototype.parseDouble;
+Double.parseDouble = Double.prototype.parseDouble;
+
+Clazz.defineMethod (Double, "$valueOf", 
+function (s) {
+return new Double(this.parseDouble(s));
+}, "String");
+
+Clazz.defineMethod (Double, "$valueOf", 
+function (v) {
+return new Double(v);
+}, "Number");
+
+Double.$valueOf = Double.prototype.$valueOf;
 
 Clazz.defineMethod (Double, "equals", 
 function (s) {
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
@@ -23,7 +23,7 @@ Clazz.makeConstructor (Float,
 function (s) {
 var value = null;
 if (s != null) {
-	value = Float.parseFloat (s, 10);
+	value = Float.parseFloat (s);
 } else {
 	value = 0;
 }
@@ -47,9 +47,21 @@ var floatVal =  parseFloat (s);
 if(isNaN(floatVal)){
 throw  new NumberFormatException ("Not a Number : " + s);
 }
-return new Float(floatVal);
+return floatVal;
 }, "String");
-Float.$valueOf = Float.parseFloat = Float.prototype.parseFloat;
+Float.parseFloat = Float.prototype.parseFloat;
+
+Clazz.defineMethod (Float, "$valueOf", 
+function (s) {
+return new Float(Float.parseFloat (s, 10));
+}, "String");
+
+Clazz.defineMethod (Float, "$valueOf", 
+function (s) {
+return new Float(s);
+}, "Number");
+
+Float.$valueOf = Float.prototype.$valueOf;
 Clazz.defineMethod (Float, "isNaN", 
 function (num) {
 return isNaN (num);
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
@@ -44,16 +44,32 @@ var integer = parseInt (s, radix);
 if(isNaN(integer)){
 throw  new NumberFormatException ("Not a Number : " + s);
 }
-return new Integer(integer);
+return integer;
 }, "String, Number");
 Integer.parseInt = Integer.prototype.parseInt;
 Clazz.defineMethod (Integer, "parseInt", 
 function (s) {
 return Integer.parseInt (s, 10);
 }, "String");
 
-Integer.$valueOf = Integer.parseInt = Integer.prototype.parseInt;
+Integer.parseInt = Integer.prototype.parseInt;
+
+Clazz.defineMethod (Integer, "$valueOf", 
+function (s) {
+return new Integer(Integer.parseInt (s, 10));
+}, "String");
+
+Clazz.defineMethod (Integer, "$valueOf", 
+function (s) {
+return new Integer(s);
+}, "Number");
+
+Clazz.defineMethod (Integer, "$valueOf", 
+function (s, r) {
+return new Integer(Integer.parseInt (s, r));
+}, "String, Number");
 
+Integer.$valueOf = Integer.prototype.$valueOf;
 Clazz.defineMethod (Integer, "equals", 
 function (s) {
 if(s == null || ! Clazz.instanceOf(s, Integer) ){
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
@@ -44,15 +44,32 @@ var longVal = parseInt (s, radix);
 if(isNaN(longVal)){
 throw  new NumberFormatException ("Not a Number : " + s);
 }
-return new Long(longVal);
+return longVal;
 }, "String, Number");
-Long.$valueOf = Long.parseLong = Long.prototype.parseLong;
+
 Clazz.defineMethod (Long, "parseLong", 
 function (s) {
 return Long.parseLong (s, 10);
 }, "String");
+
 Long.parseLong = Long.prototype.parseLong;
 
+Clazz.defineMethod (Long, "$valueOf", 
+function (s) {
+return new Long(Long.parseLong (s, 10));
+}, "String");
+
+Clazz.defineMethod (Long, "$valueOf", 
+function (s) {
+return new Long(s);
+}, "Number");
+
+Clazz.defineMethod (Long, "$valueOf", 
+function (s, r) {
+return new Long(Long.parseLong (s, r));
+}, "String, Number");
+
+Long.$valueOf = Long.prototype.$valueOf;
 Clazz.defineMethod (Long, "equals", 
 function (s) {
 if(s == null || ! Clazz.instanceOf(s, Long) ){
