- Timestamp:
- 2016-10-07T23:43:52+02:00 (8 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/data
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/Data.java
r8512 r11095 22 22 * @return Area object encompassing downloaded data. 23 23 */ 24 Area getDataSourceArea(); 24 default Area getDataSourceArea() { 25 return DataSource.getDataSourceArea(getDataSources()); 26 } 25 27 26 28 /** … … 36 38 * bounds are defined. 37 39 */ 38 List<Bounds> getDataSourceBounds(); 40 default List<Bounds> getDataSourceBounds() { 41 return DataSource.getDataSourceBounds(getDataSources()); 42 } 39 43 } -
trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java
r10906 r11095 2 2 package org.openstreetmap.josm.data.gpx; 3 3 4 import java.awt.geom.Area;5 4 import java.io.File; 6 5 import java.util.Collection; 6 import java.util.Collections; 7 7 import java.util.Date; 8 8 import java.util.HashSet; 9 9 import java.util.Iterator; 10 10 import java.util.LinkedList; 11 import java.util.List;12 11 import java.util.Map; 13 12 import java.util.NoSuchElementException; … … 470 469 @Override 471 470 public Collection<DataSource> getDataSources() { 472 return dataSources; 473 } 474 475 @Override 476 public Area getDataSourceArea() { 477 return DataSource.getDataSourceArea(dataSources); 478 } 479 480 @Override 481 public List<Bounds> getDataSourceBounds() { 482 return DataSource.getDataSourceBounds(dataSources); 471 return Collections.unmodifiableCollection(dataSources); 483 472 } 484 473 -
trunk/src/org/openstreetmap/josm/data/osm/DataSet.java
r10972 r11095 4 4 import static org.openstreetmap.josm.tools.I18n.tr; 5 5 6 import java.awt.geom.Area;7 6 import java.util.ArrayList; 8 7 import java.util.Arrays; … … 24 23 25 24 import org.openstreetmap.josm.Main; 26 import org.openstreetmap.josm.data.Bounds;27 25 import org.openstreetmap.josm.data.Data; 28 26 import org.openstreetmap.josm.data.DataSource; … … 923 921 @Override 924 922 public Collection<DataSource> getDataSources() { 925 return dataSources; 926 } 927 928 @Override 929 public Area getDataSourceArea() { 930 return DataSource.getDataSourceArea(dataSources); 923 return Collections.unmodifiableCollection(dataSources); 931 924 } 932 925 … … 1328 1321 } 1329 1322 1330 @Override1331 public List<Bounds> getDataSourceBounds() {1332 return DataSource.getDataSourceBounds(dataSources);1333 }1334 1335 1323 /** 1336 1324 * Moves all primitives and datasources from DataSet "from" to this DataSet.
Note:
See TracChangeset
for help on using the changeset viewer.