Fixed bug that Boolean object is not correctly constructed.

zhourenjian · zhourenjian · commit e1aba3aa1660 · 2008-11-04T16:09:33.000Z
Sebastian Gurin reporting:
Boolean b = new Boolean(true);
System.out.println(b.equals(true));

prints "true" in java and "false" in javascript. The sollution seems to be analog to Character's.

And another small detail, Boolean class has not the getName() method... so Boolean.class.getName() translated js code will fail to execute...
diff --git a/sources/net.sf.j2s.java.core/src/java/lang/Boolean.js b/sources/net.sf.j2s.java.core/src/java/lang/Boolean.js
@@ -1,20 +1,80 @@
-/* http://j2s.sf.net/ */
+Clazz.load (["java.lang.Comparable", "java.io.Serializable"], "java.lang.Boolean", null, function () {
 java.lang.Boolean = Boolean;
-Boolean.prototype.booleanValue=function(){
-return this.valueOf();
-}
+Boolean.__CLASS_NAME__ = "Boolean";
+Clazz.implementOf (Boolean, [java.io.Serializable, java.lang.Comparable]);
+Boolean.equals = Clazz.innerFunctions.equals;
+Boolean.getName = Clazz.innerFunctions.getName;
+Boolean.serialVersionUID = Boolean.prototype.serialVersionUID = -3665804199014368530;
 
-Boolean.prototype.parseBoolean = function(val){
-	if(val == null || val.toLowerCase() == "false" || val == false){
-		return false;
-	}
-	return true;
+Clazz.makeConstructor (Boolean, 
+function (value) {
+this.valueOf = function () {
+	return value;
+};
+}, "~B");
+Clazz.makeConstructor (Boolean, 
+function (s) {
+this.valueOf = function () {
+	return Boolean.toBoolean (s);
+};
+}, "~S");
+Boolean.parseBoolean = Clazz.defineMethod (Boolean, "parseBoolean", 
+function (s) {
+return Boolean.toBoolean (s);
+}, "~S");
+Clazz.defineMethod (Boolean, "booleanValue", 
+function () {
+return this.value;
+});
+Boolean.$valueOf = Clazz.defineMethod (Boolean, "$valueOf", 
+function (b) {
+return (b ? Boolean.TRUE : Boolean.FALSE);
+}, "~B");
+Boolean.$valueOf = Clazz.defineMethod (Boolean, "$valueOf", 
+function (s) {
+return Boolean.toBoolean (s) ? Boolean.TRUE : Boolean.FALSE;
+}, "~S");
+Boolean.toString = Clazz.defineMethod (Boolean, "toString", 
+function (b) {
+return b ? "true" : "false";
+}, "~B");
+Clazz.defineMethod (Boolean, "toString", 
+function () {
+return this.valueOf () ? "true" : "false";
+});
+Clazz.overrideMethod (Boolean, "hashCode", 
+function () {
+return this.valueOf () ? 1231 : 1237;
+});
+Clazz.overrideMethod (Boolean, "equals", 
+function (obj) {
+if (Clazz.instanceOf (obj, Boolean)) {
+return this.value == (obj).booleanValue ();
+}return false;
+}, "~O");
+Boolean.getBoolean = Clazz.defineMethod (Boolean, "getBoolean", 
+function (name) {
+var result = false;
+try {
+result = Boolean.toBoolean (System.getProperty (name));
+} catch (e) {
+if (Clazz.instanceOf (e, IllegalArgumentException)) {
+} else if (Clazz.instanceOf (e, NullPointerException)) {
+} else {
+throw e;
 }
-
-Boolean.$valueOf = Boolean.parseBoolean = Boolean.prototype.parseBoolean;
-
-Boolean.TRUE = Boolean.prototype.TRUE = new Boolean(true);
-Boolean.FALSE = Boolean.prototype.FALSE = new Boolean(false);
+}
+return result;
+}, "~S");
+Clazz.overrideMethod (Boolean, "compareTo", 
+function (b) {
+return (b.value == this.value ? 0 : (this.value ? 1 : -1));
+}, "Boolean");
+Boolean.toBoolean = Clazz.defineMethod (Boolean, "toBoolean", 
+($fz = function (name) {
+return ((name != null) && name.equalsIgnoreCase ("true"));
+}, $fz.isPrivate = true, $fz), "~S");
+Boolean.TRUE = Boolean.prototype.TRUE = new Boolean (true);
+Boolean.FALSE = Boolean.prototype.FALSE = new Boolean (false);
 Boolean.TYPE = Boolean.prototype.TYPE = Boolean;
-
-
+});
