Index: /trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java	(revision 6986)
@@ -48,5 +48,5 @@
 
     /**
-     * Constructor
+     * Constructs a new {@code OrthogonalizeAction}.
      */
     public OrthogonalizeAction() {
@@ -519,4 +519,7 @@
      */
     private static class EN {
+        private EN() {
+            // Hide implicit public constructor for utility class
+        }
         // rotate counter-clock-wise
         public static EastNorth rotate_cc(EastNorth pivot, EastNorth en, double angle) {
Index: /trunk/src/org/openstreetmap/josm/actions/UnJoinNodeWayAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/UnJoinNodeWayAction.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/actions/UnJoinNodeWayAction.java	(revision 6986)
@@ -10,5 +10,4 @@
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
@@ -18,5 +17,4 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.RemoveNodesCommand;
-import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -24,5 +22,13 @@
 import org.openstreetmap.josm.tools.Shortcut;
 
+/**
+ * Disconnect nodes from a way they currently belong to.
+ * @since 6253
+ */
 public class UnJoinNodeWayAction extends JosmAction {
+    
+    /**
+     * Constructs a new {@code UnJoinNodeWayAction}.
+     */
     public UnJoinNodeWayAction() {
         super(tr("Disconnect Node from Way"), "unjoinnodeway",
Index: /trunk/src/org/openstreetmap/josm/actions/ZoomToAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/ZoomToAction.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/actions/ZoomToAction.java	(revision 6986)
Index: /trunk/src/org/openstreetmap/josm/actions/relation/SelectMembersAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/relation/SelectMembersAction.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/actions/relation/SelectMembersAction.java	(revision 6986)
Index: /trunk/src/org/openstreetmap/josm/command/conflict/package-info.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/command/conflict/package-info.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/command/conflict/package-info.java	(revision 6986)
Index: /trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java	(revision 6986)
@@ -93,4 +93,8 @@
      */
     public static class TagSwitcher {
+
+        private TagSwitcher() {
+            // Hide implicit public constructor for utility class
+        }
 
         /**
Index: /trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java	(revision 6986)
@@ -740,4 +740,8 @@
      */
     public static class PreferencesUtils {
+
+        private PreferencesUtils() {
+            // Hide implicit public constructor for utility class
+        }
 
         private static void replacePreferences(Preferences fragment, Preferences mainpref) {
Index: /trunk/src/org/openstreetmap/josm/data/Preferences.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 6986)
@@ -576,5 +576,5 @@
      *  the corresponding value otherwise. The result is not null.
      */
-    synchronized public String get(final String key) {
+    public synchronized String get(final String key) {
         String value = get(key, null);
         return value == null ? "" : value;
@@ -589,9 +589,9 @@
      *  def otherwise
      */
-    synchronized public String get(final String key, final String def) {
+    public synchronized String get(final String key, final String def) {
         return getSetting(key, new StringSetting(def), StringSetting.class).getValue();
     }
 
-    synchronized public Map<String, String> getAllPrefix(final String prefix) {
+    public synchronized Map<String, String> getAllPrefix(final String prefix) {
         final Map<String,String> all = new TreeMap<String,String>();
         for (final Entry<String,Setting> e : settingsMap.entrySet()) {
@@ -603,5 +603,5 @@
     }
 
-    synchronized public List<String> getAllPrefixCollectionKeys(final String prefix) {
+    public synchronized List<String> getAllPrefixCollectionKeys(final String prefix) {
         final List<String> all = new LinkedList<String>();
         for (Map.Entry<String, Setting> entry : settingsMap.entrySet()) {
@@ -613,5 +613,5 @@
     }
 
-    synchronized public Map<String, String> getAllColors() {
+    public synchronized Map<String, String> getAllColors() {
         final Map<String,String> all = new TreeMap<String,String>();
         for (final Entry<String,Setting> e : defaultsMap.entrySet()) {
@@ -631,14 +631,14 @@
     }
 
-    synchronized public boolean getBoolean(final String key) {
+    public synchronized boolean getBoolean(final String key) {
         String s = get(key, null);
         return s == null ? false : Boolean.parseBoolean(s);
     }
 
-    synchronized public boolean getBoolean(final String key, final boolean def) {
+    public synchronized boolean getBoolean(final String key, final boolean def) {
         return Boolean.parseBoolean(get(key, Boolean.toString(def)));
     }
 
-    synchronized public boolean getBoolean(final String key, final String specName, final boolean def) {
+    public synchronized boolean getBoolean(final String key, final String specName, final boolean def) {
         boolean generic = getBoolean(key, def);
         String skey = key+"."+specName;
@@ -823,14 +823,14 @@
      * @return a Color object for the configured colour, or the default value if none configured.
      */
-    synchronized public Color getColor(String colName, Color def) {
+    public synchronized Color getColor(String colName, Color def) {
         return getColor(colName, null, def);
     }
 
-    synchronized public Color getUIColor(String colName) {
+    public synchronized Color getUIColor(String colName) {
         return UIManager.getColor(colName);
     }
 
     /* only for preferences */
-    synchronized public String getColorName(String o) {
+    public synchronized String getColorName(String o) {
         try {
             Matcher m = Pattern.compile("mappaint\\.(.+?)\\.(.+)").matcher(o);
@@ -869,5 +869,5 @@
      * @return a Color object for the configured colour, or the default value if none configured.
      */
-    synchronized public Color getColor(String colName, String specName, Color def) {
+    public synchronized Color getColor(String colName, String specName, Color def) {
         String colKey = ColorProperty.getColorKey(colName);
         if(!colKey.equals(colName)) {
@@ -885,5 +885,5 @@
     }
 
-    synchronized public Color getDefaultColor(String colKey) {
+    public synchronized Color getDefaultColor(String colKey) {
         StringSetting col = Utils.cast(defaultsMap.get("color."+colKey), StringSetting.class);
         String colStr = col == null ? null : col.getValue();
@@ -891,9 +891,9 @@
     }
 
-    synchronized public boolean putColor(String colKey, Color val) {
+    public synchronized boolean putColor(String colKey, Color val) {
         return put("color."+colKey, val != null ? ColorHelper.color2html(val, true) : null);
     }
 
-    synchronized public int getInteger(String key, int def) {
+    public synchronized int getInteger(String key, int def) {
         String v = get(key, Integer.toString(def));
         if(v.isEmpty())
@@ -908,5 +908,5 @@
     }
 
-    synchronized public int getInteger(String key, String specName, int def) {
+    public synchronized int getInteger(String key, String specName, int def) {
         String v = get(key+"."+specName);
         if(v.isEmpty())
@@ -923,5 +923,5 @@
     }
 
-    synchronized public long getLong(String key, long def) {
+    public synchronized long getLong(String key, long def) {
         String v = get(key, Long.toString(def));
         if(null == v)
@@ -936,5 +936,5 @@
     }
 
-    synchronized public double getDouble(String key, double def) {
+    public synchronized double getDouble(String key, double def) {
         String v = get(key, Double.toString(def));
         if(null == v)
@@ -971,5 +971,5 @@
     }
 
-    synchronized public void removeFromCollection(String key, String value) {
+    public synchronized void removeFromCollection(String key, String value) {
         List<String> a = new ArrayList<String>(getCollection(key, Collections.<String>emptyList()));
         a.remove(value);
@@ -1017,5 +1017,5 @@
     }
 
-    synchronized public Setting getSetting(String key, Setting def) {
+    public synchronized Setting getSetting(String key, Setting def) {
         return getSetting(key, def, Setting.class);
     }
@@ -1033,5 +1033,5 @@
      */
     @SuppressWarnings("unchecked")
-    synchronized public <T extends Setting> T getSetting(String key, T def, Class<T> klass) {
+    public synchronized <T extends Setting> T getSetting(String key, T def, Class<T> klass) {
         CheckParameterUtil.ensureParameterNotNull(key);
         CheckParameterUtil.ensureParameterNotNull(def);
@@ -1074,5 +1074,5 @@
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
-    synchronized public Collection<Collection<String>> getArray(String key, Collection<Collection<String>> def) {
+    public synchronized Collection<Collection<String>> getArray(String key, Collection<Collection<String>> def) {
         ListListSetting val = getSetting(key, ListListSetting.create(def), ListListSetting.class);
         return (Collection) val.getValue();
Index: /trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java	(revision 6986)
@@ -62,5 +62,5 @@
      * @param c The command to execute. Must not be {@code null}.
      */
-    synchronized public void add(final Command c) {
+    public synchronized void add(final Command c) {
         addNoRedraw(c);
         afterAdd();
@@ -78,5 +78,5 @@
      * @param num The number of commands to undo
      */
-    synchronized public void undo(int num) {
+    public synchronized void undo(int num) {
         if (commands.isEmpty())
             return;
Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/MultipolygonCache.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/MultipolygonCache.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/MultipolygonCache.java	(revision 6986)
Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java	(revision 6986)
@@ -87,4 +87,8 @@
          */
         abstract static class PrimitiveToTag implements Utils.Function<OsmPrimitive, Tag> {
+
+            private PrimitiveToTag() {
+                // Hide implicit public constructor for utility class
+            }
 
             /**
Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java	(revision 6986)
@@ -54,5 +54,5 @@
             // fake country/state to not get errors on holidays
             ENGINE.eval("var nominatimJSON = {address: {state: 'Bayern', country_code: 'de'}};");
-            ENGINE.eval("" +
+            ENGINE.eval(
                     "var oh = function (value, mode) {" +
                     " try {" +
Index: /trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java	(revision 6986)
@@ -174,5 +174,5 @@
 
                 if (n == null) {
-                    n = node.isNew() ? tr("node") : ""+ node.getId();
+                    n = node.isNew() ? tr("node") : Long.toString(node.getId());
                 }
                 name.append(n);
Index: /trunk/src/org/openstreetmap/josm/gui/MapFrameListener.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/MapFrameListener.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/gui/MapFrameListener.java	(revision 6986)
Index: /trunk/src/org/openstreetmap/josm/gui/MenuScroller.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/MenuScroller.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/gui/MenuScroller.java	(revision 6986)
@@ -566,5 +566,5 @@
         UP(9, 1, 9),
         DOWN(1, 9, 1);
-        final int[] xPoints = {1, 5, 9};
+        static final int[] xPoints = {1, 5, 9};
         final int[] yPoints;
 
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PresetListPanel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PresetListPanel.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PresetListPanel.java	(revision 6986)
@@ -14,6 +14,4 @@
 import java.util.Map;
 
-import javax.swing.Action;
-import javax.swing.Icon;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
@@ -27,4 +25,7 @@
 public class PresetListPanel extends JPanel {
 
+    /**
+     * Constructs a new {@code PresetListPanel}.
+     */
     public PresetListPanel() {
         super(new GridBagLayout());
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java	(revision 6986)
@@ -81,5 +81,5 @@
  * Class that helps PropertiesDialog add and edit tag values
  */
- class TagEditHelper {
+class TagEditHelper {
     private final DefaultTableModel tagData;
     private final Map<String, Map<String, Integer>> valueCount;
@@ -769,3 +769,3 @@
         }
     }
- }
+}
Index: /trunk/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java	(revision 6986)
Index: /trunk/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesWithReferrersTask.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesWithReferrersTask.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesWithReferrersTask.java	(revision 6986)
Index: /trunk/src/org/openstreetmap/josm/gui/layer/JumpToMarkerActions.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/JumpToMarkerActions.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/JumpToMarkerActions.java	(revision 6986)
@@ -42,5 +42,5 @@
     }
 
-    private static abstract class JumpToMarker extends AbstractAction implements MultikeyShortcutAction {
+    private abstract static class JumpToMarker extends AbstractAction implements MultikeyShortcutAction {
 
         private final Layer layer;
Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java	(revision 6986)
@@ -246,5 +246,5 @@
         "exifCoor = "+exifCoor+" | "+
         (tmp == null ? " tmp==null" :
-            " [tmp] pos = "+tmp.pos+"");
+            " [tmp] pos = "+tmp.pos);
         return result;
     }
Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/Cascade.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/mappaint/Cascade.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/gui/mappaint/Cascade.java	(revision 6986)
@@ -197,6 +197,6 @@
             } else if (val instanceof Color) {
                 res.append(Utils.toString((Color)val));
-            } else {
-                res.append(val+"");
+            } else if (val != null) {
+                res.append(val.toString());
             }
             res.append("; ");
Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/Range.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/mappaint/Range.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/gui/mappaint/Range.java	(revision 6986)
Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java	(revision 6986)
@@ -79,5 +79,5 @@
         REGEX, NREGEX, ONE_OF, BEGINS_WITH, ENDS_WITH, CONTAINS;
 
-        private static Set<Op> NEGATED_OPS = EnumSet.of(NEQ, NREGEX);
+        private static final Set<Op> NEGATED_OPS = EnumSet.of(NEQ, NREGEX);
 
         public boolean eval(String testString, String prototypeString) {
Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/xml/LinePrototype.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/mappaint/xml/LinePrototype.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/gui/mappaint/xml/LinePrototype.java	(revision 6986)
Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/xml/Prototype.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/mappaint/xml/Prototype.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/gui/mappaint/xml/Prototype.java	(revision 6986)
@@ -38,10 +38,8 @@
     }
 
-    public boolean check(OsmPrimitive primitive)
-    {
+    public boolean check(OsmPrimitive primitive) {
         if(conditions == null)
             return true;
-        for(XmlCondition r : conditions)
-        {
+        for(XmlCondition r : conditions) {
             String k = primitive.get(r.key);
 
@@ -56,4 +54,3 @@
         return true;
     }
-
 }
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java	(revision 6986)
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/PrefEntry.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/PrefEntry.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/PrefEntry.java	(revision 6986)
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/package-info.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/package-info.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/package-info.java	(revision 6986)
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/audio/package-info.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/audio/package-info.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/audio/package-info.java	(revision 6986)
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/display/package-info.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/display/package-info.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/display/package-info.java	(revision 6986)
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddImageryDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddImageryDialog.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddImageryDialog.java	(revision 6986)
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/WMSLayerTree.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/WMSLayerTree.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/WMSLayerTree.java	(revision 6986)
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/package-info.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/package-info.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/package-info.java	(revision 6986)
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/map/package-info.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/map/package-info.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/map/package-info.java	(revision 6986)
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/package-info.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/package-info.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/package-info.java	(revision 6986)
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/package-info.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/package-info.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/package-info.java	(revision 6986)
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/projection/package-info.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/projection/package-info.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/projection/package-info.java	(revision 6986)
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/remotecontrol/package-info.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/remotecontrol/package-info.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/remotecontrol/package-info.java	(revision 6986)
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/server/package-info.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/server/package-info.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/server/package-info.java	(revision 6986)
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/package-info.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/package-info.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/package-info.java	(revision 6986)
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/validator/package-info.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/validator/package-info.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/validator/package-info.java	(revision 6986)
Index: /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java	(revision 6986)
Index: /trunk/src/org/openstreetmap/josm/gui/widgets/ImageLabel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/widgets/ImageLabel.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/gui/widgets/ImageLabel.java	(revision 6986)
Index: /trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java	(revision 6986)
@@ -836,5 +836,5 @@
      * Base class for the nodes that model a MultiSplitLayout.
      */
-    public static abstract class Node {
+    public abstract static class Node {
         private Split parent = null;
         private Rectangle bounds = new Rectangle();
@@ -1107,8 +1107,8 @@
             sb.append(" \"");
             sb.append(getName());
-            sb.append("\"");
+            sb.append('\"');
             sb.append(" weight=");
             sb.append(getWeight());
-            sb.append(" ");
+            sb.append(' ');
             sb.append(getBounds());
             return sb.toString();
Index: /trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitPane.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitPane.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitPane.java	(revision 6986)
@@ -145,5 +145,5 @@
      * @see #setDividerPainter
      */
-    public static abstract class DividerPainter {
+    public abstract static class DividerPainter {
         /**
          * Paint a single Divider.
Index: /trunk/src/org/openstreetmap/josm/gui/widgets/OsmIdTextField.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/widgets/OsmIdTextField.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/gui/widgets/OsmIdTextField.java	(revision 6986)
Index: /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandler.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandler.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandler.java	(revision 6986)
Index: /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/VersionHandler.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/VersionHandler.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/VersionHandler.java	(revision 6986)
Index: /trunk/src/org/openstreetmap/josm/tools/template_engine/Condition.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/template_engine/Condition.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/tools/template_engine/Condition.java	(revision 6986)
@@ -55,4 +55,3 @@
         return sb.toString();
     }
-
 }
Index: /trunk/src/org/openstreetmap/josm/tools/template_engine/StaticText.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/template_engine/StaticText.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/tools/template_engine/StaticText.java	(revision 6986)
@@ -1,5 +1,4 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.tools.template_engine;
-
 
 public class StaticText implements TemplateEntry {
@@ -25,5 +24,3 @@
         return staticText;
     }
-
-
 }
Index: /trunk/src/org/openstreetmap/josm/tools/template_engine/TemplateEngineDataProvider.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/template_engine/TemplateEngineDataProvider.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/tools/template_engine/TemplateEngineDataProvider.java	(revision 6986)
Index: /trunk/src/org/openstreetmap/josm/tools/template_engine/TemplateEntry.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/template_engine/TemplateEntry.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/tools/template_engine/TemplateEntry.java	(revision 6986)
@@ -1,5 +1,4 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.tools.template_engine;
-
 
 public interface TemplateEntry {
Index: /trunk/src/org/openstreetmap/josm/tools/template_engine/Variable.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/template_engine/Variable.java	(revision 6985)
+++ /trunk/src/org/openstreetmap/josm/tools/template_engine/Variable.java	(revision 6986)
@@ -3,5 +3,4 @@
 
 import java.util.Collection;
-
 
 public class Variable implements TemplateEntry {
@@ -62,4 +61,3 @@
         return special;
     }
-
 }