Index: trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java	(revision 6890)
@@ -284,5 +284,5 @@
 
     @Override
-    protected void installAdapters() {
+    protected final void installAdapters() {
         super.installAdapters();
         // make this action listen to zoom and mapframe change events
Index: trunk/src/org/openstreetmap/josm/actions/ExpertToggleAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/ExpertToggleAction.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/actions/ExpertToggleAction.java	(revision 6890)
@@ -134,5 +134,5 @@
 
     @Override
-    protected void notifySelectedState() {
+    protected final void notifySelectedState() {
         super.notifySelectedState();
         fireExpertModeChanged(isSelected());
Index: trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java	(revision 6890)
@@ -226,5 +226,5 @@
         }
 
-        public void updateOffset() {
+        public final void updateOffset() {
             ignoreListener = true;
             updateOffsetIntl();
@@ -232,5 +232,5 @@
         }
 
-        public void updateOffsetIntl() {
+        public final void updateOffsetIntl() {
             // Support projections with very small numbers (e.g. 4326)
             int precision = Main.getProjection().getDefaultZoomInPPD() >= 1.0 ? 2 : 7;
Index: trunk/src/org/openstreetmap/josm/actions/JosmAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/JosmAction.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/actions/JosmAction.java	(revision 6890)
@@ -193,5 +193,5 @@
      * @param tooltip The text to display in tooltip. Can be {@code null}
      */
-    public void setTooltip(String tooltip) {
+    public final void setTooltip(String tooltip) {
         if (tooltip != null) {
             putValue(SHORT_DESCRIPTION, Main.platform.makeTooltip(tooltip, sc));
Index: trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java	(revision 6890)
@@ -205,5 +205,5 @@
      * @return <tt>true</tt> (as specified by {@link Collection#add})
      */
-    public boolean addDownloadTaskClass(Class<? extends DownloadTask> taskClass) {
+    public final boolean addDownloadTaskClass(Class<? extends DownloadTask> taskClass) {
         return this.downloadTasks.add(taskClass);
     }
Index: trunk/src/org/openstreetmap/josm/actions/SessionSaveAsAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/SessionSaveAsAction.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/actions/SessionSaveAsAction.java	(revision 6890)
@@ -166,5 +166,5 @@
          * Initializes action.
          */
-        public void initialize() {
+        public final void initialize() {
             layers = new ArrayList<Layer>(Main.map.mapView.getAllLayersAsList());
             exporters = new HashMap<Layer, SessionLayerExporter>();
@@ -205,5 +205,5 @@
         }
 
-        protected Component build() {
+        protected final Component build() {
             JPanel p = new JPanel(new GridBagLayout());
             JPanel ip = new JPanel(new GridBagLayout());
Index: trunk/src/org/openstreetmap/josm/actions/ZoomToAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/ZoomToAction.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/actions/ZoomToAction.java	(revision 6890)
@@ -77,5 +77,5 @@
     }
 
-    protected void updateEnabledState() {
+    protected final void updateEnabledState() {
         if (Main.main == null || Main.main.getEditLayer() != this.table.getLayer()) {
             setEnabled(false);
Index: trunk/src/org/openstreetmap/josm/command/MoveCommand.java
===================================================================
--- trunk/src/org/openstreetmap/josm/command/MoveCommand.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/command/MoveCommand.java	(revision 6890)
@@ -153,5 +153,5 @@
      * Save curent displacement to restore in case of some problems
      */
-    public void saveCheckpoint() {
+    public final void saveCheckpoint() {
         backupX = x;
         backupY = y;
Index: trunk/src/org/openstreetmap/josm/command/PurgeCommand.java
===================================================================
--- trunk/src/org/openstreetmap/josm/command/PurgeCommand.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/command/PurgeCommand.java	(revision 6890)
@@ -67,5 +67,5 @@
     }
 
-    protected void saveIncomplete(Collection<OsmPrimitive> makeIncomplete) {
+    protected final void saveIncomplete(Collection<OsmPrimitive> makeIncomplete) {
         makeIncompleteData = new Storage<PrimitiveData>(new Storage.PrimitiveIdHash());
         makeIncompleteData_byPrimId = makeIncompleteData.foreignKey(new Storage.PrimitiveIdHash());
Index: trunk/src/org/openstreetmap/josm/command/RotateCommand.java
===================================================================
--- trunk/src/org/openstreetmap/josm/command/RotateCommand.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/command/RotateCommand.java	(revision 6890)
@@ -52,5 +52,5 @@
      * Get angle between the horizontal axis and the line formed by the pivot and give points.
      **/
-    protected double getAngle(EastNorth currentEN) {
+    protected final double getAngle(EastNorth currentEN) {
         if ( pivot == null )
             return 0.0; // should never happen by contract
@@ -62,5 +62,5 @@
      */
     @Override
-    public void handleEvent(EastNorth currentEN) {
+    public final void handleEvent(EastNorth currentEN) {
         double currentAngle = getAngle(currentEN);
         rotationAngle = currentAngle - startAngle;
Index: trunk/src/org/openstreetmap/josm/command/ScaleCommand.java
===================================================================
--- trunk/src/org/openstreetmap/josm/command/ScaleCommand.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/command/ScaleCommand.java	(revision 6890)
@@ -54,5 +54,5 @@
      */
     @Override
-    public void handleEvent(EastNorth currentEN) {
+    public final void handleEvent(EastNorth currentEN) {
         double startAngle = Math.atan2(startEN.east()-pivot.east(), startEN.north()-pivot.north());
         double endAngle = Math.atan2(currentEN.east()-pivot.east(), currentEN.north()-pivot.north());
@@ -62,5 +62,4 @@
         transformNodes();
     }
-
 
     /**
Index: trunk/src/org/openstreetmap/josm/command/TransformNodesCommand.java
===================================================================
--- trunk/src/org/openstreetmap/josm/command/TransformNodesCommand.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/command/TransformNodesCommand.java	(revision 6890)
@@ -38,5 +38,5 @@
      * Stores the state of the nodes before the command.
      */
-    protected void storeOldState() {
+    protected final void storeOldState() {
         for (Node n : this.nodes) {
             oldStates.put(n, new OldNodeState(n));
Index: trunk/src/org/openstreetmap/josm/data/APIDataSet.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/APIDataSet.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/data/APIDataSet.java	(revision 6890)
@@ -59,5 +59,5 @@
     }
 
-    public void init(Collection<OsmPrimitive> primitives) {
+    public final void init(Collection<OsmPrimitive> primitives) {
         toAdd.clear();
         toUpdate.clear();
@@ -286,5 +286,5 @@
         }
 
-        public void build(Collection<Relation> relations) {
+        public final void build(Collection<Relation> relations) {
             this.relations = new HashSet<Relation>();
             for(Relation relation: relations) {
Index: trunk/src/org/openstreetmap/josm/data/osm/BBox.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/BBox.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/data/osm/BBox.java	(revision 6890)
@@ -107,5 +107,5 @@
     }
 
-    public void add(LatLon c) {
+    public final void add(LatLon c) {
         add(c.lon(), c.lat());
     }
@@ -114,5 +114,5 @@
      * Extends this bbox to include the point (x, y)
      */
-    public void add(double x, double y) {
+    public final void add(double x, double y) {
         xmin = Math.min(xmin, x);
         xmax = Math.max(xmax, x);
@@ -122,5 +122,5 @@
     }
 
-    public void add(BBox box) {
+    public final void add(BBox box) {
         xmin = Math.min(xmin, box.xmin);
         xmax = Math.max(xmax, box.xmax);
Index: trunk/src/org/openstreetmap/josm/data/osm/NodeData.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/NodeData.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/data/osm/NodeData.java	(revision 6890)
@@ -32,5 +32,5 @@
 
     @Override
-    public void setCoor(LatLon coor) {
+    public final void setCoor(LatLon coor) {
         if (coor == null) {
             this.lat = Double.NaN;
Index: trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java	(revision 6890)
@@ -570,5 +570,5 @@
 
     @Override
-    protected void setIncomplete(boolean incomplete) {
+    protected final void setIncomplete(boolean incomplete) {
         boolean locked = writeLock();
         try {
Index: trunk/src/org/openstreetmap/josm/data/osm/PrimitiveDeepCopy.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/PrimitiveDeepCopy.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/data/osm/PrimitiveDeepCopy.java	(revision 6890)
@@ -76,5 +76,5 @@
             }
 
-            public void visitAll() {
+            public final void visitAll() {
                 for (OsmPrimitive osm : primitives) {
                     firstIteration = true;
Index: trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java	(revision 6890)
@@ -356,5 +356,5 @@
          * corner of the box
          */
-        LatLon coor() {
+        final LatLon coor() {
             return QuadTiling.tile2LatLon(this.quad);
         }
@@ -404,5 +404,5 @@
 
     @Override
-    public void clear() {
+    public final void clear() {
         root = new QBLevel<T>(this);
         search_cache = null;
@@ -500,5 +500,5 @@
         int iterated_over;
 
-        QBLevel<T> next_content_node(QBLevel<T> q) {
+        final QBLevel<T> next_content_node(QBLevel<T> q) {
             if (q == null)
                 return null;
Index: trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java	(revision 6890)
@@ -193,5 +193,5 @@
      * @param tag the tag to add
      */
-    public void add(Tag tag){
+    public final void add(Tag tag){
         if (tag == null) return;
         if (tags.contains(tag)) return;
@@ -205,5 +205,5 @@
      * @param tags the collection of tags
      */
-    public void add(Collection<Tag> tags) {
+    public final void add(Collection<Tag> tags) {
         if (tags == null) return;
         for (Tag tag: tags){
@@ -218,5 +218,5 @@
      * @param tags the other tag collection
      */
-    public void add(TagCollection tags) {
+    public final void add(TagCollection tags) {
         if (tags == null) return;
         this.tags.addAll(tags.tags);
Index: trunk/src/org/openstreetmap/josm/data/osm/history/HistoryNode.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/history/HistoryNode.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/data/osm/history/HistoryNode.java	(revision 6890)
@@ -73,5 +73,5 @@
      * @return the coordinates. May be null.
      */
-    public LatLon getCoords() {
+    public final LatLon getCoords() {
         return coords;
     }
@@ -81,5 +81,5 @@
      * @param coords the coordinates. Can be null.
      */
-    public void setCoords(LatLon coords) {
+    public final void setCoords(LatLon coords) {
         this.coords = coords;
     }
Index: trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java	(revision 6890)
@@ -38,5 +38,5 @@
     private Map<String, String> tags;
 
-    protected void ensurePositiveLong(long value, String name) {
+    protected final void ensurePositiveLong(long value, String name) {
         if (value <= 0) {
             throw new IllegalArgumentException(MessageFormat.format("Parameter ''{0}'' > 0 expected. Got ''{1}''.", name, value));
Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java	(revision 6890)
@@ -359,5 +359,5 @@
     }
 
-    private void load(Relation r) {
+    private final void load(Relation r) {
         MultipolygonRoleMatcher matcher = getMultipolygonRoleMatcher();
 
@@ -537,5 +537,5 @@
     }
 
-    private void addInnerToOuters()  {
+    private final void addInnerToOuters()  {
 
         if (innerPolygons.isEmpty()) {
Index: trunk/src/org/openstreetmap/josm/data/preferences/CachedProperty.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/preferences/CachedProperty.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/data/preferences/CachedProperty.java	(revision 6890)
@@ -19,5 +19,5 @@
     }
 
-    protected void updateValue() {
+    protected final void updateValue() {
         if (!Main.pref.get(key).isEmpty()) {
             this.value = fromString(Main.pref.get(key));
Index: trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java	(revision 6890)
@@ -119,5 +119,5 @@
     }
 
-    public void update(String pref) throws ProjectionConfigurationException {
+    public final void update(String pref) throws ProjectionConfigurationException {
         this.pref = pref;
         if (pref == null) {
Index: trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShift.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShift.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShift.java	(revision 6890)
@@ -49,4 +49,7 @@
     private String subGridName;
 
+    /**
+     * Constructs a new {@code NTV2GridShift}.
+     */
     public NTV2GridShift() {
     }
@@ -233,5 +236,5 @@
      * @param d latitude value in seconds
      */
-    public void setLatSeconds(double d) {
+    public final void setLatSeconds(double d) {
         lat = d;
     }
@@ -241,5 +244,5 @@
      * @param d latitude value in degree
      */
-    public void setLatDegrees(double d) {
+    public final void setLatDegrees(double d) {
         lat = d * 3600.0;
     }
@@ -249,5 +252,5 @@
      * @param b availability of latitude accuracy
      */
-    public void setLatAccuracyAvailable(boolean b) {
+    public final void setLatAccuracyAvailable(boolean b) {
         latAccuracyAvailable = b;
     }
@@ -257,5 +260,5 @@
      * @param d latitude accuracy in seconds
      */
-    public void setLatAccuracySeconds(double d) {
+    public final void setLatAccuracySeconds(double d) {
         latAccuracy = d;
     }
@@ -265,5 +268,5 @@
      * @param d latitude shift in seconds
      */
-    public void setLatShiftSeconds(double d) {
+    public final void setLatShiftSeconds(double d) {
         latShift = d;
     }
@@ -273,5 +276,5 @@
      * @param d latitude value in seconds, west direction is positive
      */
-    public void setLonPositiveWestSeconds(double d) {
+    public final void setLonPositiveWestSeconds(double d) {
         lon = d;
     }
@@ -281,5 +284,5 @@
      * @param d latitude value in degree, est direction is positive
      */
-    public void setLonPositiveEastDegrees(double d) {
+    public final void setLonPositiveEastDegrees(double d) {
         lon = d * -3600.0;
     }
@@ -289,5 +292,5 @@
      * @param b availability of longitude accuracy
      */
-    public void setLonAccuracyAvailable(boolean b) {
+    public final void setLonAccuracyAvailable(boolean b) {
         lonAccuracyAvailable = b;
     }
@@ -297,5 +300,5 @@
      * @param d longitude accuracy in seconds
      */
-    public void setLonAccuracySeconds(double d) {
+    public final void setLonAccuracySeconds(double d) {
         lonAccuracy = d;
     }
@@ -305,5 +308,5 @@
      * @param d longitude shift in seconds, west direction is positive
      */
-    public void setLonShiftPositiveWestSeconds(double d) {
+    public final void setLonShiftPositiveWestSeconds(double d) {
         lonShift = d;
     }
Index: trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java	(revision 6890)
@@ -284,5 +284,5 @@
      * until most bugs were discovered while keeping the processing time reasonable)
      */
-    public void initializeGridDetail() {
+    public final void initializeGridDetail() {
         String code = Main.getProjection().toCode();
         if (Arrays.asList(ProjectionPreference.wgs84.allCodes()).contains(code)) {
Index: trunk/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java	(revision 6890)
@@ -90,5 +90,5 @@
     }
 
-    protected void build() {
+    protected final void build() {
         model = new RelationMemberTableModel();
         model.addTableModelListener(this);
@@ -275,5 +275,5 @@
     private static class RelationMemberTableColumnModel extends DefaultTableColumnModel{
 
-        protected void createColumns() {
+        protected final void createColumns() {
             TableColumn col = null;
 
Index: trunk/src/org/openstreetmap/josm/gui/actionsupport/LogShowDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/actionsupport/LogShowDialog.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/actionsupport/LogShowDialog.java	(revision 6890)
@@ -29,5 +29,5 @@
     }
 
-    protected JPanel build(String msg, String log) {
+    protected final JPanel build(String msg, String log) {
         JPanel p = new JPanel(new GridBagLayout());
         JLabel lbl = new JLabel(msg);
Index: trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java	(revision 6890)
@@ -226,5 +226,5 @@
     }
 
-    public void setFileCacheEnabled(boolean enabled) {
+    public final void setFileCacheEnabled(boolean enabled) {
         if (enabled) {
             setTileLoader(cachedLoader);
@@ -234,8 +234,7 @@
     }
 
-    public void setMaxTilesInMemory(int tiles) {
+    public final void setMaxTilesInMemory(int tiles) {
         ((MemoryTileCache) getTileCache()).setCacheSize(tiles);
     }
-
 
     /**
Index: trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java	(revision 6890)
@@ -96,5 +96,5 @@
      * builds the UI
      */
-    protected void build() {
+    protected final void build() {
         setLayout(new GridBagLayout());
 
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java	(revision 6890)
@@ -86,5 +86,5 @@
      * loads the required icons
      */
-    protected void loadIcons() {
+    protected final void loadIcons() {
         mergeComplete = ImageProvider.get("dialogs", "valid.png" );
         mergeIncomplete = ImageProvider.get("dialogs/conflict", "mergeincomplete.png" );
@@ -94,5 +94,5 @@
      * builds the UI
      */
-    protected void build() {
+    protected final void build() {
         tabbedPane = new JTabbedPane();
 
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java	(revision 6890)
@@ -227,5 +227,5 @@
     }
 
-    public void setFrozen(boolean isFrozen) {
+    public final void setFrozen(boolean isFrozen) {
         boolean oldValue = this.isFrozen;
         this.isFrozen = isFrozen;
@@ -233,5 +233,5 @@
     }
 
-    public boolean isFrozen() {
+    public final boolean isFrozen() {
         return isFrozen;
     }
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java	(revision 6890)
@@ -260,5 +260,5 @@
     }
 
-    protected void build() {
+    protected final void build() {
         setLayout(new GridBagLayout());
         GridBagConstraints gc = new GridBagConstraints();
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java	(revision 6890)
@@ -10,5 +10,5 @@
 public class NodeListColumnModel extends DefaultTableColumnModel {
 
-    protected void createColumns(TableCellRenderer renderer) {
+    protected final void createColumns(TableCellRenderer renderer) {
 
         TableColumn col = null;
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java	(revision 6890)
@@ -269,5 +269,5 @@
     }
 
-    protected void build() {
+    protected final void build() {
         setLayout(new GridBagLayout());
         buildHeaderRow();
@@ -277,4 +277,7 @@
     }
 
+    /**
+     * Constructs a new {@code PropertiesMerger}.
+     */
     public PropertiesMerger() {
         model = new PropertiesMergeModel();
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java	(revision 6890)
@@ -9,5 +9,5 @@
 public class RelationMemberListColumnModel extends DefaultTableColumnModel{
 
-    protected void createColumns() {
+    protected final void createColumns() {
         TableColumn col = null;
         RelationMemberTableCellRenderer renderer = new RelationMemberTableCellRenderer();
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java	(revision 6890)
@@ -10,5 +10,5 @@
 public class TagMergeColumnModel extends DefaultTableColumnModel {
 
-    protected void createColumns(TableCellRenderer renderer) {
+    protected final void createColumns(TableCellRenderer renderer) {
 
         TableColumn col = null;
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java	(revision 6890)
@@ -108,5 +108,5 @@
      * build the user interface
      */
-    protected void build() {
+    protected final void build() {
         GridBagConstraints gc = new GridBagConstraints();
         setLayout(new GridBagLayout());
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java	(revision 6890)
@@ -166,5 +166,5 @@
     }
 
-    protected void build() {
+    protected final void build() {
         getContentPane().setLayout(new BorderLayout());
         updateTitle();
@@ -412,5 +412,5 @@
         }
 
-        protected void updateEnabledState() {
+        protected final void updateEnabledState() {
             setEnabled(pnlTagConflictResolver.getModel().getNumConflicts() == 0
                     && pnlRelationMemberConflictResolver.getModel().getNumConflicts() == 0);
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java	(revision 6890)
@@ -61,5 +61,5 @@
      * Tries to find the best decision based on the current values.
      */
-    protected void autoDecide() {
+    protected final void autoDecide() {
         this.type = MultiValueDecisionType.UNDECIDED;
         // exactly one empty value ? -> delete the tag
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java	(revision 6890)
@@ -75,5 +75,5 @@
     }
 
-    protected void build() {
+    protected final void build() {
         setTitle(tr("Conflicts in pasted tags"));
         allPrimitivesResolver = new TagConflictResolver();
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java	(revision 6890)
@@ -48,5 +48,5 @@
     private JMultilineLabel lblHeader;
 
-    protected void build() {
+    protected final void build() {
         setLayout(new GridBagLayout());
         JPanel pnl = new JPanel();
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverTable.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverTable.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverTable.java	(revision 6890)
@@ -23,5 +23,5 @@
     }
 
-    protected void build() {
+    protected final void build() {
         setAutoResizeMode(JTable.AUTO_RESIZE_ALL_COLUMNS);
         setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java	(revision 6890)
@@ -86,5 +86,5 @@
     }
 
-    protected void build() {
+    protected final void build() {
         setLayout(new BorderLayout());
         add(buildInfoPanel(), BorderLayout.NORTH);
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java	(revision 6890)
@@ -9,5 +9,5 @@
 public class TagConflictResolverColumnModel extends DefaultTableColumnModel{
 
-    protected void createColumns() {
+    protected final void createColumns() {
         TableColumn col = null;
         MultiValueCellRenderer renderer = new MultiValueCellRenderer();
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverTable.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverTable.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverTable.java	(revision 6890)
@@ -23,5 +23,5 @@
     }
 
-    protected void build() {
+    protected final void build() {
         setAutoResizeMode(JTable.AUTO_RESIZE_ALL_COLUMNS);
         setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java	(revision 6890)
@@ -151,5 +151,5 @@
     }
 
-    protected void build() {
+    protected final void build() {
         setLayout(new BorderLayout());
         JScrollPane spQueryPanel = GuiHelper.embedInVerticalScrollPane(buildQueryPanel());
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java	(revision 6890)
@@ -129,5 +129,5 @@
     }
 
-    protected void build() {
+    protected final void build() {
         setLayout(new BorderLayout(0,5));
         setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
@@ -136,4 +136,7 @@
     }
 
+    /**
+     * Constructs a new {@code BasicChangesetQueryPanel}.
+     */
     public BasicChangesetQueryPanel() {
         build();
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java	(revision 6890)
@@ -78,6 +78,5 @@
     }
 
-
-    protected void build() {
+    protected final void build() {
         setTitle(tr("Query changesets"));
         Container cp = getContentPane();
@@ -95,5 +94,4 @@
         addWindowListener(new WindowEventHandler());
     }
-
 
     public ChangesetQueryDialog(Dialog parent) {
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java	(revision 6890)
@@ -93,5 +93,5 @@
     }
 
-    protected void build() {
+    protected final void build() {
         setLayout(new GridBagLayout());
         setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
@@ -113,6 +113,9 @@
         gc.fill = GridBagConstraints.BOTH;
         add(new JPanel(),gc);
-
-    }
+    }
+
+    /**
+     * Constructs a new {@code UrlBasedQueryPanel}.
+     */
     public UrlBasedQueryPanel() {
         build();
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java	(revision 6890)
@@ -942,5 +942,5 @@
 
         @Override
-        protected void updateEnabledState() {
+        protected final void updateEnabledState() {
             setEnabled(
                     (tagTable != null && tagTable.getSelectedRowCount() >= 1)
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java	(revision 6890)
@@ -742,5 +742,5 @@
          * Read tags from comboboxes and add it to all selected objects
          */
-        public void performTagAdding() {
+        public final void performTagAdding() {
             String key = Tag.removeWhiteSpaces(keys.getEditor().getItem().toString());
             String value = Tag.removeWhiteSpaces(values.getEditor().getItem().toString());
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java	(revision 6890)
@@ -292,5 +292,5 @@
      * @param errors The error list that is used by a data layer
      */
-    public void setErrorList(List<TestError> errors) {
+    public final void setErrorList(List<TestError> errors) {
         this.errors = errors;
         if (isVisible()) {
Index: trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java	(revision 6890)
@@ -224,5 +224,6 @@
             bookmarks.save();
         }
-        protected void updateEnabledState() {
+
+        protected final void updateEnabledState() {
             setEnabled(bookmarks.getSelectedIndices().length > 0);
         }
@@ -261,7 +262,9 @@
             }
         }
-        protected void updateEnabledState() {
+
+        protected final void updateEnabledState() {
             setEnabled(bookmarks.getSelectedIndices().length == 1);
         }
+
         @Override
         public void valueChanged(ListSelectionEvent e) {
Index: trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java	(revision 6890)
@@ -86,5 +86,5 @@
     }
 
-    protected JPanel buildMainPanel() {
+    protected final JPanel buildMainPanel() {
         JPanel pnl = new JPanel();
         pnl.setLayout(new GridBagLayout());
@@ -163,5 +163,5 @@
     }
 
-    protected JPanel buildButtonPanel() {
+    protected final JPanel buildButtonPanel() {
         JPanel pnl = new JPanel();
         pnl.setLayout(new FlowLayout());
Index: trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java	(revision 6890)
@@ -299,5 +299,5 @@
         }
 
-        protected void updateEnabledState() {
+        protected final void updateEnabledState() {
             setEnabled(cbSearchExpression.getText().trim().length() > 0);
         }
@@ -427,5 +427,5 @@
         TableColumn col3 = null;
         TableColumn col4 = null;
-        protected void createColumns() {
+        protected final void createColumns() {
             TableColumn col = null;
             NamedResultCellRenderer renderer = new NamedResultCellRenderer();
Index: trunk/src/org/openstreetmap/josm/gui/download/TileSelection.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/download/TileSelection.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/download/TileSelection.java	(revision 6890)
@@ -22,5 +22,5 @@
     private DownloadDialog parent;
 
-    protected void build() {
+    protected final void build() {
         chooser = new TileSelectionBBoxChooser();
         chooser.addPropertyChangeListener(this);
Index: trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java	(revision 6890)
@@ -170,5 +170,5 @@
     }
 
-    protected void build() {
+    protected final void build() {
         help = new JosmEditorPane();
         JosmHTMLEditorKit kit = new JosmHTMLEditorKit();
Index: trunk/src/org/openstreetmap/josm/gui/layer/Layer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/Layer.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/layer/Layer.java	(revision 6890)
@@ -231,5 +231,5 @@
      *
      */
-    public void setName(String name) {
+    public final void setName(String name) {
         if (name == null) {
             name = "";
Index: trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java	(revision 6890)
@@ -452,5 +452,5 @@
     }
 
-    private int getBestZoom() {
+    private final int getBestZoom() {
         double factor = getScaleFactor(1);
         double result = Math.log(factor)/Math.log(2)/2+1;
@@ -1502,10 +1502,10 @@
 
     @Override
-    public boolean isProjectionSupported(Projection proj) {
+    public final boolean isProjectionSupported(Projection proj) {
         return "EPSG:3857".equals(proj.toCode()) || "EPSG:4326".equals(proj.toCode());
     }
 
     @Override
-    public String nameSupportedProjections() {
+    public final String nameSupportedProjections() {
         return tr("EPSG:4326 and Mercator projection are supported");
     }
Index: trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java	(revision 6890)
@@ -269,5 +269,5 @@
     }
 
-    public void initializeImages() {
+    public final void initializeImages() {
         GeorefImage[][] old = images;
         images = new GeorefImage[dax][day];
Index: trunk/src/org/openstreetmap/josm/gui/layer/gpx/DateFilterPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/gpx/DateFilterPanel.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/layer/gpx/DateFilterPanel.java	(revision 6890)
@@ -129,5 +129,5 @@
 
     @Override
-    public void setEnabled(boolean enabled) {
+    public final void setEnabled(boolean enabled) {
         super.setEnabled(enabled); 
         for (Component c: getComponents()) {
@@ -135,7 +135,3 @@
         }
     }
-    
-    
-    
- 
 }
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategy.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategy.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategy.java	(revision 6890)
@@ -246,5 +246,5 @@
          * <tt>mappaint.nameOrder</tt> and <tt>mappaint.nameComplementOrder</tt>.
          */
-        public void initNameTagsFromPreferences() {
+        public final void initNameTagsFromPreferences() {
             if (Main.pref == null){
                 this.nameTags = new ArrayList<String>(Arrays.asList(DEFAULT_NAME_TAGS));
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/xml/AreaPrototype.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/xml/AreaPrototype.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/xml/AreaPrototype.java	(revision 6890)
@@ -20,6 +20,5 @@
     public AreaPrototype() { init(); }
 
-    public void init()
-    {
+    public final void init() {
         priority = 0;
         range = Range.ZERO_TO_INFINITY;
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/xml/IconPrototype.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/xml/IconPrototype.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/xml/IconPrototype.java	(revision 6890)
@@ -20,5 +20,5 @@
     public IconPrototype() { init(); }
 
-    public void init() {
+    public final void init() {
         priority = 0;
         range = Range.ZERO_TO_INFINITY;
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/xml/LinemodPrototype.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/xml/LinemodPrototype.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/xml/LinemodPrototype.java	(revision 6890)
@@ -20,6 +20,5 @@
 
     @Override
-    public void init()
-    {
+    public final void init() {
         super.init();
         over = true;
@@ -27,7 +26,6 @@
     }
 
-    // get width for overlays
-    public float getWidth(float ref)
-    {
+    /** get width for overlays */
+    public float getWidth(float ref) {
         float res;
         if(widthMode == WidthMode.ABSOLUTE) {
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlCondition.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlCondition.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlCondition.java	(revision 6890)
@@ -10,16 +10,15 @@
     public String boolValue;
 
-    public XmlCondition()
-    {
+    public XmlCondition() {
       init();
     }
-    public XmlCondition(XmlCondition c)
-    {
+
+    public XmlCondition(XmlCondition c) {
       key = c.key;
       value = c.value;
       boolValue = c.boolValue;
     }
-    public String getKey()
-    {
+
+    public String getKey() {
         if(value != null)
             return "n" + key + "=" + value;
@@ -29,16 +28,14 @@
             return "x" + key;
     }
-    public void init()
-    {
+
+    public final void init() {
       key = value = boolValue = null;
     }
 
-    public String toString()
-    {
+    public String toString() {
       return "Rule["+key+","+(boolValue != null ? "b="+boolValue:"v="+value)+"]";
     }
 
-    public void appendCode(StringBuilder sb)
-    {
+    public void appendCode(StringBuilder sb) {
         sb.append("[k=").append(key);
 
Index: trunk/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java	(revision 6890)
@@ -26,5 +26,5 @@
     private JCheckBox cbSaveAccessTokenInPreferences;
 
-    protected void build() {
+    protected final void build() {
         setLayout(new GridBagLayout());
         GridBagConstraints gc = new GridBagConstraints();
Index: trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java	(revision 6890)
@@ -51,5 +51,5 @@
     private String apiUrl;
 
-    protected void build() {
+    protected final void build() {
         setLayout(new GridBagLayout());
         setBorder(BorderFactory.createEmptyBorder(3,3,3,3));
Index: trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java	(revision 6890)
@@ -263,5 +263,5 @@
     }
 
-    protected void build() {
+    protected final void build() {
         setLayout(new BorderLayout());
         pnlPropertiesPanel = buildPropertiesPanel();
@@ -345,5 +345,5 @@
         }
 
-        protected void updateEnabledState() {
+        protected final void updateEnabledState() {
             setEnabled(valPassword.isValid() && valUserName.isValid());
         }
Index: trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java	(revision 6890)
@@ -23,5 +23,5 @@
     private JosmPasswordField tfPassword;
 
-    protected JPanel buildUserNamePasswordPanel() {
+    protected final JPanel buildUserNamePasswordPanel() {
         JPanel pnl = new JPanel(new GridBagLayout());
         GridBagConstraints gc = new GridBagConstraints();
Index: trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java	(revision 6890)
@@ -153,5 +153,5 @@
     }
 
-    protected void build() {
+    protected final void build() {
         setLayout(new BorderLayout());
         setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
@@ -263,5 +263,5 @@
         }
 
-        protected void updateEnabledState() {
+        protected final void updateEnabledState() {
             setEnabled(hasAccessToken());
         }
Index: trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java	(revision 6890)
@@ -161,5 +161,5 @@
      * builds the UI
      */
-    protected void build() {
+    protected final void build() {
         getContentPane().setLayout(new BorderLayout());
         getContentPane().add(buildHeaderInfoPanel(), BorderLayout.NORTH);
@@ -348,5 +348,5 @@
         }
 
-        public void updateEnabledState(OAuthToken token) {
+        public final void updateEnabledState(OAuthToken token) {
             setEnabled(token != null);
         }
Index: trunk/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java	(revision 6890)
@@ -24,5 +24,5 @@
     private JCheckBox cbModifyNotes;
 
-    protected void build() {
+    protected final void build() {
         setLayout(new GridBagLayout());
         GridBagConstraints gc = new GridBagConstraints();
@@ -86,4 +86,7 @@
     }
 
+    /**
+     * Constructs a new {@code OsmPrivilegesPanel}.
+     */
     public OsmPrivilegesPanel() {
         build();
Index: trunk/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java	(revision 6890)
@@ -51,5 +51,5 @@
      * build the UI
      */
-    protected void build() {
+    protected final void build() {
         setLayout(new BorderLayout());
         setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
@@ -187,5 +187,5 @@
 
         }
-        protected void build() {
+        protected final void build() {
             setLayout(new BorderLayout(0,5));
             JLabel lbl = new JLabel(tr("<html>Step 1/3: Retrieve an OAuth Request Token</html>"));
@@ -261,5 +261,5 @@
         }
 
-        protected void build() {
+        protected final void build() {
             setLayout(new BorderLayout());
             add(buildTitlePanel(), BorderLayout.NORTH);
@@ -340,5 +340,5 @@
         }
 
-        protected void build() {
+        protected final void build() {
             setLayout(new BorderLayout());
             add(buildTitlePanel(), BorderLayout.NORTH);
Index: trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java	(revision 6890)
@@ -63,5 +63,5 @@
     }
 
-    protected void build() {
+    protected final void build() {
         Container c = getContentPane();
         c.setLayout(new BorderLayout());
Index: trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java	(revision 6890)
@@ -871,5 +871,5 @@
         }
 
-        protected void updateEnabledState() {
+        protected final void updateEnabledState() {
             setEnabled(tblActiveSources.getSelectedRowCount() > 0);
         }
@@ -894,5 +894,5 @@
         }
 
-        protected void updateEnabledState() {
+        protected final void updateEnabledState() {
             setEnabled(tblActiveSources.getSelectedRowCount() == 1);
         }
@@ -942,5 +942,5 @@
         }
 
-        public void updateEnabledState() {
+        public final void updateEnabledState() {
             setEnabled(activeSourcesModel.canMove(increment));
         }
@@ -969,5 +969,5 @@
         }
 
-        protected void updateEnabledState() {
+        protected final void updateEnabledState() {
             setEnabled(lstAvailableSources.getSelectedIndices().length > 0);
         }
@@ -1171,5 +1171,5 @@
         }
 
-        protected void updateEnabledState() {
+        protected final void updateEnabledState() {
             setEnabled(tblIconPaths.getSelectedRowCount() > 0);
         }
@@ -1194,5 +1194,5 @@
         }
 
-        protected void updateEnabledState() {
+        protected final void updateEnabledState() {
             setEnabled(tblIconPaths.getSelectedRowCount() == 1);
         }
@@ -1394,5 +1394,5 @@
          * build the GUI
          */
-        protected void build() {
+        protected final void build() {
             setLayout(new GridBagLayout());
             GridBagConstraints gc = new GridBagConstraints();
Index: trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListEditor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListEditor.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListEditor.java	(revision 6890)
@@ -64,5 +64,5 @@
     }
 
-    protected JPanel build() {
+    protected final JPanel build() {
         JPanel p = new JPanel(new GridBagLayout());
         p.add(new JLabel(tr("Key: {0}", entry.getKey())), GBC.eol().insets(0,0,5,0));
Index: trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListListEditor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListListEditor.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListListEditor.java	(revision 6890)
@@ -75,5 +75,5 @@
     }
 
-    protected JPanel build() {
+    protected final JPanel build() {
         JPanel p = new JPanel(new GridBagLayout());
         p.add(new JLabel(tr("Key: {0}", entry.getKey())), GBC.std(0,0).span(2).weight(1, 0).insets(0,0,5,10));
@@ -158,5 +158,5 @@
         }
 
-        protected void updateEnabledState() {
+        protected final void updateEnabledState() {
             setEnabled(entryList.getSelectedIndices().length == 1);
         }
Index: trunk/src/org/openstreetmap/josm/gui/preferences/advanced/MapListEditor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/advanced/MapListEditor.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/advanced/MapListEditor.java	(revision 6890)
@@ -93,5 +93,5 @@
     }
 
-    protected JPanel build() {
+    protected final JPanel build() {
         JPanel p = new JPanel(new GridBagLayout());
         p.add(new JLabel(tr("Key: {0}", entry.getKey())), GBC.std(0,0).span(2).weight(1, 0).insets(0,0,5,10));
@@ -178,5 +178,5 @@
         }
 
-        protected void updateEnabledState() {
+        protected final void updateEnabledState() {
             setEnabled(entryList.getSelectedIndices().length == 1);
         }
Index: trunk/src/org/openstreetmap/josm/gui/preferences/advanced/StringEditor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/advanced/StringEditor.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/advanced/StringEditor.java	(revision 6890)
@@ -42,5 +42,5 @@
     }
 
-    protected JPanel build(String orig) {
+    protected final JPanel build(String orig) {
         JPanel p = new JPanel(new GridBagLayout());
         p.add(new JLabel(tr("Key: {0}", entry.getKey())), GBC.eol().insets(0,0,5,0));
Index: trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java	(revision 6890)
@@ -319,5 +319,5 @@
      * Loads preferences to UI controls
      */
-    public void loadPreferences () {
+    public final void loadPreferences () {
         makeAutoMarkers.setSelected(Main.pref.getBoolean("marker.makeautomarkers", true));
         if(layerName!=null && Main.pref.get("draw.rawgps.lines."+layerName).isEmpty()
Index: trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java	(revision 6890)
@@ -496,5 +496,5 @@
             }
 
-            protected void updateEnabledState() {
+            protected final void updateEnabledState() {
                 setEnabled(activeTable.getSelectedRowCount() > 0);
             }
Index: trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java	(revision 6890)
@@ -137,5 +137,5 @@
     }
 
-    protected void build() {
+    protected final void build() {
         setLayout(new GridBagLayout());
         GridBagConstraints gc = new GridBagConstraints();
@@ -167,5 +167,5 @@
      *
      */
-    public void initFromPreferences() {
+    public final void initFromPreferences() {
         String pref = Main.pref.get("pluginmanager.version-based-update.policy", "ask");
         Policy p = Policy.fromPreferenceValue(pref);
Index: trunk/src/org/openstreetmap/josm/gui/preferences/projection/CodeProjectionChoice.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/projection/CodeProjectionChoice.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/projection/CodeProjectionChoice.java	(revision 6890)
@@ -131,5 +131,5 @@
         }
 
-        public void setCode(String code) {
+        public final void setCode(String code) {
             int idx = filteredData.indexOf(code);
             if (idx != -1) {
Index: trunk/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java	(revision 6890)
@@ -58,5 +58,5 @@
         }
 
-        private void build(String initialText, final ActionListener listener) {
+        private final void build(String initialText, final ActionListener listener) {
             input = new JosmTextField(30);
             cbInput = new HistoryComboBox();
@@ -96,5 +96,5 @@
 
                 @Override
-                public boolean isValid() {
+                public final boolean isValid() {
                     try {
                         CustomProjection test = new CustomProjection();
Index: trunk/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java	(revision 6890)
@@ -47,5 +47,5 @@
      * builds the UI
      */
-    protected void build() {
+    protected final void build() {
         setLayout(new GridBagLayout());
         GridBagConstraints gc = new GridBagConstraints();
Index: trunk/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java	(revision 6890)
@@ -41,5 +41,5 @@
      * builds the UI
      */
-    protected void build() {
+    protected final void build() {
         setLayout(new GridBagLayout());
         setBorder(BorderFactory.createEmptyBorder(3,3,3,3));
Index: trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java	(revision 6890)
@@ -104,5 +104,5 @@
      * builds the UI
      */
-    protected void build() {
+    protected final void build() {
         setLayout(new GridBagLayout());
         setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
@@ -290,5 +290,5 @@
         }
 
-        public void refreshView() {
+        public final void refreshView() {
             String v = OAuthAccessTokenHolder.getInstance().getAccessTokenKey();
             tfAccessTokenKey.setText(v == null? "" : v);
Index: trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java	(revision 6890)
@@ -64,5 +64,5 @@
     }
 
-    protected void build() {
+    protected final void build() {
         setLayout(new GridBagLayout());
         GridBagConstraints gc = new GridBagConstraints();
@@ -205,5 +205,5 @@
         }
 
-        protected void updateEnabledState() {
+        protected final void updateEnabledState() {
             String url = getStrippedApiUrl();
             boolean enabled = !url.isEmpty() && !url.equals(lastTestedUrl);
Index: trunk/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java	(revision 6890)
@@ -114,5 +114,5 @@
      * @return panel with HTTP proxy configuration
      */
-    protected JPanel buildHttpProxyConfigurationPanel() {
+    protected final JPanel buildHttpProxyConfigurationPanel() {
         JPanel pnl = new JPanel(new GridBagLayout()) {
             @Override
@@ -190,5 +190,5 @@
      * @return panel with SOCKS proxy configuration
      */
-    protected JPanel buildSocksProxyConfigurationPanel() {
+    protected final JPanel buildSocksProxyConfigurationPanel() {
         JPanel pnl = new JPanel(new GridBagLayout()) {
             @Override
@@ -230,5 +230,5 @@
     }
 
-    protected JPanel buildProxySettingsPanel() {
+    protected final JPanel buildProxySettingsPanel() {
         JPanel pnl = new JPanel(new GridBagLayout());
         GridBagConstraints gc = new GridBagConstraints();
@@ -314,5 +314,5 @@
      * Initializes the panel with the values from the preferences
      */
-    public void initFromPreferences() {
+    public final void initFromPreferences() {
         String policy = Main.pref.get(PROXY_POLICY, null);
         ProxyPolicy pp = ProxyPolicy.fromName(policy);
@@ -365,5 +365,5 @@
     }
 
-    protected void updateEnabledState() {
+    protected final void updateEnabledState() {
         boolean isHttpProxy = rbProxyPolicy.get(ProxyPolicy.USE_HTTP_PROXY).isSelected();
         for (Component c: pnlHttpProxyConfigurationPanel.getComponents()) {
Index: trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java	(revision 6890)
@@ -98,5 +98,5 @@
      * builds the GUI
      */
-    protected void build() {
+    protected final void build() {
         setLayout(new GridBagLayout());
         JPanel tablePanel = buildTagTableEditorPanel();
Index: trunk/src/org/openstreetmap/josm/gui/tagging/TagModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TagModel.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TagModel.java	(revision 6890)
@@ -47,5 +47,5 @@
      * @param name the tag name
      */
-    public void setName(String name) {
+    public final void setName(String name) {
         name = (name == null) ? "" : name;
         this.name = name;
@@ -70,5 +70,5 @@
      * @param value the value.
      */
-    public void setValue(String value) {
+    public final void setValue(String value) {
         value = (value == null) ? "" : value;
         clearValues();
Index: trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java	(revision 6890)
@@ -268,5 +268,5 @@
         }
 
-        protected void updateEnabledState() {
+        protected final void updateEnabledState() {
             if (isEditing() && getSelectedColumnCount() == 1 && getSelectedRowCount() == 1) {
                 setEnabled(true);
@@ -308,5 +308,5 @@
         }
 
-        protected void updateEnabledState() {
+        protected final void updateEnabledState() {
             setEnabled(TagTable.this.isEnabled());
         }
@@ -357,5 +357,5 @@
         }
         
-        protected void updateEnabledState() {
+        protected final void updateEnabledState() {
             setEnabled(TagTable.this.isEnabled());
         }
@@ -395,5 +395,5 @@
      * initialize the table
      */
-    protected void init() {
+    protected final void init() {
         setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
         setRowSelectionAllowed(true);
Index: trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java	(revision 6890)
@@ -444,5 +444,5 @@
     }
 
-    protected void updateEnabledState() {
+    protected final void updateEnabledState() {
         setEnabled(Main.main != null && Main.main.getCurrentDataSet() != null);
     }
Index: trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingTextField.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingTextField.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingTextField.java	(revision 6890)
@@ -135,5 +135,5 @@
     }
 
-    protected void init() {
+    protected final void init() {
         addFocusListener(
                 new FocusAdapter() {
Index: trunk/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java	(revision 6890)
@@ -44,5 +44,5 @@
     }
 
-    protected void build() {
+    protected final void build() {
         buildInputFields();
         setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
Index: trunk/src/org/openstreetmap/josm/gui/widgets/DisableShortcutsOnFocusGainedTextField.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/DisableShortcutsOnFocusGainedTextField.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/DisableShortcutsOnFocusGainedTextField.java	(revision 6890)
@@ -105,5 +105,5 @@
     private final Set<JosmAction> disabledMenuActions = new HashSet<JosmAction>();
 
-    protected void init() {
+    protected final void init() {
         addFocusListener(this);
     }
Index: trunk/src/org/openstreetmap/josm/gui/widgets/HtmlPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/HtmlPanel.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/HtmlPanel.java	(revision 6890)
@@ -23,5 +23,5 @@
     private JosmEditorPane jepMessage;
 
-    protected void build() {
+    protected final void build() {
         setLayout(new BorderLayout());
         jepMessage = new JosmEditorPane("text/html", "");
@@ -87,5 +87,5 @@
      * @param text the text to display
      */
-    public void setText(String text) {
+    public final void setText(String text) {
         if (text == null) {
             text = "";
Index: trunk/src/org/openstreetmap/josm/gui/widgets/JosmComboBox.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/JosmComboBox.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/JosmComboBox.java	(revision 6890)
@@ -107,5 +107,5 @@
      * @since 5558
      */
-    protected Object findPrototypeDisplayValue(Collection<?> possibleValues) {
+    protected final Object findPrototypeDisplayValue(Collection<?> possibleValues) {
         Object result = null;
         int maxHeight = -1;
@@ -154,5 +154,5 @@
     }
 
-    protected void init(Object prototype) {
+    protected final void init(Object prototype) {
         if (prototype != null) {
             setPrototypeDisplayValue(prototype);
Index: trunk/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java	(revision 6890)
@@ -91,5 +91,6 @@
 
     /** Do not let anyone add mouse listeners */
-    @Override public void addMouseListener(MouseListener l) { }
+    @Override
+    public void addMouseListener(MouseListener l) { }
     
     /**
@@ -97,5 +98,5 @@
      * @param state The new state
      */
-    public void setState(State state) {
+    public final void setState(State state) {
         model.setState(state);
     }
Index: trunk/src/org/openstreetmap/josm/io/Capabilities.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/Capabilities.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/io/Capabilities.java	(revision 6890)
@@ -103,5 +103,5 @@
     }
 
-    public void clear() {
+    public final void clear() {
         capabilities = new HashMap<String, HashMap<String,String>>();
         imageryBlacklist = new ArrayList<String>();
Index: trunk/src/org/openstreetmap/josm/io/ChangesetClosedException.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/ChangesetClosedException.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/io/ChangesetClosedException.java	(revision 6890)
@@ -72,5 +72,5 @@
     private Source source;
 
-    protected void parseErrorHeader(String errorHeader) {
+    protected final void parseErrorHeader(String errorHeader) {
         Pattern p = Pattern.compile(ERROR_HEADER_PATTERN);
         Matcher m = p.matcher(errorHeader);
Index: trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java	(revision 6890)
@@ -104,5 +104,5 @@
      *
      */
-    public void initFromPreferences() {
+    public final void initFromPreferences() {
         String value = Main.pref.get(ProxyPreferencesPanel.PROXY_POLICY);
         if (value.length() == 0) {
Index: trunk/src/org/openstreetmap/josm/io/session/OsmDataSessionExporter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/session/OsmDataSessionExporter.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/io/session/OsmDataSessionExporter.java	(revision 6890)
@@ -80,5 +80,5 @@
         }
 
-        public void updateEnabledState() {
+        public final void updateEnabledState() {
             setEnabled(layer.requiresSaveToFile());
         }
Index: trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java	(revision 6890)
@@ -1326,5 +1326,5 @@
         private JCheckBox cbDontShowAgain;
 
-        protected void build() {
+        protected final void build() {
             setLayout(new GridBagLayout());
             GridBagConstraints gc = new GridBagConstraints();
Index: trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java
===================================================================
--- trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java	(revision 6890)
@@ -192,5 +192,5 @@
     }
 
-    private void scanManifest(Manifest manifest, boolean oldcheck) {
+    private final void scanManifest(Manifest manifest, boolean oldcheck) {
         String lang = LanguageInfo.getLanguageCodeManifest();
         Attributes attr = manifest.getMainAttributes();
@@ -500,5 +500,5 @@
 
     @Override
-    public String toString() {
+    public final String toString() {
         return getName();
     }
Index: trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java	(revision 6890)
@@ -59,5 +59,5 @@
     protected enum CacheType {PLUGIN_LIST, ICON_LIST}
 
-    protected void init(Collection<String> sites, boolean displayErrMsg){
+    protected final void init(Collection<String> sites, boolean displayErrMsg){
         this.sites = sites;
         if (sites == null) {
@@ -88,5 +88,4 @@
         init(sites, displayErrMsg);
     }
-
 
     @Override
Index: trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java	(revision 6889)
+++ trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java	(revision 6890)
@@ -161,5 +161,5 @@
     }
 
-    protected void initFromPreferences(String preferenceKey) throws WindowGeometryException {
+    protected final void initFromPreferences(String preferenceKey) throws WindowGeometryException {
         String value = Main.pref.get(preferenceKey);
         if (value == null || value.isEmpty())
@@ -173,5 +173,5 @@
     }
 
-    protected void initFromWindowGeometry(WindowGeometry other) {
+    protected final void initFromWindowGeometry(WindowGeometry other) {
         this.topLeft = other.topLeft;
         this.extent = other.extent;