Changeset 16050 in josm for trunk


Ignore:
Timestamp:
2020-03-06T23:54:39+01:00 (5 years ago)
Author:
Don-vip
Message:

see #18845 - see #16860 - directory cleanup

Location:
trunk
Files:
6 deleted
7 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk/.checkstyle

    r16006 r16050  
    1111  <filter name="FilesFromPackage" enabled="true">
    1212    <filter-data value="src/com"/>
    13     <filter-data value="src/javax"/>
    1413    <filter-data value="src/oauth"/>
    1514    <filter-data value="src/org/apache"/>
    16     <filter-data value="src/org/glassfish"/>
    17     <filter-data value="src/org/jdesktop"/>
    1815    <filter-data value="src/org/openstreetmap/gui"/>
    1916    <filter-data value="src/org/openstreetmap/josm/gui/mappaint/mapcss/parsergen"/>
    20     <filter-data value="src/org/tukaani"/>
    2117    <filter-data value=".externalToolBuilders"/>
    2218    <filter-data value=".settings"/>

  • trunk/README

    r16006 r16050  
    190190    -> http://svn.openstreetmap.org/applications/viewer/jmapviewer/
    191191* Apache commons compress: Support for bzip2 compression when opening files
    192     src/org/apache/commons/compress/compressors (svn external)
    193192    -> https://github.com/apache/commons-compress
    194193* Apache commons validator: Improved validator routines
    … …  
    199198    -> https://github.com/blackears/svgSalamander
    200199* Metadata Extractor: Read EXIF Metadata of photos
    201     src/com/drew
    202200    -> https://github.com/drewnoakes/metadata-extractor
    203201* Signpost: OAuth library
    … …  
    208206    -> https://github.com/floscher/multi-split
    209207    -> https://community.oracle.com/docs/DOC-983539
    210 * swinghelper: Class CheckThreadViolationRepaintManager to find classpath violations
    211     src/org/jdesktop/swinghelper/debug/CheckThreadViolationRepaintManager.java
     208* swinghelper: Class CheckThreadViolationRepaintManager to find EDT violations
     209    src/org/openstreetmap/josm/gui/util/CheckThreadViolationRepaintManager.java
    212210    -> https://github.com/floscher/swinghelper
    213211* xz extractor
    214     src/org/tukaani
    215212    -> https://tukaani.org/xz/java.html
    216213* OpeningHoursParser (MIT license)

  • trunk/build.xml

    r16036 r16050  
    298298            <!-- get rid of "internal proprietary API" warning -->
    299299            <compilerarg value="-XDignore.symbol.file"/>
    300             <exclude name="org/apache/commons/compress/**"/>
    301300            <exclude name="org/apache/commons/jcs/JCS.java"/>
    302301            <exclude name="org/apache/commons/jcs/access/GroupCacheAccess.java"/>
    … …  
    319318            <exclude name="org/apache/commons/jcs/utils/props/**"/>
    320319            <exclude name="org/apache/commons/jcs/utils/servlet/**"/>
    321             <exclude name="org/apache/commons/logging/**"/>
     320            <classpath>
     321                <path refid="runtime.path"/>
     322            </classpath>
    322323        </javac>
    323324    </target>
    … …  
    10611062        <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/josm-tools.jar" includes="org/openstreetmap/josm/tools/**/*.class"/>
    10621063        <exec executable="jdeps" dir="${modules.dir}">
    1063             <arg line="-f 'java.*|org.xml.*|org.w3c.*|sun.*|com.*|oauth.*|org.apache.*|org.glassfish.*|org.jdesktop.*|org.openstreetmap.gui.*'"/>
     1064            <arg line="-f 'java.*|org.xml.*|org.w3c.*|sun.*|com.*|oauth.*|org.apache.*|org.glassfish.*|org.openstreetmap.gui.*'"/>
    10641065            <arg line="-dotoutput dots *.jar"/>
    10651066        </exec>
    … …  
    10691070        <move file="${modules.dir}/dots/summary.dot.png" tofile="${modules.dir}/josm-without-dependencies.png"/>
    10701071        <!-- Direct dependencies -->
    1071         <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/metadata-extractor.jar" includes="com/drew/**/*.class"/>
     1072        <copy todir="${modules.dir}" flatten="true">
     1073            <fileset refid="runtime.fileset" />
     1074        </copy>
    10721075        <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/svgSalamander.jar" includes="com/kitfox/**/*.class"/>
    1073         <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/javax-json.jar" includes="javax/**/*.class"/>
    10741076        <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/oauth-signpost.jar" includes="oauth/**/*.class"/>
    1075         <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/commons-compress.jar" includes="org/apache/commons/compress/**/*.class"/>
    10761077        <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/commons-jcs.jar" includes="org/apache/commons/jcs/**/*.class"/>
    1077         <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/glassfish-json.jar" includes="org/glassfish/**/*.class"/>
    1078         <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/jdesktop.jar" includes="org/jdesktop/**/*.class"/>
    10791078        <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/jmapviewer.jar" includes="org/openstreetmap/gui/**/*.class"/>
    10801079        <exec executable="jdeps" dir="${modules.dir}">
    … …  
    10871086        <move file="${modules.dir}/dots/summary.dot.png" tofile="${modules.dir}/josm-with-direct-dependencies.png"/>
    10881087        <!-- All dependencies -->
    1089         <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/commons-logging.jar" includes="org/apache/commons/logging/**/*.class"/>
    10901088        <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/google-gdata.jar" includes="com/google/**/*.class"/>
    1091         <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/tukaani-xz.jar" includes="org/tukaani/**/*.class"/>
    10921089        <exec executable="jdeps" dir="${modules.dir}">
    10931090            <arg line="-dotoutput dots *.jar"/>
    … …  
    10981095        <move file="${modules.dir}/dots/summary.dot.png" tofile="${modules.dir}/josm-with-all-dependencies.png"/>
    10991096    </target>
    1100     <target name="resolve" depends="init-ivy" unless="resolve.notRequired">
     1097    <target name="resolve" depends="init-ivy" unless="resolve.notRequired" description="Resolve Ivy dependencies">
    11011098        <ivy:resolve keep="true"/>
    11021099        <ivy:report todir="${tools.dir}/ivy-report" graph="false"/>

  • trunk/src/org/apache/commons

    • Property svn:externals

      •  

        old new  
        11https://github.com/apache/commons-jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs jcs
        2 https://github.com/apache/commons-logging/trunk/src/main/java/org/apache/commons/logging logging
        3 https://github.com/apache/commons-compress/trunk/src/main/java/org/apache/commons/compress compress

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

    r15469 r16050  
    6363import javax.swing.UnsupportedLookAndFeelException;
    6464
    65 import org.jdesktop.swinghelper.debug.CheckThreadViolationRepaintManager;
    6665import org.openstreetmap.josm.actions.DeleteAction;
    6766import org.openstreetmap.josm.actions.JosmAction;
    … …  
    121120import org.openstreetmap.josm.gui.preferences.server.ProxyPreference;
    122121import org.openstreetmap.josm.gui.progress.swing.ProgressMonitorExecutor;
     122import org.openstreetmap.josm.gui.util.CheckThreadViolationRepaintManager;
    123123import org.openstreetmap.josm.gui.util.GuiHelper;
    124124import org.openstreetmap.josm.gui.util.RedirectInputMap;

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

    r16049 r16050  
    1515 */
    1616
    17 package org.jdesktop.swinghelper.debug;
     17package org.openstreetmap.josm.gui.util;
    1818
    1919import java.lang.ref.WeakReference;
    … …  
    2222import javax.swing.RepaintManager;
    2323import javax.swing.SwingUtilities;
     24
     25import org.openstreetmap.josm.tools.Logging;
    2426
    2527/**
    … …  
    3941 */
    4042public class CheckThreadViolationRepaintManager extends RepaintManager {
    41     // it is recommended to pass the complete check
    42     private boolean completeCheck = true;
    4343    private WeakReference<JComponent> lastComponent;
    44 
    45     public CheckThreadViolationRepaintManager(boolean completeCheck) {
    46         this.completeCheck = completeCheck;
    47     }
    48 
    49     public CheckThreadViolationRepaintManager() {
    50         this(true);
    51     }
    5244
    5345    @Override
    … …  
    6456
    6557    private void checkThreadViolations(JComponent c) {
    66         if (!SwingUtilities.isEventDispatchThread() && (completeCheck || c.isShowing())) {
     58        if (!SwingUtilities.isEventDispatchThread()) {
    6759            boolean repaint = false;
    6860            boolean fromSwing = false;
    … …  
    7163            for (StackTraceElement st : stackTrace) {
    7264                if (repaint && st.getClassName().startsWith("javax.swing.") &&
    73                         // for details see
    74                         // https://swinghelper.dev.java.net/issues/show_bug.cgi?id=1
    75                          !st.getClassName().startsWith("javax.swing.SwingWorker")) {
     65                    // for details see https://swinghelper.dev.java.net/issues/show_bug.cgi?id=1
     66                    !st.getClassName().startsWith("javax.swing.SwingWorker")) {
    7667                    fromSwing = true;
    7768                }
    … …  
    10697    }
    10798
    108     protected void violationFound(JComponent c, StackTraceElement[] stackTrace) {
    109         System.out.println();
    110         System.out.println("EDT violation detected");
    111         System.out.println(c);
     99    protected static void violationFound(JComponent c, StackTraceElement[] stackTrace) {
     100        Logging.error("");
     101        Logging.error("EDT violation detected");
     102        Logging.error(c.toString());
    112103        for (StackTraceElement st : stackTrace) {
    113             System.out.println("\tat " + st);
     104            Logging.error("\tat " + st);
    114105        }
    115106    }

  • trunk/tools/checkstyle/josm_filters.xml

    r16006 r16050  
    2424  <suppress checks="." files="[\\/]tools[\\/]pmd[\\/]" />
    2525  <suppress checks="HeaderCheck" files="josm[\\/]tools[\\/]commons[\\/]" />
     26  <suppress checks="HeaderCheck" files="CheckThreadViolationRepaintManager\.java" />
    2627  <suppress checks="HeaderCheck" files="Ellipsoid\.java" />
    2728  <suppress checks="HeaderCheck" files="NTV2GridShift\.java" />

  • trunk/tools/spotbugs/josm-filter.xml

    r14417 r16050  
    6464    </Match>
    6565    <Match>
    66         <Class name="~org.jdesktop.swinghelper.debug.*" />
    67     </Match>
    68     <Match>
    6966        <Class name="~org.openstreetmap.gui.jmapviewer.*" />
    7067    </Match>
Note: See TracChangeset for help on using the changeset viewer.