Changeset 10863 in josm


Ignore:
Timestamp:
2016-08-20T21:07:44+02:00 (3 years ago)
Author:
Don-vip
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/jdesktop/swinghelper/debug/CheckThreadViolationRepaintManager.java

    r10617 r10863  
    7373                        // for details see
    7474                        // https://swinghelper.dev.java.net/issues/show_bug.cgi?id=1
    75                         !st.getClassName().startsWith("javax.swing.SwingWorker")) {
     75                         !st.getClassName().startsWith("javax.swing.SwingWorker")) {
    7676                    fromSwing = true;
    7777                }
     
    8383                    fromSwing = false;
    8484                }
     85                if ("read".equals(st.getMethodName()) && "javax.swing.JEditorPane".equals(st.getClassName())) {
     86                    // Swing reads html from a background thread
     87                    return;
     88                }
    8589            }
    86             if (imageUpdate)
     90            if (imageUpdate) {
    8791                //assuming it is java.awt.image.ImageObserver.imageUpdate(...)
    8892                //image was asynchronously updated, that's ok
    8993                return;
    90             if (repaint && !fromSwing)
     94            }
     95            if (repaint && !fromSwing) {
    9196                //no problems here, since repaint() is thread safe
    9297                return;
     98            }
    9399            //ignore the last processed component
    94             if (lastComponent != null && c == lastComponent.get())
     100            if (lastComponent != null && c == lastComponent.get()) {
    95101                return;
     102            }
    96103            lastComponent = new WeakReference<>(c);
    97104            violationFound(c, stackTrace);
Note: See TracChangeset for help on using the changeset viewer.