Ticket #14597: execute-filters.patch

File execute-filters.patch, 3.3 KB (added by bagage, 9 years ago)

patch proposal

  • build.xml

    diff --git a/build.xml b/build.xml
    index 1f5fe6b45..4eb64d448 100644
    a b  
    1414                                            utilsplugin2/build.xml
    1515                                            log4j/build.xml
    1616                                            apache-commons/build.xml
    17                                             apache-http/build.xml
    18                                                                                         austriaaddresshelper/build.xml"/>
     17                                            apache-http/build.xml"
     18                                                                                        />
    1919    <macrodef name="iterate">
    2020        <attribute name="target"/>
    2121        <sequential>
  • utilsplugin2/.classpath

    diff --git a/utilsplugin2/.classpath b/utilsplugin2/.classpath
    index 754574aa7..5b0d76733 100644
    a b  
    1 <?xml version="1.0" encoding="UTF-8"?>
    2 <classpath>
    3         <classpathentry kind="src" path="src"/>
    4         <classpathentry kind="src" path="test/unit"/>
    5         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
    6         <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
    7         <classpathentry kind="output" path="build"/>
    8 </classpath>
     1<?xml version="1.0" encoding="UTF-8"?>
     2<classpath>
     3        <classpathentry kind="src" path="src"/>
     4        <classpathentry kind="src" path="test/unit"/>
     5        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
     6        <classpathentry kind="lib" path="/home/gautier/code/osm/josm/core/dist/josm-custom.jar" sourcepath="/JOSM"/>
     7        <classpathentry kind="output" path="build"/>
     8</classpath>
  • utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectAllInsideAction.java

    diff --git a/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectAllInsideAction.java b/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectAllInsideAction.java
    index 006e5f3fc..f7bcbc2b4 100644
    a b import java.util.Collection;  
    1010
    1111import javax.swing.JOptionPane;
    1212
     13import org.openstreetmap.josm.Main;
    1314import org.openstreetmap.josm.actions.JosmAction;
    1415import org.openstreetmap.josm.data.osm.DataSet;
    1516import org.openstreetmap.josm.data.osm.OsmPrimitive;
    1617import org.openstreetmap.josm.gui.Notification;
     18import org.openstreetmap.josm.gui.dialogs.FilterDialog;
     19import org.openstreetmap.josm.gui.dialogs.FilterTableModel;
    1720import org.openstreetmap.josm.tools.Shortcut;
    1821
    1922/**
    public class SelectAllInsideAction extends JosmAction {  
    3336        DataSet ds = getLayerManager().getEditDataSet();
    3437        Collection<OsmPrimitive> insideSelected = NodeWayUtils.selectAllInside(ds.getSelected(), ds, true);
    3538
     39
     40
    3641        if (!insideSelected.isEmpty()) {
    3742            ds.addSelected(insideSelected);
     43            FilterDialog filterDialog = Main.map.getToggleDialog(FilterDialog.class);
     44            if (filterDialog != null) {
     45                FilterTableModel filterTableModel = filterDialog.getFilterModel();
     46                filterTableModel.executeFilters();
     47            }
    3848        } else {
    3949            new Notification(
    4050                    tr("Nothing found. Please select some closed ways or multipolygons to find all primitives inside them!"))