Ticket #3140: plugins.diff

File plugins.diff, 3.7 KB (added by anonymous, 16 years ago)
  • utilsplugin/src/UtilsPlugin/JoinAreasAction.java

     
    223223
    224224        // Delete the remaining inner ways
    225225        if(innerWays != null && innerWays.size() > 0)
    226             cmds.add(DeleteCommand.delete(innerWays, true));
     226            {
     227                OsmDataLayer dataLayer = Main.map.mapView.getEditLayer();
     228                cmds.add(DeleteCommand.delete(dataLayer,innerWays, true));
     229            }
    227230        commitCommands(marktr("Delete Ways that are not part of an inner multipolygon"));
    228231
    229232        // We can attach our new multipolygon relation and pretend it has always been there
  • validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java

     
    1515import org.openstreetmap.josm.plugins.validator.Severity;
    1616import org.openstreetmap.josm.plugins.validator.Test;
    1717import org.openstreetmap.josm.plugins.validator.TestError;
    18 
     18import org.openstreetmap.josm.gui.layer.OsmDataLayer;
    1919/**
    2020 * Checks for untagged nodes that are in no way
    2121 *
     
    9595    @Override
    9696    public Command fixError(TestError testError)
    9797    {
    98         return DeleteCommand.delete(testError.getPrimitives());
     98        OsmDataLayer dataLayer = Main.map.mapView.getEditLayer();
     99        return DeleteCommand.delete(dataLayer,testError.getPrimitives());
    99100    }
    100101
    101102    @Override
  • validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java

     
    1616import org.openstreetmap.josm.plugins.validator.Severity;
    1717import org.openstreetmap.josm.plugins.validator.Test;
    1818import org.openstreetmap.josm.plugins.validator.TestError;
    19 
     19import org.openstreetmap.josm.gui.layer.OsmDataLayer;
    2020/**
    2121 * Checks for untagged ways
    2222 *
     
    151151    @Override
    152152    public Command fixError(TestError testError)
    153153    {
    154         return DeleteCommand.delete(testError.getPrimitives());
     154        OsmDataLayer dataLayer = Main.map.mapView.getEditLayer();
     155        return DeleteCommand.delete(dataLayer,testError.getPrimitives());
    155156    }
    156157}
  • validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java

     
    1414import org.openstreetmap.josm.plugins.validator.Test;
    1515import org.openstreetmap.josm.plugins.validator.TestError;
    1616
     17import org.openstreetmap.josm.Main;
     18import org.openstreetmap.josm.gui.layer.OsmDataLayer;
     19
    1720public class DuplicatedWayNodes extends Test {
    1821    protected static int DUPLICATE_WAY_NODE = 501;
    1922
     
    5760        }
    5861        if (wnew.nodes.size() < 2) {
    5962            // Empty way, delete
    60             return DeleteCommand.delete(Collections.singleton(w));
     63            OsmDataLayer dataLayer = Main.map.mapView.getEditLayer();
     64            return DeleteCommand.delete(dataLayer,Collections.singleton(w));
    6165        } else {
    6266            return new ChangeCommand(w, wnew);
    6367        }