# 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. Index: ide/netbeans/nbproject/configs/local_preferences.properties --- ide/netbeans/nbproject/configs/local_preferences.properties Base (BASE) +++ ide/netbeans/nbproject/configs/local_preferences.properties Locally Modified (Based On LOCAL) @@ -1,2 +1,2 @@ $label=local preferences -run.jvmargs=-Djosm.home=.josm-local +run.jvmargs=-Djosm.home=.josm-local -javaagent:/mnt/WD-Elements-25A1/src/josm-svn/lib/jmockit-1.42.jar Index: ide/netbeans/nbproject/genfiles.properties --- ide/netbeans/nbproject/genfiles.properties Base (BASE) +++ ide/netbeans/nbproject/genfiles.properties Locally Modified (Based On LOCAL) @@ -3,6 +3,6 @@ nbbuild.xml.stylesheet.CRC32=8064a381@1.75.2.48 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=f36994fb -nbproject/build-impl.xml.script.CRC32=250d22b4 -nbproject/build-impl.xml.stylesheet.CRC32=f89f7d21@1.94.0.48 +nbproject/build-impl.xml.data.CRC32=d23a24ee +nbproject/build-impl.xml.script.CRC32=0ef72d93 +nbproject/build-impl.xml.stylesheet.CRC32=f89f7d21@1.96.0.48 Index: ide/netbeans/nbproject/project.properties --- ide/netbeans/nbproject/project.properties Base (BASE) +++ ide/netbeans/nbproject/project.properties Locally Modified (Based On LOCAL) @@ -1,9 +1,10 @@ +#Wed, 08 Jul 2020 15:54:10 +0200 annotation.processing.enabled=true annotation.processing.enabled.in.editor=false annotation.processing.processors.list= annotation.processing.run.all.processors=true annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output -application.homepage=https://josm.openstreetmap.de/ +application.homepage=https\://josm.openstreetmap.de/ application.title=josm application.vendor= build.classes.dir=${build.dir}/classes @@ -19,10 +20,10 @@ buildfile=nbbuild.xml # Uncomment to specify the preferred debugger connection transport: #debug.transport=dt_socket -debug.classpath=\ - ${run.classpath} -debug.test.classpath=\ - ${run.test.classpath} +debug.classpath=${run.classpath} +debug.modulepath=${run.modulepath} +debug.test.classpath=${run.test.classpath} +debug.test.modulepath=${run.test.modulepath} # Files in build.classes.dir which should be excluded from distribution jar dist.archive.excludes= # This directory is removed when the project is cleaned: @@ -31,56 +32,49 @@ dist.javadoc.dir=${dist.dir}/javadoc endorsed.classpath= excludes=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 +file.reference.annotations-3.0.0.jar=/mnt/WD-Elements-25A1/src/josm-svn/lib/annotations-3.0.0.jar +file.reference.apiguardian-api-1.1.0.jar=/mnt/WD-Elements-25A1/src/josm-svn/lib/apiguardian-api-1.1.0.jar +file.reference.classgraph-4.8.87.jar=/mnt/WD-Elements-25A1/src/josm-svn/lib/classgraph-4.8.87.jar file.reference.commons-lang3-3.8.1.jar=../../tools/commons-lang3-3.8.1.jar file.reference.commons-testing-2.1.0.jar=../../test/lib/commons-testing/commons-testing-2.1.0.jar file.reference.core-src=../../src file.reference.equalsverifier-3.1.2.jar=../../test/lib/equalsverifier-3.1.2.jar -file.reference.spotbugs-annotations.jar=../../tools/spotbugs/spotbugs-annotations.jar -file.reference.hamcrest-core-1.3.jar=../../test/lib/junit/hamcrest-core-1.3.jar +file.reference.hamcrest-all-1.3.jar=/mnt/WD-Elements-25A1/src/josm-svn/lib/hamcrest-all-1.3.jar file.reference.jfcunit.jar=../../test/lib/jfcunit.jar -file.reference.jmockit.jar=../../test/lib/jmockit.jar +file.reference.jmockit-1.42.jar=/mnt/WD-Elements-25A1/src/josm-svn/lib/jmockit-1.42.jar +file.reference.jmockit.jar=/mnt/WD-Elements-25A1/src/josm-svn/lib/jmockit.jar file.reference.junit-4.12.jar=../../test/lib/junit/junit-4.12.jar -file.reference.classgraph.jar=../../test/lib/classgraph-4.6.32.jar +file.reference.junit-jupiter-api-5.5.2.jar=/mnt/WD-Elements-25A1/src/josm-svn/lib/junit-jupiter-api-5.5.2.jar +file.reference.junit-jupiter-params-5.5.2.jar=/mnt/WD-Elements-25A1/src/josm-svn/lib/junit-jupiter-params-5.5.2.jar +file.reference.opentest4j-1.2.0.jar=/mnt/WD-Elements-25A1/src/josm-svn/lib/opentest4j-1.2.0.jar +file.reference.slf4j-api-1.7.25.jar=/mnt/WD-Elements-25A1/src/josm-svn/lib/slf4j-api-1.7.25.jar +file.reference.slf4j-simple-1.7.27.jar=/mnt/WD-Elements-25A1/src/josm-svn/lib/slf4j-simple-1.7.27.jar file.reference.test-functional=../../test/functional file.reference.test-performance=../../test/performance file.reference.test-unit=../../test/unit file.reference.system-rules-1.19.0.jar=../../test/lib/system-rules-1.19.0.jar +file.reference.wiremock-jre8-2.23.2.jar=/mnt/WD-Elements-25A1/src/josm-svn/lib/wiremock-jre8-2.23.2.jar file.reference.wiremock-standalone-2.20.0.jar=../../test/lib/wiremock-standalone-2.20.0.jar file.reference.awaitility-3.1.5.jar=../../test/lib/awaitility-3.1.5.jar includes=**/*.java jar.compress=false javac.classpath=${ivy.classpath} # Space-separated list of extra javac options -javac.compilerargs=-Xlint:unchecked -Xlint:cast -Xlint:dep-ann -Xlint:divzero -Xlint:empty -Xlint:finally -Xlint:overrides -Xlint:static -Xlint:try -Xlint:deprecation +javac.compilerargs=-Xlint\:unchecked -Xlint\:cast -Xlint\:dep-ann -Xlint\:divzero -Xlint\:empty -Xlint\:finally -Xlint\:overrides -Xlint\:static -Xlint\:try -Xlint\:deprecation javac.deprecation=true javac.external.vm=false javac.modulepath= javac.processormodulepath= -javac.processorpath=\ - ${javac.classpath} +javac.processorpath=${javac.classpath} javac.source=1.8 javac.target=1.8 -javac.test.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir}:\ - ${file.reference.junit-4.12.jar}:\ - ${file.reference.jmockit.jar}:\ - ${file.reference.jfcunit.jar}:\ - ${file.reference.equalsverifier-3.1.2.jar}:\ - ${file.reference.hamcrest-core-1.3.jar}:\ - ${file.reference.classgraph.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.spotbugs-annotations.jar}:\ - ${file.reference.commons-testing-2.1.0.jar} +javac.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} javac.test.modulepath=${javac.modulepath} -javac.test.processorpath=\ - ${javac.test.classpath} +javac.test.processorpath=${javac.test.classpath} javadoc.additionalparam= javadoc.author=false javadoc.encoding=${source.encoding} +javadoc.html5=false javadoc.noindex=false javadoc.nonavbar=false javadoc.notree=false @@ -89,21 +83,21 @@ javadoc.use=true javadoc.version=false javadoc.windowtitle= +jlink.launcher=false +jlink.launcher.name=josm main.class=org.openstreetmap.josm.gui.MainApplication manifest.file=manifest.mf meta.inf.dir=${src.dir}/META-INF mkdist.disabled=false -platform.active=default_platform -run.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir} +platform.active=JDK_1.8 +run.classpath=${javac.classpath}\:${build.classes.dir} run.modulepath=${javac.modulepath} -run.test.classpath=\ - ${javac.test.classpath}:\ - ${build.test.classes.dir} +run.test.classpath=${javac.test.classpath}\:${build.test.classes.dir} run.test.modulepath=${javac.test.modulepath} source.encoding=UTF-8 src.dir=${file.reference.core-src} test.functional.dir=${file.reference.test-functional} test.performance.dir=${file.reference.test-performance} test.unit.dir=${file.reference.test-unit} + +ivy.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 Index: ide/netbeans/nbproject/project.xml --- ide/netbeans/nbproject/project.xml Base (BASE) +++ ide/netbeans/nbproject/project.xml Locally Modified (Based On LOCAL) @@ -4,6 +4,7 @@ josm + Index: src/com/kitfox/svg/ClipPath.java --- src/com/kitfox/svg/ClipPath.java Base (BASE) +++ src/com/kitfox/svg/ClipPath.java Locally Modified (Based On LOCAL) @@ -165,7 +165,7 @@ for (int i = 0; i < children.size(); ++i) { - SVGElement ele = (SVGElement) children.get(i); + SVGElement ele = children.get(i); ele.updateTime(curTime); } Index: src/com/kitfox/svg/Marker.java --- src/com/kitfox/svg/Marker.java Base (BASE) +++ src/com/kitfox/svg/Marker.java Locally Modified (Based On LOCAL) @@ -235,7 +235,7 @@ public static class MarkerLayout { - private ArrayList markerList = new ArrayList(); + private final ArrayList markerList = new ArrayList(); boolean started = false; public void layout(Shape shape) @@ -339,15 +339,15 @@ for (int i = 1; i < markerList.size(); ++i) { - MarkerPos prev = (MarkerPos) markerList.get(i - 1); - MarkerPos cur = (MarkerPos) markerList.get(i); + MarkerPos prev = markerList.get(i - 1); + MarkerPos cur = markerList.get(i); if (cur.type == MARKER_START) { prev.type = MARKER_END; } } - MarkerPos last = (MarkerPos) markerList.get(markerList.size() - 1); + MarkerPos last = markerList.get(markerList.size() - 1); last.type = MARKER_END; } Index: src/com/kitfox/svg/SVGDiagram.java --- src/com/kitfox/svg/SVGDiagram.java Base (BASE) +++ src/com/kitfox/svg/SVGDiagram.java Locally Modified (Based On LOCAL) @@ -203,7 +203,7 @@ public SVGElement getElement(String name) { - return (SVGElement)idMap.get(name); + return idMap.get(name); } public void setElement(String name, SVGElement node) Index: src/com/kitfox/svg/SVGElement.java --- src/com/kitfox/svg/SVGElement.java Base (BASE) +++ src/com/kitfox/svg/SVGElement.java Locally Modified (Based On LOCAL) @@ -452,7 +452,7 @@ protected SVGElement getParentContext() { - return contexts.isEmpty() ? null : (SVGElement) contexts.getLast(); + return contexts.isEmpty() ? null : contexts.getLast(); } public SVGRoot getRoot() Index: src/com/kitfox/svg/SVGLoader.java --- src/com/kitfox/svg/SVGLoader.java Base (BASE) +++ src/com/kitfox/svg/SVGLoader.java Locally Modified (Based On LOCAL) @@ -197,6 +197,7 @@ try { Class cls = (Class)obj; + @SuppressWarnings("deprecation") SVGElement svgEle = (SVGElement)cls.newInstance(); SVGElement parent = null; Index: src/com/kitfox/svg/SVGUniverse.java --- src/com/kitfox/svg/SVGUniverse.java Base (BASE) +++ src/com/kitfox/svg/SVGUniverse.java Locally Modified (Based On LOCAL) @@ -142,6 +142,7 @@ return curTime; } + @SuppressWarnings("deprecation") public void setCurTime(double curTime) { double oldTime = this.curTime; Index: src/com/kitfox/svg/pathcmd/Arc.java --- src/com/kitfox/svg/pathcmd/Arc.java Base (BASE) +++ src/com/kitfox/svg/pathcmd/Arc.java Locally Modified (Based On LOCAL) @@ -133,7 +133,7 @@ // Ensure radii are valid if (rx == 0 || ry == 0) { - path.lineTo((float) x, (float) y); + path.lineTo(x, y); return; } Index: src/com/kitfox/svg/xml/StyleSheet.java --- src/com/kitfox/svg/xml/StyleSheet.java Base (BASE) +++ src/com/kitfox/svg/xml/StyleSheet.java Locally Modified (Based On LOCAL) @@ -33,7 +33,7 @@ public boolean getStyle(StyleAttribute attrib, String tagName, String cssClass) { StyleSheetRule rule = new StyleSheetRule(attrib.getName(), tagName, cssClass); - String value = (String)ruleMap.get(rule); + String value = ruleMap.get(rule); if (value != null) { @@ -43,7 +43,7 @@ //Try again using just class name rule = new StyleSheetRule(attrib.getName(), null, cssClass); - value = (String)ruleMap.get(rule); + value = ruleMap.get(rule); if (value != null) { @@ -53,7 +53,7 @@ //Try again using just tag name rule = new StyleSheetRule(attrib.getName(), tagName, null); - value = (String)ruleMap.get(rule); + value = ruleMap.get(rule); if (value != null) { Index: src/org/openstreetmap/josm/tools/I18n.java --- src/org/openstreetmap/josm/tools/I18n.java Base (BASE) +++ src/org/openstreetmap/josm/tools/I18n.java Locally Modified (Based On LOCAL) @@ -384,18 +384,24 @@ try { // First check we're able to open a stream to our own SPI file // Java will fail on Windows if the jar file is in a folder with a space character! - I18n.class.getResourceAsStream("/META-INF/services/java.text.spi.DecimalFormatSymbolsProvider").close(); + java.io.InputStream is = I18n.class.getResourceAsStream("/META-INF/services/java.text.spi.DecimalFormatSymbolsProvider"); // Don't call Utils.updateSystemProperty to avoid spurious log at startup + if (is != null) { + is.close(); + // Don't call Utils.updateSystemProperty to avoid spurious log at startup return System.setProperty("java.locale.providers", "SPI,JRE,CLDR"); + } + return System.setProperty("java.locale.providers", "JRE,CLDR"); } catch (RuntimeException | IOException e) { // Don't call Logging class, it may not be fully initialized yet System.err.println("Unable to set SPI locale provider: " + e.getMessage()); + return null; } } catch (SecurityException e) { // Don't call Logging class, it may not be fully initialized yet System.err.println("Unable to set locale providers: " + e.getMessage()); + return null; } - return System.setProperty("java.locale.providers", "JRE,CLDR"); } /** Index: test/unit/org/openstreetmap/josm/TestUtils.java --- test/unit/org/openstreetmap/josm/TestUtils.java Base (BASE) +++ test/unit/org/openstreetmap/josm/TestUtils.java Locally Modified (Based On LOCAL) @@ -573,7 +573,8 @@ * @return all JOSM subtypes of the given class */ public static Set> getJosmSubtypes(Class superClass) { - try (ScanResult scan = new ClassGraph().whitelistPackages("org.openstreetmap.josm").ignoreClassVisibility().scan()) { + try (@SuppressWarnings("deprecation") + ScanResult scan = new ClassGraph().whitelistPackages("org.openstreetmap.josm").ignoreClassVisibility().scan()) { Function lambda = superClass.isInterface() ? scan::getClassesImplementing : scan::getSubclasses; return lambda.apply(superClass.getName()) .asMap().values().stream().map(x -> x.loadClass(superClass)).collect(Collectors.toSet());