Index: trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java (revision 6821) +++ trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java (revision 6822) @@ -133,5 +133,5 @@ protected void alertFilesNotMatchingWithImporter(Collection files, FileImporter importer) { - final StringBuffer msg = new StringBuffer(); + final StringBuilder msg = new StringBuilder(); msg.append(""); msg.append( @@ -160,5 +160,5 @@ protected void alertFilesWithUnknownImporter(Collection files) { - final StringBuffer msg = new StringBuffer(); + final StringBuilder msg = new StringBuilder(); msg.append(""); msg.append( Index: trunk/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java (revision 6821) +++ trunk/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java (revision 6822) @@ -19,5 +19,5 @@ protected String formatRelation(Relation r) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); if (r.getName() != null) { sb.append("'").append(r.getName()).append("'"); @@ -32,5 +32,5 @@ @Override public String getMessage() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(tr("Cyclic dependency between relations:")); sb.append("["); Index: trunk/src/org/openstreetmap/josm/data/Bounds.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/Bounds.java (revision 6821) +++ trunk/src/org/openstreetmap/josm/data/Bounds.java (revision 6822) @@ -399,5 +399,5 @@ 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) Index: trunk/src/org/openstreetmap/josm/data/Version.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/Version.java (revision 6821) +++ trunk/src/org/openstreetmap/josm/data/Version.java (revision 6822) @@ -39,5 +39,5 @@ 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()) { @@ -146,5 +146,5 @@ // 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: trunk/src/org/openstreetmap/josm/data/imagery/Shape.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/imagery/Shape.java (revision 6821) +++ trunk/src/org/openstreetmap/josm/data/imagery/Shape.java (revision 6822) @@ -36,5 +36,5 @@ public String encodeAsString(String separator) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); for (Coordinate c : coords) { if (sb.length() != 0) { Index: trunk/src/org/openstreetmap/josm/data/osm/User.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/User.java (revision 6821) +++ trunk/src/org/openstreetmap/josm/data/osm/User.java (revision 6822) @@ -220,5 +220,5 @@ @Override public String toString() { - StringBuffer s = new StringBuffer(); + StringBuilder s = new StringBuilder(); s.append("id:").append(uid); if (names.size() == 1) { Index: trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java (revision 6821) +++ trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java (revision 6822) @@ -279,5 +279,5 @@ @Override public String toString() { - StringBuffer buf = new StringBuffer("Headers : "); + StringBuilder buf = new StringBuilder("Headers : "); buf.append(overviewHeaderCount); buf.append("\nSub Hdrs : "); Index: trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java (revision 6821) +++ trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java (revision 6822) @@ -296,5 +296,5 @@ */ public String getDetails() { - StringBuffer buf = new StringBuffer("Sub Grid : "); + StringBuilder buf = new StringBuilder("Sub Grid : "); buf.append(subGridName); buf.append("\nParent : "); Index: trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java (revision 6821) +++ trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java (revision 6822) @@ -652,5 +652,5 @@ @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(","); Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java (revision 6821) +++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java (revision 6822) @@ -356,5 +356,5 @@ 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:")); Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (revision 6821) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (revision 6822) @@ -486,5 +486,5 @@ ); - final StringBuffer sb = new StringBuffer(); + final StringBuilder sb = new StringBuilder(); sb.append("").append(msg1).append(""); if (numNewConflicts > 0) { Index: trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (revision 6821) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (revision 6822) @@ -715,5 +715,5 @@ } } - StringBuffer text = new StringBuffer(); + StringBuilder text = new StringBuilder(); if(ways != 0) { text.append(text.length() > 0 ? ", " : "") Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java (revision 6821) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java (revision 6822) @@ -32,5 +32,5 @@ protected void renderLabel(Changeset cs) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); if (cs.isIncomplete()) { sb.append(tr("{0} [incomplete]", cs.getId())); Index: trunk/src/org/openstreetmap/josm/gui/download/BookmarkList.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/download/BookmarkList.java (revision 6821) +++ trunk/src/org/openstreetmap/josm/gui/download/BookmarkList.java (revision 6822) @@ -277,5 +277,5 @@ protected String buildToolTipText(Bookmark b) { Bounds area = b.getArea(); - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("min[latitude,longitude]=[") .append(area.getMinLat()).append(",").append(area.getMinLon()).append("]") Index: trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java (revision 6821) +++ trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java (revision 6822) @@ -508,6 +508,6 @@ 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()) { @@ -520,5 +520,5 @@ line.append(" ").append(t).append("
"); ret.append(line); - line = new StringBuffer(); + line = new StringBuilder(); } } Index: trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java (revision 6821) +++ trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java (revision 6822) @@ -140,5 +140,5 @@ ) ); - StringBuffer css = new StringBuffer(); + StringBuilder css = new StringBuilder(); try { String line = null; Index: trunk/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java (revision 6821) +++ trunk/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java (revision 6822) @@ -54,5 +54,5 @@ 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")); Index: trunk/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java (revision 6821) +++ trunk/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java (revision 6822) @@ -32,5 +32,5 @@ 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.")); @@ -141,5 +141,5 @@ protected void updateSummary() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(""); sb.append(buildStrategySummary()); Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (revision 6821) +++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (revision 6822) @@ -298,5 +298,5 @@ 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(); @@ -316,5 +316,5 @@ } - cbTimezones.setSelectedItem(new StringBuffer(defaultTz.getID()).append(" (") + cbTimezones.setSelectedItem(new StringBuilder(defaultTz.getID()).append(" (") .append(formatTimezone(defaultTz.getRawOffset() / 3600000.0)) .append(')').toString()); @@ -1295,5 +1295,5 @@ private String formatTimezone(double timezone) { - StringBuffer ret = new StringBuffer(); + StringBuilder ret = new StringBuilder(); if (timezone < 0) { @@ -1321,6 +1321,6 @@ 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++) { Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java (revision 6821) +++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java (revision 6822) @@ -253,5 +253,5 @@ } 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: trunk/src/org/openstreetmap/josm/io/ChangesetQuery.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/ChangesetQuery.java (revision 6821) +++ trunk/src/org/openstreetmap/josm/io/ChangesetQuery.java (revision 6822) @@ -253,5 +253,5 @@ */ public String getQueryString() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); if (uid != null) { sb.append("user").append("=").append(uid); Index: trunk/src/org/openstreetmap/josm/io/NmeaReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/NmeaReader.java (revision 6821) +++ trunk/src/org/openstreetmap/josm/io/NmeaReader.java (revision 6822) @@ -179,5 +179,5 @@ rd = new BufferedReader(new InputStreamReader(source)); - StringBuffer sb = new StringBuffer(1024); + StringBuilder sb = new StringBuilder(1024); int loopstart_char = rd.read(); ps = new NMEAParserState(); Index: trunk/src/org/openstreetmap/josm/io/OsmApi.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmApi.java (revision 6821) +++ trunk/src/org/openstreetmap/josm/io/OsmApi.java (revision 6822) @@ -322,5 +322,5 @@ */ public String getBaseUrl() { - StringBuffer rv = new StringBuffer(serverUrl); + StringBuilder rv = new StringBuilder(serverUrl); if (version != null) { rv.append("/"); @@ -603,5 +603,5 @@ */ 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(); Index: trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java (revision 6821) +++ trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java (revision 6822) @@ -135,5 +135,5 @@ 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"); @@ -169,5 +169,5 @@ 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: trunk/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java (revision 6821) +++ trunk/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java (revision 6822) @@ -57,5 +57,5 @@ 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)); @@ -90,5 +90,5 @@ 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)); @@ -134,5 +134,5 @@ } i++; - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("changeset/").append(id); InputStream in = getInputStream(sb.toString(), monitor.createSubTaskMonitor(1, true)); @@ -174,5 +174,5 @@ 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)); Index: trunk/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java (revision 6821) +++ trunk/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java (revision 6822) @@ -60,5 +60,5 @@ 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: trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java (revision 6821) +++ trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java (revision 6822) @@ -119,5 +119,5 @@ try { progressMonitor.indeterminateSubTask(tr("Downloading OSM data...")); - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(id.getType().getAPIName()); sb.append("/"); Index: trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java =================================================================== --- trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (revision 6821) +++ trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (revision 6822) @@ -761,5 +761,5 @@ private static void alertFailedPluginUpdate(Component parent, Collection plugins) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(""); sb.append(trn( @@ -1139,5 +1139,5 @@ }; - final StringBuffer msg = new StringBuffer(); + final StringBuilder msg = new StringBuilder(); msg.append(""); msg.append(tr("An unexpected exception occurred that may have come from the ''{0}'' plugin.", plugin.getPluginInformation().name)); Index: trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java (revision 6821) +++ trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java (revision 6822) @@ -248,5 +248,5 @@ */ 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(",")