fix #21578 - update to latest JOSM changes (patch by gaben)

build.gradle

@@ -32,14 +32,14 @@ java.sourceCompatibility = JavaVersion.VERSION_1_8
 
 def versions = [
   errorprone: "2.4.0",
-  jacoco: "0.8.6",
-  junit: "5.7.0",
-  pmd: "6.28.0",
-  spotbugs: "4.1.4",
+  jacoco    : "0.8.7",
+  junit     : "5.8.2",
+  pmd       : "6.28.0",
+  spotbugs  : "4.1.4",
 ]
 
 repositories {
-  jcenter()
+  mavenCentral()
 }
 dependencies {
   if (!JavaVersion.current().isJava9Compatible()) {

gradle.properties

@@ -1,9 +1,9 @@
 # The minimum JOSM version this plugin is compatible with (can be any numeric version)
-plugin.main.version = 16398
+plugin.main.version = 18173
 # The JOSM version this plugin is currently compiled against
 # Please make sure this version is available at https://josm.openstreetmap.de/download
 # The special values "latest" and "tested" are also possible here, but not recommended.
-plugin.compile.version = 17084
+plugin.compile.version = 18303
 plugin.canloadatruntime = true
 plugin.author = floscher <incoming+josm-plugin-wikipedia-6702380-issue-@incoming.gitlab.com>, simon04
 plugin.class = org.wikipedia.WikipediaPlugin

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionSha256Sum=d08f7e24d061910382c2fda9915e6ed42dd1480ae2e99211f92c70190cb697e0
+distributionSha256Sum=8c12154228a502b784f451179846e518733cf856efc7d45b2e6691012977b2fe

gradlew

@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
@@ -154,19 +156,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -175,14 +177,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -26,66 +26,55 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 echo.
 echo Please set the JAVA_HOME variable in your environment to match the
 echo location of your Java installation.
 
 goto fail
 
 :findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
 echo.
 echo Please set the JAVA_HOME variable in your environment to match the
 echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
 if "%ERRORLEVEL%"=="0" goto mainEnd
 
 :fail

src/main/java/org/wikipedia/api/wikipedia_action/json/QueryResult.java

@@ -18,9 +18,7 @@
 public final class QueryResult {
     public static final SerializationSchema<QueryResult> SCHEMA = new SerializationSchema<>(
         QueryResult.class,
-        mapper -> {
-            mapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
-        }
+        mapper -> mapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
     );
 
     private final Query query;

src/main/java/org/wikipedia/data/WikipediaEntry.java

@@ -33,7 +33,7 @@ public WikipediaEntry(String lang, String article, LatLon coordinate) {
         this.coordinate = coordinate;
     }
 
-    public static  Optional<WikipediaEntry> fromUrl(final String value) {
+    public static Optional<WikipediaEntry> fromUrl(final String value) {
         return FunctionalUtil.or(
             Optional.ofNullable(value)
                 .map(WIKIPEDIA_FULL_URL_PATTERN::matcher)

src/main/java/org/wikipedia/gui/WikiLayer.java

@@ -172,7 +172,7 @@ private static void paintWikiMarkers(final Graphics2D g, final Collection<Collec
                     final int labelWidth = g.getFontMetrics().stringWidth(label);
                     g.drawString(
                         label,
-                        (int) Math.max(Integer.MIN_VALUE, Math.min(Integer.MAX_VALUE, x - labelWidth / 2)),
+                        (int) Math.max(Integer.MIN_VALUE, Math.min(Integer.MAX_VALUE, x - labelWidth / 2.0)),
                         (int) Math.max(Integer.MIN_VALUE, Math.min(Integer.MAX_VALUE, y + getMarkerWidth() * .2))
                     );
                 }));

src/main/java/org/wikipedia/gui/WikiPreferences.java

@@ -68,7 +68,7 @@ public void addGui(PreferenceTabbedPane gui) {
         container.add(Box.createVerticalGlue(), constraints);
 
         languageField.setText(WikiProperties.WIKIPEDIA_LANGUAGE.get());
-        sophoxServerField.setPossibleItems(SophoxDownloadReader.SOPHOX_SERVER_HISTORY.get());
+        sophoxServerField.getModel().addAllElements(SophoxDownloadReader.SOPHOX_SERVER_HISTORY.get());
         sophoxServerField.setText(SophoxDownloadReader.SOPHOX_SERVER.get());
 
         getTabPreferenceSetting(gui).addSubTab(this, "Wikipedia", container);
@@ -87,7 +87,7 @@ public boolean isExpert() {
     @Override
     public boolean ok() {
         WikiProperties.WIKIPEDIA_LANGUAGE.put(languageField.getText());
-        SophoxDownloadReader.SOPHOX_SERVER_HISTORY.put(sophoxServerField.getHistory());
+        SophoxDownloadReader.SOPHOX_SERVER_HISTORY.put(sophoxServerField.getModel().asStringList());
         SophoxDownloadReader.SOPHOX_SERVER.put(sophoxServerField.getText());
         return false;
     }

src/main/java/org/wikipedia/gui/WikidataItemSearchDialog.java

@@ -23,7 +23,7 @@
 import org.openstreetmap.josm.data.tagging.ac.AutoCompletionItem;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.MainApplication;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingComboBox;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompComboBox;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.tools.GBC;
@@ -35,14 +35,14 @@
 public final class WikidataItemSearchDialog extends ExtendedDialog {
 
     private final Selector selector;
-    private final AutoCompletingComboBox targetKey;
+    private final AutoCompComboBox<AutoCompletionItem> targetKey;
     private static final WikidataItemSearchDialog INSTANCE = new WikidataItemSearchDialog();
 
     private WikidataItemSearchDialog() {
         super(MainApplication.getMainFrame(), tr("Search Wikidata items"), tr("Add Tag"), tr("Cancel"));
         this.selector = new Selector();
         this.selector.setDblClickListener(e -> buttonAction(0, null));
-        this.targetKey = new AutoCompletingComboBox();
+        this.targetKey = new AutoCompComboBox<>();
         this.targetKey.setEditable(true);
         this.targetKey.setSelectedItem(new AutoCompletionItem("wikidata"));
 
@@ -90,7 +90,7 @@ private void initTargetKeys() {
         AutoCompletionManager.of(editDataSet).getTagKeys().stream()
                 .filter(v -> v.getValue().contains("wikidata"))
                 .forEach(keys::add);
-        targetKey.setPossibleAcItems(keys);
+        targetKey.getModel().addAllElements(keys);
     }
 
     @Override

src/main/java/org/wikipedia/io/SophoxDownloadReader.java

@@ -154,7 +154,7 @@ static String date(String humanDuration, LocalDateTime from) {
             p = Period.parse(javaDur ? duration.substring(0, idx) : duration);
         }
         if (javaDur) {
-            d = Duration.parse(javaPer ? 'P' + duration.substring(idx, duration.length()) : duration);
+            d = Duration.parse(javaPer ? 'P' + duration.substring(idx) : duration);
         } else if (!javaPer) {
             d = Duration.parse(duration);
         }