- Timestamp:
- 2010-03-23T21:09:17+01:00 (15 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/AbstractMergeAction.java
r3083 r3153 30 30 */ 31 31 static public class LayerListCellRenderer extends DefaultListCellRenderer { 32 33 protected boolean isActiveLayer(Layer layer) {34 if (Main.isDisplayingMapView()) return false;35 return Main.map.mapView.getActiveLayer() == layer;36 }37 32 38 33 @Override -
trunk/src/org/openstreetmap/josm/data/osm/BBox.java
r3083 r3153 22 22 add(a); 23 23 add(b); 24 } 25 26 public BBox(BBox copy) { 27 this.xmin = copy.xmin; 28 this.xmax = copy.xmax; 29 this.ymin = copy.ymin; 30 this.ymax = copy.ymax; 24 31 } 25 32 -
trunk/src/org/openstreetmap/josm/data/osm/Relation.java
r3117 r3153 334 334 @Override 335 335 public BBox getBBox() { 336 if (members.isEmpty()) 337 return new BBox(0, 0, 0, 0); 336 338 if (getDataSet() == null) 337 339 return calculateBBox(new HashSet<PrimitiveId>()); … … 339 341 if (bbox == null) { 340 342 bbox = calculateBBox(new HashSet<PrimitiveId>()); 341 if (bbox == null) { 342 bbox = new BBox(0, 0, 0, 0); // No members 343 } 344 } 345 return bbox; 343 } 344 return new BBox(bbox); 346 345 } 347 346 } -
trunk/src/org/openstreetmap/josm/data/osm/Way.java
r3117 r3153 401 401 bbox = new BBox(this); 402 402 } 403 return bbox;403 return new BBox(bbox); 404 404 } 405 405
Note:
See TracChangeset
for help on using the changeset viewer.