initial support for toHexString, toOctalString and toBinaryString in classes Integer and Long

sebastigurin · sebastigurin · commit 6e9e79fb8e2f · 2010-12-07T18:51:25.000Z
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
@@ -1948,7 +1948,10 @@ Clazz.exceptionOf=function(e, clazz) {
 	}
 	else
 		return false;
-};
+};
+
+/* sgurin: preserve Number.prototype.toString */
+Number.prototype._numberToString=Number.prototype.toString;
 
 Clazz.declarePackage ("java.io");
 //Clazz.declarePackage ("java.lang");
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
@@ -83,14 +83,17 @@ if(s == null || ! Clazz.instanceOf(s, Integer) ){
 }
 return s.valueOf()  == this.valueOf();
 }, "Object");
-Integer.toHexString = Integer.prototype.toHexString = function (i) {
-	return i.toString (16);
+Integer.toHexString = Integer.prototype.toHexString = function (d) {
+	if(d.valueOf)d=d.valueOf();
+	return d._numberToString(16);
 };
-Integer.toOctalString = Integer.prototype.toOctalString = function (i) {
-	return i.toString (8);
+Integer.toOctalString = Integer.prototype.toOctalString = function (d) {
+	if(d.valueOf)d=d.valueOf();
+	return d._numberToString(8);
 };
-Integer.toBinaryString = Integer.prototype.toBinaryString = function (i) {
-	return i.toString (2);
+Integer.toBinaryString = Integer.prototype.toBinaryString = function (d) {
+	if(d.valueOf)d=d.valueOf();
+	return d._numberToString(2);
 };
 Integer.decode = Clazz.defineMethod (Integer, "decode", 
 function (nm) {
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
@@ -83,15 +83,31 @@ if(s == null || !Clazz.instanceOf(s, Long) ){
 }
 return s.valueOf()  == this.valueOf();
 }, "Object");
-Long.toHexString = Long.prototype.toHexString = function (i) {
-	return i.toString (16);
-};
-Long.toOctalString = Long.prototype.toOctalString = function (i) {
-	return i.toString (8);
-};
-Long.toBinaryString = Long.prototype.toBinaryString = function (i) {
-	return i.toString (2);
-};
+
+Clazz.defineMethod (Long, "toHexString", 
+function (d) {
+if(d.valueOf)d=d.valueOf();
+var r = d._numberToString(16);
+return r;
+}, "Number");
+Long.toHexString = Long.prototype.toHexString;
+
+Clazz.defineMethod (Long, "toOctalString", 
+function (d) {
+if(d.valueOf)d=d.valueOf();
+var r = d._numberToString(8);
+return r;
+}, "Number");
+Long.toOctalString = Long.prototype.toOctalString;
+
+Clazz.defineMethod (Long, "toBinaryString", 
+function (d) {
+if(d.valueOf)d=d.valueOf();
+var r = d._numberToString(2);
+return r;
+}, "Number");
+Long.toBinaryString = Long.prototype.toBinaryString;
+
 Long.decode = Clazz.defineMethod (Long, "decode", 
 function (nm) {
 var radix = 10;
