[jmapviewer] 04/13: Merge tag 'upstream/1.04+dfsg'

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository jmapviewer.

commit 395e6809a2bf146c60c8ce2b7ba25d9a60bfca67
Merge: 7929d34 efa0a85
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Dec 12 21:58:27 2014 +0100

    Merge tag 'upstream/1.04+dfsg'
    
    Upstream version 1.04+dfsg

 build.xml                                          |   2 +-
 .../gui/jmapviewer/AbstractLayer.java              |   2 +-
 .../gui/jmapviewer/AttributionSupport.java         | 326 ++++++++++-----------
 .../openstreetmap/gui/jmapviewer/Coordinate.java   |  23 ++
 .../gui/jmapviewer/DefaultMapController.java       |  22 +-
 src/org/openstreetmap/gui/jmapviewer/Demo.java     |   9 +-
 .../gui/jmapviewer/FeatureAdapter.java             | 126 ++++----
 .../openstreetmap/gui/jmapviewer/JMapViewer.java   |  23 +-
 .../gui/jmapviewer/JobDispatcher.java              |   2 +-
 .../gui/jmapviewer/MapPolygonImpl.java             | 210 ++++++-------
 .../gui/jmapviewer/MapRectangleImpl.java           | 156 +++++-----
 .../gui/jmapviewer/MemoryTileCache.java            |   2 +-
 .../gui/jmapviewer/OsmFileCacheTileLoader.java     |  41 +--
 .../gui/jmapviewer/OsmTileLoader.java              |   2 +-
 src/org/openstreetmap/gui/jmapviewer/Tile.java     |   2 +-
 .../gui/jmapviewer/events/JMVCommandEvent.java     |  96 +++---
 .../openstreetmap/gui/jmapviewer/images/error.png  | Bin 5668 -> 3217 bytes
 .../gui/jmapviewer/images/hourglass.png            | Bin 9096 -> 5918 bytes
 .../openstreetmap/gui/jmapviewer/images/minus.png  | Bin 171 -> 88 bytes
 .../openstreetmap/gui/jmapviewer/images/plus.png   | Bin 225 -> 133 bytes
 .../gui/jmapviewer/interfaces/Attributed.java      | 100 +++----
 .../interfaces/JMapViewerEventListener.java        |  34 +--
 .../gui/jmapviewer/interfaces/MapPolygon.java      |  76 ++---
 .../jmapviewer/tilesources/AbstractTileSource.java | 154 +++++-----
 .../tilesources/BingAerialTileSource.java          |  26 +-
 .../gui/jmapviewer/tilesources/OsmTileSource.java  |   2 +-
 .../jmapviewer/tilesources/ScanexTileSource.java   |   2 +-
 .../tilesources/TemplatedTMSTileSource.java        |   2 +-
 28 files changed, 720 insertions(+), 720 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/jmapviewer.git