Changeset 1353 in josm for trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

Timestamp:

31.01.2009 19:09:46 (3 years ago)

Author:

stoecker

Message:

apply patch by xeen - #2114

File:

• trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) (1 diff)

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

@@ -222 +222 @@
     @Override public void mergeFrom(final Layer from) {
         final MergeVisitor visitor = new MergeVisitor(data,((OsmDataLayer)from).data);
-        int i=0;
+//        int i=0;
         int max = ((OsmDataLayer)from).data.allPrimitives().size();
 
-        System.out.format("Add/Merge data:");
-        
+//        System.out.format("Add/Merge data:");
+
         for (final OsmPrimitive osm : ((OsmDataLayer)from).data.allPrimitives()) {
-            i++;
-            if(i%100 == 0) {
-                double perc = (((double)i) / ((double)max) * 100.0);
-                System.out.format(" " + (int)perc + "%%");
-            }
+//            i++;
+//            if(i%100 == 0) {
+//                double perc = (((double)i) / ((double)max) * 100.0);
+//                System.out.format(" " + (int)perc + "%%");
+//            }
             osm.visit(visitor);
         }
         visitor.fixReferences();
-        System.out.println("");
+//        System.out.println("");
 
         // copy the merged layer's data source info