Index: /trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java	(revision 6366)
+++ /trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java	(revision 6367)
@@ -1296,27 +1296,4 @@
 
     /**
-     * This method filters the list of relations that form the multipolygons.
-     * @param relations all relations
-     * @param polygons polygons for filtering
-     * @return relations which don't form the polygons
-     */
-    private List<Relation> filterOwnMultipolygonRelations(Collection<Relation> relations, List<Multipolygon> polygons) {
-
-        List<Relation> relationsToRemove = new ArrayList<Relation>();
-
-        for (Multipolygon m : polygons) {
-            if (m.relation != null) {
-                relationsToRemove.add(m.relation);
-            }
-        }
-
-        List<Relation> result = new ArrayList<Relation>();
-
-        result.addAll(relations);
-        result.removeAll(relationsToRemove);
-        return result;
-    }
-
-    /**
      * Will add own multipolygon relation to the "previously existing" relations. Fixup is done by fixRelations
      * @param inner List of already closed inner ways
Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java	(revision 6366)
+++ /trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java	(revision 6367)
@@ -289,9 +289,4 @@
     }
 
-    private boolean isValidModifierCombination() {
-        // TODO: implement to give feedback on invalid modifier combination
-        return true;
-    }
-
     private boolean sanityCheck() {
         // @formatter:off
Index: /trunk/src/org/openstreetmap/josm/data/Preferences.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 6366)
+++ /trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 6367)
@@ -466,14 +466,4 @@
     }
 
-    synchronized private Map<String, String> getAllPrefixDefault(final String prefix) {
-        final Map<String,String> all = new TreeMap<String,String>();
-        for (final Entry<String,String> e : defaults.entrySet()) {
-            if (e.getKey().startsWith(prefix)) {
-                all.put(e.getKey(), e.getValue());
-            }
-        }
-        return all;
-    }
-
     synchronized public Map<String, String> getAllColors() {
         final Map<String,String> all = new TreeMap<String,String>();
Index: /trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java	(revision 6366)
+++ /trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java	(revision 6367)
@@ -411,12 +411,4 @@
     }
 
-    private String getLeadingNumber(String s) {
-        int i = 0;
-        while (i < s.length() && Character.isDigit(s.charAt(i))) {
-            i++;
-        }
-        return s.substring(0, i);
-    }
-
     private String getRelationTypeName(IRelation relation) {
         String name = trc("Relation type", relation.get("type"));
Index: /trunk/src/org/openstreetmap/josm/gui/SideButton.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/SideButton.java	(revision 6366)
+++ /trunk/src/org/openstreetmap/josm/gui/SideButton.java	(revision 6367)
@@ -80,15 +80,5 @@
     }
 
-    private void setup(String name, String property, String tooltip, ActionListener actionListener)
-    {
-        doStyle();
-        setActionCommand(name);
-        addActionListener(actionListener);
-        setToolTipText(tooltip);
-        putClientProperty("help", "Dialog/"+property+"/"+name);
-    }
-
-    private void doStyle()
-    {
+    private void doStyle() {
         setLayout(new BorderLayout());
         setIconTextGap(2);
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java	(revision 6366)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java	(revision 6367)
@@ -118,6 +118,5 @@
 
         private PreferenceScrollPane(PreferencePanel preferencePanel) {
-            super(preferencePanel.getComponent());
-            this.preferenceSetting = preferencePanel.getTabPreferenceSetting();
+            this(preferencePanel.getComponent(), preferencePanel.getTabPreferenceSetting());
         }
 
Index: /trunk/src/org/openstreetmap/josm/tools/Shortcut.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/Shortcut.java	(revision 6366)
+++ /trunk/src/org/openstreetmap/josm/tools/Shortcut.java	(revision 6367)
@@ -37,6 +37,6 @@
     private String shortText;        // the unique ID of the shortcut
     private String longText;         // a human readable description that will be shown in the preferences
-    private int requestedKey;        // the key, the caller requested
-    private int requestedGroup;      // the group, the caller requested
+    private final int requestedKey;  // the key, the caller requested
+    private final int requestedGroup;// the group, the caller requested
     private int assignedKey;         // the key that actually is used
     private int assignedModifier;    // the modifiers that are used
@@ -72,12 +72,4 @@
     private void setLongText(String longText) {
         this.longText = longText;
-    }
-
-    private int getRequestedKey() {
-        return requestedKey;
-    }
-
-    public int getRequestedGroup() {
-        return requestedGroup;
     }