Changeset 34559 in osm for applications/editors/josm/plugins

Timestamp:

2018-08-18T20:22:49+02:00 (6 years ago)

Author:

donvip

Message:

update to JOSM 12847

Location:

applications/editors/josm/plugins/tag2link

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/tag2link/Tag2LinkRuleChecker.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/tag2link/action/OpenLinkAction.java (modified) (1 diff)

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

@@ -5 +5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="10899"/>
+    <property name="plugin.main.version" value="12847"/>
 
     <property name="plugin.author" value="Don-vip &amp; FrViPofm"/>

applications/editors/josm/plugins/tag2link/src/org/openstreetmap/josm/plugins/tag2link/Tag2LinkRuleChecker.java

@@ -26 +26 @@
 import java.util.regex.Pattern;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.IPrimitive;
 import org.openstreetmap.josm.data.osm.Tag;
@@ -36 +35 @@
 import org.openstreetmap.josm.plugins.tag2link.data.Source;
 import org.openstreetmap.josm.plugins.tag2link.io.SourcesReader;
+import org.openstreetmap.josm.spi.preferences.Config;
 
 /**
@@ -80 +80 @@
                 Matcher lm = Pattern.compile(".*lang(?:\\((\\p{Lower}{2,})(?:,(\\p{Lower}{2,}))*\\))?.*").matcher(arg);
                 if (lm.matches()) {
-                    String josmLang = Main.pref.get("language");
+                    String josmLang = Config.getPref().get("language");
                     String jvmLang = (josmLang.isEmpty() ? Locale.getDefault().getLanguage() : josmLang).split("_")[0];
                     if (lm.groupCount() == 0) {

applications/editors/josm/plugins/tag2link/src/org/openstreetmap/josm/plugins/tag2link/action/OpenLinkAction.java

@@ -26 +26 @@
 import java.nio.file.Files;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.plugins.tag2link.Tag2LinkConstants;