Changeset 16050 in josm for trunk/src/org

Timestamp:

2020-03-06T23:54:39+01:00 (5 years ago)

Author:

Don-vip

Message:

see #18845 - see #16860 - directory cleanup

Location:

trunk/src/org

Files:

• apache/commons (modified) (1 prop)
• glassfish (deleted)
• jdesktop (deleted)
• openstreetmap/josm/gui/MainApplication.java (modified) (2 diffs)
• openstreetmap/josm/gui/util/CheckThreadViolationRepaintManager.java (copied) (copied from trunk/src/org/jdesktop/swinghelper/debug/CheckThreadViolationRepaintManager.java ) (6 diffs)
• tukaani (deleted)

trunk/src/org/apache/commons

@@ -1 +1 @@
 https://github.com/apache/commons-jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs jcs
-https://github.com/apache/commons-logging/trunk/src/main/java/org/apache/commons/logging logging
-https://github.com/apache/commons-compress/trunk/src/main/java/org/apache/commons/compress compress

@@ -1 +1 @@
 https://github.com/apache/commons-jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs jcs
-https://github.com/apache/commons-logging/trunk/src/main/java/org/apache/commons/logging logging
-https://github.com/apache/commons-compress/trunk/src/main/java/org/apache/commons/compress compress

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -63 +63 @@
 import javax.swing.UnsupportedLookAndFeelException;
 
-import org.jdesktop.swinghelper.debug.CheckThreadViolationRepaintManager;
 import org.openstreetmap.josm.actions.DeleteAction;
 import org.openstreetmap.josm.actions.JosmAction;
@@ -121 +120 @@
 import org.openstreetmap.josm.gui.preferences.server.ProxyPreference;
 import org.openstreetmap.josm.gui.progress.swing.ProgressMonitorExecutor;
+import org.openstreetmap.josm.gui.util.CheckThreadViolationRepaintManager;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.util.RedirectInputMap;

trunk/src/org/openstreetmap/josm/gui/util/CheckThreadViolationRepaintManager.java

@@ -15 +15 @@
  */
 
-package org.jdesktop.swinghelper.debug;
+package org.openstreetmap.josm.gui.util;
 
 import java.lang.ref.WeakReference;
@@ -22 +22 @@
 import javax.swing.RepaintManager;
 import javax.swing.SwingUtilities;
+
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -39 +41 @@
  */
 public class CheckThreadViolationRepaintManager extends RepaintManager {
-    // it is recommended to pass the complete check
-    private boolean completeCheck = true;
     private WeakReference<JComponent> lastComponent;
-
-    public CheckThreadViolationRepaintManager(boolean completeCheck) {
-        this.completeCheck = completeCheck;
-    }
-
-    public CheckThreadViolationRepaintManager() {
-        this(true);
-    }
 
     @Override
@@ -64 +56 @@
 
     private void checkThreadViolations(JComponent c) {
-        if (!SwingUtilities.isEventDispatchThread() && (completeCheck || c.isShowing())) {
+        if (!SwingUtilities.isEventDispatchThread()) {
             boolean repaint = false;
             boolean fromSwing = false;
@@ -71 +63 @@
             for (StackTraceElement st : stackTrace) {
                 if (repaint && st.getClassName().startsWith("javax.swing.") &&
-                        // for details see
-                        // https://swinghelper.dev.java.net/issues/show_bug.cgi?id=1
-                         !st.getClassName().startsWith("javax.swing.SwingWorker")) {
+                    // for details see https://swinghelper.dev.java.net/issues/show_bug.cgi?id=1
+                    !st.getClassName().startsWith("javax.swing.SwingWorker")) {
                     fromSwing = true;
                 }
@@ -106 +97 @@
     }
 
-    protected void violationFound(JComponent c, StackTraceElement[] stackTrace) {
-        System.out.println();
-        System.out.println("EDT violation detected");
-        System.out.println(c);
+    protected static void violationFound(JComponent c, StackTraceElement[] stackTrace) {
+        Logging.error("");
+        Logging.error("EDT violation detected");
+        Logging.error(c.toString());
         for (StackTraceElement st : stackTrace) {
-            System.out.println("\tat " + st);
+            Logging.error("\tat " + st);
         }
     }

@@ -1 +1 @@
 https://github.com/apache/commons-jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs jcs
-https://github.com/apache/commons-logging/trunk/src/main/java/org/apache/commons/logging logging
-https://github.com/apache/commons-compress/trunk/src/main/java/org/apache/commons/compress compress