| 1 | ### Eclipse Workspace Patch 1.0
|
|---|
| 2 | #P JMapViewer
|
|---|
| 3 | Index: src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java
|
|---|
| 4 | ===================================================================
|
|---|
| 5 | --- src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java (revision 36494)
|
|---|
| 6 | +++ src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java (working copy)
|
|---|
| 7 | @@ -8,6 +8,7 @@
|
|---|
| 8 | import java.net.URISyntaxException;
|
|---|
| 9 | import java.net.URL;
|
|---|
| 10 | import java.util.ArrayList;
|
|---|
| 11 | +import java.util.Collections;
|
|---|
| 12 | import java.util.List;
|
|---|
| 13 | import java.util.Locale;
|
|---|
| 14 | import java.util.concurrent.Callable;
|
|---|
| 15 | @@ -229,7 +230,7 @@
|
|---|
| 16 | } catch (SAXException | ParserConfigurationException | XPathExpressionException | NumberFormatException e) {
|
|---|
| 17 | LOG.log(Level.SEVERE, "Could not parse Bing aerials attribution metadata.", e);
|
|---|
| 18 | }
|
|---|
| 19 | - return null;
|
|---|
| 20 | + return Collections.emptyList();
|
|---|
| 21 | }
|
|---|
| 22 |
|
|---|
| 23 | @Override
|
|---|
| 24 | @@ -337,7 +338,7 @@
|
|---|
| 25 | Thread.currentThread().interrupt();
|
|---|
| 26 | }
|
|---|
| 27 | }
|
|---|
| 28 | - return null;
|
|---|
| 29 | + return Collections.emptyList();
|
|---|
| 30 | }
|
|---|
| 31 |
|
|---|
| 32 | @Override
|
|---|