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

Timestamp:

2010-06-29T17:19:26+02:00 (14 years ago)

Author:

bastiK

Message:

added filter tests

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/FilterWorker.java (added)
• gui/dialogs/FilterDialog.java (modified) (15 diffs)
• gui/dialogs/FilterTableModel.java (moved) (moved from trunk/src/org/openstreetmap/josm/data/osm/Filters.java ) (7 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java

@@ -26 +26 @@
 import org.openstreetmap.josm.actions.search.SearchAction;
 import org.openstreetmap.josm.data.osm.Filter;
-import org.openstreetmap.josm.data.osm.Filters;
 import org.openstreetmap.josm.data.osm.event.AbstractDatasetChangedEvent;
 import org.openstreetmap.josm.data.osm.event.DataSetListener;
@@ -43 +42 @@
 
     private JTable userTable;
-    private Filters filters = new Filters();
+    private FilterTableModel filterModel = new FilterTableModel();
     private SideButton addButton;
     private SideButton editButton;
@@ -61 +60 @@
     public void showNotify() {
         DatasetEventManager.getInstance().addDatasetListener(listenerAdapter, FireMode.IN_EDT_CONSOLIDATED);
-        filters.executeFilters();
+        filterModel.executeFilters();
     }
 
@@ -67 +66 @@
     public void hideNotify() {
         DatasetEventManager.getInstance().removeDatasetListener(listenerAdapter);
-        filters.clearFilterFlags();
+        filterModel.clearFilterFlags();
         Main.map.mapView.repaint();
     }
@@ -79 +78 @@
                 Filter filter = (Filter)SearchAction.showSearchDialog(new Filter());
                 if(filter != null){
-                    filters.addFilter(filter);
+                    filterModel.addFilter(filter);
                 }
             }
@@ -90 +89 @@
                 int index = userTable.getSelectionModel().getMinSelectionIndex();
                 if(index < 0) return;
-                Filter f = filters.getFilter(index);
+                Filter f = filterModel.getFilter(index);
                 Filter filter = (Filter)SearchAction.showSearchDialog(f);
                 if(filter != null){
-                    filters.setFilter(index, filter);
+                    filterModel.setFilter(index, filter);
                 }
             }
@@ -104 +103 @@
                 int index = userTable.getSelectionModel().getMinSelectionIndex();
                 if(index < 0) return;
-                filters.removeFilter(index);
+                filterModel.removeFilter(index);
             }
         });
@@ -114 +113 @@
                 int index = userTable.getSelectionModel().getMinSelectionIndex();
                 if(index < 0) return;
-                filters.moveUpFilter(index);
+                filterModel.moveUpFilter(index);
                 userTable.getSelectionModel().setSelectionInterval(index-1, index-1);
             }
@@ -125 +124 @@
                 int index = userTable.getSelectionModel().getMinSelectionIndex();
                 if(index < 0) return;
-                filters.moveDownFilter(index);
+                filterModel.moveDownFilter(index);
                 userTable.getSelectionModel().setSelectionInterval(index+1, index+1);
             }
@@ -144 +143 @@
         JPanel pnl = new JPanel();
         pnl.setLayout(new BorderLayout());
-        userTable = new JTable(filters){
+        userTable = new JTable(filterModel){
             @Override
             protected JTableHeader createDefaultTableHeader() {
@@ -183 +182 @@
 
     public void processDatasetEvent(AbstractDatasetChangedEvent event) {
-        filters.executeFilters();
+        filterModel.executeFilters();
     }
 
@@ -189 +188 @@
         @Override
         public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus,int row,int column) {
-            Filters model = (Filters)table.getModel();
+            FilterTableModel model = (FilterTableModel)table.getModel();
             Component cell = super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
             cell.setEnabled(model.isCellEnabled(row, column));
@@ -198 +197 @@
     static class BooleanRenderer extends JCheckBox implements TableCellRenderer {
         public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus,int row,int column) {
-            Filters model = (Filters)table.getModel();
+            FilterTableModel model = (FilterTableModel)table.getModel();
             setSelected((Boolean)value);
             setEnabled(model.isCellEnabled(row, column));
@@ -209 +208 @@
         SwingUtilities.invokeLater(new Runnable() {
             public void run() {
-                setTitle(tr("Filter Hidden:{0} Disabled:{1}", filters.disabledAndHiddenCount, filters.disabledCount));
+                setTitle(tr("Filter Hidden:{0} Disabled:{1}", filterModel.disabledAndHiddenCount, filterModel.disabledCount));
             }
         });
@@ -215 +214 @@
 
     public void drawOSDText(Graphics2D g) {
-        filters.drawOSDText(g);
+        filterModel.drawOSDText(g);
     }
 }

trunk/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java

@@ -1 @@
-package org.openstreetmap.josm.data.osm;
+package org.openstreetmap.josm.gui.dialogs;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -21 +21 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.search.SearchCompiler.ParseError;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.Filter;
+import org.openstreetmap.josm.data.osm.FilterMatcher;
+import org.openstreetmap.josm.data.osm.FilterWorker;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 
 /**
@@ -26 +31 @@
  * @author Petr_Dlouhý
  */
-public class Filters extends AbstractTableModel {
+public class FilterTableModel extends AbstractTableModel {
 
     // number of primitives that are disabled but not hidden
@@ -33 +38 @@
     public int disabledAndHiddenCount;
 
-    public Filters() {
+    public FilterTableModel() {
         loadPrefs();
     }
@@ -54 +59 @@
 
 
-    /**
-     * Apply the filters to the primitives of the data set.
-     *
-     * There are certain rules to ensure that a way is not displayed "naked"
-     * without its nodes (1) and on the other hand to avoid hiding a way but
-     * leaving its nodes visible as a cloud of points (2).
-     *
-     * In normal (non-inverted) mode only problem (2) is relevant.
-     * Untagged child nodes of filtered ways that are not used by other
-     * unfiltered ways are filtered as well.
-     *
-     * If a filter applies explicitly to a node, (2) is ignored and it
-     * is filtered in any case.
-     *
-     * In inverted mode usually only problem (1) is relevant.
-     * If the inverted filter applies explicitly to a node, this no longer
-     * means it is filtered in any case:
-     * E.g. the filter [searchtext="highway=footway", inverted=true] displays
-     * the footways only. But that does not mean, the nodes of the footway
-     * (which do not have the highway tag) should be filtered as well.
-     *
-     * So first the Filter is applied for ways and relations. Then to nodes
-     * (but hides them only if they are not used by any unfiltered way).
-     */
+    
     public void executeFilters() {
         DataSet ds = Main.main.getCurrentDataSet();
@@ -85 +67 @@
         final Collection<OsmPrimitive> all = ds.allNonDeletedCompletePrimitives();
 
-        for (OsmPrimitive primitive: all) {
-            if (filterMatcher.isHidden(primitive)) {
-                primitive.setDisabledState(true);
-            } else if (filterMatcher.isDisabled(primitive)) {
-                primitive.setDisabledState(false);
-            } else {
-                primitive.unsetDisabledState();
-            }
-        }
-
-        for (OsmPrimitive primitive: all) {
-            if (primitive instanceof Way && primitive.isDisabled()) {
-                Way w = (Way)primitive;
-                for (Node n: w.getNodes()) {
-
-                    if (n.isTagged()) {
-                        continue;
-                    }
-
-                    boolean disabled = w.isDisabled();
-                    boolean hidden = w.isDisabledAndHidden();
-                    for (OsmPrimitive ref: n.getReferrers()) {
-                        if (ref instanceof Way) {
-                            disabled = disabled && ref.isDisabled();
-                            hidden = hidden && ref.isDisabledAndHidden();
-                        }
-                    }
-
-                    if (disabled) {
-                        n.setDisabledState(hidden);
-                    }
-                }
-            }
-        }
+        FilterWorker.executeFilters(all, filterMatcher);
 
         disabledCount = 0;
@@ -147 +96 @@
         DataSet ds = Main.main.getCurrentDataSet();
         if (ds != null) {
-            for (OsmPrimitive osm : ds.allPrimitives()) {
-                osm.unsetDisabledState();
-            }
+            FilterWorker.clearFilterFlags(ds.allPrimitives());
         }
         disabledCount = 0;