This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository jmapviewer.
commit 1ac303443b092d456064716eee4f4edae30b8f88 Merge: 85ed565 4fdb8d2 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Fri Oct 9 10:37:54 2015 +0200 Merge tag 'upstream/1.10+dfsg' Upstream version 1.10+dfsg build.xml | 48 ++++- .../gui/jmapviewer/AbstractLayer.java | 51 +++-- .../gui/jmapviewer/AttributionSupport.java | 4 +- .../openstreetmap/gui/jmapviewer/Coordinate.java | 8 +- .../gui/jmapviewer/DefaultMapController.java | 25 ++- src/org/openstreetmap/gui/jmapviewer/Demo.java | 60 +++--- .../gui/jmapviewer/FeatureAdapter.java | 22 ++- .../openstreetmap/gui/jmapviewer/JMapViewer.java | 210 ++++++++++++--------- .../gui/jmapviewer/JMapViewerTree.java | 86 +++++---- .../gui/jmapviewer/JobDispatcher.java | 69 ++++--- src/org/openstreetmap/gui/jmapviewer/Layer.java | 23 ++- .../openstreetmap/gui/jmapviewer/LayerGroup.java | 46 +++-- .../gui/jmapviewer/MapMarkerCircle.java | 90 +++++++-- .../openstreetmap/gui/jmapviewer/MapMarkerDot.java | 10 +- .../gui/jmapviewer/MapObjectImpl.java | 58 ++++-- .../gui/jmapviewer/MapPolygonImpl.java | 17 +- .../gui/jmapviewer/MapRectangleImpl.java | 14 +- .../gui/jmapviewer/MemoryTileCache.java | 49 +++-- .../openstreetmap/gui/jmapviewer/OsmMercator.java | 39 ++-- .../gui/jmapviewer/OsmTileLoader.java | 164 +++++++++------- src/org/openstreetmap/gui/jmapviewer/Style.java | 21 ++- src/org/openstreetmap/gui/jmapviewer/Tile.java | 141 ++++++++++---- .../gui/jmapviewer/TileController.java | 4 +- src/org/openstreetmap/gui/jmapviewer/TileXY.java | 57 ++++++ .../jmapviewer/checkBoxTree/CheckBoxNodeData.java | 12 +- .../checkBoxTree/CheckBoxNodeEditor.java | 9 +- .../jmapviewer/checkBoxTree/CheckBoxNodePanel.java | 12 +- .../checkBoxTree/CheckBoxNodeRenderer.java | 56 +++--- .../gui/jmapviewer/checkBoxTree/CheckBoxTree.java | 148 +++++++++------ .../gui/jmapviewer/interfaces/Attributed.java | 4 +- .../jmapviewer/interfaces/CachedTileLoader.java | 2 +- .../gui/jmapviewer/interfaces/ICoordinate.java | 12 +- .../interfaces/JMapViewerEventListener.java | 2 +- .../gui/jmapviewer/interfaces/MapMarker.java | 26 ++- .../gui/jmapviewer/interfaces/MapObject.java | 29 ++- .../gui/jmapviewer/interfaces/MapPolygon.java | 20 +- .../gui/jmapviewer/interfaces/MapRectangle.java | 6 +- .../jmapviewer/interfaces/TemplatedTileSource.java | 18 ++ .../gui/jmapviewer/interfaces/TileCache.java | 8 +- .../jmapviewer/interfaces/TileClearController.java | 2 +- .../gui/jmapviewer/interfaces/TileJob.java | 4 +- .../gui/jmapviewer/interfaces/TileLoader.java | 2 +- .../jmapviewer/interfaces/TileLoaderListener.java | 2 +- .../gui/jmapviewer/interfaces/TileSource.java | 175 +++++++++++++++-- src/org/openstreetmap/gui/jmapviewer/package.html | 2 +- .../tilesources/AbstractOsmTileSource.java | 8 +- .../tilesources/AbstractTMSTileSource.java | 158 ++++++++++++++-- .../jmapviewer/tilesources/AbstractTileSource.java | 7 +- .../tilesources/BingAerialTileSource.java | 51 +++-- .../tilesources/MapQuestOpenAerialTileSource.java | 4 +- .../tilesources/MapQuestOsmTileSource.java | 6 +- .../gui/jmapviewer/tilesources/OsmTileSource.java | 21 +-- .../jmapviewer/tilesources/ScanexTileSource.java | 109 ++++++----- .../tilesources/TemplatedTMSTileSource.java | 87 +++++++-- .../gui/jmapviewer/tilesources/TileSourceInfo.java | 79 +++++--- 55 files changed, 1622 insertions(+), 775 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/jmapviewer.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel