Index: trunk/src/org/openstreetmap/josm/data/cache/BufferedImageCacheEntry.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/cache/BufferedImageCacheEntry.java	(revision 8513)
+++ trunk/src/org/openstreetmap/josm/data/cache/BufferedImageCacheEntry.java	(revision 8514)
@@ -7,5 +7,4 @@
 
 import javax.imageio.ImageIO;
-
 
 /**
Index: trunk/src/org/openstreetmap/josm/data/cache/HostLimitQueue.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/cache/HostLimitQueue.java	(revision 8513)
+++ trunk/src/org/openstreetmap/josm/data/cache/HostLimitQueue.java	(revision 8514)
@@ -28,5 +28,4 @@
  *
  */
-
 public class HostLimitQueue extends LinkedBlockingDeque<Runnable> {
     private static final long serialVersionUID = 1L;
Index: trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java	(revision 8513)
+++ trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java	(revision 8514)
@@ -34,5 +34,5 @@
  * @since 8168
  */
-public class JCSCacheManager {
+public final class JCSCacheManager {
     private static final Logger log = FeatureAdapter.getLogger(JCSCacheManager.class.getCanonicalName());
 
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java	(revision 8513)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java	(revision 8514)
@@ -479,5 +479,5 @@
      * A utility class to fetch changesets and display the changeset dialog.
      */
-    public static class LaunchChangesetManager {
+    public static final class LaunchChangesetManager {
 
         private LaunchChangesetManager() {
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java	(revision 8513)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java	(revision 8514)
@@ -486,5 +486,5 @@
         public final boolean not;
 
-        private PseudoClassCondition(Method method, boolean not) {
+        protected PseudoClassCondition(Method method, boolean not) {
             this.method = method;
             this.not = not;
@@ -501,5 +501,4 @@
             }
             throw new IllegalArgumentException("Invalid pseudo class specified: " + id);
-
         }
 
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java	(revision 8513)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java	(revision 8514)
@@ -108,5 +108,5 @@
      */
     @SuppressWarnings("UnusedDeclaration")
-    public static class Functions {
+    public static final class Functions {
 
         private Functions() {
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java	(revision 8513)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java	(revision 8514)
@@ -266,5 +266,5 @@
 
         private class ContainsFinder extends AbstractFinder {
-            private ContainsFinder(Environment e) {
+            protected ContainsFinder(Environment e) {
                 super(e);
                 CheckParameterUtil.ensureThat(!(e.osm instanceof Node), "Nodes not supported");
Index: trunk/src/org/openstreetmap/josm/tools/RightAndLefthandTraffic.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/RightAndLefthandTraffic.java	(revision 8513)
+++ trunk/src/org/openstreetmap/josm/tools/RightAndLefthandTraffic.java	(revision 8514)
@@ -21,5 +21,5 @@
  * Look up, if there is right- or left-hand traffic at a certain place.
  */
-public class RightAndLefthandTraffic {
+public final class RightAndLefthandTraffic {
 
     private static class RLTrafficGeoProperty implements GeoProperty<Boolean> {
Index: trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergerTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergerTest.java	(revision 8513)
+++ trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergerTest.java	(revision 8514)
@@ -70,5 +70,5 @@
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         NodeListMergerTest test = new NodeListMergerTest();
         test.setSize(600, 600);
Index: trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java	(revision 8513)
+++ trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java	(revision 8514)
@@ -45,5 +45,5 @@
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         PropertiesMergerTest app = new PropertiesMergerTest();
         app.setSize(600, 400);
Index: trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMergerTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMergerTest.java	(revision 8513)
+++ trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMergerTest.java	(revision 8514)
@@ -49,5 +49,5 @@
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         RelationMemberMergerTest test = new RelationMemberMergerTest();
         test.setSize(600, 600);
Index: trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergerTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergerTest.java	(revision 8513)
+++ trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergerTest.java	(revision 8514)
@@ -34,5 +34,5 @@
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         TagMergerTest test  = new TagMergerTest();
         test.setSize(600, 600);
Index: trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTest.java	(revision 8513)
+++ trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTest.java	(revision 8514)
@@ -44,5 +44,5 @@
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         ConflictResolutionDialogTest test = new ConflictResolutionDialogTest();
         test.setVisible(true);
Index: trunk/test/functional/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerTest.java	(revision 8513)
+++ trunk/test/functional/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerTest.java	(revision 8514)
@@ -16,5 +16,5 @@
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         new ChangesetCacheManagerTest().start();
     }
Index: trunk/test/functional/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialogTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialogTest.java	(revision 8513)
+++ trunk/test/functional/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialogTest.java	(revision 8514)
@@ -17,5 +17,5 @@
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         new ChangesetQueryDialogTest().start();
     }
Index: trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTest.java	(revision 8513)
+++ trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTest.java	(revision 8514)
@@ -59,5 +59,5 @@
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         HistoryBrowserTest.init();
         new HistoryBrowserTest().setVisible(true);
Index: trunk/test/functional/org/openstreetmap/josm/io/UploadStrategySelectionPanelTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/io/UploadStrategySelectionPanelTest.java	(revision 8513)
+++ trunk/test/functional/org/openstreetmap/josm/io/UploadStrategySelectionPanelTest.java	(revision 8514)
@@ -60,5 +60,5 @@
     }
 
-    public static void main(String args[]) throws OsmApiInitializationException, OsmTransferCanceledException {
+    public static void main(String[] args) throws OsmApiInitializationException, OsmTransferCanceledException {
         OsmApi.getOsmApi().initialize(NullProgressMonitor.INSTANCE);
         new UploadStrategySelectionPanelTest().setVisible(true);
Index: trunk/test/unit/org/CustomMatchers.java
===================================================================
--- trunk/test/unit/org/CustomMatchers.java	(revision 8513)
+++ trunk/test/unit/org/CustomMatchers.java	(revision 8514)
@@ -1,4 +1,6 @@
 // License: GPL. For details, see LICENSE file.
 package org;
+
+import java.util.Collection;
 
 import org.hamcrest.Description;
@@ -8,8 +10,10 @@
 import org.openstreetmap.josm.tools.Predicate;
 
-import java.util.Collection;
+@Ignore("no test")
+public final class CustomMatchers {
 
-@Ignore("no test")
-public class CustomMatchers {
+    private CustomMatchers() {
+        // Hide constructor for utility classes
+    }
 
     public static <T> Matcher<? extends T> forPredicate(final Predicate<T> predicate) {
Index: trunk/test/unit/org/openstreetmap/josm/TestUtils.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/TestUtils.java	(revision 8513)
+++ trunk/test/unit/org/openstreetmap/josm/TestUtils.java	(revision 8514)
@@ -10,5 +10,9 @@
  * Various utils, useful for unit tests.
  */
-public class TestUtils {
+public final class TestUtils {
+
+    private TestUtils() {
+        // Hide constructor for utility classes
+    }
 
     /**
Index: trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryNodeTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryNodeTest.java	(revision 8513)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryNodeTest.java	(revision 8514)
@@ -18,9 +18,9 @@
         Date d = new Date();
         HistoryNode node = new HistoryNode(
-                1l,
-                2l,
+                1L,
+                2L,
                 true,
                 User.createOsmUser(3, "testuser"),
-                4l,
+                4L,
                 d,
                 new LatLon(0, 0)
Index: trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java	(revision 8513)
+++ trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java	(revision 8514)
@@ -60,5 +60,5 @@
             }
             try {
-                int rows[] = (int[]) idx[i];
+                int[] rows = (int[]) idx[i];
                 if (rows.length != 2) {
                     fail("illegal selection range. Either null or not length 2: " + Arrays.toString(rows));
Index: trunk/test/unit/org/openstreetmap/josm/tools/AlphanumComparatorTest.groovy
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/tools/AlphanumComparatorTest.groovy	(revision 8513)
+++ trunk/test/unit/org/openstreetmap/josm/tools/AlphanumComparatorTest.groovy	(revision 8514)
Index: trunk/test/unit/org/openstreetmap/josm/tools/date/DateUtilsTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/tools/date/DateUtilsTest.java	(revision 8513)
+++ trunk/test/unit/org/openstreetmap/josm/tools/date/DateUtilsTest.java	(revision 8514)
Index: trunk/tools/checkstyle/josm_checks.xml
===================================================================
--- trunk/tools/checkstyle/josm_checks.xml	(revision 8513)
+++ trunk/tools/checkstyle/josm_checks.xml	(revision 8514)
@@ -90,4 +90,9 @@
       <property name="allowSingleLineStatement" value="true"/>
     </module>
+    <module name="ArrayTypeStyle"/>
+    <module name="UpperEll"/>
+    <module name="OuterTypeFilename"/>
+    <module name="FinalClass"/>
+    <module name="HideUtilityClassConstructor"/>
   </module>
   <module name="Header">
@@ -104,3 +109,6 @@
   </module>
   <module name="FileTabCharacter"/>
+  <module name="NewlineAtEndOfFile">
+    <property name="lineSeparator" value="lf"/>
+  </module>
 </module>