Ticket #19505: osm.diff

File osm.diff, 19.4 KB (added by anonymous, 6 years ago)

  • ide/netbeans/nbproject/configs/local_preferences.properties 

    # This patch file was generated by NetBeans IDE
# Following Index: paths are relative to: /mnt/WD-Elements-25A1/src/josm-svn/josm
# This patch can be applied using context Tools: Patch action on respective folder.
# It uses platform neutral UTF-8 encoding and \n newlines.
# Above lines and this line are ignored by the patching process.
     
    11$label=local preferences
    2 run.jvmargs=-Djosm.home=.josm-local
     2run.jvmargs=-Djosm.home=.josm-local -javaagent:/mnt/WD-Elements-25A1/src/josm-svn/lib/jmockit-1.42.jar

  • ide/netbeans/nbproject/genfiles.properties

     
    33nbbuild.xml.stylesheet.CRC32=8064a381@1.75.2.48
    44# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
    55# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
    6 nbproject/build-impl.xml.data.CRC32=f36994fb
    7 nbproject/build-impl.xml.script.CRC32=250d22b4
    8 nbproject/build-impl.xml.stylesheet.CRC32=f89f7d21@1.94.0.48
     6nbproject/build-impl.xml.data.CRC32=d23a24ee
     7nbproject/build-impl.xml.script.CRC32=0ef72d93
     8nbproject/build-impl.xml.stylesheet.CRC32=f89f7d21@1.96.0.48

  • ide/netbeans/nbproject/project.properties

     
     1#Wed, 08 Jul 2020 15:54:10 +0200
    12annotation.processing.enabled=true
    23annotation.processing.enabled.in.editor=false
    34annotation.processing.processors.list=
    45annotation.processing.run.all.processors=true
    56annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
    6 application.homepage=https://josm.openstreetmap.de/
     7application.homepage=https\://josm.openstreetmap.de/
    78application.title=josm
    89application.vendor=
    910build.classes.dir=${build.dir}/classes
    … …  
    1920buildfile=nbbuild.xml
    2021# Uncomment to specify the preferred debugger connection transport:
    2122#debug.transport=dt_socket
    22 debug.classpath=\
    23     ${run.classpath}
    24 debug.test.classpath=\
    25     ${run.test.classpath}
     23debug.classpath=${run.classpath}
     24debug.modulepath=${run.modulepath}
     25debug.test.classpath=${run.test.classpath}
     26debug.test.modulepath=${run.test.modulepath}
    2627# Files in build.classes.dir which should be excluded from distribution jar
    2728dist.archive.excludes=
    2829# This directory is removed when the project is cleaned:
    … …  
    3132dist.javadoc.dir=${dist.dir}/javadoc
    3233endorsed.classpath=
    3334excludes=org/apache/commons/jcs3/JCS.java,org/apache/commons/jcs3/access/GroupCacheAccess.java,org/apache/commons/jcs3/access/PartitionedCacheAccess.java,org/apache/commons/jcs3/access/behavior/IGroupCacheAccess.java,org/apache/commons/jcs3/access/exception/InvalidGroupException.java,org/apache/commons/jcs3/admin/servlet/**,org/apache/commons/jcs3/auxiliary/AbstractAuxiliaryCacheMonitor.java,org/apache/commons/jcs3/auxiliary/disk/jdbc/**,org/apache/commons/jcs3/auxiliary/lateral/**,org/apache/commons/jcs3/auxiliary/remote/AbstractRemoteAuxiliaryCache.java,org/apache/commons/jcs3/auxiliary/remote/AbstractRemoteCacheListener.java,org/apache/commons/jcs3/auxiliary/remote/AbstractRemoteCacheNoWaitFacade.java,org/apache/commons/jcs3/auxiliary/remote/RemoteCache.java,org/apache/commons/jcs3/auxiliary/remote/RemoteCacheFactory.java,org/apache/commons/jcs3/auxiliary/remote/RemoteCacheFailoverRunner.java,org/apache/commons/jcs3/auxiliary/remote/RemoteCacheListener.java,org/apache/commons/jcs3/auxiliary/remote/RemoteCacheManager.java,org/apache/commons/jcs3/auxiliary/remote/RemoteCacheMonitor.java,org/apache/commons/jcs3/auxiliary/remote/RemoteCacheNoWait.java,org/apache/commons/jcs3/auxiliary/remote/RemoteCacheNoWaitFacade.java,org/apache/commons/jcs3/auxiliary/remote/RemoteCacheRestore.java,org/apache/commons/jcs3/auxiliary/remote/http/**,org/apache/commons/jcs3/auxiliary/remote/server/RemoteCacheStartupServlet.java,org/apache/commons/jcs3/auxiliary/remote/server/TimeoutConfigurableRMISocketFactory.java,org/apache/commons/jcs3/engine/CacheAdaptor.java,org/apache/commons/jcs3/engine/CacheGroup.java,org/apache/commons/jcs3/engine/CacheWatchRepairable.java,org/apache/commons/jcs3/engine/ZombieCacheService.java,org/apache/commons/jcs3/engine/ZombieCacheServiceNonLocal.java,org/apache/commons/jcs3/engine/ZombieCacheWatch.java,org/apache/commons/jcs3/engine/logging/CacheEventLoggerDebugLogger.java,org/apache/commons/jcs3/utils/access/**,org/apache/commons/jcs3/utils/discovery/**,org/apache/commons/jcs3/utils/net/**,org/apache/commons/jcs3/utils/props/**,org/apache/commons/jcs3/utils/servlet/**,org/apache/commons/logging/impl/AvalonLogger.java,org/apache/commons/logging/impl/Jdk13LumberjackLogger.java,org/apache/commons/logging/impl/Log4JLogger.java,org/apache/commons/logging/impl/LogKitLogger.java,org/apache/commons/logging/impl/ServletContextCleaner.java,org/openstreetmap/gui/jmapviewer/Demo.java,org/openstreetmap/gui/jmapviewer/JMapViewerTree.java,org/openstreetmap/gui/jmapviewer/checkBoxTree/**,org/apache/commons/compress/archivers/**,org/apache/commons/compress/changes/**,org/apache/commons/compress/parallel/**,org/apache/commons/compress/PasswordRequiredException.java
     35file.reference.annotations-3.0.0.jar=/mnt/WD-Elements-25A1/src/josm-svn/lib/annotations-3.0.0.jar
     36file.reference.apiguardian-api-1.1.0.jar=/mnt/WD-Elements-25A1/src/josm-svn/lib/apiguardian-api-1.1.0.jar
     37file.reference.classgraph-4.8.87.jar=/mnt/WD-Elements-25A1/src/josm-svn/lib/classgraph-4.8.87.jar
    3438file.reference.commons-lang3-3.8.1.jar=../../tools/commons-lang3-3.8.1.jar
    3539file.reference.commons-testing-2.1.0.jar=../../test/lib/commons-testing/commons-testing-2.1.0.jar
    3640file.reference.core-src=../../src
    3741file.reference.equalsverifier-3.1.2.jar=../../test/lib/equalsverifier-3.1.2.jar
    38 file.reference.spotbugs-annotations.jar=../../tools/spotbugs/spotbugs-annotations.jar
    39 file.reference.hamcrest-core-1.3.jar=../../test/lib/junit/hamcrest-core-1.3.jar
     42file.reference.hamcrest-all-1.3.jar=/mnt/WD-Elements-25A1/src/josm-svn/lib/hamcrest-all-1.3.jar
    4043file.reference.jfcunit.jar=../../test/lib/jfcunit.jar
    41 file.reference.jmockit.jar=../../test/lib/jmockit.jar
     44file.reference.jmockit-1.42.jar=/mnt/WD-Elements-25A1/src/josm-svn/lib/jmockit-1.42.jar
     45file.reference.jmockit.jar=/mnt/WD-Elements-25A1/src/josm-svn/lib/jmockit.jar
    4246file.reference.junit-4.12.jar=../../test/lib/junit/junit-4.12.jar
    43 file.reference.classgraph.jar=../../test/lib/classgraph-4.6.32.jar
     47file.reference.junit-jupiter-api-5.5.2.jar=/mnt/WD-Elements-25A1/src/josm-svn/lib/junit-jupiter-api-5.5.2.jar
     48file.reference.junit-jupiter-params-5.5.2.jar=/mnt/WD-Elements-25A1/src/josm-svn/lib/junit-jupiter-params-5.5.2.jar
     49file.reference.opentest4j-1.2.0.jar=/mnt/WD-Elements-25A1/src/josm-svn/lib/opentest4j-1.2.0.jar
     50file.reference.slf4j-api-1.7.25.jar=/mnt/WD-Elements-25A1/src/josm-svn/lib/slf4j-api-1.7.25.jar
     51file.reference.slf4j-simple-1.7.27.jar=/mnt/WD-Elements-25A1/src/josm-svn/lib/slf4j-simple-1.7.27.jar
    4452file.reference.test-functional=../../test/functional
    4553file.reference.test-performance=../../test/performance
    4654file.reference.test-unit=../../test/unit
    4755file.reference.system-rules-1.19.0.jar=../../test/lib/system-rules-1.19.0.jar
     56file.reference.wiremock-jre8-2.23.2.jar=/mnt/WD-Elements-25A1/src/josm-svn/lib/wiremock-jre8-2.23.2.jar
    4857file.reference.wiremock-standalone-2.20.0.jar=../../test/lib/wiremock-standalone-2.20.0.jar
    4958file.reference.awaitility-3.1.5.jar=../../test/lib/awaitility-3.1.5.jar
    5059includes=**/*.java
    5160jar.compress=false
    5261javac.classpath=${ivy.classpath}
    5362# Space-separated list of extra javac options
    54 javac.compilerargs=-Xlint:unchecked -Xlint:cast -Xlint:dep-ann -Xlint:divzero -Xlint:empty -Xlint:finally -Xlint:overrides -Xlint:static -Xlint:try  -Xlint:deprecation
     63javac.compilerargs=-Xlint\:unchecked -Xlint\:cast -Xlint\:dep-ann -Xlint\:divzero -Xlint\:empty -Xlint\:finally -Xlint\:overrides -Xlint\:static -Xlint\:try  -Xlint\:deprecation
    5564javac.deprecation=true
    5665javac.external.vm=false
    5766javac.modulepath=
    5867javac.processormodulepath=
    59 javac.processorpath=\
    60     ${javac.classpath}
     68javac.processorpath=${javac.classpath}
    6169javac.source=1.8
    6270javac.target=1.8
    63 javac.test.classpath=\
    64     ${javac.classpath}:\
    65     ${build.classes.dir}:\
    66     ${file.reference.junit-4.12.jar}:\
    67     ${file.reference.jmockit.jar}:\
    68     ${file.reference.jfcunit.jar}:\
    69     ${file.reference.equalsverifier-3.1.2.jar}:\
    70     ${file.reference.hamcrest-core-1.3.jar}:\
    71     ${file.reference.classgraph.jar}:\
    72     ${file.reference.commons-lang3-3.8.1.jar}:\
    73     ${file.reference.system-rules-1.19.0.jar}:\
    74     ${file.reference.wiremock-standalone-2.20.0.jar}:\
    75     ${file.reference.awaitility-3.1.5.jar}:\
    76     ${file.reference.spotbugs-annotations.jar}:\
    77     ${file.reference.commons-testing-2.1.0.jar}
     71javac.test.classpath=${javac.classpath}\:${build.classes.dir}\:${file.reference.junit-4.12.jar}\:${file.reference.jfcunit.jar}\:${file.reference.equalsverifier-3.1.2.jar}\:${file.reference.commons-lang3-3.8.1.jar}\:${file.reference.system-rules-1.19.0.jar}\:${file.reference.wiremock-standalone-2.20.0.jar}\:${file.reference.awaitility-3.1.5.jar}\:${file.reference.commons-testing-2.1.0.jar}\:${file.reference.junit-jupiter-api-5.5.2.jar}\:${file.reference.wiremock-jre8-2.23.2.jar}\:${file.reference.jmockit-1.42.jar}\:${file.reference.annotations-3.0.0.jar}\:${file.reference.jmockit.jar}\:${file.reference.junit-jupiter-params-5.5.2.jar}\:${file.reference.hamcrest-all-1.3.jar}\:${file.reference.apiguardian-api-1.1.0.jar}\:${file.reference.classgraph-4.8.87.jar}\:${file.reference.opentest4j-1.2.0.jar}\:${file.reference.slf4j-api-1.7.25.jar}\:${file.reference.slf4j-simple-1.7.27.jar}
    7872javac.test.modulepath=${javac.modulepath}
    79 javac.test.processorpath=\
    80     ${javac.test.classpath}
     73javac.test.processorpath=${javac.test.classpath}
    8174javadoc.additionalparam=
    8275javadoc.author=false
    8376javadoc.encoding=${source.encoding}
     77javadoc.html5=false
    8478javadoc.noindex=false
    8579javadoc.nonavbar=false
    8680javadoc.notree=false
    … …  
    8983javadoc.use=true
    9084javadoc.version=false
    9185javadoc.windowtitle=
     86jlink.launcher=false
     87jlink.launcher.name=josm
    9288main.class=org.openstreetmap.josm.gui.MainApplication
    9389manifest.file=manifest.mf
    9490meta.inf.dir=${src.dir}/META-INF
    9591mkdist.disabled=false
    96 platform.active=default_platform
    97 run.classpath=\
    98     ${javac.classpath}:\
    99     ${build.classes.dir}
     92platform.active=JDK_1.8
     93run.classpath=${javac.classpath}\:${build.classes.dir}
    10094run.modulepath=${javac.modulepath}
    101 run.test.classpath=\
    102     ${javac.test.classpath}:\
    103     ${build.test.classes.dir}
     95run.test.classpath=${javac.test.classpath}\:${build.test.classes.dir}
    10496run.test.modulepath=${javac.test.modulepath}
    10597source.encoding=UTF-8
    10698src.dir=${file.reference.core-src}
    10799test.functional.dir=${file.reference.test-functional}
    108100test.performance.dir=${file.reference.test-performance}
    109101test.unit.dir=${file.reference.test-unit}
     102
     103ivy.classpath=/root/.ivy2/cache/org.openstreetmap.jmapviewer/jmapviewer/jars/jmapviewer-2.14.jar\:/root/.ivy2/cache/javax.json/javax.json-api/bundles/javax.json-api-1.1.4.jar\:/root/.ivy2/cache/org.glassfish/javax.json/bundles/javax.json-1.1.4.jar\:/root/.ivy2/cache/org.apache.commons/commons-jcs3-core/jars/commons-jcs3-core-3.0-SNAPSHOT.jar\:/root/.ivy2/cache/org.apache.commons/commons-compress/jars/commons-compress-1.20.jar\:/root/.ivy2/cache/org.tukaani/xz/jars/xz-1.8.jar\:/root/.ivy2/cache/com.adobe.xmp/xmpcore/jars/xmpcore-6.1.10.jar\:/root/.ivy2/cache/com.drewnoakes/metadata-extractor/jars/metadata-extractor-2.13.0.jar\:/root/.ivy2/cache/ch.poole/OpeningHoursParser/jars/OpeningHoursParser-0.21.4.jar\:/root/.ivy2/cache/oauth.signpost/signpost-core/jars/signpost-core-2.0.0.jar\:/root/.ivy2/cache/org.webjars.npm/tag2link/jars/tag2link-2020.5.16.jar

  • ide/netbeans/nbproject/project.xml

     
    44    <configuration>
    55        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
    66            <name>josm</name>
     7            <explicit-platform explicit-source-supported="true"/>
    78            <source-roots>
    89                <root id="src.dir"/>
    910            </source-roots>

  • src/com/kitfox/svg/ClipPath.java

     
    165165
    166166        for (int i = 0; i < children.size(); ++i)
    167167        {
    168             SVGElement ele = (SVGElement) children.get(i);
     168            SVGElement ele = children.get(i);
    169169            ele.updateTime(curTime);
    170170        }
    171171       

  • src/com/kitfox/svg/Marker.java

     
    235235    public static class MarkerLayout
    236236    {
    237237
    238         private ArrayList<MarkerPos> markerList = new ArrayList<MarkerPos>();
     238        private final ArrayList<MarkerPos> markerList = new ArrayList<MarkerPos>();
    239239        boolean started = false;
    240240
    241241        public void layout(Shape shape)
    … …  
    339339
    340340            for (int i = 1; i < markerList.size(); ++i)
    341341            {
    342                 MarkerPos prev = (MarkerPos) markerList.get(i - 1);
    343                 MarkerPos cur = (MarkerPos) markerList.get(i);
     342                MarkerPos prev = markerList.get(i - 1);
     343                MarkerPos cur = markerList.get(i);
    344344
    345345                if (cur.type == MARKER_START)
    346346                {
    347347                    prev.type = MARKER_END;
    348348                }
    349349            }
    350             MarkerPos last = (MarkerPos) markerList.get(markerList.size() - 1);
     350            MarkerPos last = markerList.get(markerList.size() - 1);
    351351            last.type = MARKER_END;
    352352        }
    353353

  • src/com/kitfox/svg/SVGDiagram.java

     
    203203
    204204    public SVGElement getElement(String name)
    205205    {
    206         return (SVGElement)idMap.get(name);
     206        return idMap.get(name);
    207207    }
    208208
    209209    public void setElement(String name, SVGElement node)

  • src/com/kitfox/svg/SVGElement.java

     
    452452
    453453    protected SVGElement getParentContext()
    454454    {
    455         return contexts.isEmpty() ? null : (SVGElement) contexts.getLast();
     455        return contexts.isEmpty() ? null : contexts.getLast();
    456456    }
    457457
    458458    public SVGRoot getRoot()

  • src/com/kitfox/svg/SVGLoader.java

     
    197197
    198198        try {
    199199            Class<?> cls = (Class<?>)obj;
     200            @SuppressWarnings("deprecation")
    200201            SVGElement svgEle = (SVGElement)cls.newInstance();
    201202
    202203            SVGElement parent = null;

  • src/com/kitfox/svg/SVGUniverse.java

     
    142142        return curTime;
    143143    }
    144144
     145    @SuppressWarnings("deprecation")
    145146    public void setCurTime(double curTime)
    146147    {
    147148        double oldTime = this.curTime;

  • src/com/kitfox/svg/pathcmd/Arc.java

     
    133133
    134134        // Ensure radii are valid
    135135        if (rx == 0 || ry == 0) {
    136             path.lineTo((float) x, (float) y);
     136            path.lineTo(x, y);
    137137            return;
    138138        }
    139139

  • src/com/kitfox/svg/xml/StyleSheet.java

     
    3333    public boolean getStyle(StyleAttribute attrib, String tagName, String cssClass)
    3434    {
    3535        StyleSheetRule rule = new StyleSheetRule(attrib.getName(), tagName, cssClass);
    36         String value = (String)ruleMap.get(rule);
     36        String value = ruleMap.get(rule);
    3737       
    3838        if (value != null)
    3939        {
    … …  
    4343       
    4444        //Try again using just class name
    4545        rule = new StyleSheetRule(attrib.getName(), null, cssClass);
    46         value = (String)ruleMap.get(rule);
     46        value = ruleMap.get(rule);
    4747       
    4848        if (value != null)
    4949        {
    … …  
    5353       
    5454        //Try again using just tag name
    5555        rule = new StyleSheetRule(attrib.getName(), tagName, null);
    56         value = (String)ruleMap.get(rule);
     56        value = ruleMap.get(rule);
    5757       
    5858        if (value != null)
    5959        {

  • src/org/openstreetmap/josm/tools/I18n.java

     
    384384            try {
    385385                // First check we're able to open a stream to our own SPI file
    386386                // Java will fail on Windows if the jar file is in a folder with a space character!
    387                 I18n.class.getResourceAsStream("/META-INF/services/java.text.spi.DecimalFormatSymbolsProvider").close();
     387                java.io.InputStream is = I18n.class.getResourceAsStream("/META-INF/services/java.text.spi.DecimalFormatSymbolsProvider");
    388388                // Don't call Utils.updateSystemProperty to avoid spurious log at startup
     389                if (is != null) {
     390                  is.close();
     391                  // Don't call Utils.updateSystemProperty to avoid spurious log at startup
    389392                  return System.setProperty("java.locale.providers", "SPI,JRE,CLDR");
     393                }
     394                return System.setProperty("java.locale.providers", "JRE,CLDR");
    390395            } catch (RuntimeException | IOException e) {
    391396                // Don't call Logging class, it may not be fully initialized yet
    392397                System.err.println("Unable to set SPI locale provider: " + e.getMessage());
     398                return null;
    393399            }
    394400        } catch (SecurityException e) {
    395401            // Don't call Logging class, it may not be fully initialized yet
    396402            System.err.println("Unable to set locale providers: " + e.getMessage());
     403            return null;
    397404        }
    398         return System.setProperty("java.locale.providers", "JRE,CLDR");
    399405    }
    400406
    401407    /**

  • test/unit/org/openstreetmap/josm/TestUtils.java

     
    573573     * @return all JOSM subtypes of the given class
    574574     */
    575575    public static <T> Set<Class<? extends T>> getJosmSubtypes(Class<T> superClass) {
    576         try (ScanResult scan = new ClassGraph().whitelistPackages("org.openstreetmap.josm").ignoreClassVisibility().scan()) {
     576        try (@SuppressWarnings("deprecation")
     577        ScanResult scan = new ClassGraph().whitelistPackages("org.openstreetmap.josm").ignoreClassVisibility().scan()) {
    577578            Function<String, ClassInfoList> lambda = superClass.isInterface() ? scan::getClassesImplementing : scan::getSubclasses;
    578579            return lambda.apply(superClass.getName())
    579580                    .asMap().values().stream().map(x -> x.loadClass(superClass)).collect(Collectors.toSet());