Index: trunk/src/org/openstreetmap/josm/actions/SaveAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/SaveAction.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/actions/SaveAction.java	(revision 6362)
@@ -19,5 +19,5 @@
  * @author imi
  */
-public class SaveAction extends SaveActionBase {
+public final class SaveAction extends SaveActionBase {
     private static SaveAction instance = new SaveAction();
 
Index: trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyHelper.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyHelper.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyHelper.java	(revision 6362)
@@ -22,5 +22,5 @@
  * @author Alexander Kachkaev <alexander@kachkaev.ru>, 2011
  */
-class ImproveWayAccuracyHelper {
+final class ImproveWayAccuracyHelper {
 
     private ImproveWayAccuracyHelper() {
Index: trunk/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java	(revision 6362)
@@ -1,4 +1,6 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.actions.upload;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.BorderLayout;
@@ -19,8 +21,4 @@
 import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
 import org.openstreetmap.josm.tools.WindowGeometry;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
-
-import org.openstreetmap.josm.actions.upload.UploadHook;
 
 /**
Index: trunk/src/org/openstreetmap/josm/corrector/ReverseWayNoTagCorrector.java
===================================================================
--- trunk/src/org/openstreetmap/josm/corrector/ReverseWayNoTagCorrector.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/corrector/ReverseWayNoTagCorrector.java	(revision 6362)
@@ -23,5 +23,5 @@
  * @since 5724
  */
-public class ReverseWayNoTagCorrector {
+public final class ReverseWayNoTagCorrector {
 
     private ReverseWayNoTagCorrector() {
Index: trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java	(revision 6362)
@@ -55,5 +55,5 @@
  * can be used to modify preferences, store/delete files in .josm folders etc
  */
-public class CustomConfigurator {
+public final class CustomConfigurator {
     
     private CustomConfigurator() {
Index: trunk/src/org/openstreetmap/josm/data/coor/QuadTiling.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/coor/QuadTiling.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/data/coor/QuadTiling.java	(revision 6362)
@@ -2,5 +2,5 @@
 package org.openstreetmap.josm.data.coor;
 
-public class QuadTiling {
+public final class QuadTiling {
     
     private QuadTiling() {
Index: trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java	(revision 6362)
@@ -32,5 +32,5 @@
  *
  */
-public class ChangesetCache implements PreferenceChangedListener{
+public final class ChangesetCache implements PreferenceChangedListener{
     /** the unique instance */
     static private final ChangesetCache instance = new ChangesetCache();
Index: trunk/src/org/openstreetmap/josm/data/osm/FilterWorker.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/FilterWorker.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/data/osm/FilterWorker.java	(revision 6362)
@@ -12,5 +12,5 @@
  * @author Petr_Dlouhý
  */
-public class FilterWorker {
+public final class FilterWorker {
     
     private FilterWorker() {
Index: trunk/src/org/openstreetmap/josm/data/osm/OsmUtils.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/OsmUtils.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/data/osm/OsmUtils.java	(revision 6362)
@@ -7,5 +7,5 @@
 import java.util.Locale;
 
-public class OsmUtils {
+public final class OsmUtils {
     
     private OsmUtils() {
Index: trunk/src/org/openstreetmap/josm/data/osm/Storage.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/Storage.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/data/osm/Storage.java	(revision 6362)
@@ -392,5 +392,5 @@
      */
 
-    private class FMap<K> implements Map<K,T> {
+    private final class FMap<K> implements Map<K,T> {
         Hash<K,? super T> fHash;
 
Index: trunk/src/org/openstreetmap/josm/data/osm/TigerUtils.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/TigerUtils.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/data/osm/TigerUtils.java	(revision 6362)
@@ -11,5 +11,5 @@
  * @since 529
  */
-public class TigerUtils {
+public final class TigerUtils {
     
     private TigerUtils() {
Index: trunk/src/org/openstreetmap/josm/data/osm/User.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/User.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/data/osm/User.java	(revision 6362)
@@ -23,5 +23,5 @@
  *
  */
-public class User {
+public final class User {
 
     static private AtomicLong uidCounter = new AtomicLong();
Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintSettings.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintSettings.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintSettings.java	(revision 6362)
@@ -8,5 +8,5 @@
 import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener;
 
-public class MapPaintSettings implements PreferenceChangedListener {
+public final class MapPaintSettings implements PreferenceChangedListener {
 
     public static final MapPaintSettings INSTANCE = new MapPaintSettings();
Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java	(revision 6362)
@@ -37,5 +37,5 @@
  *
  */
-public class MapRendererFactory {
+public final class MapRendererFactory {
 
     /** preference key for the renderer class name. Default: class name for {@link StyledMapRenderer}
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 6361)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/MultipolygonCache.java	(revision 6362)
@@ -38,5 +38,5 @@
  * 
  */
-public class MultipolygonCache implements DataSetListener, LayerChangeListener, ProjectionChangeListener, SelectionChangedListener {
+public final class MultipolygonCache implements DataSetListener, LayerChangeListener, ProjectionChangeListener, SelectionChangedListener {
 
     private static final MultipolygonCache instance = new MultipolygonCache(); 
Index: trunk/src/org/openstreetmap/josm/data/projection/Ellipsoid.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/Ellipsoid.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/data/projection/Ellipsoid.java	(revision 6362)
@@ -13,5 +13,5 @@
  * the reference ellipsoids
  */
-public class Ellipsoid {
+public final class Ellipsoid {
     /**
      * Clarke 1880 IGN (French national geographic institute)
Index: trunk/src/org/openstreetmap/josm/data/projection/Projections.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/Projections.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/data/projection/Projections.java	(revision 6362)
@@ -39,5 +39,5 @@
  *
  */
-public class Projections {
+public final class Projections {
 
     private Projections() {
Index: trunk/src/org/openstreetmap/josm/data/projection/datum/GRS80Datum.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/datum/GRS80Datum.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/data/projection/datum/GRS80Datum.java	(revision 6362)
@@ -10,5 +10,5 @@
  * is necessary to get from or to the WGS84 datum.
  */
-public class GRS80Datum extends NullDatum {
+public final class GRS80Datum extends NullDatum {
 
     public final static GRS80Datum INSTANCE = new GRS80Datum();
Index: trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2Util.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2Util.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2Util.java	(revision 6362)
@@ -27,5 +27,5 @@
  * @author Peter Yuill
  */
-public class NTV2Util {
+public final class NTV2Util {
 
     private NTV2Util() {
Index: trunk/src/org/openstreetmap/josm/data/projection/datum/WGS84Datum.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/datum/WGS84Datum.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/data/projection/datum/WGS84Datum.java	(revision 6362)
@@ -9,5 +9,5 @@
  * WGS84 datum. Transformation from and to WGS84 datum is a no-op.
  */
-public class WGS84Datum extends NullDatum {
+public final class WGS84Datum extends NullDatum {
 
     public static final WGS84Datum INSTANCE = new WGS84Datum();
Index: trunk/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java	(revision 6362)
@@ -2,6 +2,15 @@
 package org.openstreetmap.josm.data.projection.proj;
 
-import static java.lang.Math.*;
-
+import static java.lang.Math.PI;
+import static java.lang.Math.abs;
+import static java.lang.Math.atan;
+import static java.lang.Math.cos;
+import static java.lang.Math.exp;
+import static java.lang.Math.log;
+import static java.lang.Math.pow;
+import static java.lang.Math.sin;
+import static java.lang.Math.sqrt;
+import static java.lang.Math.tan;
+import static java.lang.Math.toRadians;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
Index: trunk/src/org/openstreetmap/josm/data/projection/proj/Mercator.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/proj/Mercator.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/data/projection/proj/Mercator.java	(revision 6362)
@@ -2,6 +2,9 @@
 package org.openstreetmap.josm.data.projection.proj;
 
-import static java.lang.Math.*;
-
+import static java.lang.Math.PI;
+import static java.lang.Math.atan;
+import static java.lang.Math.log;
+import static java.lang.Math.sinh;
+import static java.lang.Math.tan;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
Index: trunk/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java	(revision 6362)
@@ -2,6 +2,9 @@
 package org.openstreetmap.josm.data.projection.proj;
 
-import static java.lang.Math.*;
-
+import static java.lang.Math.cos;
+import static java.lang.Math.pow;
+import static java.lang.Math.sin;
+import static java.lang.Math.sqrt;
+import static java.lang.Math.tan;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
Index: trunk/src/org/openstreetmap/josm/data/validation/util/ValUtil.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/util/ValUtil.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/data/validation/util/ValUtil.java	(revision 6362)
@@ -19,5 +19,5 @@
  * @author frsantos
  */
-public class ValUtil {
+public final class ValUtil {
     
     private ValUtil() {
Index: trunk/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java	(revision 6362)
@@ -26,5 +26,5 @@
  *
  */
-public class ConditionalOptionPaneUtil {
+public final class ConditionalOptionPaneUtil {
     static public final int DIALOG_DISABLED_OPTION = Integer.MIN_VALUE;
 
Index: trunk/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java	(revision 6362)
@@ -31,5 +31,5 @@
  *
  */
-public class ExceptionDialogUtil {
+public final class ExceptionDialogUtil {
 
     /**
Index: trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java	(revision 6362)
@@ -34,5 +34,5 @@
 import org.openstreetmap.josm.tools.WindowGeometry;
 
-public class HelpAwareOptionPane {
+public final class HelpAwareOptionPane {
 
     private HelpAwareOptionPane() {
Index: trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java	(revision 6362)
@@ -49,5 +49,5 @@
  *
  */
-public class JosmUserIdentityManager implements PreferenceChangedListener{
+public final class JosmUserIdentityManager implements PreferenceChangedListener{
 
     static private JosmUserIdentityManager instance;
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java	(revision 6362)
@@ -74,5 +74,5 @@
                 if (e.getID() == KeyEvent.KEY_PRESSED && e.getKeyCode() == KeyEvent.VK_ENTER) {
                     fireGotoNextDecision();
-                } if (e.getID() == KeyEvent.KEY_PRESSED && e.getKeyCode() == KeyEvent.VK_TAB) {
+                } else if (e.getID() == KeyEvent.KEY_PRESSED && e.getKeyCode() == KeyEvent.VK_TAB) {
                     if (e.isShiftDown()) {
                         fireGotoPreviousDecision();
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java	(revision 6362)
@@ -1,4 +1,7 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.conflict.tags;
+
+import static org.openstreetmap.josm.gui.conflict.tags.RelationMemberConflictDecisionType.UNDECIDED;
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -6,7 +9,4 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.gui.conflict.tags.RelationMemberConflictDecisionType.*;
 
 public class RelationMemberConflictDecision {
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolutionUtil.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolutionUtil.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolutionUtil.java	(revision 6362)
@@ -13,5 +13,5 @@
  *
  */
-public class TagConflictResolutionUtil {
+public final class TagConflictResolutionUtil {
 
     /** no constructor, just static utility methods */
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java	(revision 6362)
@@ -1104,5 +1104,5 @@
      * the properties {@link Layer#VISIBLE_PROP} and {@link Layer#NAME_PROP}.
      */
-    public class LayerListModel extends AbstractTableModel implements MapView.LayerChangeListener, PropertyChangeListener {
+    public final class LayerListModel extends AbstractTableModel implements MapView.LayerChangeListener, PropertyChangeListener {
         /** manages list selection state*/
         private DefaultListSelectionModel selectionModel;
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java	(revision 6362)
@@ -221,5 +221,5 @@
     }
 
-    public class EditTagDialog extends AbstractTagsDialog {
+    public final class EditTagDialog extends AbstractTagsDialog {
         final String key;
         final Map<String, Integer> m;
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSortUtils.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSortUtils.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSortUtils.java	(revision 6362)
@@ -11,5 +11,5 @@
 import org.openstreetmap.josm.gui.dialogs.relation.sort.WayConnectionType.Direction;
 
-class RelationSortUtils {
+final class RelationSortUtils {
 
     private RelationSortUtils() {
Index: trunk/src/org/openstreetmap/josm/gui/help/HelpUtil.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/help/HelpUtil.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/gui/help/HelpUtil.java	(revision 6362)
@@ -16,5 +16,5 @@
 import org.openstreetmap.josm.tools.LanguageInfo.LocaleType;
 
-public class HelpUtil {
+public final class HelpUtil {
 
     private HelpUtil() {
Index: trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java	(revision 6362)
@@ -403,5 +403,5 @@
      *
      */
-    public class VersionTableModel extends AbstractTableModel {
+    public final class VersionTableModel extends AbstractTableModel {
 
         private VersionTableModel() {
Index: trunk/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java	(revision 6362)
@@ -8,4 +8,6 @@
 import java.awt.Component;
 import java.awt.event.ActionEvent;
+import java.util.LinkedList;
+import java.util.List;
 
 import javax.swing.AbstractAction;
@@ -14,9 +16,6 @@
 import javax.swing.JMenuItem;
 import javax.swing.JOptionPane;
-import java.util.LinkedList;
-import java.util.List;
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.Layer.LayerAction;
 import org.openstreetmap.josm.gui.layer.Layer.MultiLayerAction;
Index: trunk/src/org/openstreetmap/josm/gui/layer/JumpToMarkerActions.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/JumpToMarkerActions.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/gui/layer/JumpToMarkerActions.java	(revision 6362)
@@ -16,5 +16,5 @@
 import org.openstreetmap.josm.tools.Shortcut;
 
-public class JumpToMarkerActions {
+public final class JumpToMarkerActions {
 
     public interface JumpToMarkerLayer {
Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java	(revision 6362)
@@ -23,10 +23,10 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.dialogs.DialogsPanel.Action;
 import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
-import org.openstreetmap.josm.gui.dialogs.DialogsPanel.Action;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
 
-public class ImageViewerDialog extends ToggleDialog {
+public final class ImageViewerDialog extends ToggleDialog {
 
     private static final String COMMAND_ZOOM = "zoom";
Index: trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java	(revision 6362)
@@ -81,5 +81,5 @@
 public class Marker implements TemplateEngineDataProvider {
 
-    public static class TemplateEntryProperty extends CachedProperty<TemplateEntry> {
+    public static final class TemplateEntryProperty extends CachedProperty<TemplateEntry> {
         // This class is a bit complicated because it supports both global and per layer settings. I've added per layer settings because
         // GPXSettingsPanel had possibility to set waypoint label but then I've realized that markers use different layer then gpx data
Index: trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java	(revision 6362)
@@ -34,5 +34,5 @@
  * @since 572
  */
-public class PlayHeadMarker extends Marker {
+public final class PlayHeadMarker extends Marker {
 
     private Timer timer = null;
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java	(revision 6362)
@@ -38,5 +38,5 @@
  * On change, mapPaintSylesUpdated() is fired for all listeners.
  */
-public class MapPaintStyles {
+public final class MapPaintStyles {
 
     private static ElemStyles styles = new ElemStyles();
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java	(revision 6362)
@@ -19,5 +19,5 @@
  * and its subclasses).
  */
-public class StyleCache {
+public final class StyleCache {
     /* list of boundaries for the scale ranges */
     private final List<Double> bd;
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/CSSColors.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/CSSColors.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/CSSColors.java	(revision 6362)
@@ -6,5 +6,5 @@
 import java.util.Map;
 
-public class CSSColors {
+public final class CSSColors {
     private final static Map<String, Color> CSS_COLORS = new HashMap<String, Color>();
     static {
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java	(revision 6362)
@@ -29,5 +29,5 @@
  * See {@link #createFunctionExpression}.
  */
-public class ExpressionFactory {
+public final class ExpressionFactory {
 
     private static final List<Method> arrayFunctions;
Index: trunk/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java	(revision 6362)
@@ -261,5 +261,5 @@
                 alertInternalError();
                 return;
-            } if (e.getResponseCode() == HttpURLConnection.HTTP_UNAUTHORIZED) {
+            } else if (e.getResponseCode() == HttpURLConnection.HTTP_UNAUTHORIZED) {
                 alertFailedAuthentication();
                 return;
Index: trunk/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java	(revision 6362)
@@ -12,6 +12,6 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
 import org.openstreetmap.josm.tools.GBC;
-import org.openstreetmap.josm.gui.widgets.JosmTextField;
 
 /*
@@ -27,5 +27,5 @@
  */
 
-public class AudioPreference extends DefaultTabPreferenceSetting {
+public final class AudioPreference extends DefaultTabPreferenceSetting {
 
     public static class Factory implements PreferenceSettingFactory {
Index: trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java	(revision 6362)
@@ -45,4 +45,5 @@
 import org.openstreetmap.josm.gui.preferences.plugin.PluginUpdatePolicyPanel;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
 import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator;
 import org.openstreetmap.josm.plugins.PluginDownloadTask;
@@ -52,7 +53,6 @@
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.gui.widgets.JosmTextField;
-
-public class PluginPreference extends DefaultTabPreferenceSetting {
+
+public final class PluginPreference extends DefaultTabPreferenceSetting {
     public static class Factory implements PreferenceSettingFactory {
         @Override
Index: trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java	(revision 6362)
@@ -29,6 +29,6 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.ExpertToggleAction;
+import org.openstreetmap.josm.actions.ExpertToggleAction.ExpertModeChangeListener;
 import org.openstreetmap.josm.actions.RestartAction;
-import org.openstreetmap.josm.actions.ExpertToggleAction.ExpertModeChangeListener;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;
@@ -59,5 +59,6 @@
  * @author imi
  */
-public class PreferenceTabbedPane extends JTabbedPane implements MouseWheelListener, ExpertModeChangeListener, ChangeListener {
+public final class PreferenceTabbedPane extends JTabbedPane implements MouseWheelListener, ExpertModeChangeListener, ChangeListener {
+    
     /**
      * Allows PreferenceSettings to do validation of entered values when ok was pressed.
@@ -78,5 +79,5 @@
     }
 
-    public static class PreferencePanel extends JPanel implements PreferenceTab {
+    public static final class PreferencePanel extends JPanel implements PreferenceTab {
         private final TabPreferenceSetting preferenceSetting;
 
@@ -108,5 +109,5 @@
     }
 
-    public static class PreferenceScrollPane extends JScrollPane implements PreferenceTab {
+    public static final class PreferenceScrollPane extends JScrollPane implements PreferenceTab {
         private final TabPreferenceSetting preferenceSetting;
 
Index: trunk/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java	(revision 6362)
@@ -32,5 +32,5 @@
  * @author Frederik Ramm
  */
-public class RemoteControlPreference extends DefaultTabPreferenceSetting {
+public final class RemoteControlPreference extends DefaultTabPreferenceSetting {
 
     /**
Index: trunk/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java	(revision 6362)
@@ -19,5 +19,5 @@
 import org.openstreetmap.josm.gui.widgets.VerticallyScrollablePanel;
 
-public class ServerAccessPreference extends DefaultTabPreferenceSetting {
+public final class ServerAccessPreference extends DefaultTabPreferenceSetting {
 
     public static class Factory implements PreferenceSettingFactory {
Index: trunk/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java	(revision 6362)
@@ -24,5 +24,5 @@
  * @author frsantos
  */
-public class ValidatorPreference extends DefaultTabPreferenceSetting {
+public final class ValidatorPreference extends DefaultTabPreferenceSetting {
 
     public static class Factory implements PreferenceSettingFactory {
Index: trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java	(revision 6362)
@@ -48,5 +48,5 @@
 import org.openstreetmap.josm.tools.GBC;
 
-public class AdvancedPreference extends DefaultTabPreferenceSetting {
+public final class AdvancedPreference extends DefaultTabPreferenceSetting {
 
     public static class Factory implements PreferenceSettingFactory {
Index: trunk/src/org/openstreetmap/josm/gui/preferences/display/DisplayPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/display/DisplayPreference.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/display/DisplayPreference.java	(revision 6362)
@@ -12,5 +12,5 @@
 import org.openstreetmap.josm.tools.GBC;
 
-public class DisplayPreference extends DefaultTabPreferenceSetting {
+public final class DisplayPreference extends DefaultTabPreferenceSetting {
     public static class Factory implements PreferenceSettingFactory {
         @Override
Index: trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java	(revision 6362)
@@ -66,5 +66,5 @@
 import org.openstreetmap.josm.tools.LanguageInfo;
 
-public class ImageryPreference extends DefaultTabPreferenceSetting {
+public final class ImageryPreference extends DefaultTabPreferenceSetting {
     public static class Factory implements PreferenceSettingFactory {
         @Override
Index: trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPreference.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPreference.java	(revision 6362)
@@ -12,5 +12,5 @@
 import org.openstreetmap.josm.tools.GBC;
 
-public class MapPreference extends DefaultTabPreferenceSetting {
+public final class MapPreference extends DefaultTabPreferenceSetting {
     public static class Factory implements PreferenceSettingFactory {
         @Override
Index: trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java	(revision 6362)
@@ -46,5 +46,5 @@
 import org.xml.sax.SAXParseException;
 
-public class TaggingPresetPreference implements SubPreferenceSetting {
+public final class TaggingPresetPreference implements SubPreferenceSetting {
 
     public static class Factory implements PreferenceSettingFactory {
Index: trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/ShortcutPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/ShortcutPreference.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/ShortcutPreference.java	(revision 6362)
@@ -16,5 +16,5 @@
 import org.openstreetmap.josm.tools.Shortcut;
 
-public class ShortcutPreference extends DefaultTabPreferenceSetting {
+public final class ShortcutPreference extends DefaultTabPreferenceSetting {
 
     private String defaultFilter;
Index: trunk/src/org/openstreetmap/josm/gui/progress/NullProgressMonitor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/progress/NullProgressMonitor.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/gui/progress/NullProgressMonitor.java	(revision 6362)
@@ -6,5 +6,5 @@
 import org.openstreetmap.josm.Main;
 
-public class NullProgressMonitor implements ProgressMonitor {
+public final class NullProgressMonitor implements ProgressMonitor {
 
     public static final ProgressMonitor INSTANCE = new NullProgressMonitor();
Index: trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java	(revision 6362)
@@ -15,5 +15,5 @@
  * @since 3388
  */
-public class TaggingPresetSearchDialog extends ExtendedDialog {
+public final class TaggingPresetSearchDialog extends ExtendedDialog {
 
     private TaggingPresetSelector selector;
Index: trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java	(revision 6362)
@@ -37,5 +37,10 @@
  * basic gui utils
  */
-public class GuiHelper {
+public final class GuiHelper {
+    
+    private GuiHelper() {
+        // Hide default constructor for utils classes
+    }
+    
     /**
      * disable / enable a component and all its child components
Index: trunk/src/org/openstreetmap/josm/gui/util/TableHelper.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/util/TableHelper.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/gui/util/TableHelper.java	(revision 6362)
@@ -10,10 +10,15 @@
  * The class that provide common JTable customization methods
  */
-public class TableHelper {
+public final class TableHelper {
+    
+    private TableHelper() {
+        // Hide default constructor for utils classes
+    }
+    
     /**
-    * (originally from @class org.openstreetmap.josm.gui.preferences.SourceEditor)
-    * adjust the preferred width of column col to the maximum preferred width of the cells
-    * requires JTable.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
-    */
+     * (originally from @class org.openstreetmap.josm.gui.preferences.SourceEditor)
+     * adjust the preferred width of column col to the maximum preferred width of the cells
+     * requires JTable.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
+     */
     public static void adjustColumnWidth(JTable tbl, int col, int maxColumnWidth) {
         int maxwidth = 0;
@@ -26,4 +31,3 @@
         tbl.getColumnModel().getColumn(col).setPreferredWidth(Math.min(maxwidth+10, maxColumnWidth));
     }
-    
 }
Index: trunk/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java	(revision 6362)
@@ -19,5 +19,4 @@
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.Utils;
-import org.openstreetmap.josm.gui.widgets.JosmTextField;
 
 /**
Index: trunk/src/org/openstreetmap/josm/io/AbstractParser.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/AbstractParser.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/io/AbstractParser.java	(revision 6362)
@@ -137,5 +137,5 @@
                     id,version,visible,user,changesetId,timestamp
             );
-        }if (type.equals(OsmPrimitiveType.RELATION)) {
+        } else if (type.equals(OsmPrimitiveType.RELATION)) {
             primitive = new HistoryRelation(
                     id,version,visible,user,changesetId,timestamp
Index: trunk/src/org/openstreetmap/josm/io/OsmChangesetParser.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmChangesetParser.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/io/OsmChangesetParser.java	(revision 6362)
@@ -38,5 +38,5 @@
  *
  */
-public class OsmChangesetParser {
+public final class OsmChangesetParser {
     private List<Changeset> changesets;
 
Index: trunk/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java	(revision 6362)
@@ -11,5 +11,4 @@
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
 
Index: trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java	(revision 6362)
@@ -4,5 +4,4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.io.IOException;
 import java.io.InputStream;
 import java.text.MessageFormat;
@@ -16,5 +15,4 @@
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.Utils;
-import org.xml.sax.SAXException;
 
 /**
@@ -110,6 +108,5 @@
      * null
      * @return the downloaded data
-     * @throws SAXException
-     * @throws IOException
+     * @throws OsmTransferException
      */
     @Override
Index: trunk/src/org/openstreetmap/josm/io/UTFInputStreamReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/UTFInputStreamReader.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/io/UTFInputStreamReader.java	(revision 6362)
@@ -11,5 +11,6 @@
  * Detects the different UTF encodings from byte order mark
  */
-public class UTFInputStreamReader extends InputStreamReader {
+public final class UTFInputStreamReader extends InputStreamReader {
+    
     /**
      * converts input stream to reader
Index: trunk/src/org/openstreetmap/josm/io/auth/DefaultAuthenticator.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/auth/DefaultAuthenticator.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/io/auth/DefaultAuthenticator.java	(revision 6362)
@@ -15,5 +15,5 @@
  *
  */
-public  class DefaultAuthenticator extends Authenticator {
+public final class DefaultAuthenticator extends Authenticator {
     private static DefaultAuthenticator instance;
 
Index: trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java	(revision 6362)
@@ -396,5 +396,5 @@
         r.append(", \"parameters\" : [");
 
-        String params[] = handler.getMandatoryParams();
+        String[] params = handler.getMandatoryParams();
         if (params != null) {
             for (int i = 0; i < params.length; i++) {
@@ -408,5 +408,5 @@
         }
         r.append("], \"optional\" : [");
-        String optional[] = handler.getOptionalParams();
+        String[] optional = handler.getOptionalParams();
         if (optional != null) {
             for (int i = 0; i < optional.length; i++) {
@@ -421,5 +421,5 @@
         
         r.append("], \"examples\" : [");
-        String examples[] = handler.getUsageExamples(cmd.substring(1));
+        String[] examples = handler.getUsageExamples(cmd.substring(1));
         if (examples != null) {
             for (int i = 0; i < examples.length; i++) {
Index: trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java	(revision 6362)
@@ -70,5 +70,5 @@
  * @since 1326
  */
-public class PluginHandler {
+public final class PluginHandler {
 
     /**
Index: trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java	(revision 6362)
@@ -22,5 +22,5 @@
  * @since 547
  */
-public class AudioPlayer extends Thread {
+public final class AudioPlayer extends Thread {
 
     private static AudioPlayer audioPlayer = null;
Index: trunk/src/org/openstreetmap/josm/tools/AudioUtil.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/AudioUtil.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/tools/AudioUtil.java	(revision 6362)
@@ -17,6 +17,10 @@
  * @since 1462
  */
-public class AudioUtil {
+public final class AudioUtil {
 
+    private AudioUtil() {
+        // Hide default constructor for utils classes
+    }
+    
     /**
      * Returns calibrated length of recording in seconds.
Index: trunk/src/org/openstreetmap/josm/tools/Base64.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Base64.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/tools/Base64.java	(revision 6362)
@@ -4,6 +4,10 @@
 import java.nio.ByteBuffer;
 
-public class Base64 {
+public final class Base64 {
 
+    private Base64() {
+        // Hide default constructor for utils classes
+    }
+    
     private static String encDefault = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
     private static String encUrlSafe = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
Index: trunk/src/org/openstreetmap/josm/tools/CheckParameterUtil.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/CheckParameterUtil.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/tools/CheckParameterUtil.java	(revision 6362)
@@ -12,9 +12,11 @@
  * This utility class provides a collection of static helper methods for checking
  * parameters at run-time.
- * @ince 2711
+ * @since 2711
  */
-public class CheckParameterUtil {
+public final class CheckParameterUtil {
 
-    private CheckParameterUtil(){}
+    private CheckParameterUtil() {
+        // Hide default constructor for utils classes
+    }
 
     /**
Index: trunk/src/org/openstreetmap/josm/tools/ColorHelper.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/ColorHelper.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/tools/ColorHelper.java	(revision 6362)
@@ -7,5 +7,5 @@
  * Helper to convert from color to html string and back
  */
-public class ColorHelper {
+public final class ColorHelper {
 
     private ColorHelper() {
Index: trunk/src/org/openstreetmap/josm/tools/CopyList.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/CopyList.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/tools/CopyList.java	(revision 6362)
@@ -56,15 +56,18 @@
 
     // read-only access:
-    public @Override E get(int index) {
+    @Override
+    public E get(int index) {
         rangeCheck(index);
         return array[index];
     }
 
-    public @Override int size() {
+    @Override
+    public int size() {
         return size;
     }
 
     // modification:
-    public @Override E set(int index, E element) {
+    @Override
+    public E set(int index, E element) {
         rangeCheck(index);
         changeCheck();
@@ -76,5 +79,6 @@
 
     // full resizable semantics:
-    public @Override void add(int index, E element) {
+    @Override
+    public void add(int index, E element) {
         // range check
         ensureCapacity(size+1);
@@ -86,5 +90,6 @@
     }
 
-    public @Override E remove(int index) {
+    @Override
+    public E remove(int index) {
         rangeCheck(index);
         changeCheck();
@@ -102,5 +107,6 @@
 
     // speed optimizations:
-    public @Override boolean add(E element) {
+    @Override
+    public boolean add(E element) {
         ensureCapacity(size+1);
         changeCheck();
@@ -109,5 +115,6 @@
     }
 
-    public @Override void clear() {
+    @Override
+    public void clear() {
         modCount++;
 
@@ -125,5 +132,6 @@
      * @return a clone of this <tt>CopyList</tt> instance
      */
-    public @Override Object clone() {
+    @Override
+    public Object clone() {
         return new CopyList<E>(array, size);
     }
Index: trunk/src/org/openstreetmap/josm/tools/DateParser.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/DateParser.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/tools/DateParser.java	(revision 6362)
@@ -10,5 +10,10 @@
  * @author Immanuel.Scholz
  */
-public class DateParser {
+public final class DateParser {
+    
+    private DateParser() {
+        // Hide default constructor for utils classes
+    }
+    
     public static Date parse(String d) throws ParseException {
         return new PrimaryDateParser().parse(d);
Index: trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java	(revision 6362)
@@ -37,6 +37,8 @@
 
 @SuppressWarnings("CallToThreadDumpStack")
-public class ExceptionUtil {
+public final class ExceptionUtil {
+    
     private ExceptionUtil() {
+        // Hide default constructor for utils classes
     }
 
Index: trunk/src/org/openstreetmap/josm/tools/ExifReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/ExifReader.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/tools/ExifReader.java	(revision 6362)
@@ -25,5 +25,5 @@
  * @since 99
  */
-public class ExifReader {
+public final class ExifReader {
 
     private ExifReader() {
Index: trunk/src/org/openstreetmap/josm/tools/GBC.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/GBC.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/tools/GBC.java	(revision 6362)
@@ -15,5 +15,5 @@
  * @author imi
  */
-public class GBC extends GridBagConstraints {
+public final class GBC extends GridBagConstraints {
 
     /**
Index: trunk/src/org/openstreetmap/josm/tools/Geometry.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Geometry.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/tools/Geometry.java	(revision 6362)
@@ -30,5 +30,10 @@
  * @author viesturs
  */
-public class Geometry {
+public final class Geometry {
+    
+    private Geometry() {
+        // Hide default constructor for utils classes
+    }
+    
     public enum PolygonIntersection {FIRST_INSIDE_SECOND, SECOND_INSIDE_FIRST, OUTSIDE, CROSSING}
 
Index: trunk/src/org/openstreetmap/josm/tools/I18n.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/I18n.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/tools/I18n.java	(revision 6362)
@@ -31,5 +31,5 @@
  * @author Immanuel.Scholz
  */
-public class I18n {
+public final class I18n {
     
     private I18n() {
Index: trunk/src/org/openstreetmap/josm/tools/InputMapUtils.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/InputMapUtils.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/tools/InputMapUtils.java	(revision 6362)
@@ -16,6 +16,11 @@
  *
  */
-public class InputMapUtils {
-      public static void unassignCtrlShiftUpDown(JComponent cmp, int condition) {
+public final class InputMapUtils {
+    
+    private InputMapUtils() {
+        // Hide default constructor for utils classes
+    }
+    
+    public static void unassignCtrlShiftUpDown(JComponent cmp, int condition) {
         InputMap inputMap=SwingUtilities.getUIInputMap(cmp, condition);
         inputMap.remove(KeyStroke.getKeyStroke(KeyEvent.VK_UP,InputEvent.CTRL_MASK|InputEvent.SHIFT_MASK));
@@ -24,25 +29,23 @@
         inputMap.remove(KeyStroke.getKeyStroke(KeyEvent.VK_DOWN,InputEvent.ALT_MASK|InputEvent.SHIFT_MASK));
         SwingUtilities.replaceUIInputMap(cmp,JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT,inputMap);
-      }
+    }
 
-
-      /**
-       * Enable activating button on Enter (which is replaced with spacebar for certain Look-And-Feels)
-       */
-      public static void enableEnter(JButton b) {
+    /**
+     * Enable activating button on Enter (which is replaced with spacebar for certain Look-And-Feels)
+     */
+    public static void enableEnter(JButton b) {
          b.setFocusable(true);
          b.getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), "enter");
          b.getActionMap().put("enter",b.getAction());
-      }
+    }
 
-      public static void addEnterAction(JComponent c, Action a) {
+    public static void addEnterAction(JComponent c, Action a) {
          c.getActionMap().put("enter", a);
          c.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), "enter");
-      }
+    }
 
-      public static void addSpacebarAction(JComponent c, Action a) {
+    public static void addSpacebarAction(JComponent c, Action a) {
          c.getActionMap().put("spacebar", a);
          c.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_SPACE, 0), "spacebar");
-      }
-
+    }
 }
Index: trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java	(revision 6362)
@@ -4,5 +4,5 @@
 import java.util.Locale;
 
-public class LanguageInfo {
+public final class LanguageInfo {
     
     private LanguageInfo() {
Index: trunk/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java	(revision 6362)
@@ -27,5 +27,5 @@
 import org.openstreetmap.josm.tools.MultikeyShortcutAction.MultikeyInfo;
 
-public class MultikeyActionsHandler {
+public final class MultikeyActionsHandler {
 
     private static final long DIALOG_DELAY = 1000;
Index: trunk/src/org/openstreetmap/josm/tools/OpenBrowser.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/OpenBrowser.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/tools/OpenBrowser.java	(revision 6362)
@@ -20,5 +20,5 @@
  * @author Imi
  */
-public class OpenBrowser {
+public final class OpenBrowser {
 
     private OpenBrowser() {
Index: trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java	(revision 6362)
@@ -13,6 +13,10 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 
-public class OsmUrlToBounds {
+public final class OsmUrlToBounds {
     private static final String SHORTLINK_PREFIX = "http://osm.org/go/";
+    
+    private OsmUrlToBounds() {
+        // Hide default constructor for utils classes
+    }
 
     public static Bounds parse(String url) {
Index: trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java	(revision 6362)
@@ -12,5 +12,4 @@
 import java.io.InputStreamReader;
 import java.util.Arrays;
-import java.util.List;
 
 import org.openstreetmap.josm.Main;
Index: trunk/src/org/openstreetmap/josm/tools/Shortcut.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Shortcut.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/tools/Shortcut.java	(revision 6362)
@@ -34,5 +34,5 @@
  *
  */
-public class Shortcut {
+public final class Shortcut {
     private String shortText;        // the unique ID of the shortcut
     private String longText;         // a human readable description that will be shown in the preferences
Index: trunk/src/org/openstreetmap/josm/tools/TaggingPresetNameTemplateList.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/TaggingPresetNameTemplateList.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/tools/TaggingPresetNameTemplateList.java	(revision 6362)
@@ -15,5 +15,5 @@
  * List of tagging presets with name templates, allows to find appropriate template based on existing primitive
  */
-public class TaggingPresetNameTemplateList {
+public final class TaggingPresetNameTemplateList {
 
     private static TaggingPresetNameTemplateList instance;
Index: trunk/src/org/openstreetmap/josm/tools/TextTagParser.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/TextTagParser.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/tools/TextTagParser.java	(revision 6362)
@@ -27,5 +27,5 @@
  * Class that helps to parse tags from arbitrary text
  */
-public class TextTagParser {
+public final class TextTagParser {
     
     // properties need JOSM restart to apply, modified rarely enough
Index: trunk/src/org/openstreetmap/josm/tools/Utils.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Utils.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/tools/Utils.java	(revision 6362)
@@ -45,5 +45,5 @@
  * Basic utils, that can be useful in different parts of the program.
  */
-public class Utils {
+public final class Utils {
 
     private Utils() {
Index: trunk/src/org/openstreetmap/josm/tools/template_engine/CompoundTemplateEntry.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/template_engine/CompoundTemplateEntry.java	(revision 6361)
+++ trunk/src/org/openstreetmap/josm/tools/template_engine/CompoundTemplateEntry.java	(revision 6362)
@@ -3,5 +3,5 @@
 
 
-public class CompoundTemplateEntry implements TemplateEntry {
+public final class CompoundTemplateEntry implements TemplateEntry {
 
     public static TemplateEntry fromArray(TemplateEntry... entry) {