Changeset 8390 in josm
- Timestamp:
- 2015-05-18T02:14:30+02:00 (9 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 104 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java
r8338 r8390 326 326 public String toString() { 327 327 return new StringBuilder() 328 .append( "[")328 .append('[') 329 329 .append(a.getId()) 330 .append( ",")330 .append(',') 331 331 .append(b.getId()) 332 .append( "]")332 .append(']') 333 333 .toString(); 334 334 } -
trunk/src/org/openstreetmap/josm/actions/CopyAction.java
r8194 r8390 67 67 StringBuilder idsBuilder = new StringBuilder(); 68 68 for (OsmPrimitive p : primitives) { 69 idsBuilder.append(OsmPrimitiveType.from(p).getAPIName()).append(" "); 70 idsBuilder.append(p.getId()).append(","); 69 idsBuilder.append(OsmPrimitiveType.from(p).getAPIName()).append(' ').append(p.getId()).append(','); 71 70 } 72 71 return idsBuilder.substring(0, idsBuilder.length() - 1); -
trunk/src/org/openstreetmap/josm/actions/CopyCoordinatesAction.java
r7937 r8390 32 32 s.append(", "); 33 33 s.append(n.getCoor().lon()); 34 s.append( "\n");34 s.append('\n'); 35 35 } 36 36 Utils.copyToClipboard(s.toString().trim()); -
trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java
r8379 r8390 165 165 importer.filter.getDescription() 166 166 ) 167 ).append("<br> ").append("<ul>");167 ).append("<br><ul>"); 168 168 for (File f: files) { 169 169 msg.append("<li>").append(f.getAbsolutePath()).append("</li>"); … … 189 189 files.size() 190 190 ) 191 ).append("<br> ").append("<ul>");191 ).append("<br><ul>"); 192 192 for (File f: files) { 193 193 msg.append("<li>").append(f.getAbsolutePath()).append(" (<i>") -
trunk/src/org/openstreetmap/josm/actions/RestartAction.java
r8376 r8390 116 116 StringBuilder sb = new StringBuilder(mainCommand[0]); 117 117 for (int i = 1; i < mainCommand.length && !mainCommand[i-1].endsWith(".jar"); i++) { 118 sb.append( " ").append(mainCommand[i]);118 sb.append(' ').append(mainCommand[i]); 119 119 } 120 120 String jarPath = sb.toString(); -
trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
r8379 r8390 70 70 StringBuilder text = new StringBuilder(); 71 71 text.append(Version.getInstance().getReleaseAttributes()) 72 .append("\n") 73 .append("Identification: ").append(Version.getInstance().getAgentString()) 74 .append("\n") 75 .append("Memory Usage: ") 72 .append("\nIdentification: ").append(Version.getInstance().getAgentString()) 73 .append("\nMemory Usage: ") 76 74 .append(Runtime.getRuntime().totalMemory()/1024/1024) 77 75 .append(" MB / ") … … 79 77 .append(" MB (") 80 78 .append(Runtime.getRuntime().freeMemory()/1024/1024) 81 .append(" MB allocated, but free)") 82 .append("\n") 83 .append("Java version: ").append(System.getProperty("java.version")).append(", ") 84 .append(System.getProperty("java.vendor")).append(", ").append(System.getProperty("java.vm.name")) 85 .append("\n"); 79 .append(" MB allocated, but free)\nJava version: ") 80 .append(System.getProperty("java.version")).append(", ") 81 .append(System.getProperty("java.vendor")).append(", ") 82 .append(System.getProperty("java.vm.name")).append('\n'); 86 83 if (Main.platform.getClass() == PlatformHookUnixoid.class) { 87 84 // Add Java package details … … 90 87 text.append("Java package: ") 91 88 .append(packageDetails) 92 .append( "\n");89 .append('\n'); 93 90 } 94 91 // Add WebStart package details if run from JNLP … … 98 95 text.append("WebStart package: ") 99 96 .append(webStartDetails) 100 .append( "\n");97 .append('\n'); 101 98 } 102 99 } … … 127 124 } 128 125 if (!vmArguments.isEmpty()) { 129 text.append("VM arguments: "+ vmArguments.toString().replace("\\\\", "\\")); 130 text.append("\n"); 126 text.append("VM arguments: ").append(vmArguments.toString().replace("\\\\", "\\")).append('\n'); 131 127 } 132 128 } catch (SecurityException e) { … … 135 131 List<String> commandLineArgs = Main.getCommandLineArgs(); 136 132 if (!commandLineArgs.isEmpty()) { 137 text.append("Program arguments: "+ Arrays.toString(commandLineArgs.toArray())); 138 text.append("\n"); 133 text.append("Program arguments: ").append(Arrays.toString(commandLineArgs.toArray())).append('\n'); 139 134 } 140 135 if (Main.main != null) { … … 145 140 text.append("Dataset consistency test: No problems found\n"); 146 141 } else { 147 text.append("\nDataset consistency test:\n"+result+"\n"); 148 } 149 } 150 } 151 text.append("\n") 152 .append(PluginHandler.getBugReportText()) 153 .append("\n"); 142 text.append("\nDataset consistency test:\n").append(result).append('\n'); 143 } 144 } 145 } 146 text.append('\n').append(PluginHandler.getBugReportText()).append('\n'); 154 147 155 148 Collection<String> errorsWarnings = Main.getLastErrorAndWarnings(); … … 157 150 text.append("Last errors/warnings:\n"); 158 151 for (String s : errorsWarnings) { 159 text.append("- ").append(s).append( "\n");160 } 161 text.append( "\n");152 text.append("- ").append(s).append('\n'); 153 } 154 text.append('\n'); 162 155 } 163 156 … … 180 173 } 181 174 for (Entry<String, Setting<?>> entry : settings.entrySet()) { 182 text.append(entry.getKey()).append( "=").append(entry.getValue().getValue()).append("\n");175 text.append(entry.getKey()).append('=').append(entry.getValue().getValue()).append('\n'); 183 176 } 184 177 } catch (Exception x) { -
trunk/src/org/openstreetmap/josm/actions/ToggleAction.java
r8308 r8390 3 3 4 4 import java.awt.event.ActionEvent; 5 import java.util. ArrayList;6 import java.util. List;5 import java.util.HashSet; 6 import java.util.Set; 7 7 8 8 import javax.swing.ButtonModel; … … 23 23 public abstract class ToggleAction extends JosmAction { 24 24 25 private final transient List<ButtonModel> buttonModels = new ArrayList<>();25 private final transient Set<ButtonModel> buttonModels = new HashSet<>(); 26 26 27 27 /** -
trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
r8384 r8390 1192 1192 if (getCurrentBaseNode() != null && !wayIsFinished) { 1193 1193 if (alt) { 1194 rv.append( " ").append(tr("Start new way from last node."));1194 rv.append(' ').append(tr("Start new way from last node.")); 1195 1195 } else { 1196 rv.append( " ").append(tr("Continue way from last node."));1196 rv.append(' ').append(tr("Continue way from last node.")); 1197 1197 } 1198 1198 if (snapHelper.isSnapOn()) { 1199 rv.append( " ").append(tr("Angle snapping active."));1199 rv.append(' ').append(tr("Angle snapping active.")); 1200 1200 } 1201 1201 } … … 1220 1220 for (Node m : w.getNodes()) { 1221 1221 if (m.equals(mouseOnExistingNode) || mouseOnExistingWays.contains(w)) { 1222 rv.append( " ").append(tr("Finish drawing."));1222 rv.append(' ').append(tr("Finish drawing.")); 1223 1223 break; 1224 1224 } -
trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java
r8345 r8390 252 252 "Alt-drag to create a new rectangle, double click to add a new node.")); 253 253 if (dualAlignEnabled) { 254 rv.append( " ").append(tr("Dual alignment active."));254 rv.append(' ').append(tr("Dual alignment active.")); 255 255 if (dualAlignSegmentCollapsed) 256 rv.append( " ").append(tr("Segment collapsed due to its direction reversing."));256 rv.append(' ').append(tr("Segment collapsed due to its direction reversing.")); 257 257 } 258 258 } else { … … 270 270 } 271 271 if (dualAlignActive) { 272 rv.append( " ").append(tr("Dual alignment active."));272 rv.append(' ').append(tr("Dual alignment active.")); 273 273 if (dualAlignSegmentCollapsed) { 274 rv.append( " ").append(tr("Segment collapsed due to its direction reversing."));274 rv.append(' ').append(tr("Segment collapsed due to its direction reversing.")); 275 275 } 276 276 } -
trunk/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java
r7463 r8390 177 177 // try parsing number 178 178 try { 179 currentNumber = Long. parseLong(currentText);179 currentNumber = Long.valueOf(currentText); 180 180 } catch (NumberFormatException e) { 181 181 currentNumber = null; … … 186 186 if (isRange) { 187 187 try { 188 currentNumber = Long. parseLong(currentText.substring(0, pos));188 currentNumber = Long.valueOf(currentText.substring(0, pos)); 189 189 } catch (NumberFormatException e) { 190 190 currentNumber = null; 191 191 } 192 192 try { 193 currentRange = Long. parseLong(currentText.substring(pos + 1));193 currentRange = Long.valueOf(currentText.substring(pos + 1)); 194 194 } catch (NumberFormatException e) { 195 195 currentRange = null; -
trunk/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java
r8379 r8390 20 20 StringBuilder sb = new StringBuilder(); 21 21 if (r.getName() != null) { 22 sb.append( "'").append(r.getName()).append("'");22 sb.append('\'').append(r.getName()).append('\''); 23 23 } else if (!r.isNew()) { 24 24 sb.append(r.getId()); … … 33 33 StringBuilder sb = new StringBuilder(); 34 34 sb.append(tr("Cyclic dependency between relations:")) 35 .append( "[");35 .append('['); 36 36 for (int i=0; i< cycle.size(); i++) { 37 37 if (i >0 ) { 38 sb.append( ",");38 sb.append(','); 39 39 } 40 40 sb.append(formatRelation(cycle.get(i))); 41 41 } 42 sb.append( "]");42 sb.append(']'); 43 43 return sb.toString(); 44 44 } -
trunk/src/org/openstreetmap/josm/actions/upload/UploadNotesTask.java
r8380 r8390 133 133 for (Map.Entry<Note, Exception> entry : failedNotes.entrySet()) { 134 134 sb.append(tr("Note {0} failed: {1}", entry.getKey().getId(), entry.getValue().getMessage())); 135 sb.append( "\n");135 sb.append('\n'); 136 136 } 137 137 Main.error("Notes failed to upload: " + sb.toString()); -
trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java
r8338 r8390 75 75 public static void log(String s) { 76 76 summary.append(s); 77 summary.append( "\n");77 summary.append('\n'); 78 78 } 79 79 -
trunk/src/org/openstreetmap/josm/data/Preferences.java
r8357 r8390 1370 1370 f.setAccessible(true); 1371 1371 if (f.getType() == Boolean.class || f.getType() == boolean.class) { 1372 value = Boolean. parseBoolean(key_value.getValue());1372 value = Boolean.valueOf(key_value.getValue()); 1373 1373 } else if (f.getType() == Integer.class || f.getType() == int.class) { 1374 1374 try { 1375 value = Integer. parseInt(key_value.getValue());1375 value = Integer.valueOf(key_value.getValue()); 1376 1376 } catch (NumberFormatException nfe) { 1377 1377 continue; … … 1379 1379 } else if (f.getType() == Double.class || f.getType() == double.class) { 1380 1380 try { 1381 value = Double. parseDouble(key_value.getValue());1381 value = Double.valueOf(key_value.getValue()); 1382 1382 } catch (NumberFormatException nfe) { 1383 1383 continue; … … 1701 1701 public String toXML(boolean nopass) { 1702 1702 StringBuilder b = new StringBuilder( 1703 "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n " +1704 "<preferences xmlns=\""+Main.getXMLBase()+"/preferences-1.0\" version=\""+1705 Version.getInstance().getVersion() +"\">\n");1703 "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<preferences xmlns=\"") 1704 .append(Main.getXMLBase()).append("/preferences-1.0\" version=\"") 1705 .append(Version.getInstance().getVersion()).append("\">\n"); 1706 1706 SettingToXml toXml = new SettingToXml(b, nopass); 1707 1707 for (Entry<String, Setting<?>> e : settingsMap.entrySet()) { -
trunk/src/org/openstreetmap/josm/data/Version.java
r8126 r8390 41 41 try (BufferedReader in = Utils.openURLReader(resource)) { 42 42 for (String line = in.readLine(); line != null; line = in.readLine()) { 43 sb.append(line).append( "\n");43 sb.append(line).append('\n'); 44 44 } 45 45 } … … 144 144 StringBuilder sb = new StringBuilder(); 145 145 for(Entry<String,String> property: properties.entrySet()) { 146 sb.append(property.getKey()).append( ":").append(property.getValue()).append("\n");146 sb.append(property.getKey()).append(':').append(property.getValue()).append('\n'); 147 147 } 148 148 releaseDescription = sb.toString(); -
trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
r8384 r8390 262 262 for (Shape s : i.bounds.getShapes()) { 263 263 if (shapesString.length() > 0) { 264 shapesString.append( ";");264 shapesString.append(';'); 265 265 } 266 266 shapesString.append(s.encodeAsString(",")); … … 274 274 for (String p : i.serverProjections) { 275 275 if (val.length() > 0) { 276 val.append( ",");276 val.append(','); 277 277 } 278 278 val.append(p); -
trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java
r8291 r8390 435 435 436 436 if (isIncomplete()) { 437 builder.append( "I");437 builder.append('I'); 438 438 } 439 439 if (isModified()) { 440 builder.append( "M");440 builder.append('M'); 441 441 } 442 442 if (isVisible()) { 443 builder.append( "V");443 builder.append('V'); 444 444 } 445 445 if (isDeleted()) { 446 builder.append( "D");446 builder.append('D'); 447 447 } 448 448 return builder.toString(); -
trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
r8370 r8390 1285 1285 if (isDisabled()) { 1286 1286 if (isDisabledAndHidden()) { 1287 builder.append( "h");1287 builder.append('h'); 1288 1288 } else { 1289 builder.append( "d");1289 builder.append('d'); 1290 1290 } 1291 1291 } 1292 1292 if (isTagged()) { 1293 builder.append( "T");1293 builder.append('T'); 1294 1294 } 1295 1295 if (hasDirectionKeys()) { 1296 1296 if (reversedDirection()) { 1297 builder.append( "<");1297 builder.append('<'); 1298 1298 } else { 1299 builder.append( ">");1299 builder.append('>'); 1300 1300 } 1301 1301 } -
trunk/src/org/openstreetmap/josm/data/osm/OsmUtils.java
r8285 r8390 2 2 package org.openstreetmap.josm.data.osm; 3 3 4 import java.util.ArrayList;5 4 import java.util.Arrays; 6 import java.util. List;5 import java.util.HashSet; 7 6 import java.util.Locale; 8 7 import java.util.Map; 8 import java.util.Set; 9 9 10 10 import org.openstreetmap.josm.data.coor.LatLon; … … 14 14 public final class OsmUtils { 15 15 16 private OsmUtils() { 17 // Hide default constructor for utils classes 18 } 19 20 private static final List<String> TRUE_VALUES = new ArrayList<>(Arrays 21 .asList(new String[] { "true", "yes", "1", "on" })); 22 private static final List<String> FALSE_VALUES = new ArrayList<>(Arrays 23 .asList(new String[] { "false", "no", "0", "off" })); 24 private static final List<String> REVERSE_VALUES = new ArrayList<>(Arrays 25 .asList(new String[] { "reverse", "-1" })); 16 private static final Set<String> TRUE_VALUES = new HashSet<>(Arrays 17 .asList("true", "yes", "1", "on")); 18 private static final Set<String> FALSE_VALUES = new HashSet<>(Arrays 19 .asList("false", "no", "0", "off")); 20 private static final Set<String> REVERSE_VALUES = new HashSet<>(Arrays 21 .asList("reverse", "-1")); 26 22 27 23 public static final String trueval = "yes"; 28 24 public static final String falseval = "no"; 29 25 public static final String reverseval = "-1"; 26 27 private OsmUtils() { 28 // Hide default constructor for utils classes 29 } 30 30 31 31 public static Boolean getOsmBoolean(String value) { -
trunk/src/org/openstreetmap/josm/data/osm/Relation.java
r8379 r8390 274 274 .append(" version=") 275 275 .append(getVersion()) 276 .append( " ")276 .append(' ') 277 277 .append(getFlagsAsString()) 278 278 .append(" ["); 279 279 for (RelationMember rm:getMembers()) { 280 280 result.append(OsmPrimitiveType.from(rm.getMember())) 281 .append( " ")281 .append(' ') 282 282 .append(rm.getMember().getUniqueId()) 283 283 .append(", "); 284 284 } 285 285 result.delete(result.length()-2, result.length()) 286 .append("]") 287 .append("}"); 286 .append("]}"); 288 287 return result.toString(); 289 288 } -
trunk/src/org/openstreetmap/josm/data/osm/TigerUtils.java
r8338 r8390 60 60 for (Object part : resultSet) { 61 61 if (combined.length() > 0) { 62 combined.append( ":");62 combined.append(':'); 63 63 } 64 64 combined.append(part); -
trunk/src/org/openstreetmap/josm/data/osm/history/History.java
r8291 r8390 341 341 result.append(", versions=\n"); 342 342 for (HistoryOsmPrimitive v : versions) { 343 result.append( "\t").append(v).append(",\n");343 result.append('\t').append(v).append(",\n"); 344 344 } 345 345 } 346 result.append( "]");346 result.append(']'); 347 347 return result.toString(); 348 348 } -
trunk/src/org/openstreetmap/josm/data/preferences/IntegerProperty.java
r5464 r8390 6 6 /** 7 7 * A property containing an {@code Integer} value. 8 * @since 3246 8 9 */ 9 10 public class IntegerProperty extends AbstractProperty<Integer> { … … 35 36 */ 36 37 public boolean parseAndPut(String value) { 37 Integer intVal;38 38 try { 39 intVal = Integer.parseInt(value);39 return put(Integer.valueOf(value)); 40 40 } catch (NumberFormatException ex) { 41 41 return false; 42 42 } 43 return put(intVal);44 43 } 45 44 } -
trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java
r8384 r8390 335 335 for (String str : numStr) { 336 336 try { 337 towgs84Param.add(Double. parseDouble(str));337 towgs84Param.add(Double.valueOf(str)); 338 338 } catch (NumberFormatException e) { 339 339 throw new ProjectionConfigurationException(tr("Unable to parse value of parameter ''towgs84'' (''{0}'')", str), e); … … 496 496 if (code != null && code.startsWith("EPSG:")) { 497 497 try { 498 return Integer. parseInt(code.substring(5));498 return Integer.valueOf(code.substring(5)); 499 499 } catch (NumberFormatException e) { 500 500 Main.warn(e); -
trunk/src/org/openstreetmap/josm/data/validation/TestError.java
r8380 r8390 187 187 } 188 188 for (String o : strings) { 189 ignorestring.append( ":").append(o);189 ignorestring.append(':').append(o); 190 190 } 191 191 return ignorestring.toString(); -
trunk/src/org/openstreetmap/josm/data/validation/routines/RegexValidator.java
r8345 r8390 182 182 return matcher.group(1); 183 183 } 184 StringBu ffer buffer = new StringBuffer();184 StringBuilder buffer = new StringBuilder(); 185 185 for (int j = 0; j < count; j++) { 186 186 String component = matcher.group(j+1); … … 201 201 @Override 202 202 public String toString() { 203 StringBu ffer buffer = new StringBuffer();203 StringBuilder buffer = new StringBuilder(); 204 204 buffer.append("RegexValidator{"); 205 205 for (int i = 0; i < patterns.length; i++) { 206 206 if (i > 0) { 207 buffer.append( ",");207 buffer.append(','); 208 208 } 209 209 buffer.append(patterns[i].pattern()); 210 210 } 211 buffer.append( "}");211 buffer.append('}'); 212 212 return buffer.toString(); 213 213 } 214 215 214 } -
trunk/src/org/openstreetmap/josm/data/validation/tests/Highways.java
r8382 r8390 43 43 * Classified highways in order of importance 44 44 */ 45 pr otected static final List<String> CLASSIFIED_HIGHWAYS =Arrays.asList(45 private static final Set<String> CLASSIFIED_HIGHWAYS = new HashSet<>(Arrays.asList( 46 46 "motorway", "motorway_link", 47 47 "trunk", "trunk_link", … … 51 51 "unclassified", 52 52 "residential", 53 "living_street") ;54 55 pr otected static final List<String> KNOWN_SOURCE_MAXSPEED_CONTEXTS =Arrays.asList(56 "urban", "rural", "zone", "zone30", "zone:30", "nsl_single", "nsl_dual", "motorway", "trunk", "living_street", "bicycle_road") ;57 58 pr otected static final List<String> ISO_COUNTRIES = Arrays.asList(Locale.getISOCountries());53 "living_street")); 54 55 private static final Set<String> KNOWN_SOURCE_MAXSPEED_CONTEXTS = new HashSet<>(Arrays.asList( 56 "urban", "rural", "zone", "zone30", "zone:30", "nsl_single", "nsl_dual", "motorway", "trunk", "living_street", "bicycle_road")); 57 58 private static final Set<String> ISO_COUNTRIES = new HashSet<>(Arrays.asList(Locale.getISOCountries())); 59 59 60 60 private boolean leftByPedestrians = false; -
trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java
r8373 r8390 246 246 247 247 static final String possibleThrows() { 248 StringBu ffer sb = new StringBuffer();248 StringBuilder sb = new StringBuilder(); 249 249 for (Severity s : Severity.values()) { 250 250 if (sb.length() > 0) { -
trunk/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java
r8378 r8390 261 261 } 262 262 if (expression.length() > 0) { 263 expression.append( "|");263 expression.append('|'); 264 264 } 265 265 expression.append(Pattern.quote(words[i])); -
trunk/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java
r8378 r8390 9 9 import java.util.Collections; 10 10 import java.util.HashSet; 11 import java.util.List;12 11 import java.util.Set; 13 12 … … 47 46 private final String engMessage; 48 47 /** The special values, to be ignored if ignore is set to true; to be considered only if ignore is set to false */ 49 private final List<String> specialValues;48 private final Set<String> specialValues; 50 49 /** The boolean indicating if special values must be ignored or considered only */ 51 50 private final boolean ignore; … … 58 57 */ 59 58 public UnclosedWaysCheck(int code, String key, String engMessage) { 60 this(code, key, engMessage, Collections.<String>empty List());59 this(code, key, engMessage, Collections.<String>emptySet()); 61 60 } 62 61 … … 68 67 * @param ignoredValues The ignored values. 69 68 */ 70 public UnclosedWaysCheck(int code, String key, String engMessage, List<String> ignoredValues) {69 public UnclosedWaysCheck(int code, String key, String engMessage, Set<String> ignoredValues) { 71 70 this(code, key, engMessage, ignoredValues, true); 72 71 } … … 80 79 * @param ignore indicates if special values must be ignored or considered only 81 80 */ 82 public UnclosedWaysCheck(int code, String key, String engMessage, List<String> specialValues, boolean ignore) {81 public UnclosedWaysCheck(int code, String key, String engMessage, Set<String> specialValues, boolean ignore) { 83 82 this.code = code; 84 83 this.key = key; … … 137 136 138 137 private final UnclosedWaysCheck[] checks = { 139 new UnclosedWaysCheck(1101, "natural", marktr("natural type {0}"), Arrays.asList("coastline", "cliff", "tree_row", "ridge", "arete", "gorge")), 138 new UnclosedWaysCheck(1101, "natural", marktr("natural type {0}"), 139 new HashSet<>(Arrays.asList("coastline", "cliff", "tree_row", "ridge", "arete", "gorge"))), 140 140 new UnclosedWaysCheck(1102, "landuse", marktr("landuse type {0}")), 141 141 new UnclosedWaysCheck(1103, "amenities", marktr("amenities type {0}")), 142 new UnclosedWaysCheck(1104, "sport", marktr("sport type {0}"), Arrays.asList("water_slide", "climbing")), 143 new UnclosedWaysCheck(1105, "tourism", marktr("tourism type {0}"), Arrays.asList("attraction", "artwork")), 142 new UnclosedWaysCheck(1104, "sport", marktr("sport type {0}"), 143 new HashSet<>(Arrays.asList("water_slide", "climbing"))), 144 new UnclosedWaysCheck(1105, "tourism", marktr("tourism type {0}"), 145 new HashSet<>(Arrays.asList("attraction", "artwork"))), 144 146 new UnclosedWaysCheck(1106, "shop", marktr("shop type {0}")), 145 new UnclosedWaysCheck(1107, "leisure", marktr("leisure type {0}"), Arrays.asList("track", "slipway")), 146 new UnclosedWaysCheck(1108, "waterway", marktr("waterway type {0}"), Arrays.asList("riverbank"), false), 147 new UnclosedWaysCheck(1107, "leisure", marktr("leisure type {0}"), 148 new HashSet<>(Arrays.asList("track", "slipway"))), 149 new UnclosedWaysCheck(1108, "waterway", marktr("waterway type {0}"), 150 new HashSet<>(Arrays.asList("riverbank")), false), 147 151 new UnclosedWaysCheck(1109, "boundary", marktr("boundary type {0}")), 148 152 new UnclosedWaysBooleanCheck(1120, "building", marktr("building")), -
trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java
r8379 r8390 183 183 } 184 184 if (node.getCoor() != null) { 185 name.append(" \u200E(").append(node.getCoor().latToString(CoordinateFormat.getDefaultFormat())).append(", ").append(node.getCoor().lonToString(CoordinateFormat.getDefaultFormat())).append(")"); 185 name.append(" \u200E(").append(node.getCoor().latToString(CoordinateFormat.getDefaultFormat())).append(", ") 186 .append(node.getCoor().lonToString(CoordinateFormat.getDefaultFormat())).append(')'); 186 187 } 187 188 } … … 287 288 /* I18n: count of nodes as parameter */ 288 289 String nodes = trn("{0} node", "{0} nodes", nodesNo, nodesNo); 289 name.append(mark).append(" (").append(nodes).append( ")");290 name.append(mark).append(" (").append(nodes).append(')'); 290 291 } 291 292 decorateNameWithId(name, way); … … 337 338 } 338 339 339 name.append( ")");340 name.append(')'); 340 341 } 341 342 decorateNameWithId(name, relation); … … 363 364 } else { 364 365 preset.nameTemplate.appendText(result, relation); 365 result.append( "(");366 result.append('('); 366 367 } 367 368 } … … 512 513 private String buildDefaultToolTip(long id, Map<String, String> tags) { 513 514 StringBuilder sb = new StringBuilder(); 514 sb.append("<html>") 515 .append("<strong>id</strong>=") 516 .append(id) 517 .append("<br>"); 515 sb.append("<html><strong>id</strong>=") 516 .append(id) 517 .append("<br>"); 518 518 List<String> keyList = new ArrayList<>(tags.keySet()); 519 519 Collections.sort(keyList); … … 524 524 String key = keyList.get(i); 525 525 sb.append("<strong>") 526 .append(key) 527 .append("</strong>") 528 .append("="); 526 .append(key) 527 .append("</strong>="); 529 528 String value = tags.get(key); 530 529 while(value.length() != 0) { … … 583 582 .append(", ") 584 583 .append(coord.lonToString(CoordinateFormat.getDefaultFormat())) 585 .append( ")");584 .append(')'); 586 585 } 587 586 decorateNameWithId(sb, node); … … 671 670 672 671 int mbno = relation.getNumMembers(); 673 sb.append(trn("{0} member", "{0} members", mbno, mbno)).append( ")");672 sb.append(trn("{0} member", "{0} members", mbno, mbno)).append(')'); 674 673 675 674 decorateNameWithId(sb, relation); -
trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java
r8308 r8390 15 15 import java.util.Arrays; 16 16 import java.util.Collections; 17 import java.util.HashSet; 17 18 import java.util.List; 19 import java.util.Set; 18 20 19 21 import javax.swing.AbstractAction; … … 86 88 private String[] bToolTipTexts; 87 89 private transient Icon[] bIcons; 88 private transient List<Integer> cancelButtonIdx = Collections.emptyList();90 private transient Set<Integer> cancelButtonIdx = Collections.emptySet(); 89 91 private int defaultButtonIdx = 1; 90 92 protected JButton defaultButton = null; … … 561 563 */ 562 564 public ExtendedDialog setCancelButton(Integer... cancelButtonIdx) { 563 this.cancelButtonIdx = Arrays.<Integer>asList(cancelButtonIdx);565 this.cancelButtonIdx = new HashSet<>(Arrays.<Integer>asList(cancelButtonIdx)); 564 566 return this; 565 567 } -
trunk/src/org/openstreetmap/josm/gui/MapStatus.java
r8378 r8390 572 572 */ 573 573 private JLabel popupBuildPrimitiveLabels(final OsmPrimitive osm) { 574 final StringBuilder text = new StringBuilder( );574 final StringBuilder text = new StringBuilder(32); 575 575 String name = osm.getDisplayName(DefaultNameFormatter.getInstance()); 576 576 if (osm.isNewOrUndeleted() || osm.isModified()) { … … 583 583 584 584 if (!osm.isNew() && !idShown) { 585 text.append(" [id=" +osm.getId()+"]");585 text.append(" [id=").append(osm.getId()).append(']'); 586 586 } 587 587 588 588 if(osm.getUser() != null) { 589 text.append(" [" + tr("User:") + " " + osm.getUser().getName() + "]");589 text.append(" [").append(tr("User:")).append(' ').append(osm.getUser().getName()).append(']'); 590 590 } 591 591 592 592 for (String key : osm.keySet()) { 593 text.append("<br>" + key + "=" +osm.get(key));593 text.append("<br>").append(key).append('=').append(osm.get(key)); 594 594 } 595 595 596 596 final JLabel l = new JLabel( 597 "<html>" + text.toString() + "</html>",597 "<html>" + text.toString() + "</html>", 598 598 ImageProvider.get(osm.getDisplayType()), 599 599 JLabel.HORIZONTAL … … 601 601 // This is necessary so the label updates its colors when the 602 602 // selection is changed from the outside 603 @Override public void validate() { 603 @Override 604 public void validate() { 604 605 super.validate(); 605 606 popupSetLabelColors(this, osm); … … 613 614 l.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); 614 615 l.addMouseListener(new MouseAdapter(){ 615 @Override public void mouseEntered(MouseEvent e) { 616 @Override 617 public void mouseEntered(MouseEvent e) { 616 618 l.setBackground(SystemColor.info); 617 619 l.setForeground(SystemColor.infoText); 618 620 } 619 @Override public void mouseExited(MouseEvent e) { 621 @Override 622 public void mouseExited(MouseEvent e) { 620 623 popupSetLabelColors(l, osm); 621 624 } 622 @Override public void mouseClicked(MouseEvent e) { 625 @Override 626 public void mouseClicked(MouseEvent e) { 623 627 DataSet ds = Main.main.getCurrentDataSet(); 624 628 // Let the user toggle the selection -
trunk/src/org/openstreetmap/josm/gui/MapView.java
r8378 r8390 26 26 import java.util.Collections; 27 27 import java.util.Comparator; 28 import java.util.Linked List;28 import java.util.LinkedHashSet; 29 29 import java.util.List; 30 import java.util.Set; 30 31 import java.util.concurrent.CopyOnWriteArrayList; 31 32 … … 224 225 public MouseEvent lastMEvent = new MouseEvent(this, 0, 0, 0, 0, 0, 0, false); // In case somebody reads it before first mouse move 225 226 226 private final transient List<MapViewPaintable> temporaryLayers = new LinkedList<>();227 private final transient Set<MapViewPaintable> temporaryLayers = new LinkedHashSet<>(); 227 228 228 229 private transient BufferedImage nonChangedLayersBuffer; -
trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java
r8379 r8390 651 651 @Override 652 652 public String toString() { 653 StringBuilder sb = new StringBuilder( );654 sb.append("min=").append(min.x).append( ",").append(min.y).append(",")655 .append(" max=").append(max.x).append(",").append(max.y).append(",")656 .append(" zoom=").append(zoomLevel);653 StringBuilder sb = new StringBuilder(24); 654 sb.append("min=").append(min.x).append(',').append(min.y) 655 .append(",max=").append(max.x).append(',').append(max.y) 656 .append(",zoom=").append(zoomLevel); 657 657 return sb.toString(); 658 658 } -
trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java
r8388 r8390 14 14 import java.util.ArrayList; 15 15 import java.util.EnumMap; 16 import java.util.HashSet; 16 17 import java.util.List; 17 18 import java.util.Map; 18 19 import java.util.Observable; 20 import java.util.Set; 19 21 20 22 import javax.swing.AbstractListModel; … … 85 87 protected EntriesSelectionModel mergedEntriesSelectionModel; 86 88 87 private final List<PropertyChangeListener> listeners;89 private final Set<PropertyChangeListener> listeners; 88 90 private boolean isFrozen = false; 89 91 private final ComparePairListModel comparePairListModel; … … 199 201 mergedEntriesSelectionModel = new EntriesSelectionModel(entries.get(MERGED_ENTRIES)); 200 202 201 listeners = new ArrayList<>();203 listeners = new HashSet<>(); 202 204 comparePairListModel = new ComparePairListModel(); 203 205 … … 207 209 public void addPropertyChangeListener(PropertyChangeListener listener) { 208 210 synchronized(listeners) { 209 if (listener != null && ! 211 if (listener != null && !listeners.contains(listener)) { 210 212 listeners.add(listener); 211 213 } -
trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java
r8308 r8390 290 290 return tr("(none)"); 291 291 StringBuilder sb = new StringBuilder(); 292 sb.append( "(")292 sb.append('(') 293 293 .append(COORD_FORMATTER.format(coord.lat())) 294 .append( ",")294 .append(',') 295 295 .append(COORD_FORMATTER.format(coord.lon())) 296 .append( ")");296 .append(')'); 297 297 return sb.toString(); 298 298 } -
trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.java
r8308 r8390 36 36 37 37 /** the property change listeners */ 38 private final transient List<PropertyChangeListener> listeners;38 private final transient Set<PropertyChangeListener> listeners; 39 39 40 40 private int numUndecidedTags = 0; … … 45 45 public TagMergeModel() { 46 46 tagMergeItems = new ArrayList<>(); 47 listeners = new ArrayList<>();47 listeners = new HashSet<>(); 48 48 } 49 49 -
trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java
r8308 r8390 13 13 import java.awt.event.MouseAdapter; 14 14 import java.awt.event.MouseEvent; 15 import java.util. ArrayList;16 import java.util. List;15 import java.util.HashSet; 16 import java.util.Set; 17 17 18 18 import javax.swing.AbstractAction; … … 331 331 */ 332 332 static class AdjustmentSynchronizer implements AdjustmentListener { 333 private final List<Adjustable> synchronizedAdjustables;333 private final Set<Adjustable> synchronizedAdjustables; 334 334 335 335 public AdjustmentSynchronizer() { 336 synchronizedAdjustables = new ArrayList<>();336 synchronizedAdjustables = new HashSet<>(); 337 337 } 338 338 -
trunk/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java
r8366 r8390 46 46 private EastNorth eastNorthCoordinates; 47 47 48 private static final double ZERO = 0.0;48 private static final Double ZERO = 0.0; 49 49 private static final String DEG = "\u00B0"; 50 50 private static final String MIN = "\u2032"; … … 349 349 if (mXml.matches()) { 350 350 setLatLonObj(latLon, 351 Double. parseDouble(mXml.group(1).replace(',', '.')), ZERO, ZERO, "N",352 Double. parseDouble(mXml.group(2).replace(',', '.')), ZERO, ZERO, "E");351 Double.valueOf(mXml.group(1).replace(',', '.')), ZERO, ZERO, "N", 352 Double.valueOf(mXml.group(2).replace(',', '.')), ZERO, ZERO, "E"); 353 353 } else { 354 354 final Matcher m = P.matcher(coord); … … 360 360 if (m.group(1) != null) { 361 361 sb.append('R'); // floating point number 362 list.add(Double. parseDouble(m.group(1).replace(',', '.')));362 list.add(Double.valueOf(m.group(1).replace(',', '.'))); 363 363 } else if (m.group(2) != null) { 364 364 sb.append('Z'); // integer number 365 list.add(Double. parseDouble(m.group(2)));365 list.add(Double.valueOf(m.group(2))); 366 366 } else if (m.group(3) != null) { 367 367 sb.append('o'); // degree sign … … 373 373 sb.append(','); // separator 374 374 } else if (m.group(7) != null) { 375 sb.append( "x"); // cardinal direction375 sb.append('x'); // cardinal direction 376 376 String c = m.group(7).toUpperCase(); 377 377 if ("N".equals(c) || "S".equals(c) || "E".equals(c) || "W".equals(c)) { -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java
r7001 r8390 40 40 } else { 41 41 String comment = cs.get("comment"); 42 sb.append(cs.getId()) ;43 sb.append(" - ");44 sb.append(cs.isOpen() ? tr("open") : tr("closed"));42 sb.append(cs.getId()) 43 .append(" - ") 44 .append(cs.isOpen() ? tr("open") : tr("closed")); 45 45 if (comment != null) { 46 sb.append(" - ").append("'").append(comment).append("'");46 sb.append(" - '").append(comment).append('\''); 47 47 } 48 48 } -
trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesCellRenderer.java
r8387 r8390 79 79 sb.append(trn(", {0} unset", ", {0} unset", blankCount, blankCount)); 80 80 } 81 sb.append( ">");81 sb.append('>'); 82 82 str = sb.toString(); 83 83 c.setFont(c.getFont().deriveFont(Font.ITALIC)); -
trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
r8345 r8390 1282 1282 t = "type:relation "; 1283 1283 } 1284 s.append(sep).append( "(").append(t).append("\"").append(1284 s.append(sep).append('(').append(t).append('"').append( 1285 1285 org.openstreetmap.josm.actions.search.SearchAction.escapeStringForSearch(key)).append("\"=\"").append( 1286 1286 org.openstreetmap.josm.actions.search.SearchAction.escapeStringForSearch(val)).append("\")"); -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java
r8308 r8390 8 8 import java.lang.reflect.Constructor; 9 9 import java.lang.reflect.Method; 10 import java.util.ArrayList;11 10 import java.util.Collection; 12 import java.util.List; 11 import java.util.LinkedHashSet; 12 import java.util.Set; 13 13 14 14 import org.openstreetmap.josm.Main; … … 32 32 33 33 /** the list of registered relation editor classes */ 34 private static List<Class<RelationEditor>> editors = new ArrayList<>();34 private static Set<Class<RelationEditor>> editors = new LinkedHashSet<>(); 35 35 36 36 /** -
trunk/src/org/openstreetmap/josm/gui/download/BookmarkList.java
r8342 r8390 214 214 protected String buildToolTipText(Bookmark b) { 215 215 Bounds area = b.getArea(); 216 StringBuilder sb = new StringBuilder( );216 StringBuilder sb = new StringBuilder(128); 217 217 sb.append("<html>min[latitude,longitude]=<strong>[") 218 .append(area.getMinLat()).append(",").append(area.getMinLon()).append("]</strong>") 219 .append("<br>") 220 .append("max[latitude,longitude]=<strong>[") 221 .append(area.getMaxLat()).append(",").append(area.getMaxLon()).append("]</strong>") 222 .append("</html>"); 218 .append(area.getMinLat()).append(',').append(area.getMinLon()).append("]</strong>") 219 .append("<br>max[latitude,longitude]=<strong>[") 220 .append(area.getMaxLat()).append(',').append(area.getMaxLon()).append("]</strong>") 221 .append("</html>"); 223 222 return sb.toString(); 224 225 223 } 226 224 -
trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java
r8347 r8390 539 539 line.append(t); 540 540 } else if (line.length() < 80) { 541 line.append( " ").append(t);541 line.append(' ').append(t); 542 542 } else { 543 line.append( " ").append(t).append("<br>");543 line.append(' ').append(t).append("<br>"); 544 544 ret.append(line); 545 545 line = new StringBuilder(); -
trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java
r8308 r8390 144 144 while ((line = reader.readLine()) != null) { 145 145 css.append(line); 146 css.append( "\n");146 css.append('\n'); 147 147 } 148 148 } catch (Exception e) { -
trunk/src/org/openstreetmap/josm/gui/history/SelectionSynchronizer.java
r7005 r8390 2 2 package org.openstreetmap.josm.gui.history; 3 3 4 import java.util. ArrayList;5 import java.util. List;4 import java.util.HashSet; 5 import java.util.Set; 6 6 7 7 import javax.swing.DefaultListSelectionModel; … … 12 12 public class SelectionSynchronizer implements ListSelectionListener { 13 13 14 private List<ListSelectionModel> participants;14 private final Set<ListSelectionModel> participants; 15 15 16 16 /** … … 18 18 */ 19 19 public SelectionSynchronizer() { 20 participants = new ArrayList<>();20 participants = new HashSet<>(); 21 21 } 22 22 -
trunk/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java
r8379 r8390 35 35 protected String buildToolTipText(Changeset cs) { 36 36 StringBuilder sb = new StringBuilder(); 37 sb.append("<html>") 38 .append("<strong>").append(tr("Changeset id:")).append("</strong>").append(cs.getId()).append("<br>"); 37 sb.append("<html><strong>").append(tr("Changeset id:")).append("</strong>").append(cs.getId()).append("<br>"); 39 38 if (cs.getCreatedAt() != null) { 40 39 sb.append("<strong>").append(tr("Created at:")).append("</strong>").append( -
trunk/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java
r8379 r8390 32 32 33 33 protected String buildChangesetSummary() { 34 StringBuilder msg = new StringBuilder( );34 StringBuilder msg = new StringBuilder(96); 35 35 if (selectedChangeset == null || selectedChangeset.isNew()) { 36 36 msg.append(tr("Objects are uploaded to a <strong>new changeset</strong>.")); … … 43 43 )); 44 44 } 45 msg.append( " ");45 msg.append(' '); 46 46 if (closeChangesetAfterNextUpload) { 47 47 msg.append(tr("The changeset is going to be <strong>closed</strong> after this upload")); … … 49 49 msg.append(tr("The changeset is <strong>left open</strong> after this upload")); 50 50 } 51 msg.append(" (<a href=\"urn:changeset-configuration\">" + tr("configure changeset") +"</a>)");51 msg.append(" (<a href=\"urn:changeset-configuration\">").append(tr("configure changeset")).append("</a>)"); 52 52 return msg.toString(); 53 53 } -
trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java
r8379 r8390 120 120 @Override 121 121 public Object getInfoComponent() { 122 StringBuilder info = new StringBuilder( );122 StringBuilder info = new StringBuilder(48); 123 123 124 124 if (data.attr.containsKey("name")) { … … 131 131 132 132 if (!data.tracks.isEmpty()) { 133 info.append("<table><thead align='center'><tr><td colspan='5'>" 134 + trn("{0} track", "{0} tracks", data.tracks.size(), data.tracks.size())135 + "</td></tr><tr align='center'><td>" + tr("Name") + "</td><td>"136 + tr("Description") + "</td><td>" + tr("Timespan")137 + "</td><td>" + tr("Length") + "</td><td>" + tr("URL")138 +"</td></tr></thead>");133 info.append("<table><thead align='center'><tr><td colspan='5'>") 134 .append(trn("{0} track", "{0} tracks", data.tracks.size(), data.tracks.size())) 135 .append("</td></tr><tr align='center'><td>").append(tr("Name")).append("</td><td>") 136 .append(tr("Description")).append("</td><td>").append(tr("Timespan")) 137 .append("</td><td>").append(tr("Length")).append("</td><td>").append(tr("URL")) 138 .append("</td></tr></thead>"); 139 139 140 140 for (GpxTrack trk : data.tracks) { … … 145 145 info.append("</td><td>"); 146 146 if (trk.getAttributes().containsKey(GpxConstants.GPX_DESC)) { 147 info.append( " ").append(trk.get(GpxConstants.GPX_DESC));147 info.append(' ').append(trk.get(GpxConstants.GPX_DESC)); 148 148 } 149 149 info.append("</td><td>"); … … 209 209 @Override 210 210 public String getToolTipText() { 211 StringBuilder info = new StringBuilder( ).append("<html>");211 StringBuilder info = new StringBuilder(48).append("<html>"); 212 212 213 213 if (data.attr.containsKey(GpxConstants.META_NAME)) { … … 223 223 .append(trn("{0} waypoint", "{0} waypoints", data.waypoints.size(), data.waypoints.size())).append("<br>") 224 224 .append(tr("Length: {0}", NavigatableComponent.getSystemOfMeasurement().getDistText(data.length()))) 225 .append("<br>") 226 .append("</html>"); 225 .append("<br></html>"); 227 226 return info.toString(); 228 227 } -
trunk/src/org/openstreetmap/josm/gui/layer/NoteLayer.java
r8379 r8390 113 113 StringBuilder sb = new StringBuilder("<html>"); 114 114 sb.append(tr("Note")) 115 .append( " ").append(noteData.getSelectedNote().getId());115 .append(' ').append(noteData.getSelectedNote().getId()); 116 116 for (NoteComment comment : noteData.getSelectedNote().getComments()) { 117 117 String commentText = comment.getText(); … … 196 196 StringBuilder sb = new StringBuilder(); 197 197 sb.append(tr("Notes layer")) 198 .append( "\n")198 .append('\n') 199 199 .append(tr("Total notes:")) 200 .append( " ")200 .append(' ') 201 201 .append(noteData.getNotes().size()) 202 .append( "\n")202 .append('\n') 203 203 .append(tr("Changes need uploading?")) 204 .append( " ")204 .append(' ') 205 205 .append(isModified()); 206 206 return sb.toString(); -
trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java
r8384 r8390 524 524 ed.setIcon(JOptionPane.INFORMATION_MESSAGE); 525 525 StringBuilder content = new StringBuilder(); 526 content.append("Tile name: ").append(clickedTile.getKey()).append( "\n");526 content.append("Tile name: ").append(clickedTile.getKey()).append('\n'); 527 527 try { 528 content.append("Tile url: ").append(clickedTile.getUrl()).append( "\n");528 content.append("Tile url: ").append(clickedTile.getUrl()).append('\n'); 529 529 } catch (IOException e) { 530 530 } 531 content.append("Tile size: ").append(clickedTile.getTileSource().getTileSize()).append( "x").append(clickedTile.getTileSource().getTileSize()).append("\n");531 content.append("Tile size: ").append(clickedTile.getTileSource().getTileSize()).append('x').append(clickedTile.getTileSource().getTileSize()).append('\n'); 532 532 Rectangle displaySize = tileToRect(clickedTile); 533 content.append("Tile display size: ").append(displaySize.width).append( "x").append(displaySize.height).append("\n");533 content.append("Tile display size: ").append(displaySize.width).append('x').append(displaySize.height).append('\n'); 534 534 ed.setContent(content.toString()); 535 535 ed.showDialog(); -
trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java
r8354 r8390 120 120 if (exts != null && exts.containsKey("offset")) { 121 121 try { 122 offset = Double. parseDouble(exts.get("offset"));122 offset = Double.valueOf(exts.get("offset")); 123 123 } catch (NumberFormatException nfe) { 124 124 Main.warn(nfe); -
trunk/src/org/openstreetmap/josm/gui/mappaint/Cascade.java
r8384 r8390 127 127 if (o instanceof String && !((String) o).isEmpty()) { 128 128 try { 129 return Float. parseFloat((String) o);129 return Float.valueOf((String) o); 130 130 } catch (NumberFormatException e) { 131 Main.debug("'"+o+"' cannot be converted to float"); 131 if (Main.isDebugEnabled()) { 132 Main.debug("'"+o+"' cannot be converted to float"); 133 } 132 134 } 133 135 } … … 217 219 res.append("; "); 218 220 } 219 return res.append( "}").toString();221 return res.append('}').toString(); 220 222 } 221 223 -
trunk/src/org/openstreetmap/josm/gui/mappaint/StyleSetting.java
r7509 r8390 4 4 import java.awt.event.ActionEvent; 5 5 import java.util.Arrays; 6 6 7 import javax.swing.AbstractAction; 7 8 import javax.swing.Action; 8 9 import javax.swing.JCheckBoxMenuItem; 9 10 import javax.swing.JMenu; 11 10 12 import org.openstreetmap.josm.Main; 11 13 … … 91 93 String val = Main.pref.get(prefKey, null); 92 94 if (val == null) return def; 93 return Boolean. parseBoolean(val);95 return Boolean.valueOf(val); 94 96 } 95 96 97 } 97 98 } -
trunk/src/org/openstreetmap/josm/gui/mappaint/TextElement.java
r8379 r8390 177 177 178 178 protected String toStringImpl() { 179 StringBuilder sb = new StringBuilder( );180 sb.append("labelCompositionStrategy=" +labelCompositionStrategy)181 .append(" font=" +font);179 StringBuilder sb = new StringBuilder(96); 180 sb.append("labelCompositionStrategy=").append(labelCompositionStrategy) 181 .append(" font=").append(font); 182 182 if (xOffset != 0) { 183 sb.append(" xOffset=" +xOffset);183 sb.append(" xOffset=").append(xOffset); 184 184 } 185 185 if (yOffset != 0) { 186 sb.append(" yOffset=" +yOffset);187 } 188 sb.append(" color=" +Utils.toString(color));186 sb.append(" yOffset=").append(yOffset); 187 } 188 sb.append(" color=").append(Utils.toString(color)); 189 189 if (haloRadius != null) { 190 sb.append(" haloRadius=" +haloRadius)191 .append(" haloColor=" +haloColor);190 sb.append(" haloRadius=").append(haloRadius) 191 .append(" haloColor=").append(haloColor); 192 192 } 193 193 return sb.toString(); -
trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java
r8384 r8390 1140 1140 public String toString() { 1141 1141 StringBuilder b = new StringBuilder("ParameterFunction~"); 1142 b.append(m.getName()).append( "(");1142 b.append(m.getName()).append('('); 1143 1143 for (int i = 0; i < args.size(); ++i) { 1144 if (i > 0) b.append(","); 1145 b.append(expectedParameterTypes[i]); 1146 b.append(" ").append(args.get(i)); 1144 if (i > 0) b.append(','); 1145 b.append(expectedParameterTypes[i]).append(' ').append(args.get(i)); 1147 1146 } 1148 1147 b.append(')'); … … 1205 1204 public String toString() { 1206 1205 StringBuilder b = new StringBuilder("ArrayFunction~"); 1207 b.append(m.getName()).append( "(");1206 b.append(m.getName()).append('('); 1208 1207 for (int i = 0; i < args.size(); ++i) { 1209 if (i > 0) b.append(","); 1210 b.append(arrayComponentType); 1211 b.append(" ").append(args.get(i)); 1208 if (i > 0) b.append(','); 1209 b.append(arrayComponentType).append(' ').append(args.get(i)); 1212 1210 } 1213 1211 b.append(')'); -
trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlCondition.java
r7801 r8390 46 46 sb.append(",v=").append(value); 47 47 48 sb.append( "]");48 sb.append(']'); 49 49 } 50 50 } -
trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSourceHandler.java
r8285 r8390 81 81 case "width": 82 82 String val = atts.getValue(count); 83 if (! 83 if (!(val.startsWith("+") || val.startsWith("-") || val.endsWith("%"))) { 84 84 line.setWidth(Integer.parseInt(val)); 85 85 } … … 89 89 break; 90 90 case "realwidth": 91 line.realWidth = Integer. parseInt(atts.getValue(count));91 line.realWidth = Integer.valueOf(atts.getValue(count)); 92 92 break; 93 93 case "dashed": … … 224 224 break; 225 225 case "annotate": 226 rule.icon.annotate = Boolean. parseBoolean(atts.getValue(count));226 rule.icon.annotate = Boolean.valueOf(atts.getValue(count)); 227 227 break; 228 228 case "priority": -
trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java
r8304 r8390 186 186 */ 187 187 public String getAuthoriseUrl(OAuthToken requestToken) { 188 StringBuilder sb = new StringBuilder( );188 StringBuilder sb = new StringBuilder(32); 189 189 190 190 // OSM is an OAuth 1.0 provider and JOSM isn't a web app. We just add the oauth request token to 191 191 // the authorisation request, no callback parameter. 192 192 // 193 sb.append(oauthProviderParameters.getAuthoriseUrl()).append("?") 194 .append(OAuth.OAUTH_TOKEN).append("=").append(requestToken.getKey()); 193 sb.append(oauthProviderParameters.getAuthoriseUrl()).append('?'+OAuth.OAUTH_TOKEN+'=').append(requestToken.getKey()); 195 194 return sb.toString(); 196 195 } … … 249 248 250 249 protected String buildPostRequest(Map<String,String> parameters) throws OsmOAuthAuthorizationException { 251 StringBuilder sb = new StringBuilder( );250 StringBuilder sb = new StringBuilder(32); 252 251 253 252 for(Iterator<Entry<String,String>> it = parameters.entrySet().iterator(); it.hasNext();) { … … 255 254 String value = entry.getValue(); 256 255 value = (value == null) ? "" : value; 257 sb.append(entry.getKey()).append( "=").append(Utils.encodeUrl(value));256 sb.append(entry.getKey()).append('=').append(Utils.encodeUrl(value)); 258 257 if (it.hasNext()) { 259 sb.append( "&");258 sb.append('&'); 260 259 } 261 260 } -
trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java
r8377 r8390 1333 1333 } else if ("min-josm-version".equals(key)) { 1334 1334 try { 1335 last.minJosmVersion = Integer. parseInt(value);1335 last.minJosmVersion = Integer.valueOf(value); 1336 1336 } catch (NumberFormatException e) { 1337 1337 // ignore -
trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddTMSLayerPanel.java
r8379 r8390 69 69 String z = sanitize(tmsZoom.getText()); 70 70 if (!z.isEmpty()) { 71 a.append( "[").append(z).append("]");71 a.append('[').append(z).append(']'); 72 72 } 73 a.append( ":").append(getImageryRawUrl());73 a.append(':').append(getImageryRawUrl()); 74 74 return a.toString(); 75 75 } -
trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java
r8379 r8390 63 63 sb.append(pi.version); 64 64 if (pi.oldmode) { 65 sb.append( "*");65 sb.append('*'); 66 66 } 67 67 } -
trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java
r8387 r8390 88 88 Collection<PluginInformation> failed = task.getFailedPlugins(); 89 89 StringBuilder sb = new StringBuilder(); 90 if (! 90 if (!downloaded.isEmpty()) { 91 91 sb.append(trn( 92 92 "The following plugin has been downloaded <strong>successfully</strong>:", … … 97 97 sb.append("<ul>"); 98 98 for(PluginInformation pi: downloaded) { 99 sb.append("<li>").append(pi.name).append(" (").append(pi.version).append(") ").append("</li>");99 sb.append("<li>").append(pi.name).append(" (").append(pi.version).append(")</li>"); 100 100 } 101 101 sb.append("</ul>"); 102 102 } 103 if (! 103 if (!failed.isEmpty()) { 104 104 sb.append(trn( 105 105 "Downloading the following plugin has <strong>failed</strong>:", -
trunk/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java
r8379 r8390 169 169 private JComponent build() { 170 170 StringBuilder s = new StringBuilder(); 171 s.append("<b>+proj=...</b> - <i>"+tr("Projection name")+"</i><br>") 172 .append(" "+tr("Supported values:")+" ") 173 .append(listKeys(Projections.projs)+"<br>") 174 .append("<b>+lat_0=..., +lat_1=..., +lat_2=...</b> - <i>"+tr("Projection parameters")+"</i><br>") 175 .append("<b>+x_0=..., +y_0=...</b> - <i>"+tr("False easting and false northing")+"</i><br>") 176 .append("<b>+lon_0=...</b> - <i>"+tr("Central meridian")+"</i><br>") 177 .append("<b>+k_0=...</b> - <i>"+tr("Scaling factor")+"</i><br>") 178 .append("<b>+ellps=...</b> - <i>"+tr("Ellipsoid name")+"</i><br>") 179 .append(" "+tr("Supported values:")+" ") 180 .append(listKeys(Projections.ellipsoids)+"<br>") 181 .append("<b>+a=..., +b=..., +rf=..., +f=..., +es=...</b> - <i>"+tr("Ellipsoid parameters")+"</i><br>") 182 .append("<b>+datum=...</b> - <i>"+tr("Datum name")+"</i><br>") 183 .append(" "+tr("Supported values:")+" ") 184 .append(listKeys(Projections.datums)+"<br>") 185 .append("<b>+towgs84=...</b> - <i>"+tr("3 or 7 term datum transform parameters")+"</i><br>") 186 .append("<b>+nadgrids=...</b> - <i>"+tr("NTv2 grid file")+"</i><br>") 187 .append(" "+tr("Built-in:")+" ") 188 .append(listKeys(Projections.nadgrids)+"<br>") 189 .append("<b>+bounds=</b>minlon,minlat,maxlon,maxlat - <i>"+tr("Projection bounds (in degrees)")+"</i><br>") 190 .append("<b>+wmssrs=</b>EPSG:123456 - <i>"+tr("Sets the SRS=... parameter in the WMS request")+"</i><br>"); 171 s.append("<b>+proj=...</b> - <i>").append(tr("Projection name")) 172 .append("</i><br> ").append(tr("Supported values:")).append(' ') 173 .append(listKeys(Projections.projs)) 174 .append("<br><b>+lat_0=..., +lat_1=..., +lat_2=...</b> - <i>").append(tr("Projection parameters")) 175 .append("</i><br><b>+x_0=..., +y_0=...</b> - <i>").append(tr("False easting and false northing")) 176 .append("</i><br><b>+lon_0=...</b> - <i>").append(tr("Central meridian")) 177 .append("</i><br><b>+k_0=...</b> - <i>").append(tr("Scaling factor")) 178 .append("</i><br><b>+ellps=...</b> - <i>").append(tr("Ellipsoid name")) 179 .append("</i><br> ").append(tr("Supported values:")).append(' ') 180 .append(listKeys(Projections.ellipsoids)) 181 .append("<br><b>+a=..., +b=..., +rf=..., +f=..., +es=...</b> - <i>").append(tr("Ellipsoid parameters")) 182 .append("</i><br><b>+datum=...</b> - <i>").append(tr("Datum name")) 183 .append("</i><br> ").append(tr("Supported values:")).append(' ') 184 .append(listKeys(Projections.datums)) 185 .append("<br><b>+towgs84=...</b> - <i>").append(tr("3 or 7 term datum transform parameters")) 186 .append("</i><br><b>+nadgrids=...</b> - <i>").append(tr("NTv2 grid file")) 187 .append("</i><br> ").append(tr("Built-in:")).append(' ') 188 .append(listKeys(Projections.nadgrids)) 189 .append("<br><b>+bounds=</b>minlon,minlat,maxlon,maxlat - <i>").append(tr("Projection bounds (in degrees)")) 190 .append("</i><br><b>+wmssrs=</b>EPSG:123456 - <i>").append(tr("Sets the SRS=... parameter in the WMS request")) 191 .append("</i><br>"); 191 192 192 193 return new HtmlPanel(s.toString()); -
trunk/src/org/openstreetmap/josm/gui/tagging/TagModel.java
r7005 r8390 117 117 sb.append(values.get(i)); 118 118 if (i + 1 < values.size()) { 119 sb.append( ";");119 sb.append(';'); 120 120 } 121 121 } -
trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java
r8379 r8390 1550 1550 return null; 1551 1551 try { 1552 return Integer. parseInt(str);1552 return Integer.valueOf(str); 1553 1553 } catch (Exception e) { 1554 1554 if (Main.isTraceEnabled()) { -
trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionListItem.java
r8379 r8390 92 92 .append("',") 93 93 .append(priority) 94 .append( ">");94 .append('>'); 95 95 return sb.toString(); 96 96 } -
trunk/src/org/openstreetmap/josm/gui/util/AdjustmentSynchronizer.java
r8291 r8390 9 9 import java.awt.event.ItemEvent; 10 10 import java.awt.event.ItemListener; 11 import java.util.ArrayList;12 11 import java.util.HashMap; 13 import java.util. List;12 import java.util.HashSet; 14 13 import java.util.Map; 15 14 import java.util.Observable; 16 15 import java.util.Observer; 16 import java.util.Set; 17 17 18 18 import javax.swing.JCheckBox; … … 28 28 public class AdjustmentSynchronizer implements AdjustmentListener { 29 29 30 private final List<Adjustable> synchronizedAdjustables;30 private final Set<Adjustable> synchronizedAdjustables; 31 31 private final Map<Adjustable, Boolean> enabledMap; 32 32 … … 37 37 */ 38 38 public AdjustmentSynchronizer() { 39 synchronizedAdjustables = new ArrayList<>();39 synchronizedAdjustables = new HashSet<>(); 40 40 enabledMap = new HashMap<>(); 41 41 observable = new Observable(); -
trunk/src/org/openstreetmap/josm/gui/util/CellEditorSupport.java
r7005 r8390 3 3 4 4 import java.util.ArrayList; 5 import java.util.Linked List;5 import java.util.LinkedHashSet; 6 6 import java.util.List; 7 import java.util.Set; 7 8 8 9 import javax.swing.CellEditor; … … 17 18 public class CellEditorSupport { 18 19 private final CellEditor editor; 19 private final List<CellEditorListener> listeners;20 private final Set<CellEditorListener> listeners; 20 21 21 22 /** … … 25 26 public CellEditorSupport(CellEditor editor) { 26 27 this.editor = editor; 27 this.listeners = new Linked List<>();28 this.listeners = new LinkedHashSet<>(); 28 29 } 29 30 … … 40 41 public final void addCellEditorListener(CellEditorListener l) { 41 42 synchronized (this) { 42 if (l != null && ! 43 if (l != null && !listeners.contains(l)) { 43 44 listeners.add(l); 44 45 } … … 52 53 public final void removeCellEditorListener(CellEditorListener l) { 53 54 synchronized (this) { 54 if (l != null && listeners.contains(l)) {55 if (l != null && listeners.contains(l)) { 55 56 listeners.remove(l); 56 57 } -
trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java
r8379 r8390 1020 1020 public String toString() { 1021 1021 int nChildren = getChildren().size(); 1022 StringBu ffer sb = new StringBuffer("MultiSplitLayout.Split");1022 StringBuilder sb = new StringBuilder("MultiSplitLayout.Split"); 1023 1023 sb.append(isRowLayout() ? " ROW [" : " COLUMN [") 1024 1024 .append(nChildren + ((nChildren == 1) ? " child" : " children")) … … 1073 1073 @Override 1074 1074 public String toString() { 1075 StringBu ffer sb = new StringBuffer("MultiSplitLayout.Leaf");1075 StringBuilder sb = new StringBuilder("MultiSplitLayout.Leaf"); 1076 1076 sb.append(" \"") 1077 1077 .append(getName()) -
trunk/src/org/openstreetmap/josm/io/AbstractParser.java
r8308 r8390 62 62 Long l = 0L; 63 63 try { 64 l = Long. parseLong(v);64 l = Long.valueOf(v); 65 65 } catch(NumberFormatException e) { 66 66 throwException(tr("Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''.", name, v), e); -
trunk/src/org/openstreetmap/josm/io/AllFormatsImporter.java
r5131 r8390 13 13 */ 14 14 public class AllFormatsImporter extends FileImporter { 15 /** 16 * Constructs a new {@code AllFormatsImporter}. 17 */ 15 18 public AllFormatsImporter() { 16 19 super(new ExtensionFileFilter(getAllExtensions(), "", tr("All Formats") … … 18 21 } 19 22 20 @Override public boolean acceptFile(File pathname) { 23 @Override 24 public boolean acceptFile(File pathname) { 21 25 return false; 22 26 } … … 34 38 continue; 35 39 } 36 ext.append(fi.filter.getExtensions()); 37 ext.append(","); 40 ext.append(fi.filter.getExtensions()).append(','); 38 41 } 39 42 // remove last comma -
trunk/src/org/openstreetmap/josm/io/CachedFile.java
r8387 r8390 339 339 StringBuilder prefKey = new StringBuilder("mirror."); 340 340 if (destDir != null) { 341 prefKey.append(destDir); 342 prefKey.append("."); 341 prefKey.append(destDir).append('.'); 343 342 } 344 343 prefKey.append(url.toString()); … … 375 374 } 376 375 if (cachingStrategy == CachingStrategy.IfModifiedSince) { 377 ifModifiedSince = Long. parseLong(localPathEntry.get(0));376 ifModifiedSince = Long.valueOf(localPathEntry.get(0)); 378 377 } 379 378 } -
trunk/src/org/openstreetmap/josm/io/Capabilities.java
r8347 r8390 101 101 String s = get(element, attribute); 102 102 if (s == null) return null; 103 return Double. parseDouble(s);103 return Double.valueOf(s); 104 104 } 105 105 … … 115 115 String s = get(element, attribute); 116 116 if (s == null) return null; 117 return Long. parseLong(s);117 return Long.valueOf(s); 118 118 } 119 119 … … 197 197 if (v != null) { 198 198 try { 199 Long n = Long.parseLong(v);199 long n = Long.parseLong(v); 200 200 if (n <= 0) { 201 201 warnIllegalValue("waynodes", "maximum", n); -
trunk/src/org/openstreetmap/josm/io/ChangesetQuery.java
r8304 r8390 253 253 StringBuilder sb = new StringBuilder(); 254 254 if (uid != null) { 255 sb.append("user ").append("=").append(uid);255 sb.append("user=").append(uid); 256 256 } else if (userName != null) { 257 sb.append("display_name ").append("=").append(Utils.encodeUrl(userName));257 sb.append("display_name=").append(Utils.encodeUrl(userName)); 258 258 } 259 259 if (bounds != null) { 260 260 if (sb.length() > 0) { 261 sb.append( "&");261 sb.append('&'); 262 262 } 263 263 sb.append("bbox=").append(bounds.encodeAsString(",")); … … 265 265 if (closedAfter != null && createdBefore != null) { 266 266 if (sb.length() > 0) { 267 sb.append( "&");267 sb.append('&'); 268 268 } 269 269 DateFormat df = DateUtils.newIsoDateTimeFormat(); 270 sb.append("time ").append("=").append(df.format(closedAfter));271 sb.append( ",").append(df.format(createdBefore));270 sb.append("time=").append(df.format(closedAfter)); 271 sb.append(',').append(df.format(createdBefore)); 272 272 } else if (closedAfter != null) { 273 273 if (sb.length() > 0) { 274 sb.append( "&");274 sb.append('&'); 275 275 } 276 276 DateFormat df = DateUtils.newIsoDateTimeFormat(); 277 sb.append("time ").append("=").append(df.format(closedAfter));277 sb.append("time=").append(df.format(closedAfter)); 278 278 } 279 279 280 280 if (open != null) { 281 281 if (sb.length() > 0) { 282 sb.append( "&");282 sb.append('&'); 283 283 } 284 284 sb.append("open=").append(Boolean.toString(open)); 285 285 } else if (closed != null) { 286 286 if (sb.length() > 0) { 287 sb.append( "&");287 sb.append('&'); 288 288 } 289 289 sb.append("closed=").append(Boolean.toString(closed)); … … 291 291 // since 2013-12-05, see https://github.com/openstreetmap/openstreetmap-website/commit/1d1f194d598e54a5d6fb4f38fb569d4138af0dc8 292 292 if (sb.length() > 0) { 293 sb.append( "&");293 sb.append('&'); 294 294 } 295 295 sb.append("changesets=").append(Utils.join(",", changesetIds)); -
trunk/src/org/openstreetmap/josm/io/GpxReader.java
r8378 r8390 397 397 case "pdop": 398 398 try { 399 currentWayPoint.put(localName, Float. parseFloat(accumulator.toString()));399 currentWayPoint.put(localName, Float.valueOf(accumulator.toString())); 400 400 } catch(Exception e) { 401 401 currentWayPoint.put(localName, new Float(0)); -
trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java
r8338 r8390 256 256 257 257 /** 258 * builds the Multi Get request string for a set of ids and a given 259 * {@link OsmPrimitiveType}. 258 * builds the Multi Get request string for a set of ids and a given {@link OsmPrimitiveType}. 260 259 * 261 260 * @param type The primitive type. Must be one of {@link OsmPrimitiveType#NODE NODE}, {@link OsmPrimitiveType#WAY WAY}, {@link OsmPrimitiveType#RELATION RELATION} … … 272 271 sb.append(it.next()); 273 272 if (i < idPackage.size()-1) { 274 sb.append( ",");273 sb.append(','); 275 274 } 276 275 } … … 279 278 280 279 /** 281 * builds the Multi Get request string for a single id and a given 282 * {@link OsmPrimitiveType}. 280 * builds the Multi Get request string for a single id and a given {@link OsmPrimitiveType}. 283 281 * 284 282 * @param type The primitive type. Must be one of {@link OsmPrimitiveType#NODE NODE}, {@link OsmPrimitiveType#WAY WAY}, {@link OsmPrimitiveType#RELATION RELATION} -
trunk/src/org/openstreetmap/josm/io/NMEAImporter.java
r8379 r8390 69 69 70 70 private void showNmeaInfobox(boolean success, NmeaReader r) { 71 final StringBuilder msg = new StringBuilder( ).append("<html>");72 msg.append(tr("Coordinates imported: {0}", r.getNumberOfCoordinates()) +"<br>")73 .append(tr("Malformed sentences: {0}", r.getParserMalformed()) +"<br>")74 .append(tr("Checksum errors: {0}", r.getParserChecksumErrors()) +"<br>");71 final StringBuilder msg = new StringBuilder(160).append("<html>"); 72 msg.append(tr("Coordinates imported: {0}", r.getNumberOfCoordinates())).append("<br>") 73 .append(tr("Malformed sentences: {0}", r.getParserMalformed())).append("<br>") 74 .append(tr("Checksum errors: {0}", r.getParserChecksumErrors())).append("<br>"); 75 75 if (!success) { 76 msg.append(tr("Unknown sentences: {0}", r.getParserUnknown()) +"<br>");76 msg.append(tr("Unknown sentences: {0}", r.getParserUnknown())).append("<br>"); 77 77 } 78 78 msg.append(tr("Zero coordinates: {0}", r.getParserZeroCoordinates())) -
trunk/src/org/openstreetmap/josm/io/NmeaReader.java
r8384 r8390 315 315 accu=e[GPGGA.HDOP.position]; 316 316 if(!accu.isEmpty()) { 317 currentwp.put(GpxConstants.PT_HDOP, Float. parseFloat(accu));317 currentwp.put(GpxConstants.PT_HDOP, Float.valueOf(accu)); 318 318 } 319 319 // fix … … 364 364 accu=e[GPGSA.VDOP.position]; 365 365 if(!accu.isEmpty()) { 366 currentwp.put(GpxConstants.PT_VDOP, Float. parseFloat(accu));366 currentwp.put(GpxConstants.PT_VDOP, Float.valueOf(accu)); 367 367 } 368 368 // hdop 369 369 accu=e[GPGSA.HDOP.position]; 370 370 if(!accu.isEmpty()) { 371 currentwp.put(GpxConstants.PT_HDOP, Float. parseFloat(accu));371 currentwp.put(GpxConstants.PT_HDOP, Float.valueOf(accu)); 372 372 } 373 373 // pdop 374 374 accu=e[GPGSA.PDOP.position]; 375 375 if(!accu.isEmpty()) { 376 currentwp.put(GpxConstants.PT_PDOP, Float. parseFloat(accu));376 currentwp.put(GpxConstants.PT_PDOP, Float.valueOf(accu)); 377 377 } 378 378 } else if("$GPRMC".equals(e[0]) || "$GNRMC".equals(e[0])) { -
trunk/src/org/openstreetmap/josm/io/OsmApi.java
r8378 r8390 324 324 StringBuilder rv = new StringBuilder(serverUrl); 325 325 if (version != null) { 326 rv.append("/"); 327 rv.append(version); 328 } 329 rv.append("/"); 326 rv.append('/').append(version); 327 } 328 rv.append('/'); 330 329 // this works around a ruby (or lighttpd) bug where two consecutive slashes in 331 330 // an URL will cause a "404 not found" response. … … 683 682 while((s = in.readLine()) != null) { 684 683 responseBody.append(s); 685 responseBody.append( "\n");684 responseBody.append('\n'); 686 685 } 687 686 } -
trunk/src/org/openstreetmap/josm/io/OsmApiException.java
r8342 r8390 136 136 sb.append(", Error Header=<") 137 137 .append(eh) 138 .append( ">");138 .append('>'); 139 139 } 140 140 } catch (Exception e) { … … 146 146 sb.append(", Error Body=<") 147 147 .append(eb) 148 .append( ">");148 .append('>'); 149 149 } 150 150 } catch (Exception e) { -
trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java
r8291 r8390 125 125 progressMonitor.subTask(tr("Contacting OSM Server...")); 126 126 StringBuilder sb = new StringBuilder(); 127 sb.append(primitiveType.getAPIName()).append( "/").append(id).append(type);127 sb.append(primitiveType.getAPIName()).append('/').append(id).append(type); 128 128 129 129 try (InputStream in = getInputStream(sb.toString(), progressMonitor.createSubTaskMonitor(1, true))) { -
trunk/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java
r8291 r8390 60 60 StringBuilder sb = new StringBuilder(); 61 61 sb.append(primitiveType.getAPIName()) 62 .append( "/").append(id).append("/history");62 .append('/').append(id).append("/history"); 63 63 64 64 try (InputStream in = getInputStream(sb.toString(), progressMonitor.createSubTaskMonitor(1, true))) { -
trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java
r8379 r8390 118 118 StringBuilder sb = new StringBuilder(); 119 119 sb.append(id.getType().getAPIName()) 120 .append( "/")120 .append('/') 121 121 .append(id.getUniqueId()); 122 122 if (full && ! id.getType().equals(OsmPrimitiveType.NODE)) { 123 123 sb.append("/full"); 124 124 } else if (version > 0) { 125 sb.append( "/").append(version);125 sb.append('/').append(version); 126 126 } 127 127 -
trunk/src/org/openstreetmap/josm/io/OsmServerReader.java
r8342 r8390 184 184 while((s = in.readLine()) != null) { 185 185 errorBody.append(s); 186 errorBody.append( "\n");186 errorBody.append('\n'); 187 187 } 188 188 } -
trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java
r8349 r8390 263 263 Integer val = null; 264 264 try { 265 val = Integer. parseInt(accumulator.toString());265 val = Integer.valueOf(accumulator.toString()); 266 266 } catch(NumberFormatException e) { 267 267 val = null; … … 304 304 Integer tileSize = null; 305 305 try { 306 tileSize = Integer.parseInt(accumulator.toString());306 tileSize = Integer.valueOf(accumulator.toString()); 307 307 } catch(NumberFormatException e) { 308 308 tileSize = null; -
trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java
r8379 r8390 81 81 } 82 82 StringBuilder a = new StringBuilder(serviceUrl.getProtocol()); 83 a.append("://") 84 .append(serviceUrl.getHost()); 83 a.append("://").append(serviceUrl.getHost()); 85 84 if (serviceUrl.getPort() != -1) { 86 a.append(":") 87 .append(serviceUrl.getPort()); 88 } 89 a.append(serviceUrl.getPath()) 90 .append("?"); 85 a.append(':').append(serviceUrl.getPort()); 86 } 87 a.append(serviceUrl.getPath()).append('?'); 91 88 if (serviceUrl.getQuery() != null) { 92 89 a.append(serviceUrl.getQuery()); 93 90 if (!serviceUrl.getQuery().isEmpty() && !serviceUrl.getQuery().endsWith("&")) { 94 a.append( "&");91 a.append('&'); 95 92 } 96 93 } … … 150 147 while ((line = br.readLine()) != null) { 151 148 ba.append(line); 152 ba.append( "\n");149 ba.append('\n'); 153 150 } 154 151 } -
trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java
r8263 r8390 369 369 StringBuilder r = new StringBuilder(); 370 370 boolean first = true; 371 r.append( "[");371 r.append('['); 372 372 373 373 for (Entry<String, Class<? extends RequestHandler>> p : handlers.entrySet()) { … … 379 379 r.append(getHandlerInfoAsJSON(p.getKey())); 380 380 } 381 r.append( "]");381 r.append(']'); 382 382 383 383 return r.toString(); … … 454 454 * Reports HTML message with the description of all available commands 455 455 * @return HTML message with the description of all available commands 456 * @throws IllegalAccessException 457 * @throws InstantiationException 456 * @throws IllegalAccessException if one handler class or its nullary constructor is not accessible. 457 * @throws InstantiationException if one handler class represents an abstract class, an interface, an array class, 458 * a primitive type, or void; or if the class has no nullary constructor; or if the instantiation fails for some other reason. 458 459 */ 459 460 public static String getUsageAsHtml() throws IllegalAccessException, InstantiationException { … … 464 465 String[] optional = sample.getOptionalParams(); 465 466 String[] examples = sample.getUsageExamples(handler.getKey().substring(1)); 466 usage.append("<li>") ;467 usage.append(handler.getKey());467 usage.append("<li>") 468 .append(handler.getKey()); 468 469 if (sample.getUsage() != null && !sample.getUsage().isEmpty()) { 469 470 usage.append(" — <i>").append(sample.getUsage()).append("</i>"); … … 478 479 usage.append("<br/>examples: "); 479 480 for (String ex: examples) { 480 usage.append("<br/> <a href=\"http://localhost:8111" +ex+"\">"+ex+"</a>");481 usage.append("<br/> <a href=\"http://localhost:8111").append(ex).append("\">").append(ex).append("</a>"); 481 482 } 482 483 } -
trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/FeaturesHandler.java
r7937 r8390 2 2 package org.openstreetmap.josm.io.remotecontrol.handler; 3 3 4 import org.openstreetmap.josm.Main;5 4 import static org.openstreetmap.josm.tools.I18n.tr; 6 5 6 import org.openstreetmap.josm.Main; 7 7 import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault; 8 8 import org.openstreetmap.josm.io.remotecontrol.RequestProcessor; … … 25 25 String q=args.get("q"); 26 26 if (q!=null) { 27 buf.append( "[");27 buf.append('['); 28 28 boolean first = true; 29 29 for (String s: q.split("[,\\s]+")) { … … 40 40 } 41 41 } 42 buf.append( "]");42 buf.append(']'); 43 43 } else { 44 44 buf.append(RequestProcessor.getHandlersInfoAsJSON()); 45 45 } 46 46 47 47 content = buf.toString(); 48 48 contentType = "application/json"; … … 66 66 return null; 67 67 } 68 68 69 69 @Override 70 70 public String[] getOptionalParams() { … … 84 84 @Override 85 85 public String[] getUsageExamples() { 86 return new String[] {"/features", "/features?q=import,add_node"}; 86 return new String[] {"/features", "/features?q=import,add_node"}; 87 87 } 88 88 } -
trunk/src/org/openstreetmap/josm/io/session/GeoImageSessionImporter.java
r7937 r8390 55 55 break; 56 56 case "speed": 57 entry.setSpeed(Double. parseDouble(attrElem.getTextContent()));57 entry.setSpeed(Double.valueOf(attrElem.getTextContent())); 58 58 break; 59 59 case "elevation": 60 entry.setElevation(Double. parseDouble(attrElem.getTextContent()));60 entry.setElevation(Double.valueOf(attrElem.getTextContent())); 61 61 break; 62 62 case "gps-time": … … 64 64 break; 65 65 case "exif-orientation": 66 entry.setExifOrientation(Integer. parseInt(attrElem.getTextContent()));66 entry.setExifOrientation(Integer.valueOf(attrElem.getTextContent())); 67 67 break; 68 68 case "exif-time": -
trunk/src/org/openstreetmap/josm/io/session/SessionReader.java
r8332 r8390 362 362 Integer idx = null; 363 363 try { 364 idx = Integer. parseInt(e.getAttribute("index"));364 idx = Integer.valueOf(e.getAttribute("index")); 365 365 } catch (NumberFormatException ex) { 366 366 Main.warn(ex); … … 380 380 Integer d = null; 381 381 try { 382 d = Integer. parseInt(sd);382 d = Integer.valueOf(sd); 383 383 } catch (NumberFormatException ex) { 384 384 Main.warn(ex); -
trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java
r8379 r8390 278 278 sb.append("<li>").append(depr.name); 279 279 if (depr.reason != null) { 280 sb.append(" (").append(depr.reason).append( ")");280 sb.append(" (").append(depr.reason).append(')'); 281 281 } 282 282 sb.append("</li>"); 283 283 } 284 sb.append("</ul>") 285 .append("</html>"); 284 sb.append("</ul></html>"); 286 285 JOptionPane.showMessageDialog( 287 286 parent, … … 1326 1325 } 1327 1326 for (String s : pl) { 1328 text.append("- ").append(s).append( "\n");1327 text.append("- ").append(s).append('\n'); 1329 1328 } 1330 1329 return text.toString(); … … 1351 1350 b.append(": "); 1352 1351 b.append(e.getValue()); 1353 b.append( "\n");1352 b.append('\n'); 1354 1353 } 1355 1354 JosmTextArea a = new JosmTextArea(10, 40); -
trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java
r8379 r8390 304 304 */ 305 305 public String getDescriptionAsHtml() { 306 StringBuilder sb = new StringBuilder( );306 StringBuilder sb = new StringBuilder(128); 307 307 sb.append("<html><body>") 308 308 .append(description == null ? tr("no description available") : description); … … 315 315 && !downloadlink.startsWith("http://trac.openstreetmap.org/browser/applications/editors/josm/dist/") 316 316 && !downloadlink.startsWith("https://github.com/JOSM/")) { 317 sb.append("<p> </p><p>" +tr("<b>Plugin provided by an external source:</b> {0}", downloadlink)+"</p>");317 sb.append("<p> </p><p>").append(tr("<b>Plugin provided by an external source:</b> {0}", downloadlink)).append("</p>"); 318 318 } 319 319 sb.append("</body></html>"); -
trunk/src/org/openstreetmap/josm/plugins/PluginListParser.java
r8291 r8390 69 69 line = line.substring(1); 70 70 while (line.length() > 70) { 71 manifest.append(line.substring(0, 70)).append( "\n");71 manifest.append(line.substring(0, 70)).append('\n'); 72 72 line = " " + line.substring(70); 73 73 } 74 manifest.append(line).append( "\n");74 manifest.append(line).append('\n'); 75 75 continue; 76 76 } -
trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java
r8379 r8390 115 115 StringBuilder sb = new StringBuilder(); 116 116 sb.append("site-") 117 .append(url.getHost()).append( "-");117 .append(url.getHost()).append('-'); 118 118 if (url.getPort() != -1) { 119 sb.append(url.getPort()).append( "-");119 sb.append(url.getPort()).append('-'); 120 120 } 121 121 String path = url.getPath(); … … 125 125 sb.append(c); 126 126 } else { 127 sb.append( "_");127 sb.append('_'); 128 128 } 129 129 } … … 167 167 String line; 168 168 while ((line = in.readLine()) != null) { 169 sb.append(line).append( "\n");169 sb.append(line).append('\n'); 170 170 } 171 171 return sb.toString(); … … 198 198 String line; 199 199 while ((line = err.readLine()) != null) { 200 sb.append(line).append( "\n");200 sb.append(line).append('\n'); 201 201 } 202 202 } catch (Exception ex) { … … 228 228 StringBuilder b = new StringBuilder(); 229 229 for (String part : msg.split("(?<=\\G.{200})")) { 230 b.append(part).append( "\n");230 b.append(part).append('\n'); 231 231 } 232 232 panel.add(new JLabel("<html><body width=\"500\"><b>"+b.toString().trim()+"</b></body></html>"), GBC.eol().insets(0, 0, 0, 10)); -
trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
r8375 r8390 526 526 w.append(key + "=" + value + "\n"); 527 527 } 528 w.append( "\n");528 w.append('\n'); 529 529 for (FontEntry entry: extras) { 530 530 if ("".equals(entry.name) || "".equals(entry.file)) { … … 539 539 w.append(key + "=" + value + "\n"); 540 540 } 541 w.append( "\n");541 w.append('\n'); 542 542 String fallback = props.getProperty("sequence.fallback"); 543 543 if (fallback != null) { -
trunk/src/org/openstreetmap/josm/tools/Utils.java
r8385 r8390 931 931 all = new StringBuilder(line); 932 932 } else { 933 all.append( "\n");933 all.append('\n'); 934 934 all.append(line); 935 935 } … … 1007 1007 ++cnt; 1008 1008 } else if (cnt == 0) { 1009 sb.append( ",").append(cur);1009 sb.append(',').append(cur); 1010 1010 } else { 1011 sb.append( "-").append(last);1012 sb.append( ",").append(cur);1011 sb.append('-').append(last); 1012 sb.append(',').append(cur); 1013 1013 cnt = 0; 1014 1014 } … … 1016 1016 } 1017 1017 if (cnt >= 1) { 1018 sb.append( "-").append(last);1018 sb.append('-').append(last); 1019 1019 } 1020 1020 return sb.toString(); -
trunk/src/org/openstreetmap/josm/tools/WikiReader.java
r7434 r8390 110 110 for (String line = in.readLine(); line != null; line = in.readLine()) { 111 111 if (!line.contains("[[TranslatedPages]]")) { 112 b.append(line.replaceAll(" />", ">")).append( "\n");112 b.append(line.replaceAll(" />", ">")).append('\n'); 113 113 } 114 114 } -
trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java
r8365 r8390 253 253 public void remember(String preferenceKey) { 254 254 StringBuilder value = new StringBuilder(); 255 value.append("x=").append(topLeft.x).append(",") 256 .append("y=").append(topLeft.y).append(",") 257 .append("width=").append(extent.width).append(",") 258 .append("height=").append(extent.height); 255 value.append("x=").append(topLeft.x).append(",y=").append(topLeft.y) 256 .append(",width=").append(extent.width).append(",height=").append(extent.height); 259 257 Main.pref.put(preferenceKey, value.toString()); 260 258 } -
trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java
r8287 r8390 125 125 return parseBoolean(value); 126 126 else if (klass == Integer.TYPE || klass == Long.TYPE) 127 return Long. parseLong(value);127 return Long.valueOf(value); 128 128 else if (klass == Float.TYPE || klass == Double.TYPE) 129 return Double. parseDouble(value);129 return Double.valueOf(value); 130 130 return value; 131 131 } -
trunk/src/org/openstreetmap/josm/tools/template_engine/Condition.java
r8376 r8390 47 47 sb.append(entry); 48 48 } else { 49 sb.append("'"); 50 sb.append(entry); 51 sb.append("'"); 49 sb.append('\'').append(entry).append('\''); 52 50 } 53 sb.append( "|");51 sb.append('|'); 54 52 } 55 53 return sb.toString(); -
trunk/src/org/openstreetmap/josm/tools/template_engine/Variable.java
r7937 r8390 35 35 first = false; 36 36 } 37 result.append(key).append( "=").append(dataProvider.getTemplateValue(key, false));37 result.append(key).append('=').append(dataProvider.getTemplateValue(key, false)); 38 38 } 39 39 } else {
Note:
See TracChangeset
for help on using the changeset viewer.