Skip to content

Commit c5a5acc

Browse files
BobHansonBobHanson
authored
Merge pull request #78 from BobHanson/hanson1
Hanson1 - menubar, menu, table UI
2 parents 840fdf9 + 0eca16b commit c5a5acc

36 files changed

+638
-627
lines changed

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

-1.8 KB
Binary file not shown.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20181217223342
1+
20181220202217

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

-1.8 KB
Binary file not shown.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20181217223342
1+
20181220202217

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

-1.8 KB
Binary file not shown.

‎sources/net.sf.j2s.java.core/src/javax/swing/JTable.java‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1178,15 +1178,20 @@ public void setShowGrid(boolean showGrid) {
11781178
repaint();
11791179
}
11801180

1181-
@Override
1182-
public void repaint() {
1183-
super.repaint();
1184-
}
1185-
1186-
@Override
1187-
public void repaint(int x, int y, int width, int height) {
1188-
super.repaint(x, y, width, height);
1189-
}
1181+
// @Override
1182+
// protected void validateTree() {
1183+
// super.validateTree();
1184+
// }
1185+
//
1186+
// @Override
1187+
// public void repaint() {
1188+
// super.repaint();
1189+
// }
1190+
//
1191+
// @Override
1192+
// public void repaint(int x, int y, int width, int height) {
1193+
// super.repaint(x, y, width, height);
1194+
// }
11901195

11911196
/**
11921197
* Sets whether the table draws horizontal lines between cells. If
@@ -5979,4 +5984,5 @@ public void removeEditor() {
59795984
}
59805985
}
59815986

5987+
59825988
} // End of Class JTable

‎sources/net.sf.j2s.java.core/src/javax/swing/table/TableColumn.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ public int getWidth() {
537537
*
538538
* @param preferredWidth the new preferred width
539539
* @see #getPreferredWidth
540-
* @see JTable#doLayout()
540+
* @see JTable#
541541
* @beaninfo
542542
* bound: true
543543
* description: The preferred width of the column.

‎sources/net.sf.j2s.java.core/src/sun/swing/SwingLazyValue.java‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public SwingLazyValue(String c) {
5353
this(c, null, null);
5454
}
5555
public SwingLazyValue(String c, String m) {
56-
// new class.method()
56+
// new class.method() or $innerClass
5757
this(c, m, null);
5858
}
5959
public SwingLazyValue(String c, Object[] o) {
@@ -72,7 +72,15 @@ public SwingLazyValue(String c, String m, Object[] o) {
7272
@Override
7373
public Object createValue(final UIDefaults table) {
7474
try {
75-
// Object cl;
75+
if (className.indexOf("$") > 0) {
76+
String cname = className;
77+
// SwingJS preload inner classes
78+
/**
79+
* @j2sNative
80+
*
81+
* Clazz.load(cname.replace("$","$.").split("$"));
82+
*/
83+
}
7684
Class c = Class.forName(className, true, null);
7785
if (methodName != null) {
7886
Class[] types = getClassArray(args);

‎sources/net.sf.j2s.java.core/src/swingjs/jquery/JQueryUI.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* @author Bob Hanson
1111
*
1212
*/
13-
public class JQueryUI {
13+
public class JQueryUI {
1414

1515
public JQueryUI() {
1616

‎sources/net.sf.j2s.java.core/src/swingjs/jquery/j2sMenu.js‎

Lines changed: 107 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// J2SMenu.js from JSmolMenu.js
22
// author: Bob Hanson, hansonr@stolaf.edu
3+
// last edited 12/20/2018
34

45
/*! jQuery UI - v1.9.2 - 2012-12-17
56
* http://jqueryui.com
@@ -40,19 +41,59 @@ try{
4041
this.delay = this.options.delay;
4142

4243
this.activeMenu=this.element,this.element.uniqueId().addClass("ui-menu ui-widget ui-widget-content ui-corner-all").toggleClass("ui-menu-icons",!!this.element.find(".ui-icon").length)
43-
.attr({role:this.options.role,tabIndex:0}).bind("click"+this.eventNamespace,e.proxy(function(e){this.options.disabled&&e.preventDefault()},this)),this.options.disabled&&this.element.addClass("ui-state-disabled").attr("aria-disabled","true"),
44-
this._on({"mousedown .ui-menu-item > a":function(e){e.preventDefault()},
45-
"click .ui-state-disabled > a":function(e){e.preventDefault()},
46-
"click .ui-menu-item:has(a)":function(t){var r=e(t.target).closest(".ui-menu-item");!n&&r.not(".ui-state-disabled").length&&(n=!0,this.select(t),r.has(".ui-menu").length?this.expand(t):this.element.is(":focus")||(this.element.trigger("focus",[!0]),this.active&&this.active.parents(".ui-menu").length===1&&clearTimeout(this.timer)))},"mouseenter .ui-menu-item":function(t){var n=e(t.currentTarget);n.siblings().children(".ui-state-active").removeClass("ui-state-active"),this.focus(t,n)},mouseleave:"collapseAll","mouseleave .ui-menu": "collapseAll",
47-
focus:function(e,t){var n=this.active||this.element.children(".ui-menu-item").eq(0);t||this.focus(e,n)},
48-
blur:function(t){this._delay(function(){e.contains(this.element[0],this.document[0].activeElement)||this.collapseAll(t)})},
49-
keydown:"_keydown"}),
50-
51-
this.refresh(),
52-
this._on(this.document,{
53-
click:function(t){e(t.target).closest(".ui-menu").length||this.collapseAll(t),n=!1}})},
44+
.attr({role:this.options.role,tabIndex:0}).bind("click"+this.eventNamespace,e.proxy(function(e){this.options.disabled&&e.preventDefault()},this)),this.options.disabled&&this.element.addClass("ui-state-disabled").attr("aria-disabled","true"),
45+
this._on({
46+
"mousedown .ui-menu-item > a":function(e){e.preventDefault()},
47+
"click .ui-state-disabled > a":function(e){e.preventDefault()},
48+
"click .ui-menu-item:has(a)":function(t){
49+
50+
51+
// BH 12/20/2018 adds persistence for JMenu clicks
52+
53+
if (this.active && this.active[0].attributes.name && this.active[0].attributes.name.value == "javax.swing.JMenu") {
54+
clearTimeout(this.timer);
55+
return
56+
}
57+
58+
var r=e(t.target).closest(".ui-menu-item");
59+
60+
!n&&r.not(".ui-state-disabled").length&&(n=!0,this.select(t),r.has(".ui-menu").length?this.expand(t):this.element.is(":focus")||(this.element.trigger("focus",[!0]),this.active&&this.active.parents(".ui-menu").length===1&&clearTimeout(this.timer)))
61+
62+
; $(".ui-menu").hide();
63+
64+
65+
66+
},
67+
"mouseover .ui-menu-item":function(t){
68+
// BH 2018
69+
// -- added stopPropagation
70+
// -- changed to mouseover from mouseenter, since we have children
71+
t.stopPropagation();
72+
var n=e(t.currentTarget);
73+
n.siblings().children(".ui-state-active").removeClass("ui-state-active"),
74+
this.focus(t,n)
75+
76+
},
77+
mouseleave:"collapseAll",
78+
"mouseleave .ui-menu": "collapseAll",
79+
focus:function(e,t){var n=this.active||this.element.children(".ui-menu-item").eq(0);t||this.focus(e,n)},
80+
blur:function(t){this._delay(function(){e.contains(this.element[0],this.document[0].activeElement)||this.collapseAll(t)})},
81+
keydown:"_keydown"
82+
}),
83+
this.refresh(),
84+
this._on(this.document,{
85+
click:function(t){e(t.target).closest(".ui-menu").length||this.collapseAll(t),n=!1}})
86+
},
5487

55-
_destroy:function(){this.element.removeAttr("aria-activedescendant").find(".ui-menu").andSelf().removeClass("ui-menu ui-widget ui-widget-content ui-corner-all ui-menu-icons").removeAttr("role").removeAttr("tabIndex").removeAttr("aria-labelledby").removeAttr("aria-expanded").removeAttr("aria-hidden").removeAttr("aria-disabled").removeUniqueId().show(),this.element.find(".ui-menu-item").removeClass("ui-menu-item").removeAttr("role").removeAttr("aria-disabled").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")},
88+
_destroy:function(){this.element.removeAttr("aria-activedescendant").find(".ui-menu").andSelf()
89+
.removeClass("ui-menu ui-widget ui-widget-content ui-corner-all ui-menu-icons")
90+
.removeAttr("role").removeAttr("tabIndex").removeAttr("aria-labelledby").removeAttr("aria-expanded")
91+
.removeAttr("aria-hidden").removeAttr("aria-disabled").removeUniqueId().show(),
92+
this.element.find(".ui-menu-item").removeClass("ui-menu-item")
93+
.removeAttr("role").removeAttr("aria-disabled")
94+
.children("a").removeUniqueId().removeClass("ui-corner-all ui-state-hover")
95+
.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")
96+
},
5697
_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()},
5798
_activate:function(e){this.active.is(".ui-state-disabled")||(this.active.children("a[aria-haspopup='true']").length?this.expand(e):this.select(e))},
5899
refresh:function(){
@@ -67,7 +108,19 @@ try{
67108
.data("ui-menu-submenu-carat",!0);
68109
r.attr("aria-haspopup","true").prepend(i),t.attr("aria-labelledby",r.attr("id"))}),t=r.add(this.element),t.children(":not(.ui-menu-item):has(a)").addClass("ui-menu-item").attr("role","presentation").children("a").uniqueId().addClass("ui-corner-all").attr({tabIndex:-1,role:this._itemRole()}),t.children(":not(.ui-menu-item)").each(function(){var t=e(this);/[^\-+�G��G��+�G��G��\s]/.test(t.text())||t.addClass("ui-widget-content ui-menu-divider")}),t.children(".ui-state-disabled").attr("aria-disabled","true"),this.active&&!e.contains(this.element[0],this.active[0])&&this.blur()},
69110
_itemRole:function(){return{menu:"menuitem",listbox:"option"}[this.options.role]},
70-
focus:function(e,t){var n,r;this.blur(e,e&&e.type==="focus"),this._scrollIntoView(t),this.active=t.first(),r=this.active.children("a").addClass("ui-state-focus"),this.options.role&&this.element.attr("aria-activedescendant",r.attr("id")),this.active.parent().closest(".ui-menu-item").children("a:first").addClass("ui-state-active"),e&&e.type==="keydown"?this._close():this.timer=this._delay(function(){this._close()},this.delay),n=t.children(".ui-menu"),n.length&&/^mouse/.test(e.type)&&this._startOpening(n),this.activeMenu=t.parent(),this._trigger("focus",e,{item:t})},
111+
112+
focus:function(e,t){var n,r;this.blur(e,e&&e.type==="focus"),this._scrollIntoView(t),this.active=t.first(),
113+
r=this.active
114+
//.children("a")
115+
.addClass("ui-state-focus"),
116+
this.options.role&&this.element.attr("aria-activedescendant",
117+
r.attr("id")),
118+
this.active.parent().closest(".ui-menu-item").children("a:first").addClass("ui-state-active"),
119+
e&&e.type==="keydown"?this._close():
120+
this.timer=this._delay(function(){this._close()},this.delay),
121+
n=t.children(".ui-menu"),n.length&&/^mouse/.test(e.type)
122+
&&this._startOpening(n),this.activeMenu=t.parent(),
123+
this._trigger("focus",e,{item:t})},
71124
_scrollIntoView:function(t){var n,r,i,s,o,u;this._hasScroll()&&(n=parseFloat(e.css(this.activeMenu[0],"borderTopWidth"))||0,r=parseFloat(e.css(this.activeMenu[0],"paddingTop"))||0,i=t.offset().top-this.activeMenu.offset().top-n-r,s=this.activeMenu.scrollTop(),o=this.activeMenu.height(),u=t.height(),i<0?this.activeMenu.scrollTop(s+i):i+u>o&&this.activeMenu.scrollTop(s+i-o+u))},
72125
blur:function(e,t){
73126

@@ -76,12 +129,40 @@ try{
76129
}
77130

78131

79-
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})},
132+
t||clearTimeout(this.timer);if(!this.active)return;
133+
134+
this.active
135+
//.children("a")
136+
.removeClass("ui-state-focus"),this.active=null,this._trigger("blur",e,{item:this.active})},
80137
_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)},
81138
_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)},
82-
collapseAll:function(t,n){clearTimeout(this.timer),this.timer=this._delay(function(){var r=n?this.element:e(t&&t.target).closest(this.element.find(".ui-menu"));r.length||(r=this.element),this._close(r),this.blur(t),this.activeMenu=r},this.delay)},
83-
_close:function(e){e||(e=this.active?this.active.parent():this.element),e.find(".ui-menu").hide().attr("aria-hidden","true").attr("aria-expanded","false").end().find("a.ui-state-active").removeClass("ui-state-active")},
84-
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))},
139+
collapseAll:function(t,n){
140+
clearTimeout(this.timer),this.timer=this._delay(
141+
function(){
142+
var r=n?this.element:e(t&&t.target).closest(this.element.find(".ui-menu"));
143+
r.length||(r=this.element),
144+
this._close(r),
145+
this.blur(t),
146+
this.activeMenu=r
147+
}, this.delay)
148+
},
149+
_close:function(e){
150+
151+
var e0= e;
152+
e||(e=this.active?this.active.parent():this.element),
153+
e.find(".ui-menu")
154+
.hide()
155+
.attr("aria-hidden","true")
156+
.attr("aria-expanded","false")
157+
.end()
158+
.find("a.ui-state-active")
159+
.removeClass("ui-state-active")
160+
161+
162+
},
163+
collapse:function(e){var t=this.active&&this.active.parent().closest(".ui-menu-item",this.element);t&&t.length&&(this._close(),
164+
this.focus(e,t))
165+
},
85166
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)}))},
86167
next:function(e){this._move("next","first",e)},
87168
previous:function(e){this._move("prev","last",e)},
@@ -128,7 +209,7 @@ Swing.__getMenuStyle = function(applet) { return '\
128209
.swingjsPopupMenu .ui-icon-carat-1-e:after{content:"\\0025B6"}\
129210
.swingjsPopupMenu .ui-state-default{border:1px solid #c5dbec;background:#dfeffc;color:#2e6e9e}\
130211
.swingjsPopupMenu .ui-state-default a{color:#2e6e9e;text-decoration:none}\
131-
.swingjsPopupMenu .ui-state-hover,.swingjsPopupMenu .ui-state-focus{border:1px solid #79b7e7;background:#d0e5f5;color:#1d5987}\
212+
.swingjsPopupMenu .ui-state-hover,.swingjsPopupMenu .ui-state-focus{background:#d0e5f5;color:#1d5987}\
132213
.swingjsPopupMenu .ui-state-hover a{color:#1d5987;text-decoration:none}\
133214
.swingjsPopupMenu .ui-state-active{border:1px solid #79b7e7;background:#f5f8f9;color:#e17009}\
134215
.swingjsPopupMenu .ui-state-active a{color:#e17009;text-decoration:none}\
@@ -144,11 +225,19 @@ var bindMenuActionCommands = function(eventType, menu, isBind) {
144225
var children = (menu.uiClassID ? menu.ui.getChildren() : menu.getComponents());
145226
for(var i = children.length; --i >= 0;)
146227
bindMenuActionCommands(eventType, children[i], isBind);
228+
229+
230+
231+
147232
if (!menu.uiClassID || !menu["data-ui"])
148233
return;
149234
J2S.$documentOff(eventType, menu.id);
150235
if (isBind)
151236
J2S.$documentOn(eventType, menu.id, function(event) {
237+
238+
239+
240+
152241
if (menu.uiClassID) {
153242
System.out.println(["menu " + menu.ui.id , " clicked " , event.target.id , event.target.tagName, event.target["data-component"]]);
154243
Swing.hideMenus(menu._applet);

0 commit comments

Comments
 (0)