Index: trunk/src/org/openstreetmap/josm/corrector/ReverseWayNoTagCorrector.java
===================================================================
--- trunk/src/org/openstreetmap/josm/corrector/ReverseWayNoTagCorrector.java	(revision 8373)
+++ trunk/src/org/openstreetmap/josm/corrector/ReverseWayNoTagCorrector.java	(revision 8374)
@@ -51,5 +51,5 @@
      * @return tags that imply a semantic meaning from <code>way</code> direction and cannot be changed
      */
-    public static final TagCollection getDirectionalTags(Way way) {
+    public static TagCollection getDirectionalTags(Way way) {
         return directionalTags.intersect(TagCollection.from(way));
     }
Index: trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java
===================================================================
--- trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java	(revision 8373)
+++ trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java	(revision 8374)
@@ -103,5 +103,5 @@
          * @return The reversed tag (is equal to <code>tag</code> if no change is needed)
          */
-        public static final Tag apply(final Tag tag) {
+        public static Tag apply(final Tag tag) {
             return apply(tag.getKey(), tag.getValue());
         }
@@ -113,5 +113,5 @@
          * @return The reversed tag (is equal to <code>key=value</code> if no change is needed)
          */
-        public static final Tag apply(final String key, final String value) {
+        public static Tag apply(final String key, final String value) {
             String newKey = key;
             String newValue = value;
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 8373)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/MultipolygonCache.java	(revision 8374)
@@ -58,5 +58,5 @@
      * @return the unique instance
      */
-    public static final MultipolygonCache getInstance() {
+    public static MultipolygonCache getInstance() {
         return INSTANCE;
     }
@@ -147,5 +147,5 @@
     }
 
-    private static final boolean isMultipolygon(OsmPrimitive p) {
+    private static boolean isMultipolygon(OsmPrimitive p) {
         return p instanceof Relation && ((Relation) p).isMultipolygon();
     }
Index: trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2Util.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2Util.java	(revision 8373)
+++ trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2Util.java	(revision 8374)
@@ -38,5 +38,5 @@
      * @return the int
      */
-    public static final int getIntLE(byte[] b, int i) {
+    public static int getIntLE(byte[] b, int i) {
         return (b[i++] & 0x000000FF) | ((b[i++] << 8) & 0x0000FF00) | ((b[i++] << 16) & 0x00FF0000) | (b[i] << 24);
     }
@@ -48,5 +48,5 @@
      * @return the int
      */
-    public static final int getIntBE(byte[] b, int i) {
+    public static int getIntBE(byte[] b, int i) {
         return (b[i++] << 24) | ((b[i++] << 16) & 0x00FF0000) | ((b[i++] << 8) & 0x0000FF00) | (b[i] & 0x000000FF);
     }
@@ -59,5 +59,5 @@
      * @return the int
      */
-    public static final int getInt(byte[] b, boolean bigEndian) {
+    public static int getInt(byte[] b, boolean bigEndian) {
         if (bigEndian)
             return getIntBE(b, 0);
@@ -73,5 +73,5 @@
      * @return the float
      */
-    public static final float getFloat(byte[] b, boolean bigEndian) {
+    public static float getFloat(byte[] b, boolean bigEndian) {
         int i = 0;
         if (bigEndian) {
@@ -90,5 +90,5 @@
      * @return the double
      */
-    public static final double getDouble(byte[] b, boolean bigEndian) {
+    public static double getDouble(byte[] b, boolean bigEndian) {
         int i = 0;
         int j = 0;
Index: trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java	(revision 8373)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java	(revision 8374)
@@ -67,5 +67,5 @@
      * @return {@code true}, if the provider has been added, {@code false} otherwise
      */
-    public static final boolean registerSourceProvider(SourceProvider provider) {
+    public static boolean registerSourceProvider(SourceProvider provider) {
         if (provider != null)
             return presetSourceProviders.add(provider);
Index: trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java	(revision 8373)
+++ trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java	(revision 8374)
@@ -153,5 +153,5 @@
      * @return true if the user wants to cancel, false if they want to continue
      */
-    public static final boolean warnUser(String title, String content, ImageIcon baseActionIcon, String continueToolTip) {
+    public static boolean warnUser(String title, String content, ImageIcon baseActionIcon, String continueToolTip) {
         ExtendedDialog dlg = new ExtendedDialog(Main.parent,
                 title, new String[] {tr("Cancel"), tr("Continue")});
@@ -177,5 +177,5 @@
      * @since 7312
      */
-    public static final void notifyUserHtmlError(Component parent, String title, String message, String html) {
+    public static void notifyUserHtmlError(Component parent, String title, String message, String html) {
         JPanel p = new JPanel(new GridBagLayout());
         p.add(new JLabel(message), GBC.eol());
@@ -197,5 +197,5 @@
      * @since 5484
      */
-    public static final Image getDisabledImage(Image image) {
+    public static Image getDisabledImage(Image image) {
         return Toolkit.getDefaultToolkit().createImage(
                 new FilteredImageSource(image.getSource(), new GrayFilter(true, 20)));
@@ -208,5 +208,5 @@
      * @since 5484
      */
-    public static final ImageIcon getDisabledIcon(ImageIcon icon) {
+    public static ImageIcon getDisabledIcon(ImageIcon icon) {
         return new ImageIcon(getDisabledImage(icon.getImage()));
     }
@@ -221,5 +221,5 @@
      * @since 5493
      */
-    public static final Component prepareResizeableOptionPane(final Component pane, final Dimension minDimension) {
+    public static Component prepareResizeableOptionPane(final Component pane, final Dimension minDimension) {
         if (pane != null) {
             pane.addHierarchyListener(new HierarchyListener() {
@@ -250,5 +250,5 @@
      * @since 5735
      */
-    public static final Timer scheduleTimer(int initialDelay, ActionListener actionListener, boolean repeats) {
+    public static Timer scheduleTimer(int initialDelay, ActionListener actionListener, boolean repeats) {
         Timer timer = new Timer(initialDelay, actionListener);
         timer.setRepeats(repeats);
Index: trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java	(revision 8373)
+++ trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java	(revision 8374)
@@ -282,5 +282,5 @@
      * @since 5849
      */
-    public static final UrlLabel getBugReportUrlLabel(String debugText) {
+    public static UrlLabel getBugReportUrlLabel(String debugText) {
         URL url = getBugReportUrl(debugText);
         if (url != null) {
Index: trunk/src/org/openstreetmap/josm/tools/I18n.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/I18n.java	(revision 8373)
+++ trunk/src/org/openstreetmap/josm/tools/I18n.java	(revision 8374)
@@ -197,5 +197,5 @@
      * @see #trnc
      */
-    public static final String tr(String text, Object... objects) {
+    public static String tr(String text, Object... objects) {
         if (text == null) return null;
         return MessageFormat.format(gettext(text, null), objects);
@@ -214,5 +214,5 @@
      * @see #trnc
      */
-    public static final String trc(String context, String text) {
+    public static String trc(String context, String text) {
         if (context == null)
             return tr(text);
@@ -222,5 +222,5 @@
     }
 
-    public static final String trc_lazy(String context, String text) {
+    public static String trc_lazy(String context, String text) {
         if (context == null)
             return tr(text);
@@ -240,9 +240,9 @@
      * @return {@code text} unmodified.
      */
-    public static final String marktr(String text) {
+    public static String marktr(String text) {
         return text;
     }
 
-    public static final String marktrc(String context, String text) {
+    public static String marktrc(String context, String text) {
         return text;
     }
@@ -271,5 +271,5 @@
      * @see #trnc
      */
-    public static final String trn(String singularText, String pluralText, long n, Object... objects) {
+    public static String trn(String singularText, String pluralText, long n, Object... objects) {
         return MessageFormat.format(gettextn(singularText, pluralText, null, n), objects);
     }
@@ -298,9 +298,9 @@
      * @see #trn
      */
-    public static final String trnc(String context, String singularText, String pluralText, long n, Object... objects) {
+    public static String trnc(String context, String singularText, String pluralText, long n, Object... objects) {
         return MessageFormat.format(gettextn(singularText, pluralText, context, n), objects);
     }
 
-    private static final String gettext(String text, String ctx, boolean lazy) {
+    private static String gettext(String text, String ctx, boolean lazy) {
         int i;
         if(ctx == null && text.startsWith("_:") && (i = text.indexOf('\n')) >= 0) {
@@ -322,14 +322,14 @@
     }
 
-    private static final String gettext(String text, String ctx) {
+    private static String gettext(String text, String ctx) {
         return gettext(text, ctx, false);
     }
 
     /* try without context, when context try fails */
-    private static final String gettext_lazy(String text, String ctx) {
+    private static String gettext_lazy(String text, String ctx) {
         return gettext(text, ctx, true);
     }
 
-    private static final String gettextn(String text, String plural, String ctx, long num) {
+    private static String gettextn(String text, String plural, String ctx, long num) {
         int i;
         if(ctx == null && text.startsWith("_:") && (i = text.indexOf('\n')) >= 0) {
@@ -360,5 +360,5 @@
      * @return an array of locale objects.
      */
-    public static final Locale[] getAvailableTranslations() {
+    public static Locale[] getAvailableTranslations() {
         Collection<Locale> v = new ArrayList<>(languages.size());
         if(getTranslationFile("en") != null) {
Index: trunk/src/org/openstreetmap/josm/tools/date/DateUtils.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/date/DateUtils.java	(revision 8373)
+++ trunk/src/org/openstreetmap/josm/tools/date/DateUtils.java	(revision 8374)
@@ -151,5 +151,5 @@
      * @since 7299
      */
-    public static final SimpleDateFormat newIsoDateFormat() {
+    public static SimpleDateFormat newIsoDateFormat() {
         return new SimpleDateFormat("yyyy-MM-dd");
     }
@@ -160,5 +160,5 @@
      * @since 7299
      */
-    public static final SimpleDateFormat newIsoDateTimeFormat() {
+    public static SimpleDateFormat newIsoDateTimeFormat() {
         return new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssX");
     }
@@ -169,5 +169,5 @@
      * @since 7299
      */
-    public static final SimpleDateFormat newOsmApiDateTimeFormat() {
+    public static SimpleDateFormat newOsmApiDateTimeFormat() {
         // Example: "2010-09-07 14:39:41 UTC".
         // Always parsed with US locale regardless of the current locale in JOSM
@@ -181,5 +181,5 @@
      * @since 7299
      */
-    public static final DateFormat getDateFormat(int dateStyle) {
+    public static DateFormat getDateFormat(int dateStyle) {
         if (PROP_ISO_DATES.get()) {
             return newIsoDateFormat();
@@ -196,5 +196,5 @@
      * @since 7299
      */
-    public static final String formatDate(Date date, int dateStyle) {
+    public static String formatDate(Date date, int dateStyle) {
         CheckParameterUtil.ensureParameterNotNull(date, "date");
         return getDateFormat(dateStyle).format(date);
@@ -207,5 +207,5 @@
      * @since 7299
      */
-    public static final DateFormat getTimeFormat(int timeStyle) {
+    public static DateFormat getTimeFormat(int timeStyle) {
         if (PROP_ISO_DATES.get()) {
             // This is not strictly conform to ISO 8601. We just want to avoid US-style times such as 3.30pm
@@ -222,5 +222,5 @@
      * @since 7299
      */
-    public static final String formatTime(Date time, int timeStyle) {
+    public static String formatTime(Date time, int timeStyle) {
         CheckParameterUtil.ensureParameterNotNull(time, "time");
         return getTimeFormat(timeStyle).format(time);
@@ -234,5 +234,5 @@
      * @since 7299
      */
-    public static final DateFormat getDateTimeFormat(int dateStyle, int timeStyle) {
+    public static DateFormat getDateTimeFormat(int dateStyle, int timeStyle) {
         if (PROP_ISO_DATES.get()) {
             // This is not strictly conform to ISO 8601. We just want to avoid US-style times such as 3.30pm
@@ -252,5 +252,5 @@
      * @since 7299
      */
-    public static final String formatDateTime(Date datetime, int dateStyle, int timeStyle) {
+    public static String formatDateTime(Date datetime, int dateStyle, int timeStyle) {
         CheckParameterUtil.ensureParameterNotNull(datetime, "datetime");
         return getDateTimeFormat(dateStyle, timeStyle).format(datetime);