[jmapviewer] 01/06: New upstream version 2.3+dfsg

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository jmapviewer.

commit c0bbd32ffd9d0aed9cf73680b727d0e44042884d
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Jul 29 10:21:36 2017 +0200

    New upstream version 2.3+dfsg
---
 Readme.txt                                                           | 4 ++--
 build.xml                                                            | 2 +-
 src/org/openstreetmap/gui/jmapviewer/OsmTileLoader.java              | 2 +-
 .../gui/jmapviewer/tilesources/TemplatedTMSTileSource.java           | 5 +++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Readme.txt b/Readme.txt
index 0b35c6b..a87c59d 100644
--- a/Readme.txt
+++ b/Readme.txt
@@ -8,9 +8,9 @@ JMapViewer
 (c) 2009, Dave Hansen
 (c) 2010-2011, Ian Dees
 (c) 2010-2011, Michael Vigovsky
-(c) 2011-2016, Paul Hartmann
+(c) 2011-2017, Paul Hartmann
 (c) 2011-2016, Gleb Smirnoff
-(c) 2011-2016, Vincent Privat
+(c) 2011-2017, Vincent Privat
 (c) 2011, Jason Huntley
 (c) 2012-2016, Simon Legner
 (c) 2012, Teemu Koskinen
diff --git a/build.xml b/build.xml
index 114b95d..2b2f229 100644
--- a/build.xml
+++ b/build.xml
@@ -77,7 +77,7 @@
 
     <target name="checkstyle">
         <taskdef resource="com/puppycrawl/tools/checkstyle/ant/checkstyle-ant-task.properties" 
-        	classpath="tools/checkstyle/checkstyle-7.7-all.jar"/>
+        	classpath="tools/checkstyle/checkstyle-all.jar"/>
         <checkstyle config="tools/checkstyle/jmapviewer_checks.xml">
             <fileset dir="${basedir}/src" includes="**/*.java" />
             <formatter type="xml" toFile="checkstyle-jmapviewer.xml"/>
diff --git a/src/org/openstreetmap/gui/jmapviewer/OsmTileLoader.java b/src/org/openstreetmap/gui/jmapviewer/OsmTileLoader.java
index 2877c00..f654201 100644
--- a/src/org/openstreetmap/gui/jmapviewer/OsmTileLoader.java
+++ b/src/org/openstreetmap/gui/jmapviewer/OsmTileLoader.java
@@ -22,7 +22,7 @@ import org.openstreetmap.gui.jmapviewer.interfaces.TileLoaderListener;
  * @author Jan Peter Stotz
  */
 public class OsmTileLoader implements TileLoader {
-    private static final ThreadPoolExecutor jobDispatcher = (ThreadPoolExecutor) Executors.newFixedThreadPool(3);
+    private static final ThreadPoolExecutor jobDispatcher = (ThreadPoolExecutor) Executors.newFixedThreadPool(8);
 
     private final class OsmTileJob implements TileJob {
         private final Tile tile;
diff --git a/src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java b/src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java
index 1c38453..8a61950 100644
--- a/src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java
+++ b/src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java
@@ -55,8 +55,9 @@ public class TemplatedTMSTileSource extends TMSTileSource implements TemplatedTi
      */
     public TemplatedTMSTileSource(TileSourceInfo info) {
         super(info);
-        if (info.getCookies() != null) {
-            headers.put(COOKIE_HEADER, info.getCookies());
+        String cookies = info.getCookies();
+        if (cookies != null && !cookies.isEmpty()) {
+            headers.put(COOKIE_HEADER, cookies);
         }
         handleTemplate();
     }

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