diff --git a/gradle.properties b/gradle.properties index 5fe6f6dd..3c5d8d3e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,9 @@ # The minimum JOSM version this plugin is compatible with (can be any numeric version) -plugin.main.version = 18723 +plugin.main.version = 18877 # 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 = 18724 +plugin.compile.version = 18877 plugin.canloadatruntime = true plugin.author = floscher , simon04 plugin.class = org.wikipedia.WikipediaPlugin diff --git a/src/main/java/org/wikipedia/data/WikidataEntry.java b/src/main/java/org/wikipedia/data/WikidataEntry.java index 5fb0f8b0..d4b9fc79 100644 --- a/src/main/java/org/wikipedia/data/WikidataEntry.java +++ b/src/main/java/org/wikipedia/data/WikidataEntry.java @@ -4,7 +4,7 @@ import java.awt.Color; import java.util.Comparator; import java.util.Optional; -import javax.annotation.Nonnull; + import org.openstreetmap.josm.data.coor.LatLon; import org.openstreetmap.josm.data.osm.Tag; import org.openstreetmap.josm.tools.AlphanumComparator; @@ -12,6 +12,8 @@ import org.openstreetmap.josm.tools.Utils; import org.wikipedia.tools.RegexUtil; +import jakarta.annotation.Nonnull; + public class WikidataEntry extends WikipediaEntry { public final String label; diff --git a/src/main/java/org/wikipedia/gui/WikidataTagCellRenderer.java b/src/main/java/org/wikipedia/gui/WikidataTagCellRenderer.java index 110c0da1..92d1d2b3 100644 --- a/src/main/java/org/wikipedia/gui/WikidataTagCellRenderer.java +++ b/src/main/java/org/wikipedia/gui/WikidataTagCellRenderer.java @@ -15,10 +15,11 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutionException; import java.util.logging.Level; -import javax.annotation.Nonnull; + import javax.swing.JLabel; import javax.swing.JTable; import javax.swing.table.DefaultTableCellRenderer; + import org.openstreetmap.josm.gui.util.GuiHelper; import org.openstreetmap.josm.tools.Logging; import org.openstreetmap.josm.tools.Utils; @@ -26,6 +27,8 @@ import org.wikipedia.data.WikidataEntry; import org.wikipedia.tools.RegexUtil; +import jakarta.annotation.Nonnull; + public class WikidataTagCellRenderer extends DefaultTableCellRenderer { final Map> labelCache = new ConcurrentHashMap<>();