Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java	(revision 9989)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java	(revision 9990)
@@ -416,5 +416,5 @@
      * Base class of all other Copy* inner classes.
      */
-    abstract class CopyAction extends AbstractAction implements ListSelectionListener {
+    abstract static class CopyAction extends AbstractAction implements ListSelectionListener {
 
         protected CopyAction(String icon_name, String action_name, String short_description) {
Index: trunk/src/org/openstreetmap/josm/gui/preferences/projection/ListProjectionChoice.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/projection/ListProjectionChoice.java	(revision 9989)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/projection/ListProjectionChoice.java	(revision 9990)
@@ -85,5 +85,5 @@
     }
 
-    protected class CBPanel extends JPanel {
+    protected static class CBPanel extends JPanel {
         public JosmComboBox<String> prefcb;
 
Index: trunk/src/org/openstreetmap/josm/io/OsmServerLocationReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmServerLocationReader.java	(revision 9989)
+++ trunk/src/org/openstreetmap/josm/io/OsmServerLocationReader.java	(revision 9990)
@@ -33,5 +33,5 @@
     }
 
-    protected abstract class Parser<T> {
+    protected abstract static class Parser<T> {
         protected final ProgressMonitor progressMonitor;
         protected final Compression compression;
Index: trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadDataHandler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadDataHandler.java	(revision 9989)
+++ trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadDataHandler.java	(revision 9990)
@@ -97,5 +97,5 @@
     }
 
-    protected class LoadDataTask extends DownloadOsmTask.AbstractInternalTask {
+    protected static class LoadDataTask extends DownloadOsmTask.AbstractInternalTask {
 
         protected final String layerName;
Index: trunk/src/org/openstreetmap/josm/tools/template_engine/ContextSwitchTemplate.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/template_engine/ContextSwitchTemplate.java	(revision 9989)
+++ trunk/src/org/openstreetmap/josm/tools/template_engine/ContextSwitchTemplate.java	(revision 9990)
@@ -40,5 +40,5 @@
     };
 
-    private abstract class ContextProvider extends Match {
+    private abstract static class ContextProvider extends Match {
         protected Match condition;