Index: trunk/src/org/openstreetmap/josm/Main.java
===================================================================
--- trunk/src/org/openstreetmap/josm/Main.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/Main.java	(revision 8512)
@@ -529,5 +529,5 @@
     private static volatile InitStatusListener initListener = null;
 
-    public static interface InitStatusListener {
+    public interface InitStatusListener {
 
         Object updateStatus(String event);
@@ -1419,5 +1419,5 @@
      * are not reported.
      */
-    public static interface WindowSwitchListener {
+    public interface WindowSwitchListener {
         /**
          * Called when the user activates a window of another application.
Index: trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java	(revision 8512)
@@ -247,5 +247,5 @@
         }
 
-        private final void updateOffset() {
+        private void updateOffset() {
             ignoreListener = true;
             updateOffsetIntl();
@@ -253,5 +253,5 @@
         }
 
-        private final void updateOffsetIntl() {
+        private 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/OsmPrimitiveAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/OsmPrimitiveAction.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/actions/OsmPrimitiveAction.java	(revision 8512)
@@ -18,4 +18,4 @@
      * @param primitives The new working set of primitives. Can be null or empty
      */
-    public abstract void setPrimitives(Collection<? extends OsmPrimitive> primitives);
+    void setPrimitives(Collection<? extends OsmPrimitive> primitives);
 }
Index: trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTask.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTask.java	(revision 8512)
@@ -119,5 +119,5 @@
      *
      */
-    public void cancel();
+    void cancel();
 
     /**
@@ -127,4 +127,4 @@
      * @since
      */
-    public String getConfirmationMessage(URL url);
+    String getConfirmationMessage(URL url);
 }
Index: trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java	(revision 8512)
@@ -686,5 +686,5 @@
      * still pressed)
      */
-    private final boolean dragInProgress() {
+    private boolean dragInProgress() {
         return didMouseDrag && startingDraggingPos != null;
     }
@@ -851,5 +851,5 @@
      * reported. If there is, it will execute the merge and add it to the undo buffer.
      */
-    private final void mergePrims(Point p) {
+    private void mergePrims(Point p) {
         Collection<Node> selNodes = getCurrentDataSet().getSelectedNodes();
         if (selNodes.isEmpty())
@@ -899,5 +899,5 @@
      * position. Either returns the node or null, if no suitable one is nearby.
      */
-    private final Node findNodeToMergeTo(Point p) {
+    private Node findNodeToMergeTo(Point p) {
         Collection<Node> target = mv.getNearestNodes(p,
                 getCurrentDataSet().getSelectedNodes(),
Index: trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java	(revision 8512)
@@ -203,17 +203,17 @@
      */
     private interface MatchFactory {
-        public Collection<String> getKeywords();
+        Collection<String> getKeywords();
     }
 
     public interface SimpleMatchFactory extends MatchFactory {
-        public Match get(String keyword, PushbackTokenizer tokenizer) throws ParseError;
+        Match get(String keyword, PushbackTokenizer tokenizer) throws ParseError;
     }
 
     public interface UnaryMatchFactory extends MatchFactory {
-        public UnaryMatch get(String keyword, Match matchOperand, PushbackTokenizer tokenizer) throws ParseError;
+        UnaryMatch get(String keyword, Match matchOperand, PushbackTokenizer tokenizer) throws ParseError;
     }
 
     public interface BinaryMatchFactory extends MatchFactory {
-        public BinaryMatch get(String keyword, Match lhs, Match rhs, PushbackTokenizer tokenizer) throws ParseError;
+        BinaryMatch get(String keyword, Match lhs, Match rhs, PushbackTokenizer tokenizer) throws ParseError;
     }
 
Index: trunk/src/org/openstreetmap/josm/actions/upload/FixDataHook.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/upload/FixDataHook.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/actions/upload/FixDataHook.java	(revision 8512)
@@ -67,5 +67,5 @@
          * @return <code>true</code> if keys have been modified
          */
-        public boolean fixKeys(Map<String, String> keys, OsmPrimitive osm);
+        boolean fixKeys(Map<String, String> keys, OsmPrimitive osm);
     }
 
Index: trunk/src/org/openstreetmap/josm/actions/upload/UploadHook.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/upload/UploadHook.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/actions/upload/UploadHook.java	(revision 8512)
@@ -9,4 +9,4 @@
      * @param apiDataSet the data to upload
      */
-    public boolean checkUpload(APIDataSet apiDataSet);
+    boolean checkUpload(APIDataSet apiDataSet);
 }
Index: trunk/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java
===================================================================
--- trunk/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java	(revision 8512)
@@ -61,5 +61,5 @@
     }
 
-    private final void init(List<PrimitiveData> data, List<PrimitiveData> toSelect) {
+    private void init(List<PrimitiveData> data, List<PrimitiveData> toSelect) {
         CheckParameterUtil.ensureParameterNotNull(data, "data");
         this.data.addAll(data);
Index: trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java
===================================================================
--- trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java	(revision 8512)
@@ -34,9 +34,9 @@
     private static final String SEPARATOR = "[:_]";
 
-    private static final Pattern getPatternFor(String s) {
+    private static Pattern getPatternFor(String s) {
         return getPatternFor(s, false);
     }
 
-    private static final Pattern getPatternFor(String s, boolean exactMatch) {
+    private static Pattern getPatternFor(String s, boolean exactMatch) {
         if (exactMatch) {
             return Pattern.compile("(^)(" + s + ")($)");
Index: trunk/src/org/openstreetmap/josm/data/AutosaveTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/AutosaveTask.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/data/AutosaveTask.java	(revision 8512)
@@ -290,5 +290,5 @@
     }
 
-    private final File getPidFile(File osmFile) {
+    private File getPidFile(File osmFile) {
         return new File(autosaveDir, osmFile.getName().replaceFirst("[.][^.]+$", ".pid"));
     }
Index: trunk/src/org/openstreetmap/josm/data/Data.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/Data.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/data/Data.java	(revision 8512)
@@ -16,5 +16,5 @@
      * @return the collection of data sources.
      */
-    public Collection<DataSource> getDataSources();
+    Collection<DataSource> getDataSources();
 
     /**
@@ -22,5 +22,5 @@
      * @return Area object encompassing downloaded data.
      */
-    public Area getDataSourceArea();
+    Area getDataSourceArea();
 
     /**
@@ -36,4 +36,4 @@
      * bounds are defined.
      */
-    public List<Bounds> getDataSourceBounds();
+    List<Bounds> getDataSourceBounds();
 }
Index: trunk/src/org/openstreetmap/josm/data/SelectionChangedListener.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/SelectionChangedListener.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/data/SelectionChangedListener.java	(revision 8512)
@@ -23,4 +23,4 @@
      * @param newSelection The new selection.
      */
-    public void selectionChanged(Collection<? extends OsmPrimitive> newSelection);
+    void selectionChanged(Collection<? extends OsmPrimitive> newSelection);
 }
Index: trunk/src/org/openstreetmap/josm/data/cache/ICachedLoaderJob.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/cache/ICachedLoaderJob.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/data/cache/ICachedLoaderJob.java	(revision 8512)
@@ -16,5 +16,5 @@
      * @return cache key for tile
      */
-    public K getCacheKey();
+    K getCacheKey();
 
     /**
@@ -23,9 +23,10 @@
      *
      */
-    public URL getUrl();
+    URL getUrl();
+
     /**
      * implements the main algorithm for fetching
      */
-    public void run();
+    void run();
 
     /**
@@ -34,5 +35,5 @@
      * @return filled tile with data or null when no cache entry found
      */
-    public CacheEntry get();
+    CacheEntry get();
 
     /**
@@ -42,4 +43,4 @@
      * @param force true if the load should skip all the caches (local & remote)
      */
-    public void submit(ICachedLoaderListener listener, boolean force);
+    void submit(ICachedLoaderListener listener, boolean force);
 }
Index: trunk/src/org/openstreetmap/josm/data/cache/ICachedLoaderListener.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/cache/ICachedLoaderListener.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/data/cache/ICachedLoaderListener.java	(revision 8512)
@@ -23,4 +23,4 @@
      * @param result load result (success, failure, canceled)
      */
-    public void loadingFinished(CacheEntry data, CacheEntryAttributes attributes, LoadResult result);
+    void loadingFinished(CacheEntry data, CacheEntryAttributes attributes, LoadResult result);
 }
Index: trunk/src/org/openstreetmap/josm/data/conflict/IConflictListener.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/conflict/IConflictListener.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/data/conflict/IConflictListener.java	(revision 8512)
@@ -3,6 +3,6 @@
 
 public interface IConflictListener {
-    public void onConflictsAdded(ConflictCollection conflicts);
+    void onConflictsAdded(ConflictCollection conflicts);
 
-    public void onConflictsRemoved(ConflictCollection conflicts);
+    void onConflictsRemoved(ConflictCollection conflicts);
 }
Index: trunk/src/org/openstreetmap/josm/data/gpx/GpxConstants.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/gpx/GpxConstants.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/data/gpx/GpxConstants.java	(revision 8512)
@@ -16,34 +16,34 @@
      *  GPX does not place restrictions on the length of this field or the characters contained in it.
      *  It is up to the receiving application to validate the field before sending it to the GPS. */
-    public static final String GPX_NAME = "name";
+    String GPX_NAME = "name";
 
     /** GPS element comment. Sent to GPS as comment. */
-    public static final String GPX_CMT = "cmt";
+    String GPX_CMT = "cmt";
 
     /** Text description of the element. Holds additional information about the element intended for the user, not the GPS. */
-    public static final String GPX_DESC = "desc";
+    String GPX_DESC = "desc";
 
     /** Source of data. Included to give user some idea of reliability and accuracy of data. */
-    public static final String GPX_SRC = "src";
+    String GPX_SRC = "src";
 
-    public static final String META_PREFIX = "meta.";
-    public static final String META_AUTHOR_NAME = META_PREFIX + "author.name";
-    public static final String META_AUTHOR_EMAIL = META_PREFIX + "author.email";
-    public static final String META_AUTHOR_LINK = META_PREFIX + "author.link";
-    public static final String META_COPYRIGHT_AUTHOR = META_PREFIX + "copyright.author";
-    public static final String META_COPYRIGHT_LICENSE = META_PREFIX + "copyright.license";
-    public static final String META_COPYRIGHT_YEAR = META_PREFIX + "copyright.year";
-    public static final String META_DESC = META_PREFIX + "desc";
-    public static final String META_KEYWORDS = META_PREFIX + "keywords";
-    public static final String META_LINKS = META_PREFIX + "links";
-    public static final String META_NAME = META_PREFIX + "name";
-    public static final String META_TIME = META_PREFIX + "time";
-    public static final String META_BOUNDS = META_PREFIX + "bounds";
-    public static final String META_EXTENSIONS = META_PREFIX + "extensions";
+    String META_PREFIX = "meta.";
+    String META_AUTHOR_NAME = META_PREFIX + "author.name";
+    String META_AUTHOR_EMAIL = META_PREFIX + "author.email";
+    String META_AUTHOR_LINK = META_PREFIX + "author.link";
+    String META_COPYRIGHT_AUTHOR = META_PREFIX + "copyright.author";
+    String META_COPYRIGHT_LICENSE = META_PREFIX + "copyright.license";
+    String META_COPYRIGHT_YEAR = META_PREFIX + "copyright.year";
+    String META_DESC = META_PREFIX + "desc";
+    String META_KEYWORDS = META_PREFIX + "keywords";
+    String META_LINKS = META_PREFIX + "links";
+    String META_NAME = META_PREFIX + "name";
+    String META_TIME = META_PREFIX + "time";
+    String META_BOUNDS = META_PREFIX + "bounds";
+    String META_EXTENSIONS = META_PREFIX + "extensions";
 
-    public static final String JOSM_EXTENSIONS_NAMESPACE_URI = Main.getXMLBase() + "/gpx-extensions-1.0";
+    String JOSM_EXTENSIONS_NAMESPACE_URI = Main.getXMLBase() + "/gpx-extensions-1.0";
 
     /** Elevation (in meters) of the point. */
-    public static final String PT_ELE = "ele";
+    String PT_ELE = "ele";
 
     /** Creation/modification timestamp for the point.
@@ -51,43 +51,43 @@
      *  Conforms to ISO 8601 specification for date/time representation.
      *  Fractional seconds are allowed for millisecond timing in tracklogs. */
-    public static final String PT_TIME = "time";
+    String PT_TIME = "time";
 
     /** Magnetic variation (in degrees) at the point. 0.0 <= value < 360.0 */
-    public static final String PT_MAGVAR = "magvar";
+    String PT_MAGVAR = "magvar";
 
     /** Height, in meters, of geoid (mean sea level) above WGS-84 earth ellipsoid. (NMEA GGA message) */
-    public static final String PT_GEOIDHEIGHT = "geoidheight";
+    String PT_GEOIDHEIGHT = "geoidheight";
 
     /** Text of GPS symbol name. For interchange with other programs, use the exact spelling of the symbol on the GPS, if known. */
-    public static final String PT_SYM = "sym";
+    String PT_SYM = "sym";
 
     /** Type (textual classification) of element. */
-    public static final String PT_TYPE = "type";
+    String PT_TYPE = "type";
 
     /** Type of GPS fix. none means GPS had no fix. Value comes from list: {'none'|'2d'|'3d'|'dgps'|'pps'} */
-    public static final String PT_FIX = "fix";
+    String PT_FIX = "fix";
 
     /** Number of satellites used to calculate the GPS fix. (not number of satellites in view). */
-    public static final String PT_SAT = "sat";
+    String PT_SAT = "sat";
 
     /** Horizontal dilution of precision. */
-    public static final String PT_HDOP = "hdop";
+    String PT_HDOP = "hdop";
 
     /** Vertical dilution of precision. */
-    public static final String PT_VDOP = "vdop";
+    String PT_VDOP = "vdop";
 
     /** Position dilution of precision. */
-    public static final String PT_PDOP = "pdop";
+    String PT_PDOP = "pdop";
 
     /** Number of seconds since last DGPS update. */
-    public static final String PT_AGEOFDGPSDATA = "ageofdgpsdata";
+    String PT_AGEOFDGPSDATA = "ageofdgpsdata";
 
     /** Represents a differential GPS station. 0 <= value <= 1023 */
-    public static final String PT_DGPSID = "dgpsid";
+    String PT_DGPSID = "dgpsid";
 
     /**
      * Ordered list of all possible waypoint keys.
      */
-    public static List<String> WPT_KEYS = Arrays.asList(PT_ELE, PT_TIME, PT_MAGVAR, PT_GEOIDHEIGHT,
+    List<String> WPT_KEYS = Arrays.asList(PT_ELE, PT_TIME, PT_MAGVAR, PT_GEOIDHEIGHT,
             GPX_NAME, GPX_CMT, GPX_DESC, GPX_SRC, META_LINKS, PT_SYM, PT_TYPE,
             PT_FIX, PT_SAT, PT_HDOP, PT_VDOP, PT_PDOP, PT_AGEOFDGPSDATA, PT_DGPSID, META_EXTENSIONS);
@@ -96,5 +96,5 @@
      * Ordered list of all possible route and track keys.
      */
-    public static List<String> RTE_TRK_KEYS = Arrays.asList(
+    List<String> RTE_TRK_KEYS = Arrays.asList(
             GPX_NAME, GPX_CMT, GPX_DESC, GPX_SRC, META_LINKS, "number", PT_TYPE, META_EXTENSIONS);
 
@@ -102,4 +102,4 @@
      * Possible fix values.
      */
-    public static Collection<String> FIX_VALUES = Arrays.asList("none", "2d", "3d", "dgps", "pps");
+    Collection<String> FIX_VALUES = Arrays.asList("none", "2d", "3d", "dgps", "pps");
 }
Index: trunk/src/org/openstreetmap/josm/data/osm/Changeset.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/Changeset.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/data/osm/Changeset.java	(revision 8512)
@@ -172,5 +172,5 @@
      * @since 7700
      */
-    public final int getCommentsCount() {
+    public int getCommentsCount() {
         return commentsCount;
     }
@@ -181,5 +181,5 @@
      * @since 7700
      */
-    public final void setCommentsCount(int commentsCount) {
+    public void setCommentsCount(int commentsCount) {
         this.commentsCount = commentsCount;
     }
@@ -349,5 +349,5 @@
      * @since 7704
      */
-    public final synchronized List<ChangesetDiscussionComment> getDiscussion() {
+    public synchronized List<ChangesetDiscussionComment> getDiscussion() {
         if (discussion == null) {
             return Collections.emptyList();
@@ -361,5 +361,5 @@
      * @since 7704
      */
-    public final synchronized void addDiscussionComment(ChangesetDiscussionComment comment) {
+    public synchronized void addDiscussionComment(ChangesetDiscussionComment comment) {
         if (comment == null) {
             return;
Index: trunk/src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java	(revision 8512)
@@ -23,8 +23,8 @@
     }
 
-    public static interface ChangesetDataSetEntry {
-        public ChangesetModificationType getModificationType();
+    public interface ChangesetDataSetEntry {
+        ChangesetModificationType getModificationType();
 
-        public HistoryOsmPrimitive getPrimitive();
+        HistoryOsmPrimitive getPrimitive();
     }
 
Index: trunk/src/org/openstreetmap/josm/data/osm/DataSet.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/DataSet.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/data/osm/DataSet.java	(revision 8512)
@@ -220,5 +220,5 @@
      * @see #setUploadDiscouraged
      */
-    public final boolean isUploadDiscouraged() {
+    public boolean isUploadDiscouraged() {
         return uploadDiscouraged;
     }
@@ -229,5 +229,5 @@
      * @see #isUploadDiscouraged
      */
-    public final void setUploadDiscouraged(boolean uploadDiscouraged) {
+    public void setUploadDiscouraged(boolean uploadDiscouraged) {
         this.uploadDiscouraged = uploadDiscouraged;
     }
Index: trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java	(revision 8512)
@@ -217,5 +217,5 @@
     }
 
-    private final void resetPrimitive(OsmPrimitive osm) {
+    private void resetPrimitive(OsmPrimitive osm) {
         if (osm instanceof Way) {
             ((Way) osm).setNodes(null);
Index: trunk/src/org/openstreetmap/josm/data/osm/Hash.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/Hash.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/data/osm/Hash.java	(revision 8512)
@@ -21,5 +21,5 @@
      * @return computed hashcode
      */
-    public int getHashCode(K k);
+    int getHashCode(K k);
 
     /**
@@ -32,4 +32,4 @@
      * uniquely identifies t in given class.
      */
-    public boolean equals(K k, T t);
+    boolean equals(K k, T t);
 }
Index: trunk/src/org/openstreetmap/josm/data/osm/Node.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/Node.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/data/osm/Node.java	(revision 8512)
@@ -40,15 +40,15 @@
      * @since 7828
      */
-    public final boolean isLatLonKnown() {
+    public boolean isLatLonKnown() {
         return !Double.isNaN(lat) && !Double.isNaN(lon);
     }
 
     @Override
-    public final void setCoor(LatLon coor) {
+    public void setCoor(LatLon coor) {
         updateCoor(coor, null);
     }
 
     @Override
-    public final void setEastNorth(EastNorth eastNorth) {
+    public void setEastNorth(EastNorth eastNorth) {
         updateCoor(null, eastNorth);
     }
@@ -68,5 +68,5 @@
 
     @Override
-    public final LatLon getCoor() {
+    public LatLon getCoor() {
         if (!isLatLonKnown()) return null;
         return new LatLon(lat, lon);
@@ -89,5 +89,5 @@
      */
     @Override
-    public final EastNorth getEastNorth() {
+    public EastNorth getEastNorth() {
         if (!isLatLonKnown()) return null;
 
Index: trunk/src/org/openstreetmap/josm/data/osm/Way.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/Way.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/data/osm/Way.java	(revision 8512)
@@ -774,5 +774,5 @@
     }
 
-    public final void clearCachedNodeStyles() {
+    public void clearCachedNodeStyles() {
         for (final Node n : nodes) {
             n.clearCachedStyle();
Index: trunk/src/org/openstreetmap/josm/data/osm/history/History.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/history/History.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/data/osm/history/History.java	(revision 8512)
@@ -21,5 +21,5 @@
 public class History {
 
-    private static interface FilterPredicate {
+    private interface FilterPredicate {
         boolean matches(HistoryOsmPrimitive primitive);
     }
Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java	(revision 8512)
@@ -224,5 +224,5 @@
      * @param d Fourth value
      */
-    private static final int max(int a, int b, int c, int d) {
+    private static int max(int a, int b, int c, int d) {
         return Math.max(Math.max(a, b), Math.max(c, d));
     }
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 8511)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java	(revision 8512)
@@ -370,5 +370,5 @@
     }
 
-    private final void load(Relation r) {
+    private void load(Relation r) {
         MultipolygonRoleMatcher matcher = getMultipolygonRoleMatcher();
 
@@ -556,5 +556,5 @@
     }
 
-    private final void addInnerToOuters(List<PolyData> innerPolygons, List<PolyData> outerPolygons)  {
+    private void addInnerToOuters(List<PolyData> innerPolygons, List<PolyData> outerPolygons)  {
 
         if (innerPolygons.isEmpty()) {
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 8511)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/MultipolygonCache.java	(revision 8512)
@@ -68,5 +68,5 @@
      * @return A multipolygon object for the given relation, or {@code null}
      */
-    public final Multipolygon get(NavigatableComponent nc, Relation r) {
+    public Multipolygon get(NavigatableComponent nc, Relation r) {
         return get(nc, r, false);
     }
@@ -79,5 +79,5 @@
      * @return A multipolygon object for the given relation, or {@code null}
      */
-    public final Multipolygon get(NavigatableComponent nc, Relation r, boolean forceRefresh) {
+    public Multipolygon get(NavigatableComponent nc, Relation r, boolean forceRefresh) {
         Multipolygon multipolygon = null;
         if (nc != null && r != null) {
@@ -107,5 +107,5 @@
      * @param nc the navigatable component
      */
-    public final void clear(NavigatableComponent nc) {
+    public void clear(NavigatableComponent nc) {
         Map<DataSet, Map<Relation, Multipolygon>> map = cache.remove(nc);
         if (map != null) {
@@ -119,5 +119,5 @@
      * @param ds the data set
      */
-    public final void clear(DataSet ds) {
+    public void clear(DataSet ds) {
         for (Map<DataSet, Map<Relation, Multipolygon>> map1 : cache.values()) {
             Map<Relation, Multipolygon> map2 = map1.remove(ds);
@@ -132,9 +132,9 @@
      * Clears the whole cache.
      */
-    public final void clear() {
+    public void clear() {
         cache.clear();
     }
 
-    private final Collection<Map<Relation, Multipolygon>> getMapsFor(DataSet ds) {
+    private Collection<Map<Relation, Multipolygon>> getMapsFor(DataSet ds) {
         List<Map<Relation, Multipolygon>> result = new ArrayList<>();
         for (Map<DataSet, Map<Relation, Multipolygon>> map : cache.values()) {
@@ -151,14 +151,14 @@
     }
 
-    private final void updateMultipolygonsReferringTo(AbstractDatasetChangedEvent event) {
+    private void updateMultipolygonsReferringTo(AbstractDatasetChangedEvent event) {
         updateMultipolygonsReferringTo(event, event.getPrimitives(), event.getDataset());
     }
 
-    private final void updateMultipolygonsReferringTo(
+    private void updateMultipolygonsReferringTo(
             final AbstractDatasetChangedEvent event, Collection<? extends OsmPrimitive> primitives, DataSet ds) {
         updateMultipolygonsReferringTo(event, primitives, ds, null);
     }
 
-    private final Collection<Map<Relation, Multipolygon>> updateMultipolygonsReferringTo(
+    private Collection<Map<Relation, Multipolygon>> updateMultipolygonsReferringTo(
             AbstractDatasetChangedEvent event, Collection<? extends OsmPrimitive> primitives,
             DataSet ds, Collection<Map<Relation, Multipolygon>> initialMaps) {
@@ -189,5 +189,5 @@
     }
 
-    private final void processEvent(AbstractDatasetChangedEvent event, Relation r, Collection<Map<Relation, Multipolygon>> maps) {
+    private void processEvent(AbstractDatasetChangedEvent event, Relation r, Collection<Map<Relation, Multipolygon>> maps) {
         if (event instanceof NodeMovedEvent || event instanceof WayNodesChangedEvent) {
             dispatchEvent(event, r, maps);
@@ -202,5 +202,5 @@
     }
 
-    private final void dispatchEvent(AbstractDatasetChangedEvent event, Relation r, Collection<Map<Relation, Multipolygon>> maps) {
+    private void dispatchEvent(AbstractDatasetChangedEvent event, Relation r, Collection<Map<Relation, Multipolygon>> maps) {
         for (Map<Relation, Multipolygon> map : maps) {
             Multipolygon m = map.get(r);
@@ -217,5 +217,5 @@
     }
 
-    private final void removeMultipolygonFrom(Relation r, Collection<Map<Relation, Multipolygon>> maps) {
+    private void removeMultipolygonFrom(Relation r, Collection<Map<Relation, Multipolygon>> maps) {
         for (Map<Relation, Multipolygon> map : maps) {
             map.remove(r);
Index: trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java	(revision 8512)
@@ -209,5 +209,5 @@
      * @return interpolated value
      */
-    private final double interpolate(float a, float b, float c, float d, double x, double y) {
+    private double interpolate(float a, float b, float c, float d, double x, double y) {
         return a + (((double) b - (double) a) * x) + (((double) c - (double) a) * y) +
         (((double) a + (double) d - b - c) * x * y);
Index: trunk/src/org/openstreetmap/josm/data/validation/tests/PowerLines.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/tests/PowerLines.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/data/validation/tests/PowerLines.java	(revision 8512)
@@ -200,5 +200,5 @@
      * @return {@code true} if power key is set and equal to possible values
      */
-    private static final boolean isPowerIn(OsmPrimitive p, Collection<String> values) {
+    private static boolean isPowerIn(OsmPrimitive p, Collection<String> values) {
         String v = p.get("power");
         return v != null && values != null && values.contains(v);
Index: trunk/src/org/openstreetmap/josm/gui/FileDrop.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/FileDrop.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/gui/FileDrop.java	(revision 8512)
@@ -454,5 +454,5 @@
      * </code>
      */
-    public static interface Listener {
+    public interface Listener {
 
         /**
@@ -461,5 +461,5 @@
          * @param files An array of <tt>File</tt>s that were dropped.
          */
-        public abstract void filesDropped(File[] files);
+        void filesDropped(File[] files);
     }
 
@@ -668,5 +668,5 @@
          * @author Robert Harder
          */
-        public static interface Fetcher {
+        public interface Fetcher {
             /**
              * Return the object being encapsulated in the
@@ -675,5 +675,5 @@
              * @return The dropped object
              */
-            public abstract Object getObject();
+            Object getObject();
         }
     }
Index: trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java	(revision 8512)
@@ -101,5 +101,5 @@
         }
 
-        private final boolean addChangeListener(ChangeListener listener) {
+        private boolean addChangeListener(ChangeListener listener) {
             return listener != null ? listeners.add(listener) : false;
         }
Index: trunk/src/org/openstreetmap/josm/gui/MapFrameListener.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MapFrameListener.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/gui/MapFrameListener.java	(revision 8512)
@@ -15,4 +15,4 @@
      * @param newFrame The new MapFrame
      */
-    public abstract void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame);
+    void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame);
 }
Index: trunk/src/org/openstreetmap/josm/gui/NameFormatterHook.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/NameFormatterHook.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/gui/NameFormatterHook.java	(revision 8512)
@@ -14,5 +14,5 @@
      * @return The corrected type name if needed, null otherwise.
      */
-    public String checkRelationTypeName(IRelation relation, String defaultName);
+    String checkRelationTypeName(IRelation relation, String defaultName);
 
     /**
@@ -22,5 +22,5 @@
      * @return The corrected format if needed, null otherwise.
      */
-    public String checkFormat(INode node, String defaultName);
+    String checkFormat(INode node, String defaultName);
 
     /**
@@ -30,5 +30,5 @@
      * @return The corrected format if needed, null otherwise.
      */
-    public String checkFormat(IWay way, String defaultName);
+    String checkFormat(IWay way, String defaultName);
 
     /**
@@ -38,4 +38,4 @@
      * @return The corrected format if needed, null otherwise.
      */
-    public String checkFormat(IRelation relation, String defaultName);
+    String checkFormat(IRelation relation, String defaultName);
 }
Index: trunk/src/org/openstreetmap/josm/gui/SelectionManager.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/SelectionManager.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/gui/SelectionManager.java	(revision 8512)
@@ -60,10 +60,12 @@
          * @see InputEvent#getModifiersEx()
          */
-        public void selectionEnded(Rectangle r, MouseEvent e);
+        void selectionEnded(Rectangle r, MouseEvent e);
+
         /**
          * Called to register the selection manager for "active" property.
          * @param listener The listener to register
          */
-        public void addPropertyChangeListener(PropertyChangeListener listener);
+        void addPropertyChangeListener(PropertyChangeListener listener);
+
         /**
          * Called to remove the selection manager from the listener list
@@ -71,5 +73,5 @@
          * @param listener The listener to register
          */
-        public void removePropertyChangeListener(PropertyChangeListener listener);
+        void removePropertyChangeListener(PropertyChangeListener listener);
     }
     /**
Index: trunk/src/org/openstreetmap/josm/gui/ShowHideButtonListener.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/ShowHideButtonListener.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/gui/ShowHideButtonListener.java	(revision 8512)
@@ -8,6 +8,6 @@
  */
 public interface ShowHideButtonListener {
-    public void buttonShown();
+    void buttonShown();
 
-    public void buttonHidden();
+    void buttonHidden();
 }
Index: trunk/src/org/openstreetmap/josm/gui/bbox/BBoxChooser.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/bbox/BBoxChooser.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/gui/bbox/BBoxChooser.java	(revision 8512)
@@ -23,5 +23,5 @@
      * @param bbox the bounding box
      */
-    public void setBoundingBox(Bounds bbox);
+    void setBoundingBox(Bounds bbox);
 
     /**
@@ -32,4 +32,4 @@
      * @return the currently selected bounding box
      */
-    public Bounds getBoundingBox();
+    Bounds getBoundingBox();
 }
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java	(revision 8512)
@@ -775,5 +775,5 @@
     }
 
-    private static interface FreezeActionProperties {
+    private interface FreezeActionProperties {
         String PROP_SELECTED = FreezeActionProperties.class.getName() + ".selected";
     }
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java	(revision 8512)
@@ -41,5 +41,5 @@
      * Defines the interface for an object implementing navigation between rows
      */
-    public static interface NavigationListener {
+    public interface NavigationListener {
         /** Call when need to go to next row */
         void gotoNextDecision();
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 8512)
@@ -176,5 +176,5 @@
      *
      */
-    private final void resolve() {
+    private void resolve() {
         if (conflicts == null || model.getSize() == 0) return;
 
@@ -197,5 +197,5 @@
      * refreshes the view of this dialog
      */
-    public final void refreshView() {
+    public void refreshView() {
         OsmDataLayer editLayer =  Main.main.getEditLayer();
         conflicts = (editLayer == null ? new ConflictCollection() : editLayer.getConflicts());
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java	(revision 8512)
@@ -142,5 +142,5 @@
      * to toggle the visibility of the first ten layers.
      */
-    private final void createVisibilityToggleShortcuts() {
+    private void createVisibilityToggleShortcuts() {
         final int[] k = {
                 KeyEvent.VK_1, KeyEvent.VK_2, KeyEvent.VK_3, KeyEvent.VK_4, KeyEvent.VK_5,
@@ -1128,5 +1128,5 @@
          * @param layer the layer
          */
-        public void makeVisible(int index, Layer layer);
+        void makeVisible(int index, Layer layer);
 
 
@@ -1134,5 +1134,5 @@
          * Fired when something has changed in the layer list model.
          */
-        public void refresh();
+        void refresh();
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java	(revision 8512)
@@ -592,5 +592,5 @@
     }
 
-    private final void setupPopupMenuHandler() {
+    private void setupPopupMenuHandler() {
 
         // -- select action
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java	(revision 8512)
@@ -173,5 +173,5 @@
     }
 
-    private final void alertNoPrimitivesTo(Collection<HistoryOsmPrimitive> primitives, String title, String helpTopic) {
+    private void alertNoPrimitivesTo(Collection<HistoryOsmPrimitive> primitives, String title, String helpTopic) {
         HelpAwareOptionPane.showOptionDialog(
                 ChangesetContentPanel.this,
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorter.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorter.java	(revision 8512)
@@ -18,8 +18,8 @@
 public class RelationSorter {
 
-    private static interface AdditionalSorter {
-        public boolean acceptsMember(RelationMember m);
+    private interface AdditionalSorter {
+        boolean acceptsMember(RelationMember m);
 
-        public List<RelationMember> sortMembers(List<RelationMember> list);
+        List<RelationMember> sortMembers(List<RelationMember> list);
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/download/DownloadSelection.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/download/DownloadSelection.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/gui/download/DownloadSelection.java	(revision 8512)
@@ -17,4 +17,4 @@
      * @param area the current download area
      */
-    public void setDownloadArea(Bounds area);
+    void setDownloadArea(Bounds area);
 }
Index: trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java	(revision 8512)
@@ -499,5 +499,5 @@
     }
 
-    private final int getBestZoom() {
+    private int getBestZoom() {
         double factor = getScaleFactor(1); // check the ratio between area of tilesize at zoom 1 to current view
         double result = Math.log(factor)/Math.log(2)/2+1;
Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java	(revision 8512)
@@ -919,5 +919,5 @@
      *         {@code false} otherwise
      */
-    private static final boolean isSupportedMapMode(MapMode mapMode) {
+    private static boolean isSupportedMapMode(MapMode mapMode) {
         if (mapMode instanceof SelectAction || mapMode instanceof LassoModeAction) {
             return true;
@@ -939,5 +939,5 @@
     public void hookUpMapView() {
         mouseAdapter = new MouseAdapter() {
-            private final boolean isMapModeOk() {
+            private boolean isMapModeOk() {
                 return Main.map.mapMode == null || isSupportedMapMode(Main.map.mapMode);
             }
Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java	(revision 8512)
@@ -547,5 +547,5 @@
     }
 
-    private final Point img2compCoord(Rectangle visibleRect, int xImg, int yImg) {
+    private Point img2compCoord(Rectangle visibleRect, int xImg, int yImg) {
         Rectangle drawRect = calculateDrawImageRectangle(visibleRect);
         return new Point(drawRect.x + ((xImg - visibleRect.x) * drawRect.width) / visibleRect.width,
@@ -553,5 +553,5 @@
     }
 
-    private final Point comp2imgCoord(Rectangle visibleRect, int xComp, int yComp) {
+    private Point comp2imgCoord(Rectangle visibleRect, int xComp, int yComp) {
         Rectangle drawRect = calculateDrawImageRectangle(visibleRect);
         return new Point(visibleRect.x + ((xComp - drawRect.x) * visibleRect.width) / drawRect.width,
@@ -559,5 +559,5 @@
     }
 
-    private final Point getCenterImgCoord(Rectangle visibleRect) {
+    private Point getCenterImgCoord(Rectangle visibleRect) {
         return new Point(visibleRect.x + visibleRect.width / 2,
                 visibleRect.y + visibleRect.height / 2);
@@ -630,5 +630,5 @@
     }
 
-    private final void checkVisibleRectPos(Image image, Rectangle visibleRect) {
+    private void checkVisibleRectPos(Image image, Rectangle visibleRect) {
         if (visibleRect.x < 0) {
             visibleRect.x = 0;
Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java	(revision 8512)
@@ -82,5 +82,5 @@
      * @since 6450
      */
-    public final boolean hasGpsTime() {
+    public boolean hasGpsTime() {
         return (tmp != null && tmp.gpsTime != null) || gpsTime != null;
     }
@@ -106,5 +106,5 @@
      * @since 6450
      */
-    public final boolean hasExifTime() {
+    public boolean hasExifTime() {
         return exifTime != null;
     }
@@ -115,5 +115,5 @@
      * @since 6392
      */
-    public final Date getExifGpsTime() {
+    public Date getExifGpsTime() {
         return getDefensiveDate(exifGpsTime);
     }
@@ -124,5 +124,5 @@
      * @since 6450
      */
-    public final boolean hasExifGpsTime() {
+    public boolean hasExifGpsTime() {
         return exifGpsTime != null;
     }
@@ -182,5 +182,5 @@
      * @since 6392
      */
-    public final void setExifGpsTime(Date exifGpsTime) {
+    public void setExifGpsTime(Date exifGpsTime) {
         this.exifGpsTime = getDefensiveDate(exifGpsTime);
     }
Index: trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java	(revision 8512)
@@ -61,5 +61,5 @@
     }
 
-    private final void updateErroneous() {
+    private void updateErroneous() {
         if ("file".equals(webUrl.getProtocol())) {
             String path = webUrl.getPath();
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/BoxTextElemStyle.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/BoxTextElemStyle.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/BoxTextElemStyle.java	(revision 8512)
@@ -21,5 +21,5 @@
     public enum VerticalTextAlignment { ABOVE, TOP, CENTER, BOTTOM, BELOW }
 
-    public static interface BoxProvider {
+    public interface BoxProvider {
         BoxProviderResult get();
     }
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java	(revision 8512)
@@ -451,7 +451,7 @@
 
     public interface MapPaintSylesUpdateListener {
-        public void mapPaintStylesUpdated();
-
-        public void mapPaintStyleEntryUpdated(int idx);
+        void mapPaintStylesUpdated();
+
+        void mapPaintStyleEntryUpdated(int idx);
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Subpart.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Subpart.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Subpart.java	(revision 8512)
@@ -11,5 +11,5 @@
     String getId(Environment env);
 
-    public static Subpart DEFAULT_SUBPART = new StringSubpart("default");
+    Subpart DEFAULT_SUBPART = new StringSubpart("default");
 
     /**
@@ -18,5 +18,5 @@
      * E.g. ::layer_1
      */
-    public static class StringSubpart implements Subpart {
+    class StringSubpart implements Subpart {
         private final String id;
 
@@ -36,5 +36,5 @@
      * E.g. ::(concat("layer_", prop("i", "default")))
      */
-    public static class ExpressionSubpart implements Subpart {
+    class ExpressionSubpart implements Subpart {
         private final Expression id;
 
Index: trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceSetting.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceSetting.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceSetting.java	(revision 8512)
@@ -23,4 +23,4 @@
      * @return true if the tab has only to be displayed in expert mode, false otherwise.
      */
-    public boolean isExpert();
+    boolean isExpert();
 }
Index: trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java	(revision 8512)
@@ -191,8 +191,8 @@
     }
 
-    private static interface PreferenceTab {
-        public TabPreferenceSetting getTabPreferenceSetting();
-
-        public Component getComponent();
+    private interface PreferenceTab {
+        TabPreferenceSetting getTabPreferenceSetting();
+
+        Component getComponent();
     }
 
@@ -217,5 +217,5 @@
 
         @Override
-        public final TabPreferenceSetting getTabPreferenceSetting() {
+        public TabPreferenceSetting getTabPreferenceSetting() {
             return preferenceSetting;
         }
@@ -240,5 +240,5 @@
 
         @Override
-        public final TabPreferenceSetting getTabPreferenceSetting() {
+        public TabPreferenceSetting getTabPreferenceSetting() {
             return preferenceSetting;
         }
@@ -299,6 +299,6 @@
     }
 
-    private static interface TabIdentifier {
-        public boolean identify(TabPreferenceSetting tps, Object param);
+    private interface TabIdentifier {
+        boolean identify(TabPreferenceSetting tps, Object param);
     }
 
@@ -352,5 +352,5 @@
      * @return the {@code DisplayPreference} object.
      */
-    public final DisplayPreference getDisplayPreference() {
+    public DisplayPreference getDisplayPreference() {
         return getSetting(DisplayPreference.class);
     }
@@ -360,5 +360,5 @@
      * @return the {@code MapPreference} object.
      */
-    public final MapPreference getMapPreference() {
+    public MapPreference getMapPreference() {
         return getSetting(MapPreference.class);
     }
@@ -368,5 +368,5 @@
      * @return the {@code PluginPreference} object.
      */
-    public final PluginPreference getPluginPreference() {
+    public PluginPreference getPluginPreference() {
         return getSetting(PluginPreference.class);
     }
@@ -376,5 +376,5 @@
      * @return the {@code ImageryPreference} object.
      */
-    public final ImageryPreference getImageryPreference() {
+    public ImageryPreference getImageryPreference() {
         return getSetting(ImageryPreference.class);
     }
@@ -384,5 +384,5 @@
      * @return the {@code ShortcutPreference} object.
      */
-    public final ShortcutPreference getShortcutPreference() {
+    public ShortcutPreference getShortcutPreference() {
         return getSetting(ShortcutPreference.class);
     }
@@ -393,5 +393,5 @@
      * @since 6523
      */
-    public final ServerAccessPreference getServerPreference() {
+    public ServerAccessPreference getServerPreference() {
         return getSetting(ServerAccessPreference.class);
     }
@@ -402,5 +402,5 @@
      * @since 6665
      */
-    public final ValidatorPreference getValidatorPreference() {
+    public ValidatorPreference getValidatorPreference() {
         return getSetting(ValidatorPreference.class);
     }
Index: trunk/src/org/openstreetmap/josm/gui/preferences/SourceProvider.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/SourceProvider.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/SourceProvider.java	(revision 8512)
@@ -6,4 +6,4 @@
 public interface SourceProvider {
 
-    public Collection<SourceEntry> getSources();
+    Collection<SourceEntry> getSources();
 }
Index: trunk/src/org/openstreetmap/josm/gui/preferences/SubPreferenceSetting.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/SubPreferenceSetting.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/SubPreferenceSetting.java	(revision 8512)
@@ -13,4 +13,4 @@
      * Returns the preference setting (displayed in the specified preferences tab pane) that contains this preference setting.
      */
-    public TabPreferenceSetting getTabPreferenceSetting(final PreferenceTabbedPane gui);
+    TabPreferenceSetting getTabPreferenceSetting(final PreferenceTabbedPane gui);
 }
Index: trunk/src/org/openstreetmap/josm/gui/preferences/TabPreferenceSetting.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/TabPreferenceSetting.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/TabPreferenceSetting.java	(revision 8512)
@@ -10,10 +10,10 @@
  */
 public interface TabPreferenceSetting extends PreferenceSetting {
-    
+
     /**
      * Called during preferences dialog initialization to display the preferences tab with the returned icon.
      * @return The icon name in the preferences folder.
      */
-    public String getIconName();
+    String getIconName();
 
     /**
@@ -22,17 +22,17 @@
      */
     String getTitle();
-    
+
     /**
      * Called during preferences dialog initialization to display the preferences tab with the returned tooltip.
      * @return The tooltip of this preferences tab.
      */
-    public String getTooltip();
+    String getTooltip();
 
     /**
-     * Called during preferences tab initialization to display a description in one sentence for this tab. 
+     * Called during preferences tab initialization to display a description in one sentence for this tab.
      * Will be displayed in italic under the title.
      * @return The description of this preferences tab.
      */
-    public String getDescription();
+    String getDescription();
 
     /**
@@ -43,6 +43,6 @@
      * @since 5631
      */
-    public void addSubTab(SubPreferenceSetting sub, String title, Component component);
-    
+    void addSubTab(SubPreferenceSetting sub, String title, Component component);
+
     /**
      * Adds a new sub preference settings tab with the given title, component and tooltip.
@@ -53,5 +53,5 @@
      * @since 5631
      */
-    public void addSubTab(SubPreferenceSetting sub, String title, Component component, String tip);
+    void addSubTab(SubPreferenceSetting sub, String title, Component component, String tip);
 
     /**
@@ -61,6 +61,6 @@
      * @since 5631
      */
-    public void registerSubTab(SubPreferenceSetting sub, Component component);
-    
+    void registerSubTab(SubPreferenceSetting sub, Component component);
+
     /**
      * Returns the tab component related to the specified sub preference settings
@@ -69,5 +69,5 @@
      * @since 5631
      */
-    public Component getSubTab(SubPreferenceSetting sub);
+    Component getSubTab(SubPreferenceSetting sub);
 
     /**
@@ -77,4 +77,4 @@
      * @since 5631
      */
-    public boolean selectSubTab(SubPreferenceSetting subPref);
+    boolean selectSubTab(SubPreferenceSetting subPref);
 }
Index: trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddImageryPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddImageryPanel.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddImageryPanel.java	(revision 8512)
@@ -40,5 +40,5 @@
          * @param isValid true if the conditions required to close this panel are met
          */
-        public void contentChanged(boolean isValid);
+        void contentChanged(boolean isValid);
     }
 
@@ -103,5 +103,5 @@
     }
 
-    private final void notifyListeners() {
+    private void notifyListeners() {
         for (ContentValidationListener l : listeners) {
             l.contentChanged(isImageryValid());
Index: trunk/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java	(revision 8512)
@@ -58,5 +58,5 @@
         }
 
-        private final void build(String initialText, final ActionListener listener) {
+        private void build(String initialText, final ActionListener listener) {
             input = new JosmTextField(30);
             cbInput = new HistoryComboBox();
Index: trunk/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferenceListener.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferenceListener.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferenceListener.java	(revision 8512)
@@ -11,4 +11,4 @@
      * Method called when proxy settings are updated.
      */
-    public void proxyPreferenceChanged();
+    void proxyPreferenceChanged();
 }
Index: trunk/src/org/openstreetmap/josm/gui/preferences/server/ServerAccessPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/server/ServerAccessPreference.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/server/ServerAccessPreference.java	(revision 8512)
@@ -87,5 +87,5 @@
      * @since 6523
      */
-    public final void addApiUrlChangeListener(PropertyChangeListener listener) {
+    public void addApiUrlChangeListener(PropertyChangeListener listener) {
         pnlApiUrlPreferences.addPropertyChangeListener(listener);
     }
Index: trunk/src/org/openstreetmap/josm/gui/progress/ProgressMonitor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/progress/ProgressMonitor.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/gui/progress/ProgressMonitor.java	(revision 8512)
@@ -37,5 +37,5 @@
 
     /** Ticks count used, when no other value is supplied */
-    public final int DEFAULT_TICKS = 10000;
+    int DEFAULT_TICKS = 10000;
 
     /**
@@ -43,5 +43,5 @@
      * express that the task should use all remaining ticks
      */
-    public final int ALL_TICKS = -1;
+    int ALL_TICKS = -1;
 
     /**
Index: trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetListener.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetListener.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetListener.java	(revision 8512)
@@ -11,4 +11,4 @@
      * Called after list of tagging presets has been modified.
      */
-    public void taggingPresetsModified();
+    void taggingPresetsModified();
 }
Index: trunk/src/org/openstreetmap/josm/gui/util/KeyPressReleaseListener.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/util/KeyPressReleaseListener.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/gui/util/KeyPressReleaseListener.java	(revision 8512)
@@ -12,9 +12,10 @@
      * (no fake events while holding key)
      */
-    public void doKeyPressed(KeyEvent e);
+    void doKeyPressed(KeyEvent e);
+
     /**
      * This is called when key press event is actually released
      * (no fake events while holding key)
      */
-    public void doKeyReleased(KeyEvent e);
+    void doKeyReleased(KeyEvent e);
 }
Index: trunk/src/org/openstreetmap/josm/gui/util/ModifierListener.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/util/ModifierListener.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/gui/util/ModifierListener.java	(revision 8512)
@@ -7,4 +7,4 @@
  */
 public interface ModifierListener {
-    public void modifiersChanged(int modifiers);
+    void modifiersChanged(int modifiers);
 }
Index: trunk/src/org/openstreetmap/josm/gui/widgets/FileChooserManager.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/FileChooserManager.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/FileChooserManager.java	(revision 8512)
@@ -158,5 +158,5 @@
     }
 
-    private final FileChooserManager doCreateFileChooser(boolean multiple, String title, Collection<? extends FileFilter> filters,
+    private FileChooserManager doCreateFileChooser(boolean multiple, String title, Collection<? extends FileFilter> filters,
             FileFilter defaultFilter, String extension, int selectionMode, boolean allTypes) {
         File file = new File(curDir);
Index: trunk/src/org/openstreetmap/josm/gui/widgets/HistoryChangedListener.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/HistoryChangedListener.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/HistoryChangedListener.java	(revision 8512)
@@ -5,4 +5,4 @@
 
 public interface HistoryChangedListener {
-    public void historyChanged(List<String> history);
+    void historyChanged(List<String> history);
 }
Index: trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitPane.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitPane.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitPane.java	(revision 8512)
@@ -151,5 +151,5 @@
          * @param divider the Divider to paint
          */
-        public abstract void paint(Graphics g, Divider divider);
+        void paint(Graphics g, Divider divider);
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/widgets/OsmPrimitivesTableModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/OsmPrimitivesTableModel.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/OsmPrimitivesTableModel.java	(revision 8512)
@@ -7,5 +7,5 @@
 
 public interface OsmPrimitivesTableModel extends TableModel {
-    
-    public abstract OsmPrimitive getReferredPrimitive(int idx);
+
+    OsmPrimitive getReferredPrimitive(int idx);
 }
Index: trunk/src/org/openstreetmap/josm/io/OsmServerReadPostprocessor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmServerReadPostprocessor.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/io/OsmServerReadPostprocessor.java	(revision 8512)
@@ -7,5 +7,4 @@
 public interface OsmServerReadPostprocessor {
 
-    public void postprocessDataSet(DataSet ds, ProgressMonitor progress);
-
+    void postprocessDataSet(DataSet ds, ProgressMonitor progress);
 }
Index: trunk/src/org/openstreetmap/josm/io/OsmServerWritePostprocessor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmServerWritePostprocessor.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/io/OsmServerWritePostprocessor.java	(revision 8512)
@@ -9,5 +9,4 @@
 public interface OsmServerWritePostprocessor {
 
-    public void postprocessUploadedPrimitives(Collection<OsmPrimitive> p, ProgressMonitor progress);
-
+    void postprocessUploadedPrimitives(Collection<OsmPrimitive> p, ProgressMonitor progress);
 }
Index: trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java
===================================================================
--- trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java	(revision 8512)
@@ -198,5 +198,5 @@
     }
 
-    private final void scanManifest(Manifest manifest, boolean oldcheck) {
+    private void scanManifest(Manifest manifest, boolean oldcheck) {
         String lang = LanguageInfo.getLanguageCodeManifest();
         Attributes attr = manifest.getMainAttributes();
Index: trunk/src/org/openstreetmap/josm/tools/ColorScale.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/ColorScale.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/tools/ColorScale.java	(revision 8512)
@@ -87,5 +87,5 @@
     }
 
-    public final Color getColor(double value) {
+    public Color getColor(double value) {
         if (value < min) return belowMinColor;
         if (value > max) return aboveMaxColor;
@@ -100,5 +100,5 @@
     }
 
-    public final Color getColor(Number value) {
+    public Color getColor(Number value) {
         return (value == null) ? noDataColor : getColor(value.doubleValue());
     }
Index: trunk/src/org/openstreetmap/josm/tools/Destroyable.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Destroyable.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/tools/Destroyable.java	(revision 8512)
@@ -14,4 +14,4 @@
      * Called when the object has been destroyed.
      */
-    public void destroy();
+    void destroy();
 }
Index: trunk/src/org/openstreetmap/josm/tools/Diff.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Diff.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/tools/Diff.java	(revision 8512)
@@ -395,5 +395,5 @@
             @return a linked list of changes - or null
          */
-        public Change build_script(
+        Change build_script(
                 boolean[] changed0, int len0,
                 boolean[] changed1, int len1
Index: trunk/src/org/openstreetmap/josm/tools/MultikeyShortcutAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/MultikeyShortcutAction.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/tools/MultikeyShortcutAction.java	(revision 8512)
@@ -35,5 +35,5 @@
     }
 
-    public Shortcut getMultikeyShortcut();
+    Shortcut getMultikeyShortcut();
 
     void executeMultikeyAction(int index, boolean repeatLastAction);
Index: trunk/src/org/openstreetmap/josm/tools/PlatformHook.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/PlatformHook.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/tools/PlatformHook.java	(revision 8512)
@@ -23,13 +23,13 @@
       * that we want to be integrated with the OS before we setup our GUI.
       */
-    public void preStartupHook();
-    
+    void preStartupHook();
+
     /**
       * The afterPrefStartupHook will be called early, but after
       * the preferences have been loaded and basic processing of
-      * command line arguments is finished. 
+      * command line arguments is finished.
       * It is guaranteed to be called before the GUI setup has started.
       */
-    public void afterPrefStartupHook();
+    void afterPrefStartupHook();
 
     /**
@@ -40,5 +40,5 @@
       * OS, so we'll receive events from the system menu.
       */
-    public void startupHook();
+    void startupHook();
 
     /**
@@ -48,5 +48,5 @@
      * @throws IOException if any I/O error occurs
       */
-    public void openUrl(String url) throws IOException;
+    void openUrl(String url) throws IOException;
 
     /**
@@ -70,5 +70,5 @@
       * user to change them.
       */
-    public void initSystemShortcuts();
+    void initSystemShortcuts();
 
     /**
@@ -86,5 +86,5 @@
      * @return Full tooltip text (name + accelerator)
       */
-    public String makeTooltip(String name, Shortcut sc);
+    String makeTooltip(String name, Shortcut sc);
 
     /**
@@ -92,5 +92,5 @@
      * @return The default native LAF for this platform
      */
-    public String getDefaultStyle();
+    String getDefaultStyle();
 
     /**
@@ -98,5 +98,5 @@
      * @return {@code true} if full screen is allowed, {@code false} otherwise
      */
-    public boolean canFullscreen();
+    boolean canFullscreen();
 
     /**
@@ -106,5 +106,5 @@
      * @return {@code true} if the file has been renamed, {@code false} otherwise
      */
-    public boolean rename(File from, File to);
+    boolean rename(File from, File to);
 
     /**
@@ -113,5 +113,5 @@
      * @since 5850
      */
-    public String getOSDescription();
+    String getOSDescription();
 
     /**
@@ -126,5 +126,5 @@
      * @since 7343
      */
-    public boolean setupHttpsCertificate(String entryAlias, KeyStore.TrustedCertificateEntry trustedCert)
+    boolean setupHttpsCertificate(String entryAlias, KeyStore.TrustedCertificateEntry trustedCert)
             throws KeyStoreException, NoSuchAlgorithmException, CertificateException, IOException;
 
@@ -134,5 +134,5 @@
      * @since 7829
      */
-    public File getDefaultCacheDirectory();
+    File getDefaultCacheDirectory();
 
     /**
@@ -141,5 +141,5 @@
      * @since 7831
      */
-    public File getDefaultPrefDirectory();
+    File getDefaultPrefDirectory();
 
     /**
@@ -148,4 +148,4 @@
      * @since 7834
      */
-    public File getDefaultUserDataDirectory();
+    File getDefaultUserDataDirectory();
 }
Index: trunk/src/org/openstreetmap/josm/tools/Predicate.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Predicate.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/tools/Predicate.java	(revision 8512)
@@ -15,4 +15,4 @@
      * @return {@code true} if the object passes the test, {@code false} otherwise
      */
-    public boolean evaluate(T object);
+    boolean evaluate(T object);
 }
Index: trunk/src/org/openstreetmap/josm/tools/Property.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Property.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/tools/Property.java	(revision 8512)
@@ -14,5 +14,5 @@
      * @return the value of the property for the object obj
      */
-    public P get(O obj);
+    P get(O obj);
 
     /**
@@ -21,4 +21,4 @@
      * @param value the value the property is set to
      */
-    public void set(O obj, P value);
+    void set(O obj, P value);
 }
Index: trunk/src/org/openstreetmap/josm/tools/Utils.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Utils.java	(revision 8511)
+++ trunk/src/org/openstreetmap/josm/tools/Utils.java	(revision 8512)
@@ -648,5 +648,5 @@
      * @param <B> class of transformed objects
      */
-    public static interface Function<A, B> {
+    public interface Function<A, B> {
 
         /**