Changeset 13537 in josm for trunk

Timestamp:

2018-03-18T03:59:43+01:00 (6 years ago)

Author:

Don-vip

Message:

see #14655 - checkstyle

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/imagery/ImageryInfo.java (modified) (4 diffs)
• data/imagery/ImageryLayerInfo.java (modified) (1 diff)
• io/CachedFile.java (modified) (2 diffs)

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

@@ -918 +918 @@
 
     /**
-     * Return the sorted list of activated Imagery IDs
+     * Return the sorted list of activated Imagery IDs.
+     * @return sorted list of activated Imagery IDs
      * @since 13536
      */
-    static public Collection<String> getActiveIds() {
-        ArrayList<String> ids = new ArrayList<String>();
+    public static Collection<String> getActiveIds() {
+        ArrayList<String> ids = new ArrayList<>();
         IPreferences pref = Config.getPref();
         if (pref != null) {
@@ -929 +930 @@
             if (entries != null) {
                 for (ImageryPreferenceEntry prefEntry : entries) {
-                    if(prefEntry.id != null && prefEntry.id.length() != 0)
+                    if (prefEntry.id != null && !prefEntry.id.isEmpty())
                         ids.add(prefEntry.id);
                 }
@@ -937 +938 @@
         return ids;
     }
-    
+
     /**
      * Returns a tool tip text for display.
@@ -1258 +1259 @@
     /**
      * Returns the overlay indication.
-     * @return <code>true</code> if it is and overlay.
+     * @return <code>true</code> if it is an overlay.
      * @since 13536
      */

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

@@ -225 +225 @@
                 idMap.put(i.getId(), i);
                 Collection<String> old = i.getOldIds();
-                if(old != null) {
+                if (old != null) {
                     for (String id : old) {
                         if (idMap.containsKey(id)) {

trunk/src/org/openstreetmap/josm/io/CachedFile.java

@@ -184 +184 @@
 
     public String getName() {
-        if(parameter != null)
+        if (parameter != null)
             return name.replaceAll("%<(.*)>", "");
         return name;
@@ -478 +478 @@
         }
 
-        if(parameter != null) {
+        if (parameter != null) {
             String u = url.toExternalForm();
             String uc;
-            if("".equals(parameter)) {
+            if (parameter.isEmpty()) {
                 uc = u.replaceAll("%<(.*)>", "");
             } else {
                 uc = u.replaceAll("%<(.*)>", "$1"+parameter);
             }
-            if(!uc.equals(u))
+            if (!uc.equals(u))
                 url = new URL(uc);
         }