Index: /trunk/src/org/openstreetmap/josm/Main.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/Main.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/Main.java	(revision 8870)
@@ -1265,5 +1265,5 @@
         }
 
-        private void handleComponentEvent(ComponentEvent e) {
+        private static void handleComponentEvent(ComponentEvent e) {
             Component c = e.getComponent();
             if (c instanceof JFrame && c.isVisible()) {
Index: /trunk/src/org/openstreetmap/josm/actions/AboutAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/AboutAction.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/actions/AboutAction.java	(revision 8870)
@@ -111,5 +111,5 @@
     }
 
-    private JScrollPane createScrollPane(JosmTextArea area) {
+    private static JScrollPane createScrollPane(JosmTextArea area) {
         area.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
         area.setOpaque(false);
Index: /trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java	(revision 8870)
@@ -291,5 +291,5 @@
      * @return List of nodes with more than one referrer
      */
-    private List<Node> collectNodesWithExternReferers(List<Way> ways) {
+    private static List<Node> collectNodesWithExternReferers(List<Way> ways) {
         List<Node> withReferrers = new ArrayList<>();
         for (Way w: ways) {
@@ -308,5 +308,5 @@
      * @return Nodes anticlockwise ordered
      */
-    private List<Node> collectNodesAnticlockwise(List<Way> ways) {
+    private static List<Node> collectNodesAnticlockwise(List<Way> ways) {
         List<Node> nodes = new ArrayList<>();
         Node firstNode = ways.get(0).firstNode();
@@ -355,5 +355,5 @@
      * @return true if action can be done
      */
-    private boolean actionAllowed(Collection<Node> nodes) {
+    private static boolean actionAllowed(Collection<Node> nodes) {
         boolean outside = false;
         for (Node n: nodes) {
Index: /trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java	(revision 8870)
@@ -82,5 +82,5 @@
      * @return A array of two nodes.
      */
-    private Node[] nodePairFurthestApart(List<Node> nodes) {
+    private static Node[] nodePairFurthestApart(List<Node> nodes) {
         // Detect if selected nodes are on the same way.
 
@@ -134,5 +134,5 @@
      * @return An array containing the two most distant nodes.
      */
-    private Node[] nodeFurthestAppart(List<Node> nodes) {
+    private static Node[] nodeFurthestAppart(List<Node> nodes) {
         Node node1 = null, node2 = null;
         double minSqDistance = 0;
@@ -214,5 +214,5 @@
      * @throws InvalidSelection If the nodes have same coordinates.
      */
-    private Command alignOnlyNodes(List<Node> nodes) throws InvalidSelection {
+    private static Command alignOnlyNodes(List<Node> nodes) throws InvalidSelection {
         // Choose nodes used as anchor points for projection.
         Node[] anchors = nodePairFurthestApart(nodes);
@@ -232,5 +232,5 @@
      * @throws InvalidSelection if a polygon is selected, or if a node is used by 3 or more ways
      */
-    private Command alignMultiWay(Collection<Way> ways) throws InvalidSelection {
+    private static Command alignMultiWay(Collection<Way> ways) throws InvalidSelection {
         // Collect all nodes and compute line equation
         Set<Node> nodes = new HashSet<>();
@@ -270,5 +270,5 @@
      * @throws InvalidSelection if a node got more than 4 neighbours (self-crossing way)
      */
-    private List<Line> getInvolvedLines(Node node, List<Way> refWays) throws InvalidSelection {
+    private static List<Line> getInvolvedLines(Node node, List<Way> refWays) throws InvalidSelection {
         List<Line> lines = new ArrayList<>();
         List<Node> neighbors = new ArrayList<>();
@@ -327,5 +327,5 @@
      * @throws InvalidSelection if more than 2 lines
      */
-    private Command alignSingleNode(Node node, List<Line> lines) throws InvalidSelection {
+    private static Command alignSingleNode(Node node, List<Line> lines) throws InvalidSelection {
         if (lines.size() == 1)
             return lines.get(0).projectionCommand(node);
Index: /trunk/src/org/openstreetmap/josm/actions/CopyAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/CopyAction.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/actions/CopyAction.java	(revision 8870)
@@ -86,5 +86,5 @@
     }
 
-    private boolean isEmptySelection() {
+    private static boolean isEmptySelection() {
         Collection<OsmPrimitive> sel = getCurrentDataSet().getSelected();
         if (sel.isEmpty()) {
Index: /trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java	(revision 8870)
@@ -248,5 +248,5 @@
      * @return Modified nodes list ordered according hand traffic.
      */
-    private List<Node> orderNodesByTrafficHand(List<Node> nodes) {
+    private static List<Node> orderNodesByTrafficHand(List<Node> nodes) {
         boolean rightHandTraffic = true;
         for (Node n: nodes) {
@@ -268,5 +268,5 @@
      * @return Modified nodes list with same direction as way.
      */
-    private List<Node> orderNodesByWay(List<Node> nodes, Way way) {
+    private static List<Node> orderNodesByWay(List<Node> nodes, Way way) {
         List<Node> wayNodes = way.getNodes();
         if (!way.isClosed()) {
Index: /trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java	(revision 8870)
@@ -172,5 +172,5 @@
     }
 
-    private Relation getSelectedMultipolygonRelation() {
+    private static Relation getSelectedMultipolygonRelation() {
         return getSelectedMultipolygonRelation(getCurrentDataSet().getSelectedWays(), getCurrentDataSet().getSelectedRelations());
     }
Index: /trunk/src/org/openstreetmap/josm/actions/DistributeAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/DistributeAction.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/actions/DistributeAction.java	(revision 8870)
@@ -112,5 +112,5 @@
      * @return true in this case
      */
-    private boolean checkDistributeWay(Collection<Way> ways, Collection<Node> nodes) {
+    private static boolean checkDistributeWay(Collection<Way> ways, Collection<Node> nodes) {
         if (ways.size() == 1 && nodes.size() <= 2) {
             Way w = ways.iterator().next();
@@ -137,5 +137,5 @@
      * @return Collection of command to be executed.
      */
-    private Collection<Command> distributeWay(Collection<Way> ways,
+    private static Collection<Command> distributeWay(Collection<Way> ways,
                                               Collection<Node> nodes) {
         Way w = ways.iterator().next();
@@ -201,5 +201,5 @@
      * @return true in this case
      */
-    private Boolean checkDistributeNodes(Collection<Way> ways, Collection<Node> nodes) {
+    private static Boolean checkDistributeNodes(Collection<Way> ways, Collection<Node> nodes) {
         return ways.isEmpty() && nodes.size() >= 3;
     }
@@ -284,5 +284,5 @@
      * @return Set of nodes without coordinates
      */
-    private Set<Node> removeNodesWithoutCoordinates(Collection<Node> col) {
+    private static Set<Node> removeNodesWithoutCoordinates(Collection<Node> col) {
         Set<Node> result = new HashSet<>();
         for (Iterator<Node> it = col.iterator(); it.hasNext();) {
Index: /trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java	(revision 8870)
@@ -963,5 +963,5 @@
      * @return list of node paths to produce.
      */
-    private List<List<Node>> buildNodeChunks(Way way, Collection<Node> splitNodes) {
+    private static List<List<Node>> buildNodeChunks(Way way, Collection<Node> splitNodes) {
         List<List<Node>> result = new ArrayList<>();
         List<Node> curList = new ArrayList<>();
Index: /trunk/src/org/openstreetmap/josm/actions/MapRectifierWMSmenuAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/MapRectifierWMSmenuAction.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/actions/MapRectifierWMSmenuAction.java	(revision 8870)
@@ -233,5 +233,5 @@
      * @see WMSLayer#checkGrabberType
      */
-    private void addWMSLayer(String title, String url) {
+    private static void addWMSLayer(String title, String url) {
         WMSLayer layer = new WMSLayer(new ImageryInfo(title, url));
         Main.main.addLayer(layer);
Index: /trunk/src/org/openstreetmap/josm/actions/PurgeAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/PurgeAction.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/actions/PurgeAction.java	(revision 8870)
@@ -310,5 +310,6 @@
     }
 
-    private boolean hasOnlyIncompleteMembers(Relation r, Collection<OsmPrimitive> toPurge, Collection<? extends OsmPrimitive> moreToPurge) {
+    private static boolean hasOnlyIncompleteMembers(
+            Relation r, Collection<OsmPrimitive> toPurge, Collection<? extends OsmPrimitive> moreToPurge) {
         for (RelationMember m : r.getMembers()) {
             if (!m.getMember().isIncomplete() && !toPurge.contains(m.getMember()) && !moreToPurge.contains(m.getMember()))
Index: /trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java	(revision 8870)
@@ -303,5 +303,5 @@
      * </ul>
      */
-    private Way modifyWay(Node originalNode, Way w, List<Command> cmds, List<Node> newNodes) {
+    private static Way modifyWay(Node originalNode, Way w, List<Command> cmds, List<Node> newNodes) {
         // clone the node for the way
         Node newNode = new Node(originalNode, true /* clear OSM ID */);
@@ -396,5 +396,5 @@
      * @param newNodes New created nodes by this set of command
      */
-    private void execCommands(List<Command> cmds, List<Node> newNodes) {
+    private static void execCommands(List<Command> cmds, List<Node> newNodes) {
         Main.main.undoRedo.add(new SequenceCommand(/* for correct i18n of plural forms - see #9110 */
                 trn("Dupe into {0} node", "Dupe into {0} nodes", newNodes.size() + 1, newNodes.size() + 1), cmds));
Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java	(revision 8870)
@@ -169,5 +169,5 @@
      * removes any highlighting that may have been set beforehand.
      */
-    private void removeHighlighting() {
+    private static void removeHighlighting() {
         highlightHelper.clear();
         DataSet ds = getCurrentDataSet();
Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 8870)
@@ -831,5 +831,5 @@
     }
 
-    private void showStatusInfo(double angle, double hdg, double distance, boolean activeFlag) {
+    private static void showStatusInfo(double angle, double hdg, double distance, boolean activeFlag) {
         Main.map.statusLine.setAngle(angle);
         Main.map.statusLine.activateAnglePanel(activeFlag);
Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java	(revision 8870)
@@ -561,5 +561,5 @@
      * @param e current mouse point
      */
-    private void addNewNode(MouseEvent e) {
+    private static void addNewNode(MouseEvent e) {
         // Should maybe do the same as in DrawAction and fetch all nearby segments?
         WaySegment ws = Main.map.mapView.getNearestWaySegment(e.getPoint(), OsmPrimitive.isSelectablePredicate);
Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/ModifiersSpec.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/mapmode/ModifiersSpec.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/actions/mapmode/ModifiersSpec.java	(revision 8870)
@@ -45,10 +45,10 @@
     }
 
-    private boolean match(final int a, final int knownValue) {
+    private static boolean match(final int a, final int knownValue) {
         assert knownValue == ON | knownValue == OFF;
         return a == knownValue || a == UNKNOWN;
     }
 
-    private boolean match(final int a, final boolean knownValue) {
+    private static boolean match(final int a, final boolean knownValue) {
         return a == (knownValue ? ON : OFF) || a == UNKNOWN;
     }
Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java	(revision 8870)
@@ -362,5 +362,5 @@
     }
 
-    private void removeWayHighlighting(Collection<Way> ways) {
+    private static void removeWayHighlighting(Collection<Way> ways) {
         if (ways == null)
             return;
@@ -566,9 +566,9 @@
     }
 
-    private String prefKey(String subKey) {
+    private static String prefKey(String subKey) {
         return "edit.make-parallel-way-action." + subKey;
     }
 
-    private String getStringPref(String subKey, String def) {
+    private static String getStringPref(String subKey, String def) {
         return Main.pref.get(prefKey(subKey), def);
     }
Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java	(revision 8870)
@@ -772,5 +772,5 @@
     }
 
-    private boolean doesImpactStatusLine(Collection<Node> affectedNodes, Collection<Way> selectedWays) {
+    private static boolean doesImpactStatusLine(Collection<Node> affectedNodes, Collection<Way> selectedWays) {
         for (Way w : selectedWays) {
             for (Node n : w.getNodes()) {
@@ -798,5 +798,5 @@
      * Obtain command in undoRedo stack to "continue" when dragging
      */
-    private Command getLastCommand() {
+    private static Command getLastCommand() {
         Command c = !Main.main.undoRedo.commands.isEmpty()
                 ? Main.main.undoRedo.commands.getLast() : null;
Index: /trunk/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java	(revision 8870)
@@ -50,5 +50,5 @@
     }
 
-    private boolean checkMaxNodes(Collection<OsmPrimitive> primitives, long maxNodes) {
+    private static boolean checkMaxNodes(Collection<OsmPrimitive> primitives, long maxNodes) {
         for (OsmPrimitive osmPrimitive : primitives) {
             for (String key: osmPrimitive.keySet()) {
Index: /trunk/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java	(revision 8870)
@@ -109,5 +109,5 @@
      *          if the user requested cancel.
      */
-    private boolean displayErrorScreen(List<TestError> errors) {
+    private static boolean displayErrorScreen(List<TestError> errors) {
         JPanel p = new JPanel(new GridBagLayout());
         ValidatorTreePanel errorPanel = new ValidatorTreePanel(errors);
Index: /trunk/src/org/openstreetmap/josm/data/AutosaveTask.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/AutosaveTask.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/data/AutosaveTask.java	(revision 8870)
@@ -118,5 +118,5 @@
     }
 
-    private String getFileName(String layerName, int index) {
+    private static String getFileName(String layerName, int index) {
         String result = layerName;
         for (char illegalCharacter : ILLEGAL_CHARACTERS) {
Index: /trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java	(revision 8870)
@@ -614,5 +614,5 @@
         }
 
-        private void processPluginInstallElement(Element elem) {
+        private static void processPluginInstallElement(Element elem) {
             String install = elem.getAttribute("install");
             String uninstall = elem.getAttribute("remove");
@@ -739,5 +739,5 @@
         }
 
-        private String normalizeDirName(String dir) {
+        private static String normalizeDirName(String dir) {
             String s = dir.replace('\\', '/');
             if (s.endsWith("/")) s = s.substring(0, s.length()-1);
Index: /trunk/src/org/openstreetmap/josm/data/Preferences.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 8870)
@@ -689,5 +689,5 @@
     }
 
-    private void addPossibleResourceDir(Set<String> locations, String s) {
+    private static void addPossibleResourceDir(Set<String> locations, String s) {
         if (s != null) {
             if (!s.endsWith(File.separator)) {
@@ -867,5 +867,5 @@
     }
 
-    private void setCorrectPermissions(File file) {
+    private static void setCorrectPermissions(File file) {
         if (!file.setReadable(false, false) && Main.isDebugEnabled()) {
             Main.debug(tr("Unable to set file non-readable {0}", file.getAbsolutePath()));
@@ -1337,5 +1337,5 @@
     }
 
-    private <T> Collection<Map<String, String>> serializeListOfStructs(Collection<T> l, Class<T> klass) {
+    private static <T> Collection<Map<String, String>> serializeListOfStructs(Collection<T> l, Class<T> klass) {
         if (l == null)
             return null;
Index: /trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java	(revision 8870)
@@ -247,5 +247,5 @@
 
     // some additional checks to respect extended URLs in preferences (legacy workaround)
-    private boolean isSimilar(String a, String b) {
+    private static boolean isSimilar(String a, String b) {
         return Objects.equals(a, b) || (a != null && b != null && !a.isEmpty() && !b.isEmpty() && (a.contains(b) || b.contains(a)));
     }
Index: /trunk/src/org/openstreetmap/josm/data/osm/DataSet.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/DataSet.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/data/osm/DataSet.java	(revision 8870)
@@ -969,5 +969,5 @@
     }
 
-    private void deleteWay(Way way) {
+    private static void deleteWay(Way way) {
         way.setNodes(null);
         way.setDeleted(true);
@@ -1099,5 +1099,5 @@
     }
 
-    private void reindexRelation(Relation relation) {
+    private static void reindexRelation(Relation relation) {
         BBox before = relation.getBBox();
         relation.updatePosition();
Index: /trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java	(revision 8870)
@@ -218,5 +218,5 @@
     }
 
-    private void resetPrimitive(OsmPrimitive osm) {
+    private static void resetPrimitive(OsmPrimitive osm) {
         if (osm instanceof Way) {
             ((Way) osm).setNodes(null);
Index: /trunk/src/org/openstreetmap/josm/data/osm/FilterMatcher.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/FilterMatcher.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/data/osm/FilterMatcher.java	(revision 8870)
@@ -136,5 +136,5 @@
      * when hidden is false, returns whether the primitive is disabled or hidden
      */
-    private boolean isFiltered(OsmPrimitive primitive, boolean hidden) {
+    private static boolean isFiltered(OsmPrimitive primitive, boolean hidden) {
         return hidden ? primitive.isDisabledAndHidden() : primitive.isDisabled();
     }
@@ -147,5 +147,5 @@
      * @return true, if at least one non-inverted filter applies to the primitive
      */
-    private boolean isFilterExplicit(OsmPrimitive primitive, boolean hidden) {
+    private static boolean isFilterExplicit(OsmPrimitive primitive, boolean hidden) {
         return hidden ? primitive.getHiddenType() : primitive.getDisabledType();
     }
@@ -162,5 +162,5 @@
      * (c) at least one of the parent ways is explicitly filtered
      */
-    private boolean allParentWaysFiltered(OsmPrimitive primitive, boolean hidden) {
+    private static boolean allParentWaysFiltered(OsmPrimitive primitive, boolean hidden) {
         List<OsmPrimitive> refs = primitive.getReferrers();
         boolean isExplicit = false;
@@ -175,5 +175,5 @@
     }
 
-    private boolean oneParentWayNotFiltered(OsmPrimitive primitive, boolean hidden) {
+    private static boolean oneParentWayNotFiltered(OsmPrimitive primitive, boolean hidden) {
         List<OsmPrimitive> refs = primitive.getReferrers();
         for (OsmPrimitive p: refs) {
@@ -185,5 +185,5 @@
     }
 
-    private boolean allParentMultipolygonsFiltered(OsmPrimitive primitive, boolean hidden) {
+    private static boolean allParentMultipolygonsFiltered(OsmPrimitive primitive, boolean hidden) {
         boolean isExplicit = false;
         for (Relation r : new SubclassFilteredCollection<OsmPrimitive, Relation>(
@@ -196,5 +196,5 @@
     }
 
-    private boolean oneParentMultipolygonNotFiltered(OsmPrimitive primitive, boolean hidden) {
+    private static boolean oneParentMultipolygonNotFiltered(OsmPrimitive primitive, boolean hidden) {
         for (Relation r : new SubclassFilteredCollection<OsmPrimitive, Relation>(
                 primitive.getReferrers(), OsmPrimitive.multipolygonPredicate)) {
@@ -205,5 +205,5 @@
     }
 
-    private FilterType test(List<FilterInfo> filters, OsmPrimitive primitive, boolean hidden) {
+    private static FilterType test(List<FilterInfo> filters, OsmPrimitive primitive, boolean hidden) {
 
         if (primitive.isIncomplete())
Index: /trunk/src/org/openstreetmap/josm/data/osm/NoteData.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/NoteData.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/data/osm/NoteData.java	(revision 8870)
@@ -279,5 +279,5 @@
     }
 
-    private User getCurrentUser() {
+    private static User getCurrentUser() {
         JosmUserIdentityManager userMgr = JosmUserIdentityManager.getInstance();
         return User.createOsmUser(userMgr.getUserId(), userMgr.getUserName());
Index: /trunk/src/org/openstreetmap/josm/data/osm/Storage.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/Storage.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/data/osm/Storage.java	(revision 8870)
@@ -266,5 +266,5 @@
      * Additional mixing of hash
      */
-    private int rehash(int h) {
+    private static int rehash(int h) {
         return 1103515245*h >> 2;
     }
Index: /trunk/src/org/openstreetmap/josm/data/osm/Way.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/Way.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/data/osm/Way.java	(revision 8870)
@@ -81,5 +81,5 @@
      * Prevent directly following identical nodes in ways.
      */
-    private List<Node> removeDouble(List<Node> nodes) {
+    private static List<Node> removeDouble(List<Node> nodes) {
         Node last = null;
         int count = nodes.size();
Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java	(revision 8870)
@@ -363,5 +363,5 @@
     }
 
-    private Polygon buildPolygon(Point center, int radius, int sides, double rotation) {
+    private static Polygon buildPolygon(Point center, int radius, int sides, double rotation) {
         Polygon polygon = new Polygon();
         for (int i = 0; i < sides; i++) {
@@ -1500,5 +1500,5 @@
     }
 
-    private double[] pointAt(double t, Polygon poly, double pathLength) {
+    private static double[] pointAt(double t, Polygon poly, double pathLength) {
         double totalLen = t * pathLength;
         double curLen = 0;
Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java	(revision 8870)
@@ -276,5 +276,5 @@
     }
 
-    private boolean isNodeTagged(Node n) {
+    private static boolean isNodeTagged(Node n) {
         return n.isTagged() || n.isAnnotated();
     }
Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java	(revision 8870)
@@ -77,5 +77,5 @@
         }
 
-        private void setNormalized(Collection<String> literals, List<String> target) {
+        private static void setNormalized(Collection<String> literals, List<String> target) {
             target.clear();
             for (String l: literals) {
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 8869)
+++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/MultipolygonCache.java	(revision 8870)
@@ -202,5 +202,5 @@
     }
 
-    private void dispatchEvent(AbstractDatasetChangedEvent event, Relation r, Collection<Map<Relation, Multipolygon>> maps) {
+    private static void dispatchEvent(AbstractDatasetChangedEvent event, Relation r, Collection<Map<Relation, Multipolygon>> maps) {
         for (Map<Relation, Multipolygon> map : maps) {
             Multipolygon m = map.get(r);
@@ -217,5 +217,5 @@
     }
 
-    private void removeMultipolygonFrom(Relation r, Collection<Map<Relation, Multipolygon>> maps) {
+    private static void removeMultipolygonFrom(Relation r, Collection<Map<Relation, Multipolygon>> maps) {
         for (Map<Relation, Multipolygon> map : maps) {
             map.remove(r);
Index: /trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java	(revision 8870)
@@ -83,5 +83,5 @@
     private NTV2SubGrid lastSubGrid;
 
-    private void readBytes(InputStream in, byte[] b) throws IOException {
+    private static void readBytes(InputStream in, byte[] b) throws IOException {
         if (in.read(b) < b.length) {
             Main.error("Failed to read expected amount of bytes ("+ b.length +") from stream");
@@ -167,5 +167,5 @@
      * @return an array of top level Sub Grids with lower level Sub Grids set.
      */
-    private NTV2SubGrid[] createSubGridTree(NTV2SubGrid[] subGrid) {
+    private static NTV2SubGrid[] createSubGridTree(NTV2SubGrid[] subGrid) {
         int topLevelCount = 0;
         Map<String, List<NTV2SubGrid>> subGridMap = new HashMap<>();
Index: /trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java	(revision 8870)
@@ -149,5 +149,5 @@
     }
 
-    private void readBytes(InputStream in, byte[] b) throws IOException {
+    private static void readBytes(InputStream in, byte[] b) throws IOException {
         if (in.read(b) < b.length) {
             Main.error("Failed to read expected amount of bytes ("+ b.length +") from stream");
@@ -209,5 +209,5 @@
      * @return interpolated value
      */
-    private double interpolate(float a, float b, float c, float d, double x, double y) {
+    private static double interpolate(float a, float b, float c, float d, double x, double y) {
         return a + (((double) b - (double) a) * x) + (((double) c - (double) a) * y) +
         (((double) a + (double) d - b - c) * x * y);
Index: /trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java	(revision 8870)
@@ -162,5 +162,5 @@
      * Check if plugin directory exists (store ignored errors file)
      */
-    private void checkValidatorDir() {
+    private static void checkValidatorDir() {
         try {
             File pathDir = new File(getValidatorDir());
@@ -173,5 +173,5 @@
     }
 
-    private void loadIgnoredErrors() {
+    private static void loadIgnoredErrors() {
         ignoredErrors.clear();
         if (Main.pref.getBoolean(ValidatorPreference.PREF_USE_IGNORE, true)) {
Index: /trunk/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java	(revision 8870)
@@ -218,5 +218,5 @@
     }
 
-    private String chompLeadingDot(String str) {
+    private static String chompLeadingDot(String str) {
         if (str.startsWith(".")) {
             return str.substring(1);
Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java	(revision 8870)
@@ -91,5 +91,5 @@
     }
 
-    private GeneralPath createPath(List<Node> nodes) {
+    private static GeneralPath createPath(List<Node> nodes) {
         GeneralPath result = new GeneralPath();
         result.moveTo((float) nodes.get(0).getCoor().lat(), (float) nodes.get(0).getCoor().lon());
@@ -109,5 +109,5 @@
     }
 
-    private Intersection getPolygonIntersection(GeneralPath outer, List<Node> inner) {
+    private static Intersection getPolygonIntersection(GeneralPath outer, List<Node> inner) {
         boolean inside = false;
         boolean outside = false;
@@ -292,5 +292,5 @@
     }
 
-    private void addRelationIfNeeded(TestError error, Relation r) {
+    private static void addRelationIfNeeded(TestError error, Relation r) {
         // Fix #8212 : if the error references only incomplete primitives,
         // add multipolygon in order to let user select something and fix the error
Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java	(revision 8870)
@@ -297,5 +297,5 @@
      * @param s string to check
      */
-    private boolean containsLow(String s) {
+    private static boolean containsLow(String s) {
         if (s == null)
             return false;
@@ -454,5 +454,5 @@
     }
 
-    private Map<String, String> getPossibleValues(Set<String> values) {
+    private static Map<String, String> getPossibleValues(Set<String> values) {
         // generate a map with common typos
         Map<String, String> map = new HashMap<>();
@@ -666,5 +666,5 @@
             public boolean valueBool;
 
-            private Pattern getPattern(String str) throws PatternSyntaxException {
+            private static Pattern getPattern(String str) throws PatternSyntaxException {
                 if (str.endsWith("/i"))
                     return Pattern.compile(str.substring(1, str.length()-2), Pattern.CASE_INSENSITIVE);
Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/WayConnectedToArea.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/tests/WayConnectedToArea.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/data/validation/tests/WayConnectedToArea.java	(revision 8870)
@@ -84,5 +84,5 @@
     }
 
-    private boolean isArea(OsmPrimitive p) {
+    private static boolean isArea(OsmPrimitive p) {
         return (p.hasKey("landuse") || p.hasKey("natural"))
                 && ElemStyles.hasAreaElemStyle(p, false);
Index: /trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java	(revision 8870)
@@ -422,5 +422,5 @@
     }
 
-    private String getRelationTypeName(IRelation relation) {
+    private static String getRelationTypeName(IRelation relation) {
         String name = trc("Relation type", relation.get("type"));
         if (name == null) {
@@ -455,5 +455,5 @@
     }
 
-    private String getNameTagValue(IRelation relation, String nameTag) {
+    private static String getNameTagValue(IRelation relation, String nameTag) {
         if ("name".equals(nameTag)) {
             if (Main.pref.getBoolean("osm-primitives.localize-name", true))
@@ -509,5 +509,5 @@
     }
 
-    private String buildDefaultToolTip(long id, Map<String, String> tags) {
+    private static String buildDefaultToolTip(long id, Map<String, String> tags) {
         StringBuilder sb = new StringBuilder();
         sb.append("<html><strong>id</strong>=")
Index: /trunk/src/org/openstreetmap/josm/gui/FileDrop.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/FileDrop.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/gui/FileDrop.java	(revision 8870)
@@ -34,4 +34,5 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.OpenFileAction;
+import org.openstreetmap.josm.gui.FileDrop.TransferableObject;
 
 // CHECKSTYLE.OFF: HideUtilityClassConstructor
@@ -227,5 +228,5 @@
 
     /** Determine if the dragged data is a file list. */
-    private boolean isDragOk(final DropTargetDragEvent evt) {
+    private static boolean isDragOk(final DropTargetDragEvent evt) {
         boolean ok = false;
 
Index: /trunk/src/org/openstreetmap/josm/gui/MainApplication.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 8870)
@@ -617,5 +617,5 @@
         }
 
-        private void handleAutosave() {
+        private static void handleAutosave() {
             if (AutosaveTask.PROP_AUTOSAVE_ENABLED.get()) {
                 AutosaveTask autosaveTask = new AutosaveTask();
Index: /trunk/src/org/openstreetmap/josm/gui/MainMenu.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/MainMenu.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/gui/MainMenu.java	(revision 8870)
@@ -909,5 +909,5 @@
      * @param result resulting list ofmenu items
      */
-    private void findMenuItems(final JMenu menu, final String textToFind, final List<JMenuItem> result) {
+    private static void findMenuItems(final JMenu menu, final String textToFind, final List<JMenuItem> result) {
         for (int i = 0; i < menu.getItemCount(); i++) {
             JMenuItem menuItem = menu.getItem(i);
Index: /trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java	(revision 8870)
@@ -207,5 +207,5 @@
     }
 
-    private EastNorth calculateDefaultCenter() {
+    private static EastNorth calculateDefaultCenter() {
         Bounds b = DownloadDialog.getSavedDownloadBounds();
         if (b == null) {
Index: /trunk/src/org/openstreetmap/josm/gui/SelectionManager.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/SelectionManager.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/gui/SelectionManager.java	(revision 8870)
@@ -368,5 +368,5 @@
     }
 
-    private void selectionAreaChanged() {
+    private static void selectionAreaChanged() {
         // Trigger a redraw of the map view.
         // A nicer way would be to provide change events for the temporary layer.
@@ -436,5 +436,5 @@
     }
 
-    private Polygon rectToPolygon(Rectangle r) {
+    private static Polygon rectToPolygon(Rectangle r) {
         Polygon poly = new Polygon();
 
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java	(revision 8870)
@@ -288,5 +288,5 @@
      * @return List of primitives whose filtering can be affected by change in source primitives
      */
-    private Collection<OsmPrimitive> getAffectedPrimitives(Collection<? extends OsmPrimitive> primitives) {
+    private static Collection<OsmPrimitive> getAffectedPrimitives(Collection<? extends OsmPrimitive> primitives) {
         // Filters can use nested parent/child expression so complete tree is necessary
         Set<OsmPrimitive> result = new HashSet<>();
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java	(revision 8870)
@@ -422,5 +422,5 @@
     }
 
-    private String getSort(StyleSource s) {
+    private static String getSort(StyleSource s) {
         if (s instanceof XmlStyleSource) {
             return tr("xml");
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java	(revision 8870)
@@ -226,5 +226,5 @@
      * @return {@code true} if the user accepts to overwrite key, {@code false} otherwise
      */
-    private boolean warnOverwriteKey(String action, String togglePref) {
+    private static boolean warnOverwriteKey(String action, String togglePref) {
         ExtendedDialog ed = new ExtendedDialog(
                 Main.parent,
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java	(revision 8870)
@@ -191,5 +191,5 @@
     }
 
-    private void setDotted(Graphics g) {
+    private static void setDotted(Graphics g) {
         ((Graphics2D) g).setStroke(new BasicStroke(
                 1f,
@@ -201,5 +201,5 @@
     }
 
-    private void unsetDotted(Graphics g) {
+    private static void unsetDotted(Graphics g) {
         ((Graphics2D) g).setStroke(new BasicStroke());
     }
Index: /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java	(revision 8870)
@@ -788,5 +788,5 @@
         }
 
-        private User getCurrentUser() {
+        private static User getCurrentUser() {
             UserInfo info = JosmUserIdentityManager.getInstance().getUserInfo();
             return info == null ? User.getAnonymous() : User.createOsmUser(info.getId(), info.getDisplayName());
Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java	(revision 8870)
@@ -568,5 +568,5 @@
     }
 
-    private String getLastChangesetTagFromHistory(String historyKey, List<String> def) {
+    private static String getLastChangesetTagFromHistory(String historyKey, List<String> def) {
         Collection<String> history = Main.pref.getCollection(historyKey, def);
         int age = (int) (System.currentTimeMillis() / 1000 - Main.pref.getInteger(BasicUploadSettingsPanel.HISTORY_LAST_USED_KEY, 0));
Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java	(revision 8870)
@@ -1273,5 +1273,5 @@
     }
 
-    private int getLastIndexOfListBefore(List<ImageEntry> images, long searchedTime) {
+    private static int getLastIndexOfListBefore(List<ImageEntry> images, long searchedTime) {
         int lstSize = images.size();
 
@@ -1307,5 +1307,5 @@
     }
 
-    private String formatTimezone(double timezone) {
+    private static String formatTimezone(double timezone) {
         StringBuilder ret = new StringBuilder();
 
@@ -1326,5 +1326,5 @@
     }
 
-    private double parseTimezone(String timezone) throws ParseException {
+    private static double parseTimezone(String timezone) throws ParseException {
 
         if (timezone.isEmpty())
@@ -1397,5 +1397,5 @@
     }
 
-    private long parseOffset(String offset) throws ParseException {
+    private static long parseOffset(String offset) throws ParseException {
         String error = tr("Error while parsing offset.\nExpected format: {0}", "number");
 
Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java	(revision 8870)
@@ -444,5 +444,5 @@
     }
 
-    private Dimension scaledDimension(Image thumb) {
+    private static Dimension scaledDimension(Image thumb) {
         final double d = Main.map.mapView.getDist100Pixel();
         final double size = 10 /*meter*/;     /* size of the photo on the map */
Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java	(revision 8870)
@@ -559,5 +559,5 @@
     }
 
-    private Point getCenterImgCoord(Rectangle visibleRect) {
+    private static Point getCenterImgCoord(Rectangle visibleRect) {
         return new Point(visibleRect.x + visibleRect.width / 2,
                 visibleRect.y + visibleRect.height / 2);
@@ -630,5 +630,5 @@
     }
 
-    private void checkVisibleRectPos(Image image, Rectangle visibleRect) {
+    private static void checkVisibleRectPos(Image image, Rectangle visibleRect) {
         if (visibleRect.x < 0) {
             visibleRect.x = 0;
@@ -645,5 +645,5 @@
     }
 
-    private void checkVisibleRectSize(Image image, Rectangle visibleRect) {
+    private static void checkVisibleRectSize(Image image, Rectangle visibleRect) {
         if (visibleRect.width > image.getWidth(null)) {
             visibleRect.width = image.getWidth(null);
Index: /trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java	(revision 8870)
@@ -57,5 +57,5 @@
     }
 
-    private void warnCantImportIntoServerLayer(GpxLayer layer) {
+    private static void warnCantImportIntoServerLayer(GpxLayer layer) {
         String msg = tr("<html>The data in the GPX layer ''{0}'' has been downloaded from the server.<br>" +
                 "Because its way points do not include a timestamp we cannot correlate them with audio data.</html>",
Index: /trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportImagesAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportImagesAction.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportImagesAction.java	(revision 8870)
@@ -33,5 +33,5 @@
     }
 
-    private void warnCantImportIntoServerLayer(GpxLayer layer) {
+    private static void warnCantImportIntoServerLayer(GpxLayer layer) {
         String msg = tr("<html>The data in the GPX layer ''{0}'' has been downloaded from the server.<br>"+
                 "Because its way points do not include a timestamp we cannot correlate them with images.</html>",
@@ -41,5 +41,5 @@
     }
 
-    private void addRecursiveFiles(List<File> files, File[] sel) {
+    private static void addRecursiveFiles(List<File> files, File[] sel) {
         for (File f : sel) {
             if (f.isDirectory()) {
Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintMenu.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintMenu.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintMenu.java	(revision 8870)
@@ -69,5 +69,5 @@
         }
 
-        private boolean mapHasGpxorMarkerLayer() {
+        private static boolean mapHasGpxorMarkerLayer() {
             for (Layer layer : Main.map.mapView.getAllLayers()) {
                 if (layer instanceof GpxLayer || layer instanceof MarkerLayer) {
Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java	(revision 8870)
@@ -309,5 +309,5 @@
         }
 
-        private boolean conditionRequiresKeyPresence(KeyMatchType matchType) {
+        private static boolean conditionRequiresKeyPresence(KeyMatchType matchType) {
             return matchType != KeyMatchType.REGEX;
         }
Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java	(revision 8870)
@@ -141,5 +141,5 @@
      * @param mc side effect: update the valid region for the current MultiCascade
      */
-    private boolean requiresUpdate(Prototype current, Prototype candidate, Double scale, MultiCascade mc) {
+    private static boolean requiresUpdate(Prototype current, Prototype candidate, Double scale, MultiCascade mc) {
         if (current == null || candidate.priority >= current.priority) {
             if (scale == null)
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java	(revision 8870)
@@ -684,5 +684,5 @@
         }
 
-        private void appendRow(StringBuilder s, String th, String td) {
+        private static void appendRow(StringBuilder s, String th, String td) {
             s.append("<tr><th>").append(th).append("</th><td>").append(td).append("</td</tr>");
         }
@@ -1426,5 +1426,5 @@
         }
 
-        private String fromSourceEntry(SourceEntry entry) {
+        private static String fromSourceEntry(SourceEntry entry) {
             if (entry == null)
                 return null;
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java	(revision 8870)
@@ -195,5 +195,5 @@
     }
 
-    private File[] askUserForCustomSettingsFiles(boolean saveFileFlag, String title) {
+    private static File[] askUserForCustomSettingsFiles(boolean saveFileFlag, String title) {
         FileFilter filter = new FileFilter() {
             @Override
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java	(revision 8870)
@@ -143,5 +143,5 @@
     }
 
-    private String getName(String o) {
+    private static String getName(String o) {
         return Main.pref.getColorName(o);
     }
@@ -262,5 +262,5 @@
      * Add all missing color entries.
      */
-    private void fixColorPrefixes() {
+    private static void fixColorPrefixes() {
         PaintColors.getColors();
         ConflictColors.getColors();
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/CacheContentsPanel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/CacheContentsPanel.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/CacheContentsPanel.java	(revision 8870)
@@ -172,5 +172,5 @@
     }
 
-    private Long getCacheSize(CacheAccess<String, BufferedImageCacheEntry> cache) {
+    private static Long getCacheSize(CacheAccess<String, BufferedImageCacheEntry> cache) {
         ICacheStats stats = cache.getStatistics();
         for (IStats cacheStats: stats.getAuxiliaryCacheStats()) {
@@ -242,5 +242,5 @@
     }
 
-    private DefaultTableModel getTableModel(final CacheAccess<String, BufferedImageCacheEntry> cache) {
+    private static DefaultTableModel getTableModel(final CacheAccess<String, BufferedImageCacheEntry> cache) {
         final DefaultTableModel tableModel = new DefaultTableModel(
                 getCacheStats(cache),
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java	(revision 8870)
@@ -99,5 +99,5 @@
     }
 
-    private void addSettingsSection(final JPanel p, String name, JPanel section, GBC gbc) {
+    private static void addSettingsSection(final JPanel p, String name, JPanel section, GBC gbc) {
         final JLabel lbl = new JLabel(name);
         lbl.setFont(lbl.getFont().deriveFont(Font.BOLD));
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java	(revision 8870)
@@ -164,5 +164,5 @@
         }
 
-        private JComponent build() {
+        private static JComponent build() {
             StringBuilder s = new StringBuilder();
             s.append("<b>+proj=...</b> - <i>").append(tr("Projection name"))
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java	(revision 8870)
@@ -471,5 +471,5 @@
     }
 
-    private Collection<String> getSubprojectionPreference(ProjectionChoice pc) {
+    private static Collection<String> getSubprojectionPreference(ProjectionChoice pc) {
         return Main.pref.getCollection("projection.sub."+pc.getId(), null);
     }
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/validator/ValidatorTagCheckerRulesPreference.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/validator/ValidatorTagCheckerRulesPreference.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/validator/ValidatorTagCheckerRulesPreference.java	(revision 8870)
@@ -160,5 +160,5 @@
         }
 
-        private void addDefault(List<ExtendedSourceEntry> defaults, String filename, String title, String description) {
+        private static void addDefault(List<ExtendedSourceEntry> defaults, String filename, String title, String description) {
             ExtendedSourceEntry i = new ExtendedSourceEntry(filename+".mapcss", "resource://data/validator/"+filename+".mapcss");
             i.title = title;
Index: /trunk/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java	(revision 8870)
@@ -53,5 +53,5 @@
     private boolean cancelable;
 
-    private void doInEDT(Runnable runnable) {
+    private static void doInEDT(Runnable runnable) {
         // This must be invoke later even if current thread is EDT because inside there is dialog.setVisible
         // which freeze current code flow until modal dialog is closed
Index: /trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetMenu.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetMenu.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetMenu.java	(revision 8870)
@@ -65,5 +65,5 @@
     }
 
-    private Component copyMenuComponent(Component menuComponent) {
+    private static Component copyMenuComponent(Component menuComponent) {
         if (menuComponent instanceof JMenu) {
             JMenu menu = (JMenu) menuComponent;
Index: /trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSelector.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSelector.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSelector.java	(revision 8870)
@@ -162,5 +162,5 @@
         }
 
-        private int isMatching(Collection<String> values, String[] searchString) {
+        private static int isMatching(Collection<String> values, String[] searchString) {
             int sum = 0;
             for (String word: searchString) {
Index: /trunk/src/org/openstreetmap/josm/gui/util/AdvancedKeyPressDetector.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/util/AdvancedKeyPressDetector.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/gui/util/AdvancedKeyPressDetector.java	(revision 8870)
@@ -198,5 +198,5 @@
     }
 
-    private boolean isFocusInMainWindow() {
+    private static boolean isFocusInMainWindow() {
         Component focused = KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner();
         return focused != null && SwingUtilities.getWindowAncestor(focused) instanceof JFrame;
Index: /trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java	(revision 8870)
@@ -312,5 +312,5 @@
     }
 
-    private Dimension sizeWithInsets(Container parent, Dimension size) {
+    private static Dimension sizeWithInsets(Container parent, Dimension size) {
         Insets insets = parent.getInsets();
         int width = size.width + insets.left + insets.right;
@@ -331,5 +331,5 @@
     }
 
-    private Rectangle boundsWithYandHeight(Rectangle bounds, double y, double height) {
+    private static Rectangle boundsWithYandHeight(Rectangle bounds, double y, double height) {
         Rectangle r = new Rectangle();
         r.setBounds((int) (bounds.getX()), (int) y, (int) (bounds.getWidth()), (int) height);
@@ -337,5 +337,5 @@
     }
 
-    private Rectangle boundsWithXandWidth(Rectangle bounds, double x, double width) {
+    private static Rectangle boundsWithXandWidth(Rectangle bounds, double x, double width) {
         Rectangle r = new Rectangle();
         r.setBounds((int) x, (int) (bounds.getY()), (int) width, (int) (bounds.getHeight()));
Index: /trunk/src/org/openstreetmap/josm/io/GpxExporter.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/GpxExporter.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/io/GpxExporter.java	(revision 8870)
@@ -27,5 +27,4 @@
 import org.openstreetmap.josm.data.gpx.GpxConstants;
 import org.openstreetmap.josm.data.gpx.GpxData;
-import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
@@ -173,5 +172,5 @@
             gpxData = ((GpxLayer) layer).data;
         } else {
-            gpxData = OsmDataLayer.toGpxData(getCurrentDataSet(), file);
+            gpxData = OsmDataLayer.toGpxData(Main.main.getCurrentDataSet(), file);
         }
 
@@ -337,12 +336,3 @@
         authorNameListener.keyReleased(null);
     }
-
-    /**
-     * Replies the current dataset
-     *
-     * @return the current dataset. null, if no current dataset exists
-     */
-    private DataSet getCurrentDataSet() {
-        return Main.main.getCurrentDataSet();
-    }
 }
Index: /trunk/src/org/openstreetmap/josm/io/InvalidXmlCharacterFilter.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/InvalidXmlCharacterFilter.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/io/InvalidXmlCharacterFilter.java	(revision 8870)
@@ -61,5 +61,5 @@
     }
 
-    private char filter(char in) {
+    private static char filter(char in) {
         if (in < 0x20 && INVALID_CHARS[in]) {
             if (firstWarning) {
Index: /trunk/src/org/openstreetmap/josm/io/JpgImporter.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/JpgImporter.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/io/JpgImporter.java	(revision 8870)
@@ -88,5 +88,5 @@
     }
 
-    private void addRecursiveFiles(List<File> files, Set<String> visitedDirs, List<File> sel, ProgressMonitor progressMonitor)
+    private static void addRecursiveFiles(List<File> files, Set<String> visitedDirs, List<File> sel, ProgressMonitor progressMonitor)
             throws IOException {
 
Index: /trunk/src/org/openstreetmap/josm/io/NmeaReader.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/NmeaReader.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/io/NmeaReader.java	(revision 8870)
@@ -448,5 +448,5 @@
     }
 
-    private LatLon parseLatLon(String ns, String ew, String dlat, String dlon)
+    private static LatLon parseLatLon(String ns, String ew, String dlat, String dlon)
     throws NumberFormatException {
         String widthNorth = dlat.trim();
Index: /trunk/src/org/openstreetmap/josm/io/OsmServerReader.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/OsmServerReader.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/io/OsmServerReader.java	(revision 8870)
@@ -210,5 +210,5 @@
     }
 
-    private InputStream fixEncoding(InputStream stream, String encoding) throws IOException {
+    private static InputStream fixEncoding(InputStream stream, String encoding) throws IOException {
         if ("gzip".equalsIgnoreCase(encoding)) {
             stream = new GZIPInputStream(stream);
Index: /trunk/src/org/openstreetmap/josm/io/OverpassDownloadReader.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/OverpassDownloadReader.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/io/OverpassDownloadReader.java	(revision 8870)
@@ -54,5 +54,5 @@
     }
 
-    private String completeOverpassQuery(String query) {
+    private static String completeOverpassQuery(String query) {
         int firstColon = query.indexOf(';');
         if (firstColon == -1) {
Index: /trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java	(revision 8870)
@@ -303,5 +303,5 @@
     }
 
-    private boolean isProjSupported(String crs) {
+    private static boolean isProjSupported(String crs) {
         for (ProjectionChoice pc : ProjectionPreference.getProjectionChoices()) {
             if (pc.getPreferencesFromCode(crs) != null) return true;
Index: /trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java	(revision 8870)
@@ -354,5 +354,5 @@
      *             When error
      */
-    private void sendHeader(Writer out, String status, String contentType,
+    private static void sendHeader(Writer out, String status, String contentType,
             boolean endHeaders) throws IOException {
         out.write("HTTP/1.1 " + status + "\r\n");
Index: /trunk/src/org/openstreetmap/josm/io/session/GeoImageSessionExporter.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/session/GeoImageSessionExporter.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/io/session/GeoImageSessionExporter.java	(revision 8870)
@@ -124,8 +124,8 @@
     }
 
-    private void addAttr(String name, String value, Element element, SessionWriter.ExportSupport support) {
-            Element attrElem = support.createElement(name);
-            attrElem.appendChild(support.createTextNode(value));
-            element.appendChild(attrElem);
+    private static void addAttr(String name, String value, Element element, SessionWriter.ExportSupport support) {
+        Element attrElem = support.createElement(name);
+        attrElem.appendChild(support.createTextNode(value));
+        element.appendChild(attrElem);
     }
 }
Index: /trunk/src/org/openstreetmap/josm/tools/AlphanumComparator.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/AlphanumComparator.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/tools/AlphanumComparator.java	(revision 8870)
@@ -64,5 +64,5 @@
      * calculate it once) *
      */
-    private String getChunk(String s, int slength, int marker) {
+    private static String getChunk(String s, int slength, int marker) {
         StringBuilder chunk = new StringBuilder();
         char c = s.charAt(marker);
Index: /trunk/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java	(revision 8870)
@@ -208,5 +208,5 @@
     }
 
-    private String formatMenuText(KeyStroke keyStroke, String index, String description) {
+    private static String formatMenuText(KeyStroke keyStroke, String index, String description) {
         String shortcutText = KeyEvent.getKeyModifiersText(keyStroke.getModifiers()) + '+'
                 + KeyEvent.getKeyText(keyStroke.getKeyCode()) + ',' + index;
Index: /trunk/src/org/openstreetmap/josm/tools/WikiReader.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/WikiReader.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/tools/WikiReader.java	(revision 8870)
@@ -106,5 +106,5 @@
     }
 
-    private String readNormal(BufferedReader in, boolean html) throws IOException {
+    private static String readNormal(BufferedReader in, boolean html) throws IOException {
         StringBuilder b = new StringBuilder();
         for (String line = in.readLine(); line != null; line = in.readLine()) {
Index: /trunk/src/org/openstreetmap/josm/tools/date/PrimaryDateParser.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/date/PrimaryDateParser.java	(revision 8869)
+++ /trunk/src/org/openstreetmap/josm/tools/date/PrimaryDateParser.java	(revision 8870)
@@ -40,5 +40,5 @@
     }
 
-    private boolean isDateInShortStandardFormat(String date) {
+    private static boolean isDateInShortStandardFormat(String date) {
         char[] dateChars;
         // We can only parse the date if it is in a very specific format.
@@ -107,5 +107,5 @@
     }
 
-    private boolean isDateInLongStandardFormat(String date) {
+    private static boolean isDateInLongStandardFormat(String date) {
         char[] dateChars;
         // We can only parse the date if it is in a very specific format.