Index: trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java (revision 11648) +++ trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java (revision 11649) @@ -70,5 +70,4 @@ + "This may both clutter your screen with browser windows
" + "and take some time to finish.", numBrowsers, numBrowsers); - msg = "" + msg + ""; ButtonSpec[] spec = new ButtonSpec[] { new ButtonSpec( @@ -88,5 +87,5 @@ return 0 == HelpAwareOptionPane.showOptionDialog( Main.parent, - msg, + new StringBuilder(msg).insert(0, "").append("").toString(), tr("Warning"), JOptionPane.WARNING_MESSAGE, Index: trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java (revision 11648) +++ trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java (revision 11649) @@ -859,24 +859,24 @@ */ public String getToolTipText() { - String res = getName(); + StringBuilder res = new StringBuilder(getName()); boolean html = false; - String date = getDate(); - if (date != null && !date.isEmpty()) { - res += "
" + tr("Date of imagery: {0}", date); + String dateStr = getDate(); + if (dateStr != null && !dateStr.isEmpty()) { + res.append("
").append(tr("Date of imagery: {0}", dateStr)); html = true; } if (bestMarked) { - res += "
" + tr("This imagery is marked as best in this region in other editors."); + res.append("
").append(tr("This imagery is marked as best in this region in other editors.")); html = true; } String desc = getDescription(); if (desc != null && !desc.isEmpty()) { - res += "
" + desc; + res.append("
").append(desc); html = true; } if (html) { - res = "" + res + ""; - } - return res; + res.insert(0, "").append(""); + } + return res.toString(); } Index: trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (revision 11648) +++ trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (revision 11649) @@ -1055,8 +1055,9 @@ File file = getAssociatedFile(); if (file == null && isRenamed()) { - String filename = Main.pref.get("lastDirectory") + '/' + getName(); - if (!OsmImporter.FILE_FILTER.acceptName(filename)) - filename = filename + '.' + extension; - file = new File(filename); + StringBuilder filename = new StringBuilder(Main.pref.get("lastDirectory")).append('/').append(getName()); + if (!OsmImporter.FILE_FILTER.acceptName(filename.toString())) { + filename.append('.').append(extension); + } + file = new File(filename.toString()); } return new FileChooserManager() Index: trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java (revision 11648) +++ trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java (revision 11649) @@ -89,14 +89,14 @@ String incomingData = ex3.getIncomingData().trim(); String title = tr("WMS Error"); - String message = tr("Could not parse WMS layer list."); + StringBuilder message = new StringBuilder(tr("Could not parse WMS layer list.")); Main.error(ex3, "Could not parse WMS layer list. Incoming data:\n"+incomingData); if ((incomingData.startsWith("") || incomingData.startsWith("")) && (incomingData.endsWith("") || incomingData.endsWith(""))) { - GuiHelper.notifyUserHtmlError(this, title, message, incomingData); + GuiHelper.notifyUserHtmlError(this, title, message.toString(), incomingData); } else { if (ex3.getMessage() != null) { - message += '\n' + ex3.getMessage(); + message.append('\n').append(ex3.getMessage()); } - JOptionPane.showMessageDialog(getParent(), message, title, JOptionPane.ERROR_MESSAGE); + JOptionPane.showMessageDialog(getParent(), message.toString(), title, JOptionPane.ERROR_MESSAGE); } } Index: trunk/src/org/openstreetmap/josm/io/XmlStreamParsingException.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/XmlStreamParsingException.java (revision 11648) +++ trunk/src/org/openstreetmap/josm/io/XmlStreamParsingException.java (revision 11649) @@ -42,10 +42,11 @@ if (getLocation() == null) return msg; - msg += ' ' + tr("(at line {0}, column {1})", getLocation().getLineNumber(), getLocation().getColumnNumber()); + StringBuilder sb = new StringBuilder(msg).append(' ') + .append(tr("(at line {0}, column {1})", getLocation().getLineNumber(), getLocation().getColumnNumber())); int offset = getLocation().getCharacterOffset(); if (offset > -1) { - msg += ". "+ tr("{0} bytes have been read", offset); + sb.append(". ").append(tr("{0} bytes have been read", offset)); } - return msg; + return sb.toString(); } } Index: trunk/src/org/openstreetmap/josm/tools/ImageProvider.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (revision 11648) +++ trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (revision 11649) @@ -789,7 +789,5 @@ return null; - String prefix = ""; - if (isDisabled) - prefix = "dis:"+prefix; + String prefix = isDisabled ? "dis:" : ""; if (name.startsWith("data:")) { String url = name; Index: trunk/src/org/openstreetmap/josm/tools/bugreport/ReportedException.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/bugreport/ReportedException.java (revision 11648) +++ trunk/src/org/openstreetmap/josm/tools/bugreport/ReportedException.java (revision 11649) @@ -135,10 +135,10 @@ private static String niceThreadName(Thread thread) { - String name = "Thread: " + thread.getName() + " (" + thread.getId() + ')'; + StringBuilder name = new StringBuilder("Thread: ").append(thread.getName()).append(" (").append(thread.getId()).append(')'); ThreadGroup threadGroup = thread.getThreadGroup(); if (threadGroup != null) { - name += " of " + threadGroup.getName(); - } - return name; + name.append(" of ").append(threadGroup.getName()); + } + return name.toString(); }