Changeset 6296 in josm for trunk/src/org/openstreetmap/josm/data/osm

Timestamp:

2013-10-04T03:27:01+02:00 (11 years ago)

Author:

Don-vip

Message:

Sonar/Findbugs - Avoid commented-out lines of code, javadoc

Location:

trunk/src/org/openstreetmap/josm/data/osm

Files:

• DataSetMerger.java (modified) (2 diffs)
• OsmPrimitive.java (modified) (1 diff)
• QuadBuckets.java (modified) (1 diff)
• history/HistoryOsmPrimitive.java (modified) (1 diff)
• visitor/paint/StyledMapRenderer.java (modified) (4 diffs)
• visitor/paint/relations/Multipolygon.java (modified) (3 diffs)

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

@@ -80 +80 @@
     protected void mergePrimitive(OsmPrimitive source, Collection<? extends OsmPrimitive> candidates) {
         if (!source.isNew() ) {
-            // try to merge onto a matching primitive with the same
-            // defined id
+            // try to merge onto a matching primitive with the same defined id
             //
             if (mergeById(source))
                 return;
-            //if (!source.isVisible())
-            // ignore it
-            //    return;
         } else {
             // ignore deleted primitives from source
@@ -101 +97 @@
                 if (target.hasEqualSemanticAttributes(source)) {
                     mergedMap.put(source.getPrimitiveId(), target.getPrimitiveId());
-                    // copy the technical attributes from other
-                    // version
+                    // copy the technical attributes from other version
                     target.setVisible(source.isVisible());
                     target.setUser(source.getUser());

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

@@ -1127 +1127 @@
         if (!isNew() &&  id != other.id)
             return false;
-        //        if (isIncomplete() && ! other.isIncomplete() || !isIncomplete()  && other.isIncomplete())
         if (isIncomplete() ^ other.isIncomplete()) // exclusive or operator for performance (see #7159)
             return false;

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

@@ -506 +506 @@
             QBLevel<T> next;
             next = q.nextContentNode();
-            //if (consistency_testing && (orig == next))
             if (orig == next) {
                 abort("got same leaf back leaf: " + q.isLeaf());

trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java

@@ -249 +249 @@
         // equal semantics is valid for subclasses like {@link HistoryOsmNode} etc. too.
         // So, don't enforce equality of class.
-        //
-        //        if (getClass() != obj.getClass())
-        //            return false;
         HistoryOsmPrimitive other = (HistoryOsmPrimitive) obj;
         if (id != other.id)

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

@@ -498 +498 @@
             } else {
                 TexturePaint texture = new TexturePaint(fillImage.getImage(),
-                        //                        new Rectangle(polygon.xpoints[0], polygon.ypoints[0], fillImage.getWidth(), fillImage.getHeight()));
                         new Rectangle(0, 0, fillImage.getWidth(), fillImage.getHeight()));
                 g.setPaint(texture);
@@ -511 +510 @@
 
         if (text != null && isShowNames()) {
-            /*
-             * abort if we can't compose the label to be rendered
-             */
+            // abort if we can't compose the label to be rendered
             if (text.labelCompositionStrategy == null) return;
             String name = text.labelCompositionStrategy.compose(osm);
@@ -522 +519 @@
             Rectangle2D nb = fontMetrics.getStringBounds(name, g); // if slow, approximate by strlen()*maxcharbounds(font)
 
-            // Point2D c = getCentroid(polygon);
             // Using the Centroid is Nicer for buildings like: +--------+
             // but this needs to be fast.  As most houses are  |   42   |
@@ -528 +524 @@
             // will have to do.                                    ++
             // Centroids are not optimal either, just imagine a U-shaped house.
-            // Point2D c = new Point2D.Double(pb.x + pb.width / 2.0, pb.y + pb.height / 2.0);
-            // Rectangle2D.Double centeredNBounds =
-            //     new Rectangle2D.Double(c.getX() - nb.getWidth()/2,
-            //                            c.getY() - nb.getHeight()/2,
-            //                            nb.getWidth(),
-            //                            nb.getHeight());
 
             Rectangle centeredNBounds = new Rectangle(pb.x + (int)((pb.width - nb.getWidth())/2.0),

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java

@@ -488 +488 @@
                         }
                     }
-                } /* for(i = ... */
-            } /* while(joined) */
+                }
+            }
 
             if (nodes == null) {
@@ -497 +497 @@
 
             result.add(new JoinedWay(nodes, wayIds, selected));
-        } /* while(left != 0) */
+        }
 
         return result;
@@ -575 +575 @@
         return innerWays;
     }
-/*
-    public List<PolyData> getInnerPolygons() {
-        return innerPolygons;
-    }
-
-    public List<PolyData> getOuterPolygons() {
-        return outerPolygons;
-    }
-*/
+
     public List<PolyData> getCombinedPolygons() {
         return combinedPolygons;