Changeset 17332 in josm for trunk/scripts

Timestamp:

2020-11-23T16:01:19+01:00 (5 years ago)

Author:

Don-vip

Message:

fix #20131 - fix unit tests and codestyle violations

File:

• trunk/scripts/SyncEditorLayerIndex.java (modified) (3 diffs)

trunk/scripts/SyncEditorLayerIndex.java

@@ -541 +541 @@
     // catch reordered arguments and switches to WMS version 1.3.0
     String unifyWMS(String url) {
-        String x[] = url.replaceAll("(?i)VERSION=[0-9.]+", "VERSION=x").replaceAll("(?i)SRS=", "CRS=").split("\\?");
-        String a[] = x[1].split("&");
+        String[] x = url.replaceAll("(?i)VERSION=[0-9.]+", "VERSION=x").replaceAll("(?i)SRS=", "CRS=").split("\\?");
+        String[] a = x[1].split("&");
         Arrays.sort(a);
-        url = x[0]+"?"+String.join("&",a);
+        url = x[0]+"?"+String.join("&", a);
         return url;
     }
@@ -579 +579 @@
 
                         if (ide.equals(idj) && Objects.equals(getType(j), getType(e))) {
-                            if(getType(j).equals("wms") && unifyWMS(urle).equals(unifyWMS(urlj))) {
+                            if (getType(j).equals("wms") && unifyWMS(urle).equals(unifyWMS(urlj))) {
                                 myprintln("# WMS-URL for id "+idj+" modified: "+getDescription(j));
                             } else {
@@ -591 +591 @@
                             break;
                         }
-                        Collection<String> old = ((ImageryInfo)j).getOldIds();
-                        if(old != null) {
+                        Collection<String> old = j.getOldIds();
+                        if (old != null) {
                             for (String oidj : old) {
                                 if (ide.equals(oidj) && Objects.equals(getType(j), getType(e))) {
-                                    if(getType(j).equals("wms") && unifyWMS(urle).equals(unifyWMS(urlj))) {
+                                    if (getType(j).equals("wms") && unifyWMS(urle).equals(unifyWMS(urlj))) {
                                         myprintln("# WMS-URL for oldid "+idj+" modified: "+getDescription(j));
                                     } else {