Merge branch 'yadav1' of https://github.com/BobHanson/java2script.git

BobHanson · BobHanson · commit 3610740aefdf · 2017-12-22T14:36:12.000-06:00
into yadav1

Conflicts:
	sources/net.sf.j2s.java.core/srcjs/js/j2sSwingJS.js
	sources/net.sf.j2s.java.core/srcjs/swingjs2.js
diff --git a/sources/net.sf.j2s.java.core/srcjs/js/j2sSwingJS.js b/sources/net.sf.j2s.java.core/srcjs/js/j2sSwingJS.js
@@ -373,7 +373,6 @@ Clazz.newClass = function (prefix, name, clazz, clazzSuper, interfacez, type) {
   }
   clazz || (clazz = function () {Clazz.newInstance(this,arguments,0,clazz)});  
   clazz.__NAME__ = name;
-  prefix.__CLASS_NAME__ && (clazz.$this$0 = prefix.__CLASS_NAME__);
   clazz.$load$ = [clazzSuper, interfacez];
   
   // get qualifed name, and for inner classes, the name to use to refer to this
diff --git a/sources/net.sf.j2s.java.core/srcjs/swingjs2.js b/sources/net.sf.j2s.java.core/srcjs/swingjs2.js
@@ -10654,7 +10654,6 @@ return jQuery;
 })(jQuery,document,"click mousemove mouseup touchmove touchend", "outjsmol");
 // j2sApplet.js (based on JmolCore.js)
 
-// BH 12/22/2017 1:18:42 PM adds j2sargs for setting arguments
 // BH 11/19/2017 3:55:04 AM adding support for swingjs2.js; adds static j2sHeadless=true;
 // BH 10/4/2017 2:25:03 PM adds Clazz.loadClass("javajs.util.Base64")
 // BH 7/18/2017 10:46:44 AM adds J2S._canClickFileReader, fixing J2S.getFileFromDialog for Chrome and Safari

Original file line number	Diff line number	Diff line change
`@@ -373,7 +373,6 @@ Clazz.newClass = function (prefix, name, clazz, clazzSuper, interfacez, type) {`
`373`	`373`	`}`
`374`	`374`	`clazz \|\| (clazz = function () {Clazz.newInstance(this,arguments,0,clazz)});`
`375`	`375`	`clazz.__NAME__ = name;`
`376`		`- prefix.__CLASS_NAME__ && (clazz.$this$0 = prefix.__CLASS_NAME__);`
`377`	`376`	`clazz.$load$ = [clazzSuper, interfacez];`
`378`	`377`
`379`	`378`	`// get qualifed name, and for inner classes, the name to use to refer to this`