Index: /trunk/src/org/openstreetmap/josm/gui/SplashScreen.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/SplashScreen.java	(revision 8510)
+++ /trunk/src/org/openstreetmap/josm/gui/SplashScreen.java	(revision 8511)
@@ -124,5 +124,5 @@
      * A task (of a {@link ProgressMonitor}).
      */
-    private static abstract class Task {
+    private abstract static class Task {
 
         /**
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 8510)
+++ /trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergerTest.java	(revision 8511)
@@ -70,5 +70,5 @@
     }
 
-    static public 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 8510)
+++ /trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java	(revision 8511)
@@ -45,5 +45,5 @@
     }
 
-    static public 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 8510)
+++ /trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMergerTest.java	(revision 8511)
@@ -49,5 +49,5 @@
     }
 
-    static public 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/dialogs/ConflictResolutionDialogTest.java
===================================================================
--- /trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTest.java	(revision 8510)
+++ /trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTest.java	(revision 8511)
@@ -44,5 +44,5 @@
     }
 
-    static public 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 8510)
+++ /trunk/test/functional/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerTest.java	(revision 8511)
@@ -2,7 +2,7 @@
 package org.openstreetmap.josm.gui.dialogs.changeset;
 
+import javax.swing.JFrame;
+
 import org.junit.Ignore;
-
-import javax.swing.JFrame;
 
 @Ignore
@@ -16,5 +16,5 @@
     }
 
-    static public 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 8510)
+++ /trunk/test/functional/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialogTest.java	(revision 8511)
@@ -2,7 +2,7 @@
 package org.openstreetmap.josm.gui.dialogs.changeset.query;
 
+import javax.swing.JFrame;
+
 import org.junit.Ignore;
-
-import javax.swing.JFrame;
 
 @Ignore
@@ -17,5 +17,5 @@
     }
 
-    static public 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 8510)
+++ /trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTest.java	(revision 8511)
@@ -22,5 +22,5 @@
 
     @BeforeClass
-    static public void init() {
+    public static void init() {
         JOSMFixture.createFunctionalTestFixture().init();
     }
@@ -59,5 +59,5 @@
     }
 
-    static public void main(String args[]) {
+    public static void main(String args[]) {
         HistoryBrowserTest.init();
         new HistoryBrowserTest().setVisible(true);
Index: /trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java
===================================================================
--- /trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java	(revision 8510)
+++ /trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java	(revision 8511)
@@ -46,5 +46,5 @@
  */
 public class OsmServerBackreferenceReaderTest {
-    static private final Logger logger = Logger.getLogger(OsmServerBackreferenceReader.class.getName());
+    private static final Logger logger = Logger.getLogger(OsmServerBackreferenceReader.class.getName());
 
     protected static Node lookupNode(DataSet ds, int i) {
@@ -131,5 +131,5 @@
      * @throws OsmTransferException if something goes wrong
      */
-    static public void createDataSetOnServer(APIDataSet ds) throws OsmTransferException, CyclicUploadDependencyException {
+    public static void createDataSetOnServer(APIDataSet ds) throws OsmTransferException, CyclicUploadDependencyException {
         logger.info("creating data set on the server ...");
         ds.adjustRelationUploadOrder();
Index: /trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java	(revision 8510)
+++ /trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java	(revision 8511)
@@ -23,5 +23,5 @@
      * @return A new test fixture for unit tests
      */
-    static public JOSMFixture createUnitTestFixture() {
+    public static JOSMFixture createUnitTestFixture() {
         return new JOSMFixture("test/config/unit-josm.home");
     }
@@ -31,5 +31,5 @@
      * @return A new test fixture for functional tests
      */
-    static public JOSMFixture createFunctionalTestFixture() {
+    public static JOSMFixture createFunctionalTestFixture() {
         return new JOSMFixture("test/config/functional-josm.home");
     }
@@ -39,5 +39,5 @@
      * @return A new test fixture for performance tests
      */
-    static public JOSMFixture createPerformanceTestFixture() {
+    public static JOSMFixture createPerformanceTestFixture() {
         return new JOSMFixture("test/config/performance-josm.home");
     }
Index: /trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java	(revision 8510)
+++ /trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java	(revision 8511)
@@ -25,5 +25,5 @@
 public class PropertiesMergeModelTest {
 
-    public static abstract class TestObserver implements Observer {
+    public abstract static class TestObserver implements Observer {
         public int numInvocations;
 
Index: /trunk/test/unit/org/openstreetmap/josm/gui/tagging/PresetClassificationsTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/gui/tagging/PresetClassificationsTest.java	(revision 8510)
+++ /trunk/test/unit/org/openstreetmap/josm/gui/tagging/PresetClassificationsTest.java	(revision 8511)
@@ -23,5 +23,5 @@
 public class PresetClassificationsTest {
 
-    final static TaggingPresetSelector.PresetClassifications classifications = new TaggingPresetSelector.PresetClassifications();
+    static final TaggingPresetSelector.PresetClassifications classifications = new TaggingPresetSelector.PresetClassifications();
 
     /**
Index: /trunk/tools/checkstyle/josm_checks.xml
===================================================================
--- /trunk/tools/checkstyle/josm_checks.xml	(revision 8510)
+++ /trunk/tools/checkstyle/josm_checks.xml	(revision 8511)
@@ -73,4 +73,5 @@
       <property name="allowMultipleEmptyLines" value="false"/>
     </module>
+    <module name="ModifierOrder"/>
   </module>
   <module name="Header">