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

into hanson1

Conflicts:
	sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip
	sources/net.sf.j2s.core/dist/swingjs/timestamp
	sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/SwingJS-site.zip
	sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/timestamp
	sources/net.sf.j2s.java.core/dist/SwingJS-site.zip
	sources/net.sf.j2s.java.core/src/swingjs/jquery/j2sMenu.js
	sources/net.sf.j2s.java.core/src/swingjs/plaf/JSTableUI.java

Author: hansonr

sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip

@@ -1 +1,5 @@
+<<<<<<< HEAD
 20181222153027 
+=======
+20181220202217 
+>>>>>>> branch 'hanson1' of https://github.com/BobHanson/java2script.git

sources/net.sf.j2s.core/dist/swingjs/timestamp

@@ -1 +1,5 @@
+<<<<<<< HEAD
 20181222153027 
+=======
+20181220202217 
+>>>>>>> branch 'hanson1' of https://github.com/BobHanson/java2script.git

sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/SwingJS-site.zip

@@ -109,8 +109,12 @@ var r=e(t.target).closest(".ui-menu-item");
 	 .children("a").removeUniqueId().removeClass("ui-corner-all ui-state-hover")
 	 .removeAttr("tabIndex").removeAttr("role").removeAttr("aria-haspopup").children().each(function(){var t=e(this);t.data("ui-menu-submenu-carat")&&t.remove()}),this.element.find(".ui-menu-divider").removeClass("ui-menu-divider ui-widget-content")
 	 },
+<<<<<<< HEAD
  _keydown:function(t){function a(e){return e.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")}var n,r,i,s,o,u=!0;switch(t.keyCode){case e.ui.keyCode.PAGE_UP:this.previousPage(t);break;case e.ui.keyCode.PAGE_DOWN:this.nextPage(t);break;case e.ui.keyCode.HOME:this._move("first","first",t);break;case e.ui.keyCode.END:this._move("last","last",t);break;case e.ui.keyCode.UP:this.previous(t);break;case e.ui.keyCode.DOWN:this.next(t);break;case e.ui.keyCode.LEFT:this.collapse(t);break;case e.ui.keyCode.RIGHT:this.active&&!this.active.is(".ui-state-disabled")&&this.expand(t);break;case e.ui.keyCode.ENTER:case e.ui.keyCode.SPACE:this._activate(t);break;case e.ui.keyCode.ESCAPE:this.collapse(t);break;default:u=!1,r=this.previousFilter||"",i=String.fromCharCode(t.keyCode),s=!1,clearMe(this.filterTimer),i===r?s=!0:i=r+i,o=new RegExp("^"+a(i),"i"),n=this.activeMenu.children(".ui-menu-item").filter(function(){return o.test(e(this).children("a").text())}),n=s&&n.index(this.active.next())!==-1?this.active.nextAll(".ui-menu-item"):n,n.length||(i=String.fromCharCode(t.keyCode),o=new RegExp("^"+a(i),"i"),n=this.activeMenu.children(".ui-menu-item").filter(function(){return o.test(e(this).children("a").text())})),n.length?(this.focus(t,n),n.length>1?(this.previousFilter=i,
 		 	this.filterTimer=delayMe(function(){delete this.previousFilter},1e3)):delete this.previousFilter):delete this.previousFilter}u&&t.preventDefault()},
+=======
+ _keydown:function(t){function a(e){return e.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")}var n,r,i,s,o,u=!0;switch(t.keyCode){case e.ui.keyCode.PAGE_UP:this.previousPage(t);break;case e.ui.keyCode.PAGE_DOWN:this.nextPage(t);break;case e.ui.keyCode.HOME:this._move("first","first",t);break;case e.ui.keyCode.END:this._move("last","last",t);break;case e.ui.keyCode.UP:this.previous(t);break;case e.ui.keyCode.DOWN:this.next(t);break;case e.ui.keyCode.LEFT:this.collapse(t);break;case e.ui.keyCode.RIGHT:this.active&&!this.active.is(".ui-state-disabled")&&this.expand(t);break;case e.ui.keyCode.ENTER:case e.ui.keyCode.SPACE:this._activate(t);break;case e.ui.keyCode.ESCAPE:this.collapse(t);break;default:u=!1,r=this.previousFilter||"",i=String.fromCharCode(t.keyCode),s=!1,clearTimeout(this.filterTimer),i===r?s=!0:i=r+i,o=new RegExp("^"+a(i),"i"),n=this.activeMenu.children(".ui-menu-item").filter(function(){return o.test(e(this).children("a").text())}),n=s&&n.index(this.active.next())!==-1?this.active.nextAll(".ui-menu-item"):n,n.length||(i=String.fromCharCode(t.keyCode),o=new RegExp("^"+a(i),"i"),n=this.activeMenu.children(".ui-menu-item").filter(function(){return o.test(e(this).children("a").text())})),n.length?(this.focus(t,n),n.length>1?(this.previousFilter=i,this.filterTimer=this._delay(function(){delete this.previousFilter},1e3)):delete this.previousFilter):delete this.previousFilter}u&&t.preventDefault()},
+>>>>>>> branch 'hanson1' of https://github.com/BobHanson/java2script.git
  _activate:function(e){this.active.is(".ui-state-disabled")||(this.active.children("a[aria-haspopup='true']").length?this.expand(e):this.select(e))},
  refresh:function(){
 	 var t,n=this.options.icons.submenu,role=this.options.role,
@@ -133,7 +137,11 @@ var r=e(t.target).closest(".ui-menu-item");
     		r.attr("id")),
     this.active.parent().closest(".ui-menu-item").children("a:first").addClass("ui-state-active"),
     e&&e.type==="keydown"?this._close():
+<<<<<<< HEAD
 this.timer=delayMe(this, function(){this._close()},this.delay),
+=======
+this.timer=this._delay(function(){this._close()},this.delay),
+>>>>>>> branch 'hanson1' of https://github.com/BobHanson/java2script.git
 n=t.children(".ui-menu"),n.length&&/^mouse/.test(e.type)
 &&this._startOpening(n),this.activeMenu=t.parent(),
 this._trigger("focus",e,{item:t})},
@@ -145,6 +153,7 @@ this._trigger("focus",e,{item:t})},
 	 }
 
 
+<<<<<<< HEAD
 	 t||clearMe(this.timer);if(!this.active)return;
 
 	 this.active
@@ -154,6 +163,15 @@ this._trigger("focus",e,{item:t})},
  _startOpening:function(e){clearMe(this.timer);if(e.attr("aria-hidden")!=="true")return;
  this.timer=delayMe(this, function(){this._close(),this._open(e)},this.delay)},
  _open:function(t){var n=e.extend({of:this.active},this.options.position);clearMe(this.timer),this.element.find(".ui-menu").not(t.parents(".ui-menu")).hide().attr("aria-hidden","true"),t.show().removeAttr("aria-hidden").attr("aria-expanded","true").position(n)},
+=======
+	 t||clearTimeout(this.timer);if(!this.active)return;
+	 
+	 this.active
+	 //.children("a")
+	 .removeClass("ui-state-focus"),this.active=null,this._trigger("blur",e,{item:this.active})},
+ _startOpening:function(e){clearTimeout(this.timer);if(e.attr("aria-hidden")!=="true")return;this.timer=this._delay(function(){this._close(),this._open(e)},this.delay)},
+ _open:function(t){var n=e.extend({of:this.active},this.options.position);clearTimeout(this.timer),this.element.find(".ui-menu").not(t.parents(".ui-menu")).hide().attr("aria-hidden","true"),t.show().removeAttr("aria-hidden").attr("aria-expanded","true").position(n)},
+>>>>>>> branch 'hanson1' of https://github.com/BobHanson/java2script.git
  collapseAll:function(t,n){
 	 clearMe(this.timer),
 	 this.timer=delayMe(this,
@@ -182,8 +200,12 @@ e.find(".ui-menu")
  collapse:function(e){var t=this.active&&this.active.parent().closest(".ui-menu-item",this.element);t&&t.length&&(this._close(),
 		 this.focus(e,t))
  },
+<<<<<<< HEAD
  expand:function(e){var t=this.active&&this.active.children(".ui-menu ").children(".ui-menu-item").first();t&&t.length&&(this._open(t.parent()),
 		 delayMe(this,function(){this.focus(e,t)}))},
+=======
+ expand:function(e){var t=this.active&&this.active.children(".ui-menu ").children(".ui-menu-item").first();t&&t.length&&(this._open(t.parent()),this._delay(function(){this.focus(e,t)}))},
+>>>>>>> branch 'hanson1' of https://github.com/BobHanson/java2script.git
  next:function(e){this._move("next","first",e)},
  previous:function(e){this._move("prev","last",e)},
  isFirstItem:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},

sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/timestamp

@@ -153,7 +153,11 @@ public void setTainted() {
 	@Override
 	public void propertyChange(PropertyChangeEvent e) {
 		String prop = e.getPropertyName();
+<<<<<<< HEAD
 		System.out.println("JSTableUI prop=" + prop);
+=======
+		System.out.println("JSTableUI prop=" + e);
+>>>>>>> branch 'hanson1' of https://github.com/BobHanson/java2script.git
 		switch (prop) {
 		case "model":
 			currentRowMin = currentRowMax = -1;