- Timestamp:
- 2018-03-18T03:59:43+01:00 (7 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
r13536 r13537 918 918 919 919 /** 920 * Return the sorted list of activated Imagery IDs 920 * Return the sorted list of activated Imagery IDs. 921 * @return sorted list of activated Imagery IDs 921 922 * @since 13536 922 923 */ 923 static public Collection<String> getActiveIds() {924 ArrayList<String> ids = new ArrayList< String>();924 public static Collection<String> getActiveIds() { 925 ArrayList<String> ids = new ArrayList<>(); 925 926 IPreferences pref = Config.getPref(); 926 927 if (pref != null) { … … 929 930 if (entries != null) { 930 931 for (ImageryPreferenceEntry prefEntry : entries) { 931 if (prefEntry.id != null && prefEntry.id.length() != 0)932 if (prefEntry.id != null && !prefEntry.id.isEmpty()) 932 933 ids.add(prefEntry.id); 933 934 } … … 937 938 return ids; 938 939 } 939 940 940 941 /** 941 942 * Returns a tool tip text for display. … … 1258 1259 /** 1259 1260 * Returns the overlay indication. 1260 * @return <code>true</code> if it is an doverlay.1261 * @return <code>true</code> if it is an overlay. 1261 1262 * @since 13536 1262 1263 */ -
trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java
r13536 r13537 225 225 idMap.put(i.getId(), i); 226 226 Collection<String> old = i.getOldIds(); 227 if (old != null) {227 if (old != null) { 228 228 for (String id : old) { 229 229 if (idMap.containsKey(id)) { -
trunk/src/org/openstreetmap/josm/io/CachedFile.java
r13536 r13537 184 184 185 185 public String getName() { 186 if (parameter != null)186 if (parameter != null) 187 187 return name.replaceAll("%<(.*)>", ""); 188 188 return name; … … 478 478 } 479 479 480 if (parameter != null) {480 if (parameter != null) { 481 481 String u = url.toExternalForm(); 482 482 String uc; 483 if ("".equals(parameter)) {483 if (parameter.isEmpty()) { 484 484 uc = u.replaceAll("%<(.*)>", ""); 485 485 } else { 486 486 uc = u.replaceAll("%<(.*)>", "$1"+parameter); 487 487 } 488 if (!uc.equals(u))488 if (!uc.equals(u)) 489 489 url = new URL(uc); 490 490 }
Note:
See TracChangeset
for help on using the changeset viewer.