Index: /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Demo.java
===================================================================
--- /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Demo.java	(revision 32389)
+++ /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Demo.java	(revision 32390)
@@ -35,5 +35,5 @@
  *
  */
-public class Demo extends JFrame implements JMapViewerEventListener  {
+public class Demo extends JFrame implements JMapViewerEventListener {
 
     private static final long serialVersionUID = 1L;
Index: /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java
===================================================================
--- /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java	(revision 32389)
+++ /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java	(revision 32390)
@@ -29,5 +29,4 @@
  * {header:(HEADER_NAME,HEADER_VALUE)} - sets the headers to be sent to tile server
  */
-
 public class TemplatedTMSTileSource extends TMSTileSource implements TemplatedTileSource {
 
@@ -36,4 +35,5 @@
     private final Map<String, String> headers = new HashMap<>();
 
+    // CHECKSTYLE.OFF: SingleSpaceSeparator
     private static final String COOKIE_HEADER   = "Cookie";
     private static final String PATTERN_ZOOM    = "\\{(?:(\\d+)-)?z(?:oom)?([+-]\\d+)?\\}";
@@ -44,8 +44,8 @@
     private static final String PATTERN_SWITCH  = "\\{switch:([^}]+)\\}";
     private static final String PATTERN_HEADER  = "\\{header\\(([^,]+),([^}]+)\\)\\}";
+    // CHECKSTYLE.ON: SingleSpaceSeparator
 
     private static final String[] ALL_PATTERNS = {
-        PATTERN_HEADER, PATTERN_ZOOM, PATTERN_X, PATTERN_Y, PATTERN_Y_YAHOO, PATTERN_NEG_Y,
-        PATTERN_SWITCH
+        PATTERN_HEADER, PATTERN_ZOOM, PATTERN_X, PATTERN_Y, PATTERN_Y_YAHOO, PATTERN_NEG_Y, PATTERN_SWITCH
     };
 
Index: /applications/viewer/jmapviewer/tools/checkstyle/jmapviewer_checks.xml
===================================================================
--- /applications/viewer/jmapviewer/tools/checkstyle/jmapviewer_checks.xml	(revision 32389)
+++ /applications/viewer/jmapviewer/tools/checkstyle/jmapviewer_checks.xml	(revision 32390)
@@ -56,4 +56,5 @@
     <module name="NoWhitespaceAfter"/>
     <module name="NoWhitespaceBefore"/>
+    <module name="SingleSpaceSeparator"/>
     <module name="MethodParamPad"/>
     <module name="ParenPad"/>