see #18845 - see #16860 - directory cleanup

git-svn-id: https://josm.openstreetmap.de/svn/trunk@16050 0c6e7542-c601-0410-84e7-c038aed88b3b

Author: don-vip

.checkstyle

@@ -10,14 +10,10 @@
   <filter name="DerivedFiles" enabled="true"/>
   <filter name="FilesFromPackage" enabled="true">
     <filter-data value="src/com"/>
-    <filter-data value="src/javax"/>
     <filter-data value="src/oauth"/>
     <filter-data value="src/org/apache"/>
-    <filter-data value="src/org/glassfish"/>
-    <filter-data value="src/org/jdesktop"/>
     <filter-data value="src/org/openstreetmap/gui"/>
     <filter-data value="src/org/openstreetmap/josm/gui/mappaint/mapcss/parsergen"/>
-    <filter-data value="src/org/tukaani"/>
     <filter-data value=".externalToolBuilders"/>
     <filter-data value=".settings"/>
     <filter-data value=".svn"/>

README

@@ -189,7 +189,6 @@ There are some third party libraries which are directly included in the source c
     src/org/openstreetmap/gui (svn external)
     -> http://svn.openstreetmap.org/applications/viewer/jmapviewer/
 * Apache commons compress: Support for bzip2 compression when opening files
-    src/org/apache/commons/compress/compressors (svn external)
     -> https://github.com/apache/commons-compress
 * Apache commons validator: Improved validator routines
     src/org/openstreetmap/josm/data/validation/routines
@@ -198,7 +197,6 @@ There are some third party libraries which are directly included in the source c
     src/com/kitfox/svg
     -> https://github.com/blackears/svgSalamander
 * Metadata Extractor: Read EXIF Metadata of photos
-    src/com/drew
     -> https://github.com/drewnoakes/metadata-extractor
 * Signpost: OAuth library
     src/oauth, src/com/google
@@ -207,11 +205,10 @@ There are some third party libraries which are directly included in the source c
     src/org/openstreetmap/josm/gui/MultiSplitLayout.java, MultiSplitPane.java
     -> https://github.com/floscher/multi-split
     -> https://community.oracle.com/docs/DOC-983539
-* swinghelper: Class CheckThreadViolationRepaintManager to find classpath violations
-    src/org/jdesktop/swinghelper/debug/CheckThreadViolationRepaintManager.java
+* swinghelper: Class CheckThreadViolationRepaintManager to find EDT violations
+    src/org/openstreetmap/josm/gui/util/CheckThreadViolationRepaintManager.java
     -> https://github.com/floscher/swinghelper
 * xz extractor
-    src/org/tukaani
     -> https://tukaani.org/xz/java.html
 * OpeningHoursParser (MIT license)
     -> https://github.com/simonpoole/OpeningHoursParser

build.xml

@@ -297,7 +297,6 @@ Build-Date: ${build.tstamp}
             destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeAntRuntime="false" createMissingPackageInfoClass="false">
             <!-- get rid of "internal proprietary API" warning -->
             <compilerarg value="-XDignore.symbol.file"/>
-            <exclude name="org/apache/commons/compress/**"/>
             <exclude name="org/apache/commons/jcs/JCS.java"/>
             <exclude name="org/apache/commons/jcs/access/GroupCacheAccess.java"/>
             <exclude name="org/apache/commons/jcs/access/PartitionedCacheAccess.java"/>
@@ -318,7 +317,9 @@ Build-Date: ${build.tstamp}
             <exclude name="org/apache/commons/jcs/utils/net/**"/>
             <exclude name="org/apache/commons/jcs/utils/props/**"/>
             <exclude name="org/apache/commons/jcs/utils/servlet/**"/>
-            <exclude name="org/apache/commons/logging/**"/>
+            <classpath>
+                <path refid="runtime.path"/>
+            </classpath>
         </javac>
     </target>
     <target name="compile-jmapviewer" depends="init" description="Compiles JMapViewer">
@@ -1060,22 +1061,20 @@ Build-Date: ${build.tstamp}
         <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/josm-spi.jar" includes="org/openstreetmap/josm/spi/**/*.class"/>
         <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/josm-tools.jar" includes="org/openstreetmap/josm/tools/**/*.class"/>
         <exec executable="jdeps" dir="${modules.dir}">
-            <arg line="-f 'java.*|org.xml.*|org.w3c.*|sun.*|com.*|oauth.*|org.apache.*|org.glassfish.*|org.jdesktop.*|org.openstreetmap.gui.*'"/>
+            <arg line="-f 'java.*|org.xml.*|org.w3c.*|sun.*|com.*|oauth.*|org.apache.*|org.glassfish.*|org.openstreetmap.gui.*'"/>
             <arg line="-dotoutput dots *.jar"/>
         </exec>
         <exec executable="dot" dir="${modules.dir}/dots">
             <arg line="-O -Tpng summary.dot"/>
         </exec>
         <move file="${modules.dir}/dots/summary.dot.png" tofile="${modules.dir}/josm-without-dependencies.png"/>
         <!-- Direct dependencies -->
-        <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/metadata-extractor.jar" includes="com/drew/**/*.class"/>
+        <copy todir="${modules.dir}" flatten="true">
+            <fileset refid="runtime.fileset" />
+        </copy>
         <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/svgSalamander.jar" includes="com/kitfox/**/*.class"/>
-        <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/javax-json.jar" includes="javax/**/*.class"/>
         <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/oauth-signpost.jar" includes="oauth/**/*.class"/>
-        <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/commons-compress.jar" includes="org/apache/commons/compress/**/*.class"/>
         <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/commons-jcs.jar" includes="org/apache/commons/jcs/**/*.class"/>
-        <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/glassfish-json.jar" includes="org/glassfish/**/*.class"/>
-        <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/jdesktop.jar" includes="org/jdesktop/**/*.class"/>
         <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/jmapviewer.jar" includes="org/openstreetmap/gui/**/*.class"/>
         <exec executable="jdeps" dir="${modules.dir}">
             <arg line="-f 'java.*|org.xml.*|org.w3c.*|sun.*|com.sun.*|com.google.*|org.tukaani.*|org.apache.commons.logging.*'"/>
@@ -1086,9 +1085,7 @@ Build-Date: ${build.tstamp}
         </exec>
         <move file="${modules.dir}/dots/summary.dot.png" tofile="${modules.dir}/josm-with-direct-dependencies.png"/>
         <!-- All dependencies -->
-        <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/commons-logging.jar" includes="org/apache/commons/logging/**/*.class"/>
         <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/google-gdata.jar" includes="com/google/**/*.class"/>
-        <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/tukaani-xz.jar" includes="org/tukaani/**/*.class"/>
         <exec executable="jdeps" dir="${modules.dir}">
             <arg line="-dotoutput dots *.jar"/>
         </exec>
@@ -1097,7 +1094,7 @@ Build-Date: ${build.tstamp}
         </exec>
         <move file="${modules.dir}/dots/summary.dot.png" tofile="${modules.dir}/josm-with-all-dependencies.png"/>
     </target>
-    <target name="resolve" depends="init-ivy" unless="resolve.notRequired">
+    <target name="resolve" depends="init-ivy" unless="resolve.notRequired" description="Resolve Ivy dependencies">
         <ivy:resolve keep="true"/>
         <ivy:report todir="${tools.dir}/ivy-report" graph="false"/>
         <ivy:cachepath pathid="compile.path" conf="compile"/>

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

@@ -62,7 +62,6 @@
 import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
 
-import org.jdesktop.swinghelper.debug.CheckThreadViolationRepaintManager;
 import org.openstreetmap.josm.actions.DeleteAction;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.actions.OpenFileAction;
@@ -120,6 +119,7 @@
 import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference;
 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;
 import org.openstreetmap.josm.gui.util.WindowGeometry;

src/org/jdesktop/swinghelper/debug/CheckThreadViolationRepaintManager.java renamed to src/org/openstreetmap/josm/gui/util/CheckThreadViolationRepaintManager.java

@@ -14,14 +14,16 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-package org.jdesktop.swinghelper.debug;
+package org.openstreetmap.josm.gui.util;
 
 import java.lang.ref.WeakReference;
 
 import javax.swing.JComponent;
 import javax.swing.RepaintManager;
 import javax.swing.SwingUtilities;
 
+import org.openstreetmap.josm.tools.Logging;
+
 /**
  * <p>This class is used to detect Event Dispatch Thread rule violations<br>
  * See <a href="http://java.sun.com/docs/books/tutorial/uiswing/misc/threads.html">How to Use Threads</a>
@@ -38,18 +40,8 @@
  * https://swinghelper.dev.java.net/
  */
 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
     public synchronized void addInvalidComponent(JComponent component) {
         checkThreadViolations(component);
@@ -63,16 +55,15 @@ public void addDirtyRegion(JComponent component, int x, int y, int w, int h) {
     }
 
     private void checkThreadViolations(JComponent c) {
-        if (!SwingUtilities.isEventDispatchThread() && (completeCheck || c.isShowing())) {
+        if (!SwingUtilities.isEventDispatchThread()) {
             boolean repaint = false;
             boolean fromSwing = false;
             boolean imageUpdate = false;
             StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace();
             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;
                 }
                 if (repaint && "imageUpdate".equals(st.getMethodName())) {
@@ -105,12 +96,12 @@ private void checkThreadViolations(JComponent c) {
         }
     }
 
-    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);
         }
     }
 }

tools/checkstyle/josm_filters.xml

@@ -23,6 +23,7 @@
   <suppress checks="." files="[\\/]tools[\\/]japicc[\\/]" />
   <suppress checks="." files="[\\/]tools[\\/]pmd[\\/]" />
   <suppress checks="HeaderCheck" files="josm[\\/]tools[\\/]commons[\\/]" />
+  <suppress checks="HeaderCheck" files="CheckThreadViolationRepaintManager\.java" />
   <suppress checks="HeaderCheck" files="Ellipsoid\.java" />
   <suppress checks="HeaderCheck" files="NTV2GridShift\.java" />
   <suppress checks="HeaderCheck" files="NTV2GridShiftFile\.java" />

tools/spotbugs/josm-filter.xml

@@ -62,9 +62,6 @@
     <Match>
         <Class name="~org.glassfish.json.*" />
     </Match>
-    <Match>
-        <Class name="~org.jdesktop.swinghelper.debug.*" />
-    </Match>
     <Match>
         <Class name="~org.openstreetmap.gui.jmapviewer.*" />
     </Match>