Index: /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (revision 12152)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (revision 12153)
@@ -108,5 +108,4 @@
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;
@@ -481,17 +480,27 @@
@Override public String getToolTipText() {
- 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)+", ";
- tool += trn("{0} way", "{0} ways", ways, ways)+", ";
- tool += trn("{0} relation", "{0} relations", rels, rels);
+ DataCountVisitor counter = new DataCountVisitor();
+ for (final OsmPrimitive osm : data.allPrimitives()) {
+ osm.accept(counter);
+ }
+ int nodes = counter.nodes - counter.deletedNodes;
+ int ways = counter.ways - counter.deletedWays;
+ int rels = counter.relations - counter.deletedRelations;
+
+ StringBuilder tooltip = new StringBuilder();
+ tooltip.append("");
+ tooltip.append(trn("{0} node", "{0} nodes", nodes, nodes));
+ tooltip.append("
");
+ tooltip.append(trn("{0} way", "{0} ways", ways, ways));
+ tooltip.append("
");
+ tooltip.append(trn("{0} relation", "{0} relations", rels, rels));
File f = getAssociatedFile();
if (f != null) {
- tool = ""+tool+"
"+f.getPath()+"";
- }
- return tool;
+ tooltip.append("
");
+ tooltip.append(f.getPath());
+ }
+ tooltip.append("");
+ return tooltip.toString();
}