Index: src/org/openstreetmap/josm/actions/OpenFileAction.java =================================================================== --- src/org/openstreetmap/josm/actions/OpenFileAction.java (revision 6084) +++ src/org/openstreetmap/josm/actions/OpenFileAction.java (working copy) @@ -132,7 +132,7 @@ } protected void alertFilesNotMatchingWithImporter(Collection files, FileImporter importer) { - final StringBuffer msg = new StringBuffer(); + final StringBuilder msg = new StringBuilder(); msg.append(""); msg.append( trn( @@ -159,7 +159,7 @@ } protected void alertFilesWithUnknownImporter(Collection files) { - final StringBuffer msg = new StringBuffer(); + final StringBuilder msg = new StringBuilder(); msg.append(""); msg.append( trn( Index: src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java =================================================================== --- src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java (revision 6084) +++ src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java (working copy) @@ -103,7 +103,7 @@ // multiple error object? prepare a HTML list // if (!errors.isEmpty()) { - final StringBuffer sb = new StringBuffer(); + final StringBuilder sb = new StringBuilder(); for (Object error:errors) { if (error instanceof String) { sb.append("
  • ").append(error).append("
    • ").append("
    "); Index: src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java =================================================================== --- src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java (revision 6084) +++ src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java (working copy) @@ -18,7 +18,7 @@ } protected String formatRelation(Relation r) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); if (r.getName() != null) { sb.append("'").append(r.getName()).append("'"); } else if (!r.isNew()) { @@ -31,7 +31,7 @@ @Override public String getMessage() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(tr("Cyclic dependency between relations:")); sb.append("["); for (int i=0; i< cycle.size(); i++) { Index: src/org/openstreetmap/josm/data/Bounds.java =================================================================== --- src/org/openstreetmap/josm/data/Bounds.java (revision 6084) +++ src/org/openstreetmap/josm/data/Bounds.java (working copy) @@ -309,7 +309,7 @@ } public String encodeAsString(String separator) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(minLat).append(separator).append(minLon) .append(separator).append(maxLat).append(separator) .append(maxLon); Index: src/org/openstreetmap/josm/data/Version.java =================================================================== --- src/org/openstreetmap/josm/data/Version.java (revision 6084) +++ src/org/openstreetmap/josm/data/Version.java (working copy) @@ -37,7 +37,7 @@ String s = null; try { BufferedReader in = Utils.openURLReader(resource); - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); try { for (String line = in.readLine(); line != null; line = in.readLine()) { sb.append(line).append("\n"); @@ -144,7 +144,7 @@ // the revision info // - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); for(Entry property: properties.entrySet()) { sb.append(property.getKey()).append(":").append(property.getValue()).append("\n"); } Index: src/org/openstreetmap/josm/data/imagery/Shape.java =================================================================== --- src/org/openstreetmap/josm/data/imagery/Shape.java (revision 6084) +++ src/org/openstreetmap/josm/data/imagery/Shape.java (working copy) @@ -35,7 +35,7 @@ } public String encodeAsString(String separator) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); for (Coordinate c : coords) { if (sb.length() != 0) { sb.append(separator); Index: src/org/openstreetmap/josm/data/osm/User.java =================================================================== --- src/org/openstreetmap/josm/data/osm/User.java (revision 6084) +++ src/org/openstreetmap/josm/data/osm/User.java (working copy) @@ -203,7 +203,7 @@ @Override public String toString() { - StringBuffer s = new StringBuffer(); + StringBuilder s = new StringBuilder(); s.append("id:"+uid); if (names.size() == 1) { s.append(" name:"+getName()); Index: src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java =================================================================== --- src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java (revision 6084) +++ src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java (working copy) @@ -275,7 +275,7 @@ @Override public String toString() { - StringBuffer buf = new StringBuffer("Headers : "); + StringBuilder buf = new StringBuilder("Headers : "); buf.append(overviewHeaderCount); buf.append("\nSub Hdrs : "); buf.append(subGridHeaderCount); Index: src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java =================================================================== --- src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java (revision 6084) +++ src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java (working copy) @@ -289,7 +289,7 @@ } public String getDetails() { - StringBuffer buf = new StringBuffer("Sub Grid : "); + StringBuilder buf = new StringBuilder("Sub Grid : "); buf.append(subGridName); buf.append("\nParent : "); buf.append(parentSubGridName); Index: src/org/openstreetmap/josm/gui/BookmarkList.java =================================================================== --- src/org/openstreetmap/josm/gui/BookmarkList.java (revision 6084) +++ src/org/openstreetmap/josm/gui/BookmarkList.java (working copy) @@ -214,7 +214,7 @@ protected String buildToolTipText(Bookmark b) { Bounds area = b.getArea(); - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("min[latitude,longitude]=[") .append(area.getMin().lat()).append(",").append(area.getMin().lon()).append("]") .append("
    ") Index: src/org/openstreetmap/josm/gui/MultiSplitLayout.java =================================================================== --- src/org/openstreetmap/josm/gui/MultiSplitLayout.java (revision 6084) +++ src/org/openstreetmap/josm/gui/MultiSplitLayout.java (working copy) @@ -1057,7 +1057,7 @@ @Override public String toString() { int nChildren = getChildren().size(); - StringBuffer sb = new StringBuffer("MultiSplitLayout.Split"); + StringBuilder sb = new StringBuilder("MultiSplitLayout.Split"); sb.append(isRowLayout() ? " ROW [" : " COLUMN ["); sb.append(nChildren + ((nChildren == 1) ? " child" : " children")); sb.append("] "); @@ -1112,7 +1112,7 @@ @Override public String toString() { - StringBuffer sb = new StringBuffer("MultiSplitLayout.Leaf"); + StringBuilder sb = new StringBuilder("MultiSplitLayout.Leaf"); sb.append(" \""); sb.append(getName()); sb.append("\""); Index: src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java =================================================================== --- src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java (revision 6084) +++ src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java (working copy) @@ -653,7 +653,7 @@ @Override public String toString() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("min=").append(min.x).append(",").append(min.y).append(","); sb.append("max=").append(max.x).append(",").append(max.y).append(","); sb.append("zoom=").append(zoomLevel); Index: src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java =================================================================== --- src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java (revision 6084) +++ src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java (working copy) @@ -354,7 +354,7 @@ if (deletedIds.size() > MAX_DELETED_PRIMITIVE_IN_DIALOG) { items.add(tr("{0} more...", deletedIds.size() - MAX_DELETED_PRIMITIVE_IN_DIALOG)); } - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(""); sb.append(tr("The following objects could not be copied to the target object
    because they are deleted in the target dataset:")); sb.append("
      "); Index: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (revision 6084) +++ src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (working copy) @@ -710,7 +710,7 @@ relations++; } } - StringBuffer text = new StringBuffer(); + StringBuilder text = new StringBuilder(); if(ways != 0) { text.append(text.length() > 0 ? ", " : "") .append(trn("{0} way", "{0} ways", ways, ways)); Index: src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java (revision 6084) +++ src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java (working copy) @@ -31,7 +31,7 @@ } protected void renderLabel(Changeset cs) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); if (cs.isIncomplete()) { sb.append(tr("{0} [incomplete]", cs.getId())); } else { Index: src/org/openstreetmap/josm/gui/download/PlaceSelection.java =================================================================== --- src/org/openstreetmap/josm/gui/download/PlaceSelection.java (revision 6084) +++ src/org/openstreetmap/josm/gui/download/PlaceSelection.java (working copy) @@ -510,8 +510,8 @@ } protected String lineWrapDescription(String description) { - StringBuffer ret = new StringBuffer(); - StringBuffer line = new StringBuffer(); + StringBuilder ret = new StringBuilder(); + StringBuilder line = new StringBuilder(); StringTokenizer tok = new StringTokenizer(description, " "); while(tok.hasMoreElements()) { String t = tok.nextToken(); @@ -522,7 +522,7 @@ } else { line.append(" ").append(t).append("
      "); ret.append(line); - line = new StringBuffer(); + line = new StringBuilder(); } } ret.insert(0, ""); Index: src/org/openstreetmap/josm/gui/help/HelpBrowser.java =================================================================== --- src/org/openstreetmap/josm/gui/help/HelpBrowser.java (revision 6084) +++ src/org/openstreetmap/josm/gui/help/HelpBrowser.java (working copy) @@ -136,7 +136,7 @@ getClass().getResourceAsStream("/data/help-browser.css") ) ); - StringBuffer css = new StringBuffer(); + StringBuilder css = new StringBuilder(); try { String line = null; while ((line = reader.readLine()) != null) { Index: src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java =================================================================== --- src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java (revision 6084) +++ src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java (working copy) @@ -53,7 +53,7 @@ } if (cs != null) { setIcon(icon); - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); if (cs.get("comment") != null) { sb.append(cs.getId()).append(" - ").append(cs.get("comment")); } else if (cs.get("name") != null) { Index: src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java =================================================================== --- src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java (revision 6084) +++ src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java (working copy) @@ -36,7 +36,7 @@ private ConfigurationParameterRequestHandler configHandler; protected String buildChangesetSummary() { - StringBuffer msg = new StringBuffer(); + StringBuilder msg = new StringBuilder(); if (selectedChangeset == null || selectedChangeset.isNew()) { msg.append(tr("Objects are uploaded to a new changeset.")); } else { @@ -170,7 +170,7 @@ } protected void updateSummary() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(""); sb.append(buildStrategySummary()); sb.append("

      "); Index: src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java =================================================================== --- src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (revision 6084) +++ src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (working copy) @@ -296,7 +296,7 @@ for (String tzStr : tmp) { TimeZone tz = TimeZone.getTimeZone(tzStr); - String tzDesc = new StringBuffer(tzStr).append(" (") + String tzDesc = new StringBuilder(tzStr).append(" (") .append(formatTimezone(tz.getRawOffset() / 3600000.0)) .append(')').toString(); vtTimezones.add(tzDesc); @@ -314,7 +314,7 @@ defaultTz = TimeZone.getTimeZone(tzId); } - cbTimezones.setSelectedItem(new StringBuffer(defaultTz.getID()).append(" (") + cbTimezones.setSelectedItem(new StringBuilder(defaultTz.getID()).append(" (") .append(formatTimezone(defaultTz.getRawOffset() / 3600000.0)) .append(')').toString()); @@ -1299,7 +1299,7 @@ } private String formatTimezone(double timezone) { - StringBuffer ret = new StringBuffer(); + StringBuilder ret = new StringBuilder(); if (timezone < 0) { ret.append('-'); @@ -1325,8 +1325,8 @@ return 0; char sgnTimezone = '+'; - StringBuffer hTimezone = new StringBuffer(); - StringBuffer mTimezone = new StringBuffer(); + StringBuilder hTimezone = new StringBuilder(); + StringBuilder mTimezone = new StringBuilder(); int state = 1; // 1=start/sign, 2=hours, 3=minutes. for (int i = 0; i < timezone.length(); i++) { char c = timezone.charAt(i); Index: src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java =================================================================== --- src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java (revision 6084) +++ src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java (working copy) @@ -234,7 +234,7 @@ if (entry != null) { imgDisplay.setImage(entry.getFile(), entry.getExifOrientation()); setTitle("Geotagged Images" + (entry.getFile() != null ? " - " + entry.getFile().getName() : "")); - StringBuffer osd = new StringBuffer(entry.getFile() != null ? entry.getFile().getName() : ""); + StringBuilder osd = new StringBuilder(entry.getFile() != null ? entry.getFile().getName() : ""); if (entry.getElevation() != null) { osd.append(tr("\nAltitude: {0} m", entry.getElevation().longValue())); } Index: src/org/openstreetmap/josm/io/ChangesetQuery.java =================================================================== --- src/org/openstreetmap/josm/io/ChangesetQuery.java (revision 6084) +++ src/org/openstreetmap/josm/io/ChangesetQuery.java (working copy) @@ -230,7 +230,7 @@ * @return the query string */ public String getQueryString() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); if (uid != null) { sb.append("user").append("=").append(uid); } else if (userName != null) { Index: src/org/openstreetmap/josm/io/OsmApi.java =================================================================== --- src/org/openstreetmap/josm/io/OsmApi.java (revision 6084) +++ src/org/openstreetmap/josm/io/OsmApi.java (working copy) @@ -314,7 +314,7 @@ * @return base URL string */ public String getBaseUrl() { - StringBuffer rv = new StringBuffer(serverUrl); + StringBuilder rv = new StringBuilder(serverUrl); if (version != null) { rv.append("/"); rv.append(version); @@ -589,7 +589,7 @@ * been exhausted), or rewrapping a Java exception. */ private String sendRequest(String requestMethod, String urlSuffix,String requestBody, ProgressMonitor monitor, boolean doAuthenticate, boolean fastFail) throws OsmTransferException { - StringBuffer responseBody = new StringBuffer(); + StringBuilder responseBody = new StringBuilder(); int retries = fastFail ? 0 : getMaxRetries(); while(true) { // the retry loop Index: src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java =================================================================== --- src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java (revision 6084) +++ src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java (working copy) @@ -134,7 +134,7 @@ progressMonitor.beginTask(null, 2); try { progressMonitor.indeterminateSubTask(tr("Downloading from OSM Server...")); - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(primitiveType.getAPIName()) .append("/").append(id).append("/ways"); @@ -168,7 +168,7 @@ progressMonitor.beginTask(null, 2); try { progressMonitor.subTask(tr("Contacting OSM Server...")); - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(primitiveType.getAPIName()) .append("/").append(id).append("/relations"); Index: src/org/openstreetmap/josm/io/OsmServerChangesetReader.java =================================================================== --- src/org/openstreetmap/josm/io/OsmServerChangesetReader.java (revision 6084) +++ src/org/openstreetmap/josm/io/OsmServerChangesetReader.java (working copy) @@ -58,7 +58,7 @@ } try { monitor.beginTask(tr("Reading changesets...")); - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("changesets?").append(query.getQueryString()); InputStream in = getInputStream(sb.toString(), monitor.createSubTaskMonitor(1, true)); if (in == null) @@ -92,7 +92,7 @@ } try { monitor.beginTask(tr("Reading changeset {0} ...",id)); - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("changeset/").append(id); InputStream in = getInputStream(sb.toString(), monitor.createSubTaskMonitor(1, true)); if (in == null) @@ -137,7 +137,7 @@ continue; } i++; - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("changeset/").append(id); InputStream in = getInputStream(sb.toString(), monitor.createSubTaskMonitor(1, true)); if (in == null) @@ -177,7 +177,7 @@ } try { monitor.beginTask(tr("Downloading changeset content")); - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("changeset/").append(id).append("/download"); InputStream in = getInputStream(sb.toString(), monitor.createSubTaskMonitor(1, true)); if (in == null) Index: src/org/openstreetmap/josm/io/OsmServerHistoryReader.java =================================================================== --- src/org/openstreetmap/josm/io/OsmServerHistoryReader.java (revision 6084) +++ src/org/openstreetmap/josm/io/OsmServerHistoryReader.java (working copy) @@ -59,7 +59,7 @@ progressMonitor.beginTask(""); try { progressMonitor.indeterminateSubTask(tr("Contacting OSM Server...")); - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(primitiveType.getAPIName()) .append("/").append(id).append("/history"); Index: src/org/openstreetmap/josm/io/OsmServerObjectReader.java =================================================================== --- src/org/openstreetmap/josm/io/OsmServerObjectReader.java (revision 6084) +++ src/org/openstreetmap/josm/io/OsmServerObjectReader.java (working copy) @@ -121,7 +121,7 @@ InputStream in = null; try { progressMonitor.indeterminateSubTask(tr("Downloading OSM data...")); - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(id.getType().getAPIName()); sb.append("/"); sb.append(id.getUniqueId()); Index: src/org/openstreetmap/josm/plugins/PluginHandler.java =================================================================== --- src/org/openstreetmap/josm/plugins/PluginHandler.java (revision 6084) +++ src/org/openstreetmap/josm/plugins/PluginHandler.java (working copy) @@ -734,7 +734,7 @@ } private static void alertFailedPluginUpdate(Component parent, Collection plugins) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(""); sb.append(trn( "Updating the following plugin has failed:", @@ -1082,7 +1082,7 @@ ) }; - StringBuffer msg = new StringBuffer(); + StringBuilder msg = new StringBuilder(); msg.append(""); msg.append(tr("An unexpected exception occurred that may have come from the ''{0}'' plugin.", plugin.getPluginInformation().name)); msg.append("
      "); Index: src/org/openstreetmap/josm/tools/WindowGeometry.java =================================================================== --- src/org/openstreetmap/josm/tools/WindowGeometry.java (revision 6084) +++ src/org/openstreetmap/josm/tools/WindowGeometry.java (working copy) @@ -247,7 +247,7 @@ * @param preferenceKey the preference key */ public void remember(String preferenceKey) { - StringBuffer value = new StringBuffer(); + StringBuilder value = new StringBuilder(); value.append("x=").append(topLeft.x).append(",") .append("y=").append(topLeft.y).append(",") .append("width=").append(extent.width).append(",")