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

Timestamp:

2010-03-23T21:09:17+01:00 (14 years ago)

Author:

jttt

Message:

Return copy of bbox in Way.getBBox (to make sure internal copy won't be modified)

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AbstractMergeAction.java (modified) (1 diff)
• data/osm/BBox.java (modified) (1 diff)
• data/osm/Relation.java (modified) (2 diffs)
• data/osm/Way.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/AbstractMergeAction.java

@@ -30 +30 @@
      */
     static public class LayerListCellRenderer extends DefaultListCellRenderer {
-
-        protected boolean isActiveLayer(Layer layer) {
-            if (Main.isDisplayingMapView()) return false;
-            return Main.map.mapView.getActiveLayer() == layer;
-        }
 
         @Override

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

@@ -22 +22 @@
         add(a);
         add(b);
+    }
+
+    public BBox(BBox copy) {
+        this.xmin = copy.xmin;
+        this.xmax = copy.xmax;
+        this.ymin = copy.ymin;
+        this.ymax = copy.ymax;
     }
 

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

@@ -334 +334 @@
     @Override
     public BBox getBBox() {
+        if (members.isEmpty())
+            return new BBox(0, 0, 0, 0);
         if (getDataSet() == null)
             return calculateBBox(new HashSet<PrimitiveId>());
@@ -339 +341 @@
             if (bbox == null) {
                 bbox = calculateBBox(new HashSet<PrimitiveId>());
-                if (bbox == null) {
-                    bbox = new BBox(0, 0, 0, 0); // No members
-                }
-            }
-            return  bbox;
+            }
+            return new BBox(bbox);
         }
     }

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

@@ -401 +401 @@
             bbox = new BBox(this);
         }
-        return bbox;
+        return new BBox(bbox);
     }