Index: trunk/src/org/openstreetmap/josm/actions/CopyCoordinatesAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/CopyCoordinatesAction.java	(revision 10042)
+++ trunk/src/org/openstreetmap/josm/actions/CopyCoordinatesAction.java	(revision 10043)
@@ -47,5 +47,5 @@
     }
 
-    private Collection<Node> getSelectedNodes() {
+    private static Collection<Node> getSelectedNodes() {
         if (getCurrentDataSet() == null || getCurrentDataSet().getSelected() == null) {
             return Collections.emptyList();
Index: trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java	(revision 10042)
+++ trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java	(revision 10043)
@@ -69,5 +69,5 @@
      * @return Array of number of nodes to put in each arc
      */
-    private int[] distributeNodes(PolarNode[] angles, int nodesCount) {
+    private static int[] distributeNodes(PolarNode[] angles, int nodesCount) {
         int[] count = new int[angles.length];
         double[] width = new double[angles.length];
Index: trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java	(revision 10042)
+++ trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java	(revision 10043)
@@ -777,5 +777,5 @@
      * @throws IllegalArgumentException if parts is empty
      */
-    private List<WayInPolygon> markWayInsideSide(List<Way> parts, boolean isInner) {
+    private static List<WayInPolygon> markWayInsideSide(List<Way> parts, boolean isInner) {
 
         //prepare next map
@@ -1026,5 +1026,5 @@
      * @return the outermost Way.
      */
-    private List<PolygonLevel> findOuterWaysImpl(int level, Collection<AssembledPolygon> boundaryWays) {
+    private static List<PolygonLevel> findOuterWaysImpl(int level, Collection<AssembledPolygon> boundaryWays) {
 
         //TODO: bad performance for deep nestings...
@@ -1293,5 +1293,5 @@
      * @return list of polygons, or null if too complex relation encountered.
      */
-    private List<Multipolygon> collectMultipolygons(Collection<Way> selectedWays) {
+    private static List<Multipolygon> collectMultipolygons(Collection<Way> selectedWays) {
 
         List<Multipolygon> result = new ArrayList<>();
Index: trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java	(revision 10042)
+++ trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java	(revision 10043)
@@ -367,5 +367,5 @@
      * @return List of ways to split
      */
-    private List<Way> getApplicableWays(List<Way> selectedWays, List<Node> selectedNodes) {
+    private static List<Way> getApplicableWays(List<Way> selectedWays, List<Node> selectedNodes) {
         if (selectedNodes.isEmpty())
             return null;
Index: trunk/src/org/openstreetmap/josm/actions/UnJoinNodeWayAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/UnJoinNodeWayAction.java	(revision 10042)
+++ trunk/src/org/openstreetmap/josm/actions/UnJoinNodeWayAction.java	(revision 10043)
@@ -149,5 +149,5 @@
      * @return List of relevant ways
      */
-    private List<Way> getApplicableWays(List<Way> selectedWays, List<Node> selectedNodes) {
+    private static List<Way> getApplicableWays(List<Way> selectedWays, List<Node> selectedNodes) {
         if (selectedNodes.isEmpty())
             return null;
Index: trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java	(revision 10042)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java	(revision 10043)
@@ -869,5 +869,5 @@
     }
 
-    private boolean movesHiddenWay() {
+    private static boolean movesHiddenWay() {
         final Collection<OsmPrimitive> elementsToTest = new HashSet<>(getCurrentDataSet().getSelected());
         for (Way osm : Utils.filteredCollection(getCurrentDataSet().getSelected(), Way.class)) {
Index: trunk/src/org/openstreetmap/josm/data/AutosaveTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/AutosaveTask.java	(revision 10042)
+++ trunk/src/org/openstreetmap/josm/data/AutosaveTask.java	(revision 10043)
@@ -324,5 +324,5 @@
     }
 
-    private boolean jvmPerfDataFileExists(final String jvmId) {
+    private static boolean jvmPerfDataFileExists(final String jvmId) {
         File jvmDir = new File(System.getProperty("java.io.tmpdir") + File.separator + "hsperfdata_" + System.getProperty("user.name"));
         if (jvmDir.exists() && jvmDir.canRead()) {
Index: trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java	(revision 10042)
+++ trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java	(revision 10043)
@@ -261,5 +261,5 @@
     }
 
-    private Layer userSelectLayer(Collection<Layer> layers) {
+    private static Layer userSelectLayer(Collection<Layer> layers) {
         if (layers.size() == 1)
             return layers.iterator().next();
Index: trunk/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java	(revision 10042)
+++ trunk/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java	(revision 10043)
@@ -184,5 +184,5 @@
     }
 
-    private void fireEvents(List<ListenerInfo> listeners, AbstractDatasetChangedEvent event) {
+    private static void fireEvents(List<ListenerInfo> listeners, AbstractDatasetChangedEvent event) {
         for (ListenerInfo listener: listeners) {
             if (!listener.consolidate) {
@@ -192,5 +192,5 @@
     }
 
-    private void fireConsolidatedEvents(List<ListenerInfo> listeners, AbstractDatasetChangedEvent event) {
+    private static void fireConsolidatedEvents(List<ListenerInfo> listeners, AbstractDatasetChangedEvent event) {
         for (ListenerInfo listener: listeners) {
             if (listener.consolidate) {
Index: trunk/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java	(revision 10042)
+++ trunk/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java	(revision 10043)
@@ -82,5 +82,5 @@
     }
 
-    private void fireEvents(List<ListenerInfo> listeners, Collection<? extends OsmPrimitive> newSelection) {
+    private static void fireEvents(List<ListenerInfo> listeners, Collection<? extends OsmPrimitive> newSelection) {
         for (ListenerInfo listener: listeners) {
             listener.listener.selectionChanged(newSelection);
@@ -96,4 +96,3 @@
         }
     };
-
 }
Index: trunk/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java	(revision 10042)
+++ trunk/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java	(revision 10043)
@@ -231,5 +231,5 @@
      * @return translated/shortened error/warnign message
      */
-    private String getErrorMessage(String key, Object o) {
+    private static String getErrorMessage(String key, Object o) {
         String msg = o.toString().trim()
         .replace("Unexpected token:", tr("Unexpected token:"))
Index: trunk/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java	(revision 10042)
+++ trunk/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java	(revision 10043)
@@ -67,5 +67,5 @@
     }
 
-    private boolean parentMultipolygonConcernsArea(OsmPrimitive p) {
+    private static boolean parentMultipolygonConcernsArea(OsmPrimitive p) {
         for (Relation r : OsmPrimitive.getFilteredList(p.getReferrers(), Relation.class)) {
             if (r.concernsArea()) {
Index: trunk/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java	(revision 10042)
+++ trunk/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java	(revision 10043)
@@ -126,5 +126,5 @@
     }
 
-    private Map<String, RoleInfo> buildRoleInfoMap(Relation n) {
+    private static Map<String, RoleInfo> buildRoleInfoMap(Relation n) {
         Map<String, RoleInfo> map = new HashMap<>();
         for (RelationMember m : n.getMembers()) {
@@ -141,5 +141,5 @@
 
     // return Roles grouped by key
-    private Map<String, RolePreset> buildAllRoles(Relation n) {
+    private static Map<String, RolePreset> buildAllRoles(Relation n) {
         Map<String, RolePreset> allroles = new HashMap<>();
 
Index: trunk/src/org/openstreetmap/josm/gui/MainApplication.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 10042)
+++ trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 10043)
@@ -4,6 +4,4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 import static org.openstreetmap.josm.tools.I18n.trn;
-import gnu.getopt.Getopt;
-import gnu.getopt.LongOpt;
 
 import java.awt.Dimension;
@@ -75,4 +73,7 @@
 import org.openstreetmap.josm.tools.PlatformHookWindows;
 import org.openstreetmap.josm.tools.Utils;
+
+import gnu.getopt.Getopt;
+import gnu.getopt.LongOpt;
 
 /**
@@ -651,5 +652,5 @@
         }
 
-        private boolean handleNetworkOrProxyErrors(boolean hasErrors, String title, String message) {
+        private static boolean handleNetworkOrProxyErrors(boolean hasErrors, String title, String message) {
             if (hasErrors) {
                 ExtendedDialog ed = new ExtendedDialog(
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java	(revision 10042)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java	(revision 10043)
@@ -446,5 +446,5 @@
     }
 
-    private void destroyComponents(Component component, boolean destroyItself) {
+    private static void destroyComponents(Component component, boolean destroyItself) {
         if (component instanceof Container) {
             for (Component c: ((Container) component).getComponents()) {
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesCellRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesCellRenderer.java	(revision 10042)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesCellRenderer.java	(revision 10043)
@@ -31,5 +31,5 @@
     private final Collection<TableCellRenderer> customRenderer = new CopyOnWriteArrayList<>();
 
-    private void setColors(Component c, String key, boolean isSelected) {
+    private static void setColors(Component c, String key, boolean isSelected) {
         UIDefaults defaults = javax.swing.UIManager.getDefaults();
         if (OsmPrimitive.getDiscardableKeys().contains(key)) {
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java	(revision 10042)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java	(revision 10043)
@@ -566,5 +566,5 @@
     }
 
-    private int findViewRow(JTable table, TableModel model, Object value) {
+    private static int findViewRow(JTable table, TableModel model, Object value) {
         for (int i = 0; i < model.getRowCount(); i++) {
             if (model.getValueAt(i, 0).equals(value))
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java	(revision 10042)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java	(revision 10043)
@@ -280,5 +280,5 @@
     }
 
-    private Integer findAdjacentWay(NodesWays nw, Node n) {
+    private static Integer findAdjacentWay(NodesWays nw, Node n) {
         Set<Integer> adj = nw.nodes.get(n);
         if (adj == null || adj.isEmpty()) return null;
Index: trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java	(revision 10042)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java	(revision 10043)
@@ -446,5 +446,5 @@
     }
 
-    private void updateWaypointLabelCombobox(JosmComboBox<String> cb, JosmTextField tf, TemplateEntryProperty property) {
+    private static void updateWaypointLabelCombobox(JosmComboBox<String> cb, JosmTextField tf, TemplateEntryProperty property) {
         String labelPattern = property.getAsString();
         boolean found = false;
@@ -463,5 +463,5 @@
     }
 
-    private void updateWaypointPattern(JosmComboBox<String> cb, JosmTextField tf) {
+    private static void updateWaypointPattern(JosmComboBox<String> cb, JosmTextField tf) {
         if (cb.getSelectedIndex() == WAYPOINT_LABEL_CUSTOM) {
             tf.setEnabled(true);
Index: trunk/src/org/openstreetmap/josm/gui/preferences/imagery/CacheContentsPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/imagery/CacheContentsPanel.java	(revision 10042)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/imagery/CacheContentsPanel.java	(revision 10043)
@@ -228,5 +228,5 @@
     }
 
-    private JTable getTableForCache(final CacheAccess<String, BufferedImageCacheEntry> cache, final TableModel tableModel) {
+    private static JTable getTableForCache(final CacheAccess<String, BufferedImageCacheEntry> cache, final TableModel tableModel) {
         final JTable ret = new JTable(tableModel);
 
Index: trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java	(revision 10042)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java	(revision 10043)
@@ -771,5 +771,5 @@
         }
 
-        private boolean confirmEulaAcceptance(PreferenceTabbedPane gui, String eulaUrl) {
+        private static boolean confirmEulaAcceptance(PreferenceTabbedPane gui, String eulaUrl) {
             URL url = null;
             try {
Index: trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java	(revision 10042)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java	(revision 10043)
@@ -345,5 +345,5 @@
     }
 
-    private void minimizeSplitBounds(Split split, Rectangle bounds) {
+    private static void minimizeSplitBounds(Split split, Rectangle bounds) {
         Rectangle splitBounds = new Rectangle(bounds.x, bounds.y, 0, 0);
         List<Node> splitChildren = split.getChildren();
@@ -710,5 +710,5 @@
     }
 
-    private void throwInvalidLayout(String msg, Node node) {
+    private static void throwInvalidLayout(String msg, Node node) {
         throw new InvalidLayoutException(msg, node);
     }
@@ -759,5 +759,5 @@
     }
 
-    private Divider dividerAt(Node root, int x, int y) {
+    private static Divider dividerAt(Node root, int x, int y) {
         if (root instanceof Divider) {
             Divider divider = (Divider) root;
@@ -785,5 +785,5 @@
     }
 
-    private boolean nodeOverlapsRectangle(Node node, Rectangle r2) {
+    private static boolean nodeOverlapsRectangle(Node node, Rectangle r2) {
         Rectangle r1 = node.getBounds();
         return
Index: trunk/src/org/openstreetmap/josm/io/NMEAImporter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/NMEAImporter.java	(revision 10042)
+++ trunk/src/org/openstreetmap/josm/io/NMEAImporter.java	(revision 10043)
@@ -67,5 +67,5 @@
     }
 
-    private void showNmeaInfobox(boolean success, NmeaReader r) {
+    private static void showNmeaInfobox(boolean success, NmeaReader r) {
         final StringBuilder msg = new StringBuilder(160).append("<html>");
         msg.append(tr("Coordinates imported: {0}", r.getNumberOfCoordinates())).append("<br>")
Index: trunk/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java	(revision 10042)
+++ trunk/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java	(revision 10043)
@@ -73,5 +73,5 @@
     }
 
-    private File[] listFiles(File pluginsDirectory, final String regex) {
+    private static File[] listFiles(File pluginsDirectory, final String regex) {
         return pluginsDirectory.listFiles(
                 new FilenameFilter() {
Index: trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java	(revision 10042)
+++ trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java	(revision 10043)
@@ -196,5 +196,5 @@
     }
 
-    private void displayErrorMessage(final ProgressMonitor monitor, final String msg, final String details, final String title,
+    private static void displayErrorMessage(final ProgressMonitor monitor, final String msg, final String details, final String title,
             final String firstMessage) {
         GuiHelper.runInEDTAndWait(new Runnable() {
Index: trunk/src/org/openstreetmap/josm/tools/template_engine/ContextSwitchTemplate.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/template_engine/ContextSwitchTemplate.java	(revision 10042)
+++ trunk/src/org/openstreetmap/josm/tools/template_engine/ContextSwitchTemplate.java	(revision 10043)
@@ -185,5 +185,5 @@
     private final TemplateEntry template;
 
-    private Match transform(Match m, int searchExpressionPosition) throws ParseError {
+    private static Match transform(Match m, int searchExpressionPosition) throws ParseError {
         if (m instanceof Parent) {
             Match child = transform(((Parent) m).getOperand(), searchExpressionPosition);