Changeset 10788 in josm for trunk

Timestamp:

2016-08-12T12:17:25+02:00 (8 years ago)

Author:

simon04

Message:

Remove superfluous FilteredCollection

Not used by any plugin in SVN

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/Preferences.java (modified) (2 diffs)
• data/osm/DataSet.java (modified) (2 diffs)
• gui/dialogs/CommandStackDialog.java (modified) (3 diffs)
• gui/layer/OsmDataLayer.java (modified) (2 diffs)
• tools/FilteredCollection.java (deleted)

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

@@ -67 +67 @@
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.ColorHelper;
-import org.openstreetmap.josm.tools.FilteredCollection;
 import org.openstreetmap.josm.tools.I18n;
 import org.openstreetmap.josm.tools.MultiMap;
+import org.openstreetmap.josm.tools.SubclassFilteredCollection;
 import org.openstreetmap.josm.tools.Utils;
 import org.xml.sax.SAXException;
@@ -507 +507 @@
     public synchronized void save() throws IOException {
         save(getPreferenceFile(),
-                new FilteredCollection<>(settingsMap.entrySet(), NO_DEFAULT_SETTINGS_ENTRY), false);
+                new SubclassFilteredCollection<>(settingsMap.entrySet(), NO_DEFAULT_SETTINGS_ENTRY), false);
     }
 

trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -47 +47 @@
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
-import org.openstreetmap.josm.tools.FilteredCollection;
 import org.openstreetmap.josm.tools.SubclassFilteredCollection;
 import org.openstreetmap.josm.tools.Utils;
@@ -613 +612 @@
      */
     public Collection<OsmPrimitive> getSelectedNodesAndWays() {
-        return new FilteredCollection<>(getSelected(), primitive -> primitive instanceof Node || primitive instanceof Way);
+        return new SubclassFilteredCollection<>(getSelected(), primitive -> primitive instanceof Node || primitive instanceof Way);
     }
 

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

@@ -12 +12 @@
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -45 +46 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer.CommandQueueListener;
 import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
-import org.openstreetmap.josm.tools.FilteredCollection;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.InputMapUtils;
 import org.openstreetmap.josm.tools.Shortcut;
+import org.openstreetmap.josm.tools.SubclassFilteredCollection;
 
 /**
@@ -331 +332 @@
      * @return collection of affected primitives, onluy usable ones
      */
-    protected static FilteredCollection<? extends OsmPrimitive> getAffectedPrimitives(TreePath path) {
+    protected static Collection<? extends OsmPrimitive> getAffectedPrimitives(TreePath path) {
         PseudoCommand c = ((CommandListMutableTreeNode) path.getLastPathComponent()).getCommand();
         final OsmDataLayer currentLayer = Main.getLayerManager().getEditLayer();
-        return new FilteredCollection<>(
+        return new SubclassFilteredCollection<>(
                 c.getParticipatingPrimitives(),
                 o -> {

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -96 +96 @@
 import org.openstreetmap.josm.io.OsmImporter;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
-import org.openstreetmap.josm.tools.FilteredCollection;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageOverlay;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.ImageProvider.ImageSizes;
+import org.openstreetmap.josm.tools.SubclassFilteredCollection;
 import org.openstreetmap.josm.tools.date.DateUtils;
 
@@ -425 +425 @@
 
     @Override public String getToolTipText() {
-        int nodes = new FilteredCollection<>(data.getNodes(), p -> !p.isDeleted()).size();
-        int ways = new FilteredCollection<>(data.getWays(), p -> !p.isDeleted()).size();
-        int rels = new FilteredCollection<>(data.getRelations(), p -> !p.isDeleted()).size();
+        int nodes = new SubclassFilteredCollection<>(data.getNodes(), p -> !p.isDeleted()).size();
+        int ways = new SubclassFilteredCollection<>(data.getWays(), p -> !p.isDeleted()).size();
+        int rels = new SubclassFilteredCollection<>(data.getRelations(), p -> !p.isDeleted()).size();
 
         String tool = trn("{0} node", "{0} nodes", nodes, nodes)+", ";