Index: trunk/src/org/openstreetmap/josm/actions/RestartAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/RestartAction.java	(revision 8375)
+++ trunk/src/org/openstreetmap/josm/actions/RestartAction.java	(revision 8376)
@@ -99,5 +99,5 @@
                 List<String> arguments = ManagementFactory.getRuntimeMXBean().getInputArguments();
                 if (Main.isDebugEnabled()) {
-                    Main.debug("VM arguments: "+arguments.toString());
+                    Main.debug("VM arguments: "+arguments);
                 }
                 for (String arg : arguments) {
Index: trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java	(revision 8375)
+++ trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java	(revision 8376)
@@ -179,5 +179,5 @@
             }
             for (Entry<String, Setting<?>> entry : settings.entrySet()) {
-                text.append(entry.getKey()).append("=").append(entry.getValue().getValue().toString()).append("\n");
+                text.append(entry.getKey()).append("=").append(entry.getValue().getValue()).append("\n");
             }
         } catch (Exception x) {
Index: trunk/src/org/openstreetmap/josm/command/DeleteCommand.java
===================================================================
--- trunk/src/org/openstreetmap/josm/command/DeleteCommand.java	(revision 8375)
+++ trunk/src/org/openstreetmap/josm/command/DeleteCommand.java	(revision 8376)
@@ -123,5 +123,5 @@
         for (OsmPrimitive osm: toDelete) {
             if (osm.isDeleted())
-                throw new IllegalArgumentException(osm.toString() + " is already deleted");
+                throw new IllegalArgumentException(osm + " is already deleted");
             clonedPrimitives.put(osm, osm.save());
 
Index: trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java	(revision 8375)
+++ trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java	(revision 8376)
@@ -95,5 +95,5 @@
     @Override
     public String toString() {
-        return "WayPoint (" + (attr.containsKey(GPX_NAME) ? get(GPX_NAME) + ", " :"") + getCoor().toString() + ", " + attr + ")";
+        return "WayPoint (" + (attr.containsKey(GPX_NAME) ? get(GPX_NAME) + ", " :"") + getCoor() + ", " + attr + ")";
     }
 
Index: trunk/src/org/openstreetmap/josm/data/osm/WayData.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/WayData.java	(revision 8375)
+++ trunk/src/org/openstreetmap/josm/data/osm/WayData.java	(revision 8376)
@@ -51,5 +51,5 @@
     @Override
     public String toString() {
-        return super.toString() + " WAY" + nodes.toString();
+        return super.toString() + " WAY" + nodes;
     }
 
Index: trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java	(revision 8375)
+++ trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java	(revision 8376)
@@ -231,5 +231,5 @@
      */
     public String getLocalName() {
-        String key = "name:" + Locale.getDefault().toString();
+        String key = "name:" + Locale.getDefault();
         if (get(key) != null)
             return get(key);
Index: trunk/src/org/openstreetmap/josm/gui/GettingStarted.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/GettingStarted.java	(revision 8375)
+++ trunk/src/org/openstreetmap/josm/gui/GettingStarted.java	(revision 8376)
@@ -178,5 +178,5 @@
             URL u = getClass().getResource(im);
             if (u != null) {
-                m.appendReplacement(sb, Matcher.quoteReplacement("src=\"" + u.toString() + "\""));
+                m.appendReplacement(sb, Matcher.quoteReplacement("src=\"" + u + "\""));
             }
         }
Index: trunk/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java	(revision 8375)
+++ trunk/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java	(revision 8376)
@@ -32,5 +32,5 @@
     private final JProgressBar progressBar = new JProgressBar();
 
-    public final JLabel currentAction = new JLabel("");
+    private final JLabel currentAction = new JLabel("");
     private final JLabel customText = new JLabel("");
     public final transient BoundedRangeModel progress = progressBar.getModel();
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java	(revision 8375)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java	(revision 8376)
@@ -643,5 +643,5 @@
             p.add(new JScrollPane(txtErrors), GBC.std().fill());
             for (Throwable t : s.getErrors()) {
-                txtErrors.append(t.toString() + "\n");
+                txtErrors.append(t + "\n");
             }
         }
Index: trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java	(revision 8375)
+++ trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java	(revision 8376)
@@ -140,5 +140,5 @@
         } catch (Exception sxe) {
             if (isCanceled()) {
-                Main.info("Ignoring exception caught because upload is canceled. Exception is: " + sxe.toString());
+                Main.info("Ignoring exception caught because upload is canceled. Exception is: " + sxe);
                 return;
             }
Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java	(revision 8375)
+++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java	(revision 8376)
@@ -804,5 +804,5 @@
 
                 if (toDelete.getFile().delete()) {
-                    Main.info("File "+toDelete.getFile().toString()+" deleted. ");
+                    Main.info("File "+toDelete.getFile()+" deleted. ");
                 } else {
                     JOptionPane.showMessageDialog(
Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java	(revision 8375)
+++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java	(revision 8376)
@@ -59,5 +59,5 @@
 
     private BufferedImage loadThumb(ImageEntry entry) {
-        final String cacheIdent = entry.getFile().toString()+":"+maxSize;
+        final String cacheIdent = entry.getFile()+":"+maxSize;
 
         if (!cacheOff) {
Index: trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java	(revision 8375)
+++ trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java	(revision 8376)
@@ -24,5 +24,5 @@
  *
  * @author Frederik Ramm
- *
+ * @since 200
  */
 public class WebMarker extends ButtonMarker {
@@ -36,5 +36,6 @@
     }
 
-    @Override public void actionPerformed(ActionEvent ev) {
+    @Override
+    public void actionPerformed(ActionEvent ev) {
         String error = OpenBrowser.displayUrl(webUrl.toString());
         if (error != null) {
@@ -42,5 +43,5 @@
             new Notification(
                     "<b>" + tr("There was an error while trying to display the URL for this marker") + "</b><br>" +
-                                  tr("(URL was: ") + webUrl.toString() + ")" + "<br>" + error)
+                                  tr("(URL was: ") + webUrl + ")" + "<br>" + error)
                     .setIcon(JOptionPane.ERROR_MESSAGE)
                     .setDuration(Notification.TIME_LONG)
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/Cascade.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/Cascade.java	(revision 8375)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/Cascade.java	(revision 8376)
@@ -213,5 +213,5 @@
                 res.append(Utils.toString((Color)val));
             } else if (val != null) {
-                res.append(val.toString());
+                res.append(val);
             }
             res.append("; ");
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/LiteralExpression.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/LiteralExpression.java	(revision 8375)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/LiteralExpression.java	(revision 8376)
@@ -28,5 +28,5 @@
             return Arrays.toString((float[]) literal);
         }
-        return "<" + literal.toString() + ">";
+        return "<" + literal + ">";
     }
 }
Index: trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListListEditor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListListEditor.java	(revision 8375)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListListEditor.java	(revision 8376)
@@ -118,5 +118,5 @@
         @Override
         public String getElementAt(int index) {
-            return (index+1) + ": " + data.get(index).toString();
+            return (index+1) + ": " + data.get(index);
         }
 
Index: trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSelector.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSelector.java	(revision 8375)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSelector.java	(revision 8376)
@@ -206,5 +206,5 @@
         @Override
         public String toString() {
-            return classification + " " + preset.toString();
+            return classification + " " + preset;
         }
     }
Index: trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionListItem.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionListItem.java	(revision 8375)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionListItem.java	(revision 8376)
@@ -85,15 +85,17 @@
     }
 
-    @Override public String toString() {
+    @Override
+    public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("<val='");
         sb.append(value);
         sb.append("',");
-        sb.append(priority.toString());
+        sb.append(priority);
         sb.append(">");
         return sb.toString();
     }
 
-    @Override public int hashCode() {
+    @Override
+    public int hashCode() {
         final int prime = 31;
         int result = 1;
@@ -104,5 +106,6 @@
     }
 
-    @Override public boolean equals(Object obj) {
+    @Override
+    public boolean equals(Object obj) {
         if (this == obj)
             return true;
Index: trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java	(revision 8375)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java	(revision 8376)
@@ -1113,5 +1113,5 @@
         @Override
         public String toString() {
-            return "MultiSplitLayout.Divider " + getBounds().toString();
+            return "MultiSplitLayout.Divider " + getBounds();
         }
     }
Index: trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java	(revision 8375)
+++ trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java	(revision 8376)
@@ -139,5 +139,5 @@
         }
 
-        Main.info("GET " + getCapabilitiesUrl.toString());
+        Main.info("GET " + getCapabilitiesUrl);
         URLConnection openConnection = Utils.openHttpConnection(getCapabilitiesUrl);
         StringBuilder ba = new StringBuilder();
Index: trunk/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java	(revision 8375)
+++ trunk/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java	(revision 8376)
@@ -85,5 +85,5 @@
         @Override
         public String toString() {
-            return "MultikeyAction" + action.toString();
+            return "MultikeyAction" + action;
         }
     }
Index: trunk/src/org/openstreetmap/josm/tools/Utils.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Utils.java	(revision 8375)
+++ trunk/src/org/openstreetmap/josm/tools/Utils.java	(revision 8376)
@@ -246,5 +246,5 @@
             }
             if (s != null) {
-                s.append(sep).append(a.toString());
+                s.append(sep).append(a);
             } else {
                 s = new StringBuilder(a.toString());
Index: trunk/src/org/openstreetmap/josm/tools/template_engine/CompoundTemplateEntry.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/template_engine/CompoundTemplateEntry.java	(revision 8375)
+++ trunk/src/org/openstreetmap/josm/tools/template_engine/CompoundTemplateEntry.java	(revision 8376)
@@ -36,14 +36,11 @@
     }
 
-
     @Override
     public String toString() {
         StringBuilder result = new StringBuilder();
         for (TemplateEntry te: entries) {
-            result.append(te.toString());
+            result.append(te);
         }
         return result.toString();
     }
-
-
 }
Index: trunk/src/org/openstreetmap/josm/tools/template_engine/Condition.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/template_engine/Condition.java	(revision 8375)
+++ trunk/src/org/openstreetmap/josm/tools/template_engine/Condition.java	(revision 8376)
@@ -45,8 +45,8 @@
         for (TemplateEntry entry: entries) {
             if (entry instanceof SearchExpressionCondition) {
-                sb.append(entry.toString());
+                sb.append(entry);
             } else {
                 sb.append("'");
-                sb.append(entry.toString());
+                sb.append(entry);
                 sb.append("'");
             }
Index: trunk/src/org/openstreetmap/josm/tools/template_engine/SearchExpressionCondition.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/template_engine/SearchExpressionCondition.java	(revision 8375)
+++ trunk/src/org/openstreetmap/josm/tools/template_engine/SearchExpressionCondition.java	(revision 8376)
@@ -26,6 +26,5 @@
     @Override
     public String toString() {
-        return condition.toString() + " '" + text.toString() + "'";
+        return condition.toString() + " '" + text + "'";
     }
-
 }