Changeset 33742 in osm for applications/editors/josm

Timestamp:

2017-10-29T22:32:04+01:00 (7 years ago)

Author:

donvip

Message:

update to JOSM 13007

Location:

applications/editors/josm/plugins/utilsplugin2

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/utilsplugin2/customurl/URLList.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/utilsplugin2/multitagger/MultiTagDialog.java (modified) (2 diffs)

applications/editors/josm/plugins/utilsplugin2/build.xml

@@ -5 +5 @@
     <property name="commit.message" value="[josm_utilsplugin2]: select boundary by double-click; multitagger table highlights"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="12840"/>
+    <property name="plugin.main.version" value="13007"/>
 
     <property name="plugin.author" value="Kalle Lampila, Upliner, Zverik, akks, joshdoe and others"/>

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/customurl/URLList.java

@@ -72 +72 @@
     public static List<String> loadURLList() {
         ArrayList<String> items = new ArrayList<>();
-        File f = new File(UtilsPlugin2.getInstance().getPluginDir(), "customurl.txt");
+        File f = new File(UtilsPlugin2.getInstance().getPluginDirs().getUserDataDirectory(false), "customurl.txt");
         try (BufferedReader fr = Files.newBufferedReader(f.toPath(), StandardCharsets.UTF_8)) {
             String s;
@@ -85 +85 @@
 
     public static void saveURLList(List<String> items) {
-        File f = new File(UtilsPlugin2.getInstance().getPluginDir(), "customurl.txt");
+        File f = new File(UtilsPlugin2.getInstance().getPluginDirs().getUserDataDirectory(false), "customurl.txt");
         PrintWriter fw = null;
         try {

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/multitagger/MultiTagDialog.java

@@ -47 +47 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.search.SearchMode;
-import org.openstreetmap.josm.data.preferences.ColorProperty;
+import org.openstreetmap.josm.data.preferences.NamedColorProperty;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -357 +357 @@
 
     class ColoredRenderer extends DefaultTableCellRenderer {
-        private final Color highlightColor = new ColorProperty(
+        private final Color highlightColor = new NamedColorProperty(
                 marktr("Multitag Background: highlight"), new Color(255, 255, 200)).get();
         @Override