Index: trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java (revision 8378) +++ trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java (revision 8379) @@ -157,6 +157,5 @@ protected void alertFilesNotMatchingWithImporter(Collection files, FileImporter importer) { final StringBuilder msg = new StringBuilder(); - msg.append(""); - msg.append( + msg.append("").append( trn( "Cannot open {0} file with the file importer ''{1}''.", @@ -166,6 +165,5 @@ importer.filter.getDescription() ) - ).append("
"); - msg.append("

").append(f.getAbsolutePath()).append("

files) { final StringBuilder msg = new StringBuilder(); - msg.append(""); - msg.append( + msg.append("").append( trn( "Cannot open {0} file because file does not exist or no suitable file importer is available.", @@ -192,12 +189,9 @@ files.size() ) - ).append("
"); - msg.append("

"); - msg.append(f.getAbsolutePath()); - msg.append(" ("); - msg.append(f.exists() ? tr("no importer") : tr("does not exist")); - msg.append(")
").append(f.getAbsolutePath()).append(" (") + .append(f.exists() ? tr("no importer") : tr("does not exist")) + .append(")

errorsWarnings = Main.getLastErrorAndWarnings(); Index: trunk/src/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTask.java (revision 8378) +++ trunk/src/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTask.java (revision 8379) @@ -4,4 +4,5 @@ import java.util.ArrayList; import java.util.List; + import org.openstreetmap.josm.io.XmlWriter; @@ -50,19 +51,19 @@ @Override public String acceptsDocumentationSummary() { - StringBuilder buf = new StringBuilder(""); - buf.append(getTitle()); - buf.append(":"); + StringBuilder buff = new StringBuilder(""); + buff.append(getTitle()) + .append(":"); String[] patterns = getPatterns(); if (patterns.length>0) { - buf.append("

"); - buf.append(XmlWriter.encode(pattern)); - buf.append("
") + .append(XmlWriter.encode(pattern)) + .append("

"); } - buf.append(""); - return buf.toString(); + buff.append(""); + return buff.toString(); } @@ -80,13 +81,13 @@ /** * Check / decide if the task is safe for remotecontrol. - * + * * Keep in mind that a potential attacker has full control over the content * of the file that will be downloaded. * If it is possible to run arbitrary code or write to the local file * system, then the task is (obviously) not save for remote execution. - * + * * The default value is false = unsafe. Override in a subclass to * allow running the task via remotecontol. - * + * * @return true if it is safe to download and open any file of the * corresponding format, false otherwise Index: trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (revision 8378) +++ trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (revision 8379) @@ -678,6 +678,6 @@ result.append('A'); } - result.append(' '); - result.append(text); + result.append(' ') + .append(text); return result.toString(); } Index: trunk/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java (revision 8378) +++ trunk/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java (revision 8379) @@ -32,6 +32,6 @@ public String getMessage() { StringBuilder sb = new StringBuilder(); - sb.append(tr("Cyclic dependency between relations:")); - sb.append("["); + sb.append(tr("Cyclic dependency between relations:")) + .append("["); for (int i=0; i< cycle.size(); i++) { if (i >0 ) { Index: trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java =================================================================== --- trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java (revision 8378) +++ trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java (revision 8379) @@ -78,7 +78,7 @@ StringBuilder result = new StringBuilder(); - result.append(text.substring(0, m.start(2))); - result.append(leftRight.equals(a) ? b : a); - result.append(text.substring(m.end(2))); + result.append(text.substring(0, m.start(2))) + .append(leftRight.equals(a) ? b : a) + .append(text.substring(m.end(2))); return result.toString(); Index: trunk/src/org/openstreetmap/josm/data/osm/Relation.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/Relation.java (revision 8378) +++ trunk/src/org/openstreetmap/josm/data/osm/Relation.java (revision 8379) @@ -267,22 +267,23 @@ } - @Override public String toString() { + @Override + public String toString() { StringBuilder result = new StringBuilder(); - result.append("{Relation id="); - result.append(getUniqueId()); - result.append(" version="); - result.append(getVersion()); - result.append(" "); - result.append(getFlagsAsString()); - result.append(" ["); + result.append("{Relation id=") + .append(getUniqueId()) + .append(" version=") + .append(getVersion()) + .append(" ") + .append(getFlagsAsString()) + .append(" ["); for (RelationMember rm:getMembers()) { - result.append(OsmPrimitiveType.from(rm.getMember())); - result.append(" "); - result.append(rm.getMember().getUniqueId()); - result.append(", "); - } - result.delete(result.length()-2, result.length()); - result.append("]"); - result.append("}"); + result.append(OsmPrimitiveType.from(rm.getMember())) + .append(" ") + .append(rm.getMember().getUniqueId()) + .append(", "); + } + result.delete(result.length()-2, result.length()) + .append("]") + .append("}"); return result.toString(); } Index: trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java (revision 8378) +++ trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java (revision 8379) @@ -285,27 +285,27 @@ @Override public String toString() { - StringBuilder buf = new StringBuilder("Headers : "); - buf.append(overviewHeaderCount); - buf.append("\nSub Hdrs : "); - buf.append(subGridHeaderCount); - buf.append("\nSub Grids: "); - buf.append(subGridCount); - buf.append("\nType : "); - buf.append(shiftType); - buf.append("\nVersion : "); - buf.append(version); - buf.append("\nFr Ellpsd: "); - buf.append(fromEllipsoid); - buf.append("\nTo Ellpsd: "); - buf.append(toEllipsoid); - buf.append("\nFr Maj Ax: "); - buf.append(fromSemiMajorAxis); - buf.append("\nFr Min Ax: "); - buf.append(fromSemiMinorAxis); - buf.append("\nTo Maj Ax: "); - buf.append(toSemiMajorAxis); - buf.append("\nTo Min Ax: "); - buf.append(toSemiMinorAxis); - return buf.toString(); + StringBuilder buff = new StringBuilder("Headers : "); + buff.append(overviewHeaderCount) + .append("\nSub Hdrs : ") + .append(subGridHeaderCount) + .append("\nSub Grids: ") + .append(subGridCount) + .append("\nType : ") + .append(shiftType) + .append("\nVersion : ") + .append(version) + .append("\nFr Ellpsd: ") + .append(fromEllipsoid) + .append("\nTo Ellpsd: ") + .append(toEllipsoid) + .append("\nFr Maj Ax: ") + .append(fromSemiMajorAxis) + .append("\nFr Min Ax: ") + .append(fromSemiMinorAxis) + .append("\nTo Maj Ax: ") + .append(toSemiMajorAxis) + .append("\nTo Min Ax: ") + .append(toSemiMinorAxis); + return buff.toString(); } Index: trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java (revision 8378) +++ trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java (revision 8379) @@ -301,27 +301,27 @@ */ public String getDetails() { - StringBuilder buf = new StringBuilder("Sub Grid : "); - buf.append(subGridName); - buf.append("\nParent : "); - buf.append(parentSubGridName); - buf.append("\nCreated : "); - buf.append(created); - buf.append("\nUpdated : "); - buf.append(updated); - buf.append("\nMin Lat : "); - buf.append(minLat); - buf.append("\nMax Lat : "); - buf.append(maxLat); - buf.append("\nMin Lon : "); - buf.append(minLon); - buf.append("\nMax Lon : "); - buf.append(maxLon); - buf.append("\nLat Intvl: "); - buf.append(latInterval); - buf.append("\nLon Intvl: "); - buf.append(lonInterval); - buf.append("\nNode Cnt : "); - buf.append(nodeCount); - return buf.toString(); + StringBuilder buff = new StringBuilder("Sub Grid : "); + buff.append(subGridName) + .append("\nParent : ") + .append(parentSubGridName) + .append("\nCreated : ") + .append(created) + .append("\nUpdated : ") + .append(updated) + .append("\nMin Lat : ") + .append(minLat) + .append("\nMax Lat : ") + .append(maxLat) + .append("\nMin Lon : ") + .append(minLon) + .append("\nMax Lon : ") + .append(maxLon) + .append("\nLat Intvl: ") + .append(latInterval) + .append("\nLon Intvl: ") + .append(lonInterval) + .append("\nNode Cnt : ") + .append(nodeCount); + return buff.toString(); } Index: trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java (revision 8378) +++ trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java (revision 8379) @@ -512,6 +512,6 @@ private String buildDefaultToolTip(long id, Map tags) { StringBuilder sb = new StringBuilder(); - sb.append(""); - sb.append("id=") + sb.append("") + .append("id=") .append(id) .append("
"); Index: trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java (revision 8378) +++ trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java (revision 8379) @@ -631,12 +631,11 @@ /** * Represents a rectangular area of tiles at a given zoom level. - * */ private static class TileBounds { - public Point min; - public Point max; - public int zoomLevel; - - public TileBounds() { + private Point min; + private Point max; + private int zoomLevel; + + private TileBounds() { zoomLevel = 0; min = new Point(0,0); @@ -644,5 +643,5 @@ } - public TileBounds(Point min, Point max, int zoomLevel) { + private TileBounds(Point min, Point max, int zoomLevel) { this.min = min; this.max = max; @@ -653,7 +652,7 @@ public String toString() { 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); + sb.append("min=").append(min.x).append(",").append(min.y).append(",") + .append("max=").append(max.x).append(",").append(max.y).append(",") + .append("zoom=").append(zoomLevel); return sb.toString(); } @@ -667,5 +666,5 @@ private Point max; - public TileBoundsMapView() { + private TileBoundsMapView() { setBorder(BorderFactory.createLineBorder(Color.DARK_GRAY)); TileLoader loader = tileController.getTileLoader(); Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java (revision 8378) +++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java (revision 8379) @@ -357,8 +357,8 @@ } 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(Utils.joinAsHtmlUnorderedList(items)); - sb.append(""); + sb.append("") + .append(tr("The following objects could not be copied to the target object
because they are deleted in the target dataset:")) + .append(Utils.joinAsHtmlUnorderedList(items)) + .append(""); HelpAwareOptionPane.showOptionDialog( Main.parent, Index: trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java (revision 8378) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java (revision 8379) @@ -606,6 +606,6 @@ text.append(tableRow(tr("Background:"), Utils.toString(s.getBackgroundColorOverride()))); } - text.append(tableRow(tr("Style is currently active?"), s.active ? tr("Yes") : tr("No"))); - text.append(""); + text.append(tableRow(tr("Style is currently active?"), s.active ? tr("Yes") : tr("No"))) + .append(""); p.add(new JScrollPane(new HtmlPanel(text.toString())), GBC.eol().fill(GBC.BOTH)); return p; Index: trunk/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java (revision 8378) +++ trunk/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java (revision 8379) @@ -35,6 +35,6 @@ protected String buildToolTipText(Changeset cs) { StringBuilder sb = new StringBuilder(); - sb.append(""); - sb.append("").append(tr("Changeset id:")).append("").append(cs.getId()).append("
"); + sb.append("") + .append("").append(tr("Changeset id:")).append("").append(cs.getId()).append("
"); if (cs.getCreatedAt() != null) { sb.append("").append(tr("Created at:")).append("").append( Index: trunk/src/org/openstreetmap/josm/gui/io/LayerNameAndFilePathTableCell.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/LayerNameAndFilePathTableCell.java (revision 8378) +++ trunk/src/org/openstreetmap/josm/gui/io/LayerNameAndFilePathTableCell.java (revision 8379) @@ -79,11 +79,10 @@ SaveLayerInfo info = (SaveLayerInfo)value; StringBuilder sb = new StringBuilder(); - sb.append(""); - sb.append(addLblLayerName(info)); - sb.append("
"); + sb.append("") + .append(addLblLayerName(info)) + .append("
"); add(btnFileChooser, GBC.std()); - sb.append(addLblFilename(info)); - - sb.append(""); + sb.append(addLblFilename(info)) + .append(""); setToolTipText(sb.toString()); return this; @@ -98,7 +97,7 @@ StringBuilder sb = new StringBuilder(); - sb.append(""); - sb.append(addLblLayerName(info)); - sb.append("
"); + sb.append("") + .append(addLblLayerName(info)) + .append("
"); add(btnFileChooser, GBC.std()); @@ -106,6 +105,6 @@ tfFilename.selectAll(); - sb.append(tfFilename.getToolTipText()); - sb.append(""); + sb.append(tfFilename.getToolTipText()) + .append(""); setToolTipText(sb.toString()); return this; Index: trunk/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java (revision 8378) +++ trunk/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java (revision 8379) @@ -142,9 +142,9 @@ protected void updateSummary() { StringBuilder sb = new StringBuilder(); - sb.append(""); - sb.append(buildStrategySummary()); - sb.append("

"); - sb.append(buildChangesetSummary()); - sb.append(""); + sb.append("") + .append(buildStrategySummary()) + .append("

") + .append(buildChangesetSummary()) + .append(""); jepMessage.setText(sb.toString()); } Index: trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (revision 8378) +++ trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (revision 8379) @@ -157,12 +157,9 @@ info.append(""); } - info.append("

"); - - } - - info.append(tr("Length: {0}", NavigatableComponent.getSystemOfMeasurement().getDistText(data.length()))).append("
"); - - info.append(trn("{0} route, ", "{0} routes, ", data.routes.size(), data.routes.size())).append( + } + + info.append(tr("Length: {0}", NavigatableComponent.getSystemOfMeasurement().getDistText(data.length()))).append("
") + .append(trn("{0} route, ", "{0} routes, ", data.routes.size(), data.routes.size())).append( trn("{0} waypoint", "{0} waypoints", data.waypoints.size(), data.waypoints.size())).append("
"); @@ -222,12 +219,11 @@ } - info.append(trn("{0} track, ", "{0} tracks, ", data.tracks.size(), data.tracks.size())); - info.append(trn("{0} route, ", "{0} routes, ", data.routes.size(), data.routes.size())); - info.append(trn("{0} waypoint", "{0} waypoints", data.waypoints.size(), data.waypoints.size())).append("
"); - - info.append(tr("Length: {0}", NavigatableComponent.getSystemOfMeasurement().getDistText(data.length()))); - info.append("
"); - - return info.append("").toString(); + info.append(trn("{0} track, ", "{0} tracks, ", data.tracks.size(), data.tracks.size())) + .append(trn("{0} route, ", "{0} routes, ", data.routes.size(), data.routes.size())) + .append(trn("{0} waypoint", "{0} waypoints", data.waypoints.size(), data.waypoints.size())).append("
") + .append(tr("Length: {0}", NavigatableComponent.getSystemOfMeasurement().getDistText(data.length()))) + .append("
") + .append(""); + return info.toString(); } Index: trunk/src/org/openstreetmap/josm/gui/layer/NoteLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/NoteLayer.java (revision 8378) +++ trunk/src/org/openstreetmap/josm/gui/layer/NoteLayer.java (revision 8379) @@ -112,6 +112,6 @@ if (noteData.getSelectedNote() != null) { StringBuilder sb = new StringBuilder(""); - sb.append(tr("Note")); - sb.append(" ").append(noteData.getSelectedNote().getId()); + sb.append(tr("Note")) + .append(" ").append(noteData.getSelectedNote().getId()); for (NoteComment comment : noteData.getSelectedNote().getComments()) { String commentText = comment.getText(); @@ -195,13 +195,13 @@ public Object getInfoComponent() { StringBuilder sb = new StringBuilder(); - sb.append(tr("Notes layer")); - sb.append("\n"); - sb.append(tr("Total notes:")); - sb.append(" "); - sb.append(noteData.getNotes().size()); - sb.append("\n"); - sb.append(tr("Changes need uploading?")); - sb.append(" "); - sb.append(isModified()); + sb.append(tr("Notes layer")) + .append("\n") + .append(tr("Total notes:")) + .append(" ") + .append(noteData.getNotes().size()) + .append("\n") + .append(tr("Changes need uploading?")) + .append(" ") + .append(isModified()); return sb.toString(); } Index: trunk/src/org/openstreetmap/josm/gui/mappaint/TextElement.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/mappaint/TextElement.java (revision 8378) +++ trunk/src/org/openstreetmap/josm/gui/mappaint/TextElement.java (revision 8379) @@ -178,6 +178,6 @@ protected String toStringImpl() { StringBuilder sb = new StringBuilder(); - sb.append("labelCompositionStrategy=" + labelCompositionStrategy); - sb.append(" font=" + font); + sb.append("labelCompositionStrategy=" + labelCompositionStrategy) + .append(" font=" + font); if (xOffset != 0) { sb.append(" xOffset=" + xOffset); @@ -188,6 +188,6 @@ sb.append(" color=" + Utils.toString(color)); if (haloRadius != null) { - sb.append(" haloRadius=" + haloRadius); - sb.append(" haloColor=" + haloColor); + sb.append(" haloRadius=" + haloRadius) + .append(" haloColor=" + haloColor); } return sb.toString(); Index: trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddTMSLayerPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddTMSLayerPanel.java (revision 8378) +++ trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddTMSLayerPanel.java (revision 8379) @@ -71,6 +71,5 @@ a.append("[").append(z).append("]"); } - a.append(":"); - a.append(getImageryRawUrl()); + a.append(":").append(getImageryRawUrl()); return a.toString(); } Index: trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java (revision 8378) +++ trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java (revision 8379) @@ -178,13 +178,12 @@ private static void alertPluginStillRequired(Component parent, String plugin, Set otherPlugins) { StringBuilder sb = new StringBuilder(); - sb.append(""); - sb.append(trn("Plugin {0} is still required by this plugin:", + sb.append("") + .append(trn("Plugin {0} is still required by this plugin:", "Plugin {0} is still required by these {1} plugins:", otherPlugins.size(), plugin, - otherPlugins.size() - )); - sb.append(Utils.joinAsHtmlUnorderedList(otherPlugins)); - sb.append(""); + otherPlugins.size())) + .append(Utils.joinAsHtmlUnorderedList(otherPlugins)) + .append(""); JOptionPane.showMessageDialog( parent, Index: trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java (revision 8378) +++ trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java (revision 8379) @@ -127,6 +127,6 @@ final Collection failed = task.getFailedPlugins(); final StringBuilder sb = new StringBuilder(); - sb.append(""); - sb.append(buildDownloadSummary(task)); + sb.append("") + .append(buildDownloadSummary(task)); if (restartRequired) { sb.append(tr("Please restart JOSM to activate the downloaded plugins.")); Index: trunk/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java (revision 8378) +++ trunk/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java (revision 8379) @@ -169,24 +169,24 @@ private JComponent build() { StringBuilder s = new StringBuilder(); - s.append("+proj=... - "+tr("Projection name")+"
"); - s.append("    "+tr("Supported values:")+" "); - s.append(listKeys(Projections.projs)+"
"); - s.append("+lat_0=..., +lat_1=..., +lat_2=... - "+tr("Projection parameters")+"
"); - s.append("+x_0=..., +y_0=... - "+tr("False easting and false northing")+"
"); - s.append("+lon_0=... - "+tr("Central meridian")+"
"); - s.append("+k_0=... - "+tr("Scaling factor")+"
"); - s.append("+ellps=... - "+tr("Ellipsoid name")+"
"); - s.append("    "+tr("Supported values:")+" "); - s.append(listKeys(Projections.ellipsoids)+"
"); - s.append("+a=..., +b=..., +rf=..., +f=..., +es=... - "+tr("Ellipsoid parameters")+"
"); - s.append("+datum=... - "+tr("Datum name")+"
"); - s.append("    "+tr("Supported values:")+" "); - s.append(listKeys(Projections.datums)+"
"); - s.append("+towgs84=... - "+tr("3 or 7 term datum transform parameters")+"
"); - s.append("+nadgrids=... - "+tr("NTv2 grid file")+"
"); - s.append("    "+tr("Built-in:")+" "); - s.append(listKeys(Projections.nadgrids)+"
"); - s.append("+bounds=minlon,minlat,maxlon,maxlat - "+tr("Projection bounds (in degrees)")+"
"); - s.append("+wmssrs=EPSG:123456 - "+tr("Sets the SRS=... parameter in the WMS request")+"
"); + s.append("+proj=... - "+tr("Projection name")+"
") + .append("    "+tr("Supported values:")+" ") + .append(listKeys(Projections.projs)+"
") + .append("+lat_0=..., +lat_1=..., +lat_2=... - "+tr("Projection parameters")+"
") + .append("+x_0=..., +y_0=... - "+tr("False easting and false northing")+"
") + .append("+lon_0=... - "+tr("Central meridian")+"
") + .append("+k_0=... - "+tr("Scaling factor")+"
") + .append("+ellps=... - "+tr("Ellipsoid name")+"
") + .append("    "+tr("Supported values:")+" ") + .append(listKeys(Projections.ellipsoids)+"
") + .append("+a=..., +b=..., +rf=..., +f=..., +es=... - "+tr("Ellipsoid parameters")+"
") + .append("+datum=... - "+tr("Datum name")+"
") + .append("    "+tr("Supported values:")+" ") + .append(listKeys(Projections.datums)+"
") + .append("+towgs84=... - "+tr("3 or 7 term datum transform parameters")+"
") + .append("+nadgrids=... - "+tr("NTv2 grid file")+"
") + .append("    "+tr("Built-in:")+" ") + .append(listKeys(Projections.nadgrids)+"
") + .append("+bounds=minlon,minlat,maxlon,maxlat - "+tr("Projection bounds (in degrees)")+"
") + .append("+wmssrs=EPSG:123456 - "+tr("Sets the SRS=... parameter in the WMS request")+"
"); return new HtmlPanel(s.toString()); Index: trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java (revision 8378) +++ trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java (revision 8379) @@ -121,11 +121,11 @@ final StringBuilder res = new StringBuilder(""); - res.append(getDisplayValue(true).replaceAll("<", "<").replaceAll(">", ">")); - res.append(""); + res.append(getDisplayValue(true).replaceAll("<", "<").replaceAll(">", ">")) + .append(""); if (getShortDescription(true) != null) { // wrap in table to restrict the text width - res.append("

"); - res.append(getShortDescription(true)); - res.append("

"); + res.append("

") + .append(getShortDescription(true)) + .append("

"); } return res.toString(); Index: trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionListItem.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionListItem.java (revision 8378) +++ trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionListItem.java (revision 8379) @@ -88,9 +88,9 @@ public String toString() { StringBuilder sb = new StringBuilder(); - sb.append(""); + sb.append(""); return sb.toString(); } Index: trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java (revision 8378) +++ trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java (revision 8379) @@ -1021,8 +1021,8 @@ int nChildren = getChildren().size(); StringBuffer sb = new StringBuffer("MultiSplitLayout.Split"); - sb.append(isRowLayout() ? " ROW [" : " COLUMN ["); - sb.append(nChildren + ((nChildren == 1) ? " child" : " children")); - sb.append("] "); - sb.append(getBounds()); + sb.append(isRowLayout() ? " ROW [" : " COLUMN [") + .append(nChildren + ((nChildren == 1) ? " child" : " children")) + .append("] ") + .append(getBounds()); return sb.toString(); } @@ -1074,11 +1074,11 @@ public String toString() { StringBuffer sb = new StringBuffer("MultiSplitLayout.Leaf"); - sb.append(" \""); - sb.append(getName()); - sb.append('\"'); - sb.append(" weight="); - sb.append(getWeight()); - sb.append(' '); - sb.append(getBounds()); + sb.append(" \"") + .append(getName()) + .append('\"') + .append(" weight=") + .append(getWeight()) + .append(' ') + .append(getBounds()); return sb.toString(); } Index: trunk/src/org/openstreetmap/josm/io/NMEAImporter.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/NMEAImporter.java (revision 8378) +++ trunk/src/org/openstreetmap/josm/io/NMEAImporter.java (revision 8379) @@ -70,12 +70,12 @@ private void showNmeaInfobox(boolean success, NmeaReader r) { final StringBuilder msg = new StringBuilder().append(""); - msg.append(tr("Coordinates imported: {0}", r.getNumberOfCoordinates()) + "
"); - msg.append(tr("Malformed sentences: {0}", r.getParserMalformed()) + "
"); - msg.append(tr("Checksum errors: {0}", r.getParserChecksumErrors()) + "
"); + msg.append(tr("Coordinates imported: {0}", r.getNumberOfCoordinates()) + "
") + .append(tr("Malformed sentences: {0}", r.getParserMalformed()) + "
") + .append(tr("Checksum errors: {0}", r.getParserChecksumErrors()) + "
"); if (!success) { msg.append(tr("Unknown sentences: {0}", r.getParserUnknown()) + "
"); } - msg.append(tr("Zero coordinates: {0}", r.getParserZeroCoordinates())); - msg.append(""); + msg.append(tr("Zero coordinates: {0}", r.getParserZeroCoordinates())) + .append(""); if (success) { SwingUtilities.invokeLater(new Runnable() { Index: trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java (revision 8378) +++ trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java (revision 8379) @@ -117,7 +117,7 @@ progressMonitor.indeterminateSubTask(tr("Downloading OSM data...")); StringBuilder sb = new StringBuilder(); - sb.append(id.getType().getAPIName()); - sb.append("/"); - sb.append(id.getUniqueId()); + sb.append(id.getType().getAPIName()) + .append("/") + .append(id.getUniqueId()); if (full && ! id.getType().equals(OsmPrimitiveType.NODE)) { sb.append("/full"); Index: trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java (revision 8378) +++ trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java (revision 8379) @@ -81,12 +81,12 @@ } StringBuilder a = new StringBuilder(serviceUrl.getProtocol()); - a.append("://"); - a.append(serviceUrl.getHost()); + a.append("://") + .append(serviceUrl.getHost()); if (serviceUrl.getPort() != -1) { - a.append(":"); - a.append(serviceUrl.getPort()); - } - a.append(serviceUrl.getPath()); - a.append("?"); + a.append(":") + .append(serviceUrl.getPort()); + } + a.append(serviceUrl.getPath()) + .append("?"); if (serviceUrl.getQuery() != null) { a.append(serviceUrl.getQuery()); Index: trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java (revision 8378) +++ trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java (revision 8379) @@ -96,15 +96,15 @@ private String getToolTip() { StringBuilder sb = new StringBuilder(); - sb.append(""); - sb.append(tr("Old values of")); - sb.append(" "); - sb.append(tag); - sb.append("
"); + sb.append("") + .append(tr("Old values of")) + .append(" ") + .append(tag) + .append("
"); for (Entry e : valueCount.entrySet()) { - sb.append(""); - sb.append(e.getValue()); - sb.append(" x "); - sb.append(e.getKey()); - sb.append("
"); + sb.append("") + .append(e.getValue()) + .append(" x ") + .append(e.getKey()) + .append("
"); } sb.append(""); Index: trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java =================================================================== --- trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (revision 8378) +++ trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (revision 8379) @@ -269,11 +269,10 @@ // StringBuilder sb = new StringBuilder(); - sb.append(""); - sb.append(trn( + sb.append("") + .append(trn( "The following plugin is no longer necessary and has been deactivated:", "The following plugins are no longer necessary and have been deactivated:", - removedPlugins.size() - )); - sb.append("

").append(depr.name); @@ -283,6 +282,6 @@ sb.append("

") + .append(""); JOptionPane.showMessageDialog( parent, @@ -462,13 +461,12 @@ private static void alertMissingRequiredPlugin(Component parent, String plugin, Set missingRequiredPlugin) { StringBuilder sb = new StringBuilder(); - sb.append(""); - sb.append(trn("Plugin {0} requires a plugin which was not found. The missing plugin is:", + sb.append("") + .append(trn("Plugin {0} requires a plugin which was not found. The missing plugin is:", "Plugin {0} requires {1} plugins which were not found. The missing plugins are:", missingRequiredPlugin.size(), plugin, - missingRequiredPlugin.size() - )); - sb.append(Utils.joinAsHtmlUnorderedList(missingRequiredPlugin)); - sb.append(""); + missingRequiredPlugin.size())) + .append(Utils.joinAsHtmlUnorderedList(missingRequiredPlugin)) + .append(""); JOptionPane.showMessageDialog( parent, @@ -757,13 +755,13 @@ private static void alertMissingPluginInformation(Component parent, Collection plugins) { StringBuilder sb = new StringBuilder(); - sb.append(""); - sb.append(trn("JOSM could not find information about the following plugin:", + sb.append("") + .append(trn("JOSM could not find information about the following plugin:", "JOSM could not find information about the following plugins:", - plugins.size())); - sb.append(Utils.joinAsHtmlUnorderedList(plugins)); - sb.append(trn("The plugin is not going to be loaded.", + plugins.size())) + .append(Utils.joinAsHtmlUnorderedList(plugins)) + .append(trn("The plugin is not going to be loaded.", "The plugins are not going to be loaded.", - plugins.size())); - sb.append(""); + plugins.size())) + .append(""); HelpAwareOptionPane.showOptionDialog( parent, @@ -819,22 +817,19 @@ private static void alertFailedPluginUpdate(Component parent, Collection plugins) { StringBuilder sb = new StringBuilder(); - sb.append(""); - sb.append(trn( + sb.append("") + .append(trn( "Updating the following plugin has failed:", "Updating the following plugins has failed:", - plugins.size() - ) - ); - sb.append("

").append(pi.name).append("

") + .append(trn( "Please open the Preference Dialog after JOSM has started and try to update it manually.", "Please open the Preference Dialog after JOSM has started and try to update them manually.", - plugins.size() - )); - sb.append(""); + plugins.size())) + .append(""); HelpAwareOptionPane.showOptionDialog( parent, @@ -1198,13 +1193,13 @@ 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)); - msg.append("
"); + msg.append("") + .append(tr("An unexpected exception occurred that may have come from the ''{0}'' plugin.", plugin.getPluginInformation().name)) + .append("
"); if (plugin.getPluginInformation().author != null) { - msg.append(tr("According to the information within the plugin, the author is {0}.", plugin.getPluginInformation().author)); - msg.append("
"); - } - msg.append(tr("Try updating to the newest version of this plugin before reporting a bug.")); - msg.append(""); + msg.append(tr("According to the information within the plugin, the author is {0}.", plugin.getPluginInformation().author)) + .append("
"); + } + msg.append(tr("Try updating to the newest version of this plugin before reporting a bug.")) + .append(""); try { Index: trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java =================================================================== --- trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java (revision 8378) +++ trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java (revision 8379) @@ -305,6 +305,6 @@ public String getDescriptionAsHtml() { StringBuilder sb = new StringBuilder(); - sb.append(""); - sb.append(description == null ? tr("no description available") : description); + sb.append("") + .append(description == null ? tr("no description available") : description); if (link != null) { sb.append(" ").append(tr("More info...")).append(""); Index: trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java (revision 8378) +++ trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java (revision 8379) @@ -114,6 +114,6 @@ URL url = new URL(site); StringBuilder sb = new StringBuilder(); - sb.append("site-"); - sb.append(url.getHost()).append("-"); + sb.append("site-") + .append(url.getHost()).append("-"); if (url.getPort() != -1) { sb.append(url.getPort()).append("-"); Index: trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java (revision 8378) +++ trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java (revision 8379) @@ -241,16 +241,16 @@ StringBuilder message = new StringBuilder(""); message.append(tr("A previous version of JOSM has installed a custom certificate "+ - "in order to provide HTTPS support for Remote Control:")); - message.append("

"); - message.append(alias); - message.append("
") + .append(alias) + .append("

security risk

") + .append(tr("It appears it could be an important security risk.

"+ "You are now going to be prompted by Windows to remove this insecure certificate.
"+ - "For your own safety, please click Yes in next dialog.")); - message.append(""); + "For your own safety, please click Yes in next dialog.")) + .append(""); JOptionPane.showMessageDialog(Main.parent, message.toString(), tr("Warning"), JOptionPane.WARNING_MESSAGE); for (String alias : insecureCertificates) { @@ -283,6 +283,6 @@ "You are now going to be prompted by Windows to confirm this operation.
"+ "To enable proper HTTPS support, please click Yes in next dialog.

"+ - "If unsure, you can also click No then disable HTTPS support in Remote Control preferences.")); - message.append(""); + "If unsure, you can also click No then disable HTTPS support in Remote Control preferences.")) + .append(""); JOptionPane.showMessageDialog(Main.parent, message.toString(), tr("HTTPS support in Remote Control"), JOptionPane.INFORMATION_MESSAGE);