Changeset 14436 in josm for trunk/src/org/openstreetmap/josm/data/imagery

Timestamp:

2018-11-20T02:07:07+01:00 (5 years ago)

Author:

Don-vip

Message:

fix SonarQube issues

Location:

trunk/src/org/openstreetmap/josm/data/imagery

Files:

• AbstractWMSTileSource.java (modified) (1 diff)
• GetCapabilitiesParseHelper.java (modified) (4 diffs)

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

@@ -231 +231 @@
     }
 
-    private String getBboxstr(double x1, double x2, double x3, double x4) {
+    private static String getBboxstr(double x1, double x2, double x3, double x4) {
         return new StringBuilder(64)
                 .append(LATLON_FORMAT.format(x1))

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

@@ -6 +6 @@
 import java.net.URL;
 import java.util.Locale;
-import java.util.function.BiFunction;
+import java.util.function.BiPredicate;
 
 import javax.xml.namespace.QName;
@@ -167 +167 @@
      */
     public static boolean moveReaderToTag(XMLStreamReader reader,
-            BiFunction<QName, QName, Boolean> equalsFunc, QName... tags) throws XMLStreamException {
+            BiPredicate<QName, QName> equalsFunc, QName... tags) throws XMLStreamException {
         QName stopTag = reader.getName();
         int currentLevel = 0;
@@ -175 +175 @@
 
         for (int event = 0; //skip current element, so we will not skip it as a whole
-                reader.hasNext() && !(event == XMLStreamReader.END_ELEMENT && equalsFunc.apply(stopTag, reader.getName()));
+                reader.hasNext() && !(event == XMLStreamReader.END_ELEMENT && equalsFunc.test(stopTag, reader.getName()));
                 event = reader.next()) {
-            if (event == XMLStreamReader.END_ELEMENT && skipTag != null && equalsFunc.apply(skipTag, reader.getName())) {
+            if (event == XMLStreamReader.END_ELEMENT && skipTag != null && equalsFunc.test(skipTag, reader.getName())) {
                 skipTag = null;
             }
             if (skipTag == null) {
                 if (event == XMLStreamReader.START_ELEMENT) {
-                    if (equalsFunc.apply(searchTag, reader.getName())) {
+                    if (equalsFunc.test(searchTag, reader.getName())) {
                         currentLevel += 1;
                         if (currentLevel >= tags.length) {
@@ -194 +194 @@
                 }
 
-                if (event == XMLStreamReader.END_ELEMENT && parentTag != null && equalsFunc.apply(parentTag, reader.getName())) {
+                if (event == XMLStreamReader.END_ELEMENT && parentTag != null && equalsFunc.test(parentTag, reader.getName())) {
                     currentLevel -= 1;
                     searchTag = parentTag;