Fixing bugs and other small improvements

zhourenjian · zhourenjian · commit b4c924cade30 · 2012-05-12T10:09:54.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
@@ -95,7 +95,7 @@ JavaObject.prototype.toString = function () {
 	if (this.__CLASS_NAME__ != null) {
 		return "[" + this.__CLASS_NAME__ + " object]";
 	} else {
-		return this.to$tring ();
+		return this.to$tring.apply (this, arguments);
 	}
 };
 
@@ -514,7 +514,7 @@ Clazz.getInheritedLevel = function (clazzTarget, clazzBase) {
 /* public */
 Clazz.instanceOf = function (obj, clazz) {
 	if (obj == null) {
-		return clazz == undefined; // should usually false
+		return false; // return clazz == undefined; // should usually false
 	}
 	if (clazz == null) {
 		return false;
diff --git a/sources/net.sf.j2s.java.core/src/java/lang/String.js b/sources/net.sf.j2s.java.core/src/java/lang/String.js
@@ -400,6 +400,10 @@ String.prototype.lastIndexOf = function (s, last) {
 	}
 };
 
+String.prototype.contains = function (s) {
+	return this.indexOf (s) != -1;
+};
+
 String.prototype.intern = function () {
 	return this.valueOf ();
 };
diff --git a/sources/net.sf.j2s.java.core/src/java/package.js b/sources/net.sf.j2s.java.core/src/java/package.js
@@ -38,6 +38,7 @@ window["java.package.callback"] = function () {
 		"$.XHRCallbackSWTAdapter",
        	
 		"$.SimpleSerializable",
+		"$.ISimpleCacheable",
 		"$.SimpleFilter",
 		"$.SimpleRPCRunnable",
 		"$.ISimpleRequestInfoBinding",
