Changeset 7987 in josm for trunk/src/org/openstreetmap


Ignore:
Timestamp:
2015-01-25T03:37:12+01:00 (5 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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java

    r7534 r7987  
    478478                    allWays.addAll(pol.innerWays);
    479479                }
    480                 DataSet ds = Main.main.getCurrentDataSet();
     480                DataSet ds = ways.iterator().next().getDataSet();
    481481                if (ds != null) {
    482482                    ds.setSelected(allWays);
  • trunk/src/org/openstreetmap/josm/actions/PasteAction.java

    r7005 r7987  
    9393        // But this does not work if the shortcut is changed to a single key (see #9055)
    9494        // Observed behaviour: getActionCommand() returns Action.NAME when triggered via menu, but shortcut text when triggered with it
    95         if (!getValue(NAME).equals(e.getActionCommand())) {
     95        if (e != null && !getValue(NAME).equals(e.getActionCommand())) {
    9696            final Point mp = MouseInfo.getPointerInfo().getLocation();
    9797            final Point tl = Main.map.mapView.getLocationOnScreen();
  • trunk/src/org/openstreetmap/josm/data/Preferences.java

    r7894 r7987  
    16841684
    16851685        String[] obsolete = {
    1686                 "validator.tests",                             // 01/2014 - can be removed end-2014. Replaced by validator.skip
    1687                 "validator.testsBeforeUpload",                 // 01/2014 - can be removed end-2014. Replaced by validator.skipBeforeUpload
    1688                 "validator.TagChecker.sources",                // 01/2014 - can be removed end-2014. Replaced by validator.TagChecker.source
    1689                 "validator.TagChecker.usedatafile",            // 01/2014 - can be removed end-2014. Replaced by validator.TagChecker.source
    1690                 "validator.TagChecker.useignorefile",          // 01/2014 - can be removed end-2014. Replaced by validator.TagChecker.source
    1691                 "validator.TagChecker.usespellfile",           // 01/2014 - can be removed end-2014. Replaced by validator.TagChecker.source
    1692                 "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
    16931686        };
    16941687        for (String key : obsolete) {
Note: See TracChangeset for help on using the changeset viewer.