Changeset 7987 in josm for trunk/src

Timestamp:

2015-01-25T03:37:12+01:00 (11 years ago)

Author:

Don-vip

Message:

update presets lang, update Groovy, remove deprecated stuff, fix some minor issues

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/JoinAreasAction.java (modified) (1 diff)
• actions/PasteAction.java (modified) (1 diff)
• data/Preferences.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java ¶

@@ -478 +478 @@
                     allWays.addAll(pol.innerWays);
                 }
-                DataSet ds = Main.main.getCurrentDataSet();
+                DataSet ds = ways.iterator().next().getDataSet();
                 if (ds != null) {
                     ds.setSelected(allWays);

trunk/src/org/openstreetmap/josm/actions/PasteAction.java ¶

@@ -93 +93 @@
         // But this does not work if the shortcut is changed to a single key (see #9055)
         // Observed behaviour: getActionCommand() returns Action.NAME when triggered via menu, but shortcut text when triggered with it
-        if (!getValue(NAME).equals(e.getActionCommand())) {
+        if (e != null && !getValue(NAME).equals(e.getActionCommand())) {
             final Point mp = MouseInfo.getPointerInfo().getLocation();
             final Point tl = Main.map.mapView.getLocationOnScreen();

trunk/src/org/openstreetmap/josm/data/Preferences.java ¶

@@ -1684 +1684 @@
 
         String[] obsolete = {
-                "validator.tests",                             // 01/2014 - can be removed end-2014. Replaced by validator.skip
-                "validator.testsBeforeUpload",                 // 01/2014 - can be removed end-2014. Replaced by validator.skipBeforeUpload
-                "validator.TagChecker.sources",                // 01/2014 - can be removed end-2014. Replaced by validator.TagChecker.source
-                "validator.TagChecker.usedatafile",            // 01/2014 - can be removed end-2014. Replaced by validator.TagChecker.source
-                "validator.TagChecker.useignorefile",          // 01/2014 - can be removed end-2014. Replaced by validator.TagChecker.source
-                "validator.TagChecker.usespellfile",           // 01/2014 - can be removed end-2014. Replaced by validator.TagChecker.source
-                "validator.org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker.sources" // 01/2014 - can be removed end-2014. Replaced by validator.org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker.entries
         };
         for (String key : obsolete) {