Skip to content

Commit 0625069

Browse files
BobHansonBobHanson
authored
Merge pull request #181 from BobHanson/master
upgrade for Jmol and SimpleHTTPClient (Jalview)
2 parents aa4915c + 9b5ce45 commit 0625069

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+2516
-1788
lines changed

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

-917 Bytes
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-
20201127044806
1+
20201202180738

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

-5.55 MB
Binary file not shown.

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

-6.94 MB
Binary file not shown.

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

-7.3 MB
Binary file not shown.

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

-917 Bytes
Binary file not shown.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20201127044806
1+
20201202180738

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

-917 Bytes
Binary file not shown.

‎sources/net.sf.j2s.java.core/src/java/awt/Component.java‎

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3797,7 +3797,7 @@ protected void dispatchEventImplComp(AWTEvent e) {
37973797
return;
37983798
}
37993799

3800-
if (!e.focusManagerIsDispatching) {
3800+
if (!e.focusManagerIsDispatching) {
38013801
// Invoke the private focus retargeting method which provides
38023802
// lightweight Component support
38033803
if (e.isPosted) {
@@ -5921,27 +5921,7 @@ public void addNotify() {
59215921
// able to get window-related events by itself. If any
59225922
// have been enabled, then the nearest native container must
59235923
// be enabled.
5924-
if (parent != null) {
5925-
long mask = 0;
5926-
if ((mouseListener != null) || ((eventMask & AWTEvent.MOUSE_EVENT_MASK) != 0)) {
5927-
mask |= AWTEvent.MOUSE_EVENT_MASK;
5928-
}
5929-
if ((mouseMotionListener != null) || ((eventMask & AWTEvent.MOUSE_MOTION_EVENT_MASK) != 0)) {
5930-
mask |= AWTEvent.MOUSE_MOTION_EVENT_MASK;
5931-
}
5932-
if ((mouseWheelListener != null) || ((eventMask & AWTEvent.MOUSE_WHEEL_EVENT_MASK) != 0)) {
5933-
mask |= AWTEvent.MOUSE_WHEEL_EVENT_MASK;
5934-
}
5935-
if (focusListener != null || (eventMask & AWTEvent.FOCUS_EVENT_MASK) != 0) {
5936-
mask |= AWTEvent.FOCUS_EVENT_MASK;
5937-
}
5938-
if (keyListener != null || (eventMask & AWTEvent.KEY_EVENT_MASK) != 0) {
5939-
mask |= AWTEvent.KEY_EVENT_MASK;
5940-
}
5941-
if (mask != 0) {
5942-
parent.proxyEnableEvents(mask);
5943-
}
5944-
}
5924+
((JSComponent) this).秘setProxy(parent);
59455925
// } else {
59465926
// // It's native. If the parent is lightweight it
59475927
// // will need some help.

‎sources/net.sf.j2s.java.core/src/java/awt/EventDispatchThread.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ void pumpEventsForFilter(int id, Conditional cond, EventFilter filter) {
228228
this.filter = filter;
229229
this.cond = cond;
230230
this.id = id;
231-
run1(INIT);
231+
super.run1(INIT);
232232
}
233233

234234
// @Override
@@ -272,8 +272,11 @@ void pumpEventsForFilter(int id, Conditional cond, EventFilter filter) {
272272
@SuppressWarnings("unused")
273273
protected void dispatchAndReturn(Runnable r, int mode) {
274274
JSThread me = this;
275-
JSFunction f = /** @j2sNative function() {r.run$();me.run1$I(mode)}|| */ null;
276-
JSToolkit.dispatch(f, 0, 0);
275+
JSFunction f = /** @j2sNative function() {
276+
r.run$();
277+
me.run1$I(mode);
278+
}|| */ null;
279+
JSToolkit.dispatch(f, 1, 0);
277280
}
278281

279282
private void finish() {

0 commit comments

Comments
 (0)