Changeset 11013 in josm for trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java

Timestamp:

2016-09-17T17:38:39+02:00 (10 years ago)

Author:

Don-vip

Message:

checkstyle / sonar

File:

• trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java

@@ -141 +141 @@
         private String baseUrl;
         private String style;
-        public Collection<String> tileMatrixSetLinks = new ArrayList<>();
+        private Collection<String> tileMatrixSetLinks = new ArrayList<>();
 
         Layer(Layer l) {
@@ -266 +266 @@
     private String handleTemplate(String url) {
         Pattern pattern = Pattern.compile(PATTERN_HEADER);
-        StringBuffer output = new StringBuffer(); // NOSONAR
+        StringBuffer output = new StringBuffer();
         Matcher matcher = pattern.matcher(url);
         while (matcher.find()) {
@@ -513 +513 @@
                         GetCapabilitiesParseHelper.QN_OWS_OPERATIONS_METADATA.equals(reader.getName()));
                 event = reader.next()) {
-            if (event == XMLStreamReader.START_ELEMENT) {
-                if (GetCapabilitiesParseHelper.QN_OWS_OPERATION.equals(reader.getName()) && "GetTile".equals(reader.getAttributeValue("", "name")) &&
-                        GetCapabilitiesParseHelper.moveReaderToTag(reader, new QName[]{
-                                GetCapabilitiesParseHelper.QN_OWS_DCP,
-                                GetCapabilitiesParseHelper.QN_OWS_HTTP,
-                                GetCapabilitiesParseHelper.QN_OWS_GET,
-
-                        })) {
-                    this.baseUrl = reader.getAttributeValue(GetCapabilitiesParseHelper.XLINK_NS_URL, "href");
-                    this.transferMode = GetCapabilitiesParseHelper.getTransferMode(reader);
-                }
+            if (event == XMLStreamReader.START_ELEMENT &&
+                    GetCapabilitiesParseHelper.QN_OWS_OPERATION.equals(reader.getName()) &&
+                    "GetTile".equals(reader.getAttributeValue("", "name")) &&
+                    GetCapabilitiesParseHelper.moveReaderToTag(reader, new QName[] {
+                            GetCapabilitiesParseHelper.QN_OWS_DCP,
+                            GetCapabilitiesParseHelper.QN_OWS_HTTP,
+                            GetCapabilitiesParseHelper.QN_OWS_GET,
+                    })) {
+                this.baseUrl = reader.getAttributeValue(GetCapabilitiesParseHelper.XLINK_NS_URL, "href");
+                this.transferMode = GetCapabilitiesParseHelper.getTransferMode(reader);
             }
         }
@@ -573 +572 @@
         // no support for non-square tiles (tileHeight != tileWidth)
         // and for different tile sizes at different zoom levels
-        Collection<Layer> layers = getLayers(null, Main.getProjection().toCode());
-        if (!layers.isEmpty()) {
-            return layers.iterator().next().tileMatrixSet.tileMatrix.get(0).tileHeight;
+        Collection<Layer> projLayers = getLayers(null, Main.getProjection().toCode());
+        if (!projLayers.isEmpty()) {
+            return projLayers.iterator().next().tileMatrixSet.tileMatrix.get(0).tileHeight;
         }
         // if no layers is found, fallback to default mercator tile size. Maybe it will work
@@ -584 +583 @@
     @Override
     public String getTileUrl(int zoom, int tilex, int tiley) {
-        String url;
         if (currentLayer == null) {
             return "";
         }
 
+        String url;
         if (currentLayer.baseUrl != null && transferMode == null) {
             url = currentLayer.baseUrl;