Fixed bug for KHTML browser

jossonsmith · jossonsmith · commit b9af5bd0d8c3 · 2006-06-17T15:35:09.000Z
diff --git a/sources/net.sf.j2s.lib/build.properties b/sources/net.sf.j2s.lib/build.properties
@@ -1,10 +1,10 @@
 bin.includes = META-INF/,\
                plugin.xml,\
-               library.jar,\
                j2slib/
+bin.excludes = .svn/,\
+               j2slib/.svn/
 source.library.jar = src/
 jars.compile.order = library.jar
-bin.excludes = j2slib/.cvsignore
 src.includes = src/,\
                j2slib/
 output.library.jar = bin/
diff --git a/sources/net.sf.j2s.lib/j2slib/j2s-core-bare.z.js b/sources/net.sf.j2s.lib/j2slib/j2s-core-bare.z.js
@@ -43,6 +43,9 @@ return clazzStr.replace(/[^a-zA-Z0-9]/g,'');
 }
 var idx1=idx0+8;
 var idx2=clazzStr.indexOf("(",idx1);
+if(idx2==-1){
+return"Object";
+}
 var clazzName=clazzStr.substring(idx1,idx2)
 .replace(/^\s+/,"").replace(/\s+$/,"");
 if(clazzName=="anonymous"){
@@ -66,6 +69,15 @@ return obj.__CLASS_NAME__;
 }else if(obj.constructor==null){
 return"Object";
 }else{
+if(obj.constructor.__CLASS_NAME__==null){
+if(obj instanceof Number){
+return"Number";
+}else if(obj instanceof Boolean){
+return"Boolean";
+}else if(obj instanceof Array){
+return"Array";
+}
+}
 return Clazz.getClassName(obj.constructor);
 }
 }else if(objType=="number"){
diff --git a/sources/net.sf.j2s.lib/j2slib/j2s-core-basic.z.js b/sources/net.sf.j2s.lib/j2slib/j2s-core-basic.z.js
@@ -1024,13 +1024,21 @@ function(s){
 return Integer.parseInt(s,10);
 },"String");
 Integer.parseInt=Integer.prototype.parseInt;
+
+Clazz.defineMethod(Integer,"equals",
+function(s){
+if(s==null||!Clazz.instanceOf(s,Integer)){
+return false;
+}
+return s.valueOf()==this.valueOf();
+},"Object");
 /* http://j2s.sf.net/ */Clazz.declarePackage("java.lang");
 java.lang.Long=Long=function(){
 Clazz.instantialize(this,arguments);
 };
 Clazz.decorateAsType(Long,"Long",Number,Comparable);
 Long.prototype.valueOf=function(){return 0;};
-Integer.prototype.toString=function(){
+Long.prototype.toString=function(){
 return""+this.valueOf();
 };
 Clazz.makeConstructor(Long,
@@ -1074,13 +1082,21 @@ function(s){
 return Long.parseLong(s,10);
 },"String");
 Long.parseLong=Long.prototype.parseLong;
+
+Clazz.defineMethod(Long,"equals",
+function(s){
+if(s==null||!Clazz.instanceOf(s,Long)){
+return false;
+}
+return s.valueOf()==this.valueOf();
+},"Object");
 /* http://j2s.sf.net/ */Clazz.declarePackage("java.lang");
 java.lang.Float=Float=function(){
 Clazz.instantialize(this,arguments);
 };
 Clazz.decorateAsType(Float,"Float",Number,Comparable);
 Float.prototype.valueOf=function(){return 0;};
-Integer.prototype.toString=function(){
+Float.prototype.toString=function(){
 return""+this.valueOf();
 };
 Clazz.makeConstructor(Float,
@@ -1123,13 +1139,21 @@ return isNaN(num);
 },"Number");
 Float.isNaN=Float.prototype.isNaN;
 
+Clazz.defineMethod(Float,"equals",
+function(s){
+if(s==null||!Clazz.instanceOf(s,Float)){
+return false;
+}
+return s.valueOf()==this.valueOf();
+},"Object");
+
 /* http://j2s.sf.net/ */Clazz.declarePackage("java.lang");
 java.lang.Double=Double=function(){
 Clazz.instantialize(this,arguments);
 };
 Clazz.decorateAsType(Double,"Double",Number,Comparable);
 Double.prototype.valueOf=function(){return 0;};
-Integer.prototype.toString=function(){
+Double.prototype.toString=function(){
 return""+this.valueOf();
 };
 Clazz.makeConstructor(Double,
@@ -1168,7 +1192,13 @@ return parseFloat(s);
 },"String");
 Double.parseDouble=Double.prototype.parseDouble;
 
-/* http://j2s.sf.net/ */Clazz.declarePackage("java.util");
+Clazz.defineMethod(Double,"equals",
+function(s){
+if(s==null||!Clazz.instanceOf(s,Double)){
+return false;
+}
+return s.valueOf()==this.valueOf();
+},"Object");/* http://j2s.sf.net/ */Clazz.declarePackage("java.util");
 java.util.Date=Date;
 Clazz.decorateAsType(java.util.Date,"java.util.Date",null,[java.io.Serializable,Cloneable,Comparable]);
 
diff --git a/sources/net.sf.j2s.lib/j2slib/j2s-core-common.z.js b/sources/net.sf.j2s.lib/j2slib/j2s-core-common.z.js
@@ -766,24 +766,24 @@ this.send=function(str){
 this.transport.send(str);
 };
 },net.sf.j2s.ajax,"HttpRequest",null,Runnable);
-Clazz.declarePackage ("net.sf.j2s.ajax");
-Clazz.declareInterface (net.sf.j2s.ajax, "IXHRCallback");
-Clazz.declarePackage ("net.sf.j2s.ajax");
-c$ = Clazz.decorateAsClass (function () {
-Clazz.instantialize (this, arguments);
-}, net.sf.j2s.ajax, "XHRCallbackAdapter", null, net.sf.j2s.ajax.IXHRCallback);
-Clazz.overrideMethod (c$, "onComplete", 
-function () {
+$_J("net.sf.j2s.ajax");
+$_I(net.sf.j2s.ajax,"IXHRCallback");
+$_J("net.sf.j2s.ajax");
+c$=$_C(function(){
+$_Z(this,arguments);
+},net.sf.j2s.ajax,"XHRCallbackAdapter",null,net.sf.j2s.ajax.IXHRCallback);
+$_V(c$,"onComplete",
+function(){
 });
-Clazz.overrideMethod (c$, "onInteractive", 
-function () {
+$_V(c$,"onInteractive",
+function(){
 });
-Clazz.overrideMethod (c$, "onLoaded", 
-function () {
+$_V(c$,"onLoaded",
+function(){
 });
-Clazz.overrideMethod (c$, "onLoading", 
-function () {
+$_V(c$,"onLoading",
+function(){
 });
-Clazz.overrideMethod (c$, "onUninitialized", 
-function () {
+$_V(c$,"onUninitialized",
+function(){
 });
