Commit 8991ad6d authored by Florian Schäfer's avatar Florian Schäfer

Compile against JOSM 13996, raise minJosmVersion to 13927

parents 377cbcb6 f52460b7
......@@ -89,8 +89,8 @@ tasks.withType(JavaCompile) {
"-Xep:RemoveUnusedImports:WARN",
"-Xep:UngroupedOverloads:WARN",
"-Xep:WildcardImport:WARN",
"-Xlint:deprecation",
"-Xlint:unchecked",
"-Xlint:all",
"-Xlint:-serial",
]
}
......
# The minimum JOSM version this plugin is compatible with (can be any numeric version)
plugin.main.version = 13643
plugin.main.version = 13927
# 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 = 13878
plugin.compile.version = 13996
plugin.canloadatruntime = true
plugin.author = floscher <incoming+floscher/JOSM-wikipedia@incoming.gitlab.com>, simon04
plugin.class = org.wikipedia.WikipediaPlugin
......
......@@ -26,6 +26,7 @@ import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import javax.swing.plaf.basic.BasicArrowButton;
import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask;
import org.openstreetmap.josm.actions.downloadtasks.DownloadParams;
import org.openstreetmap.josm.actions.downloadtasks.PostDownloadHandler;
import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.data.preferences.AbstractProperty;
......@@ -61,10 +62,18 @@ public class SophoxDownloadReader implements DownloadSource<SophoxDownloadReader
DownloadOsmTask task = new DownloadOsmTask();
task.setZoomAfterDownload(settings.zoomToData());
Future<?> future = task.download(
new org.wikipedia.io.SophoxDownloadReader(area, org.wikipedia.io.SophoxDownloadReader.SOPHOX_SERVER.get(), data.getQuery(),
settings.asNewLayer(), data.getDownloadReferrers(), data.getDownloadFull()),
settings.asNewLayer(), area, null);
new org.wikipedia.io.SophoxDownloadReader(
area,
org.wikipedia.io.SophoxDownloadReader.SOPHOX_SERVER.get(),
data.getQuery(),
settings.asNewLayer(),
data.getDownloadReferrers(),
data.getDownloadFull()
),
new DownloadParams().withNewLayer(true),
area,
null
);
MainApplication.worker.execute(new PostDownloadHandler(task, future, data.getErrorReporter()));
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment