Index: trunk/src/org/openstreetmap/josm/tools/Diff.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Diff.java	(revision 12796)
+++ trunk/src/org/openstreetmap/josm/tools/Diff.java	(revision 12798)
@@ -570,5 +570,5 @@
          * @see #equivCount()
          */
-        private byte[] discardable(final int ... counts) {
+        private byte[] discardable(final int... counts) {
             final int end = bufferedLines;
             final byte[] discards = new byte[end];
Index: trunk/src/org/openstreetmap/josm/tools/HiDPISupport.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/HiDPISupport.java	(revision 12796)
+++ trunk/src/org/openstreetmap/josm/tools/HiDPISupport.java	(revision 12798)
@@ -28,9 +28,13 @@
  * @since 12722
  */
-public class HiDPISupport {
+public final class HiDPISupport {
 
     private static volatile Optional<Class<? extends Image>> baseMultiResolutionImageClass;
     private static volatile Optional<Constructor<? extends Image>> baseMultiResolutionImageConstructor;
     private static volatile Optional<Method> resolutionVariantsMethod;
+
+    private HiDPISupport() {
+        // Hide default constructor
+    }
 
     /**
Index: trunk/src/org/openstreetmap/josm/tools/ImageResource.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/ImageResource.java	(revision 12796)
+++ trunk/src/org/openstreetmap/josm/tools/ImageResource.java	(revision 12798)
@@ -137,6 +137,6 @@
      * @param  dim The requested dimensions. Use (-1,-1) for the original size and (width, -1)
      *         to set the width, but otherwise scale the image proportionally.
+     * @return ImageIcon object for the image of this resource, scaled according to dim
      * @see #getImageIconBounded(java.awt.Dimension, boolean)
-     * @return ImageIcon object for the image of this resource, scaled according to dim
      */
     public ImageIcon getImageIcon(Dimension dim) {
Index: trunk/src/org/openstreetmap/josm/tools/ImageWarp.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/ImageWarp.java	(revision 12796)
+++ trunk/src/org/openstreetmap/josm/tools/ImageWarp.java	(revision 12798)
@@ -17,5 +17,9 @@
  * @since 11858
  */
-public class ImageWarp {
+public final class ImageWarp {
+
+    private ImageWarp() {
+        // Hide default constructor
+    }
 
     /**
Index: trunk/src/org/openstreetmap/josm/tools/ListenableWeakReference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/ListenableWeakReference.java	(revision 12796)
+++ trunk/src/org/openstreetmap/josm/tools/ListenableWeakReference.java	(revision 12798)
@@ -13,7 +13,6 @@
  * A special dereferenced-thread is used for this, so make sure your code is thread-safe.
  * @author Michael Zangl
+ * @param <T> The weak reference
  * @since 12181
- *
- * @param <T> The weak reference
  */
 public class ListenableWeakReference<T> extends WeakReference<T> {
Index: trunk/src/org/openstreetmap/josm/tools/ListenerList.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/ListenerList.java	(revision 12796)
+++ trunk/src/org/openstreetmap/josm/tools/ListenerList.java	(revision 12798)
@@ -210,5 +210,5 @@
         }
 
-        private static void dumpStack(StackTraceElement ... stackTraceElements) {
+        private static void dumpStack(StackTraceElement... stackTraceElements) {
             if (stackTraceElements == null) {
                 Logging.trace("  - (no trace recorded)");
Index: trunk/src/org/openstreetmap/josm/tools/Logging.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Logging.java	(revision 12796)
+++ trunk/src/org/openstreetmap/josm/tools/Logging.java	(revision 12798)
@@ -280,5 +280,5 @@
      */
     public static void logWithStackTrace(Level level, Throwable t, String pattern, Object... args) {
-        logPrivate(level, () -> getErrorLogWithStack(MessageFormat.format(pattern,  args), t));
+        logPrivate(level, () -> getErrorLogWithStack(MessageFormat.format(pattern, args), t));
     }
 
Index: trunk/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java	(revision 12796)
+++ trunk/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java	(revision 12798)
@@ -148,5 +148,6 @@
             lastAction = this;
             timer.schedule(new MyTimerTask(lastTimestamp, lastAction), DIALOG_DELAY);
-            MainApplication.getMap().statusLine.setHelpText(STATUS_BAR_ID, tr("{0}... [please type its number]", (String) action.getValue(SHORT_DESCRIPTION)));
+            MainApplication.getMap().statusLine.setHelpText(STATUS_BAR_ID,
+                    tr("{0}... [please type its number]", (String) action.getValue(SHORT_DESCRIPTION)));
         }
 
Index: trunk/src/org/openstreetmap/josm/tools/Utils.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Utils.java	(revision 12796)
+++ trunk/src/org/openstreetmap/josm/tools/Utils.java	(revision 12798)
@@ -345,5 +345,5 @@
      * @since 6222
      */
-    public static char[] copyArray(char ... array) {
+    public static char[] copyArray(char... array) {
         if (array != null) {
             return Arrays.copyOf(array, array.length);
@@ -812,5 +812,5 @@
     }
 
-    private static String strip(final String str, final char ... skipChars) {
+    private static String strip(final String str, final char... skipChars) {
 
         int start = 0;
@@ -834,5 +834,5 @@
     }
 
-    private static boolean isStrippedChar(char c, final char ... skipChars) {
+    private static boolean isStrippedChar(char c, final char... skipChars) {
         return Character.isWhitespace(c) || Character.isSpaceChar(c) || stripChar(skipChars, c);
     }
@@ -1496,5 +1496,5 @@
      * @since 10223
      */
-    public static void setObjectsAccessible(final AccessibleObject ... objects) {
+    public static void setObjectsAccessible(final AccessibleObject... objects) {
         if (objects != null && objects.length > 0) {
             AccessController.doPrivileged((PrivilegedAction<Object>) () -> {
@@ -1626,5 +1626,5 @@
             return 0;
         }
-        return firstDotPos > - 1 ? Integer.parseInt(version.substring(firstDotPos + 1,
+        return firstDotPos > -1 ? Integer.parseInt(version.substring(firstDotPos + 1,
                 lastDotPos > -1 ? lastDotPos : version.length())) : 0;
     }
Index: trunk/src/org/openstreetmap/josm/tools/template_engine/CompoundTemplateEntry.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/template_engine/CompoundTemplateEntry.java	(revision 12796)
+++ trunk/src/org/openstreetmap/josm/tools/template_engine/CompoundTemplateEntry.java	(revision 12798)
@@ -13,5 +13,5 @@
     }
 
-    private CompoundTemplateEntry(TemplateEntry ... entries) {
+    private CompoundTemplateEntry(TemplateEntry... entries) {
         this.entries = entries;
     }