Index: /trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoader.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoader.java	(revision 12538)
+++ /trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoader.java	(revision 12539)
@@ -47,6 +47,5 @@
      * and for TMS imagery
      */
-    private static ThreadPoolExecutor DEFAULT_DOWNLOAD_JOB_DISPATCHER = getNewThreadPoolExecutor("TMS-downloader-%d");
-
+    private static final ThreadPoolExecutor DEFAULT_DOWNLOAD_JOB_DISPATCHER = getNewThreadPoolExecutor("TMS-downloader-%d");
 
     private ThreadPoolExecutor downloadExecutor = DEFAULT_DOWNLOAD_JOB_DISPATCHER;
Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java	(revision 12538)
+++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java	(revision 12539)
@@ -206,5 +206,5 @@
     }
 
-    private static Map<Font, Boolean> IS_GLYPH_VECTOR_DOUBLE_TRANSLATION_BUG = new HashMap<>();
+    private static final Map<Font, Boolean> IS_GLYPH_VECTOR_DOUBLE_TRANSLATION_BUG = new HashMap<>();
 
     /**
Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/InternetTags.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/tests/InternetTags.java	(revision 12538)
+++ /trunk/src/org/openstreetmap/josm/data/validation/tests/InternetTags.java	(revision 12539)
@@ -30,5 +30,5 @@
      * List of keys subject to URL validation.
      */
-    private static String[] URL_KEYS = new String[] {
+    private static final String[] URL_KEYS = new String[] {
         "url", "source:url",
         "website", "contact:website", "heritage:website", "source:website"
@@ -38,5 +38,5 @@
      * List of keys subject to email validation.
      */
-    private static String[] EMAIL_KEYS = new String[] {
+    private static final String[] EMAIL_KEYS = new String[] {
         "email", "contact:email"
     };
Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/StyleElement.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/StyleElement.java	(revision 12538)
+++ /trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/StyleElement.java	(revision 12539)
@@ -137,16 +137,16 @@
      * a JOSM session. Should have a listener listening to preference changes.
      */
-    private static volatile String DEFAULT_FONT_NAME;
-    private static volatile Float DEFAULT_FONT_SIZE;
+    private static volatile String defaultFontName;
+    private static volatile Float defaultFontSize;
     private static final Object lock = new Object();
 
     // thread save access (double-checked locking)
     private static Float getDefaultFontSize() {
-        Float s = DEFAULT_FONT_SIZE;
+        Float s = defaultFontSize;
         if (s == null) {
             synchronized (lock) {
-                s = DEFAULT_FONT_SIZE;
+                s = defaultFontSize;
                 if (s == null) {
-                    DEFAULT_FONT_SIZE = s = (float) Main.pref.getInteger("mappaint.fontsize", 8);
+                    defaultFontSize = s = (float) Main.pref.getInteger("mappaint.fontsize", 8);
                 }
             }
@@ -156,10 +156,10 @@
 
     private static String getDefaultFontName() {
-        String n = DEFAULT_FONT_NAME;
+        String n = defaultFontName;
         if (n == null) {
             synchronized (lock) {
-                n = DEFAULT_FONT_NAME;
+                n = defaultFontName;
                 if (n == null) {
-                    DEFAULT_FONT_NAME = n = Main.pref.get("mappaint.font", "Droid Sans");
+                    defaultFontName = n = Main.pref.get("mappaint.font", "Droid Sans");
                 }
             }
Index: /trunk/tools/pmd/josm-ruleset.xml
===================================================================
--- /trunk/tools/pmd/josm-ruleset.xml	(revision 12538)
+++ /trunk/tools/pmd/josm-ruleset.xml	(revision 12539)
@@ -16,6 +16,39 @@
   <rule ref="rulesets/java/finalizers.xml"/>
   <rule ref="rulesets/java/imports.xml"/>
-  <rule ref="rulesets/java/migrating.xml"/>
-  <rule ref="rulesets/java/naming.xml"/>-->
+  <rule ref="rulesets/java/migrating.xml"/>-->
+  <rule ref="rulesets/java/naming.xml">
+  	<exclude name="AbstractNaming"/>
+  	<exclude name="AvoidFieldNameMatchingMethodName"/>
+  	<exclude name="AvoidFieldNameMatchingTypeName"/>
+  	<exclude name="BooleanGetMethodName"/>
+  	<exclude name="LongVariable"/>
+  	<exclude name="ShortClassName"/>
+  	<exclude name="ShortMethodName"/>
+  	<exclude name="ShortVariable"/>
+  	<exclude name="MethodNamingConventions"/>
+  	<exclude name="VariableNamingConventions"/>
+  </rule>
+  <rule ref="rulesets/java/naming.xml/ShortMethodName">
+    <properties>
+        <property name="violationSuppressXPath" value="//MethodDeclarator[@Image='at' or @Image='ht' or @Image='of' or @Image='ok' or @Image='tr']
+        	| //MethodDeclarator/../../Annotation/MarkerAnnotation/Name[@Image='Deprecated']
+        	| //MethodDeclarator/../../../..[@Image='LambertConformalConic']"/>
+    </properties>
+  </rule>
+  <rule ref="rulesets/java/naming.xml/MethodNamingConventions">
+    <properties>
+        <property name="violationSuppressXPath" value="//MethodDeclarator/../../../..[@Image='Functions' or @Image='PseudoClasses' or @Image='Role' or @Image='TaggingPreset']"/>
+    </properties>
+  </rule>
+  <rule ref="rulesets/java/naming.xml/VariableNamingConventions">
+    <properties>
+        <property name="violationSuppressXPath" value="//FieldDeclaration[@Public='true']|//FieldDeclaration/../Annotation/MarkerAnnotation/Name[@Image='pref']"/>
+    </properties>
+  </rule>
+  <rule ref="rulesets/java/naming.xml/LongVariable">
+    <properties>
+        <property name="minimum" value="44"/>
+    </properties>
+  </rule>
   <rule ref="rulesets/java/optimizations.xml">
   	<exclude name="LocalVariableCouldBeFinal"/>