Changeset 11095 in josm for trunk/src/org

Timestamp:

2016-10-07T23:43:52+02:00 (8 years ago)

Author:

simon04

Message:

Default method implementations of Data interface

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• Data.java (modified) (2 diffs)
• gpx/GpxData.java (modified) (2 diffs)
• osm/DataSet.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/Data.java

@@ -22 +22 @@
      * @return Area object encompassing downloaded data.
      */
-    Area getDataSourceArea();
+    default Area getDataSourceArea() {
+        return DataSource.getDataSourceArea(getDataSources());
+    }
 
     /**
@@ -36 +38 @@
      * bounds are defined.
      */
-    List<Bounds> getDataSourceBounds();
+    default List<Bounds> getDataSourceBounds() {
+        return DataSource.getDataSourceBounds(getDataSources());
+    }
 }

trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.gpx;
 
-import java.awt.geom.Area;
 import java.io.File;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedList;
-import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
@@ -470 +469 @@
     @Override
     public Collection<DataSource> getDataSources() {
-        return dataSources;
-    }
-
-    @Override
-    public Area getDataSourceArea() {
-        return DataSource.getDataSourceArea(dataSources);
-    }
-
-    @Override
-    public List<Bounds> getDataSourceBounds() {
-        return DataSource.getDataSourceBounds(dataSources);
+        return Collections.unmodifiableCollection(dataSources);
     }
 

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.geom.Area;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -24 +23 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.Data;
 import org.openstreetmap.josm.data.DataSource;
@@ -923 +921 @@
     @Override
     public Collection<DataSource> getDataSources() {
-        return dataSources;
-    }
-
-    @Override
-    public Area getDataSourceArea() {
-        return DataSource.getDataSourceArea(dataSources);
+        return Collections.unmodifiableCollection(dataSources);
     }
 
@@ -1328 +1321 @@
     }
 
-    @Override
-    public List<Bounds> getDataSourceBounds() {
-        return DataSource.getDataSourceBounds(dataSources);
-    }
-
     /**
      * Moves all primitives and datasources from DataSet "from" to this DataSet.