Changeset 10863 in josm for trunk/src/org/jdesktop/swinghelper

Timestamp:

2016-08-20T21:07:44+02:00 (8 years ago)

Author:

Don-vip

Message:

update CheckThreadViolationRepaintManager to r296 - fix for ​https://java.net/jira/browse/SWINGHELPER-4

File:

• trunk/src/org/jdesktop/swinghelper/debug/CheckThreadViolationRepaintManager.java (modified) (2 diffs)

trunk/src/org/jdesktop/swinghelper/debug/CheckThreadViolationRepaintManager.java

@@ -73 +73 @@
                         // for details see
                         // https://swinghelper.dev.java.net/issues/show_bug.cgi?id=1
-                        !st.getClassName().startsWith("javax.swing.SwingWorker")) {
+                         !st.getClassName().startsWith("javax.swing.SwingWorker")) {
                     fromSwing = true;
                 }
@@ -83 +83 @@
                     fromSwing = false;
                 }
+                if ("read".equals(st.getMethodName()) && "javax.swing.JEditorPane".equals(st.getClassName())) {
+                    // Swing reads html from a background thread
+                    return;
+                }
             }
-            if (imageUpdate)
+            if (imageUpdate) {
                 //assuming it is java.awt.image.ImageObserver.imageUpdate(...)
                 //image was asynchronously updated, that's ok
                 return;
-            if (repaint && !fromSwing)
+            }
+            if (repaint && !fromSwing) {
                 //no problems here, since repaint() is thread safe
                 return;
+            }
             //ignore the last processed component
-            if (lastComponent != null && c == lastComponent.get())
+            if (lastComponent != null && c == lastComponent.get()) {
                 return;
+            }
             lastComponent = new WeakReference<>(c);
             violationFound(c, stackTrace);