Changeset 9603 in josm

Timestamp:

2016-01-24T02:07:12+01:00 (9 years ago)

Author:

Don-vip

Message:

fix some Sonar issues

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/imagery/WMTSTileSource.java (modified) (7 diffs)
• gui/mappaint/mapcss/MapCSSStyleSource.java (modified) (1 diff)
• gui/mappaint/xml/XmlStyleSource.java (modified) (1 diff)

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

@@ -105 +105 @@
 
     private static class Layer {
+        private String format;
+        private String name;
+        private TileMatrixSet tileMatrixSet;
+        private String baseUrl;
+        private String style;
+        public Collection<String> tileMatrixSetLinks = new ArrayList<>();
+
         Layer(Layer l) {
             if (l != null) {
@@ -117 +124 @@
         Layer() {
         }
-
-        private String format;
-        private String name;
-        private TileMatrixSet tileMatrixSet;
-        private String baseUrl;
-        private String style;
-        public Collection<String> tileMatrixSetLinks = new ArrayList<>();
     }
 
@@ -151 +151 @@
 
     private static final class SelectLayerDialog extends ExtendedDialog {
-        private final Layer[] layers;
+        private final transient Layer[] layers;
         private final JTable list;
 
@@ -256 +256 @@
     private String handleTemplate(String url) {
         Pattern pattern = Pattern.compile(PATTERN_HEADER);
-        StringBuffer output = new StringBuffer();
+        StringBuffer output = new StringBuffer(); // NOSONAR
         Matcher matcher = pattern.matcher(url);
         while (matcher.find()) {
@@ -278 +278 @@
                 throw new IllegalArgumentException("Could not read data from: " + baseUrl);
             }
-            XMLStreamReader reader = factory.createXMLStreamReader(
-                    new ByteArrayInputStream(data)
-                    );
+            XMLStreamReader reader = factory.createXMLStreamReader(new ByteArrayInputStream(data));
 
             Collection<Layer> ret = null;
@@ -509 +507 @@
      */
     private static TransferMode getTransferMode(XMLStreamReader reader) throws XMLStreamException {
-        QName GET_QNAME = new QName(OWS_NS_URL, "Get");
-
-        Utils.ensure(GET_QNAME.equals(reader.getName()), "WMTS Parser state invalid. Expected element %s, got %s",
-                GET_QNAME, reader.getName());
+        QName getQname = new QName(OWS_NS_URL, "Get");
+
+        Utils.ensure(getQname.equals(reader.getName()), "WMTS Parser state invalid. Expected element %s, got %s",
+                getQname, reader.getName());
         for (int event = reader.getEventType();
-                reader.hasNext() && !(event == XMLStreamReader.END_ELEMENT && GET_QNAME.equals(reader.getName()));
+                reader.hasNext() && !(event == XMLStreamReader.END_ELEMENT && getQname.equals(reader.getName()));
                 event = reader.next()) {
-            if (event == XMLStreamReader.START_ELEMENT && new QName(OWS_NS_URL, "Constraint").equals(reader.getName())) {
-                if ("GetEncoding".equals(reader.getAttributeValue("", "name"))) {
-                    moveReaderToTag(reader, new QName[]{
-                            new QName(OWS_NS_URL, "AllowedValues"),
-                            new QName(OWS_NS_URL, "Value")
-                    });
-                    return TransferMode.fromString(reader.getElementText());
-                }
+            if (event == XMLStreamReader.START_ELEMENT && new QName(OWS_NS_URL, "Constraint").equals(reader.getName())
+             && "GetEncoding".equals(reader.getAttributeValue("", "name"))) {
+                moveReaderToTag(reader, new QName[]{
+                        new QName(OWS_NS_URL, "AllowedValues"),
+                        new QName(OWS_NS_URL, "Value")
+                });
+                return TransferMode.fromString(reader.getElementText());
             }
         }
@@ -565 +562 @@
                 }
 
-                if (event == XMLStreamReader.END_ELEMENT) {
-                    if (parentTag != null && parentTag.equals(reader.getName())) {
-                        currentLevel -= 1;
-                        searchTag = parentTag;
-                        if (currentLevel >= 0) {
-                            parentTag = tags[currentLevel];
-                        } else {
-                            parentTag = null;
-                        }
+                if (event == XMLStreamReader.END_ELEMENT && parentTag != null && parentTag.equals(reader.getName())) {
+                    currentLevel -= 1;
+                    searchTag = parentTag;
+                    if (currentLevel >= 0) {
+                        parentTag = tags[currentLevel];
+                    } else {
+                        parentTag = null;
                     }
                 }

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java

@@ -502 +502 @@
 
     @Override
+    @SuppressWarnings("resource")
     public CachedFile getCachedFile() throws IOException {
-        return new CachedFile(url).setHttpAccept(MAPCSS_STYLE_MIME_TYPES);
+        return new CachedFile(url).setHttpAccept(MAPCSS_STYLE_MIME_TYPES); // NOSONAR
     }
 

trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java

@@ -117 +117 @@
 
     @Override
+    @SuppressWarnings("resource")
     public CachedFile getCachedFile() throws IOException {
-        return new CachedFile(url).setHttpAccept(XML_STYLE_MIME_TYPES);
+        return new CachedFile(url).setHttpAccept(XML_STYLE_MIME_TYPES); // NOSONAR
     }