Index: trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java	(revision 6334)
+++ trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java	(revision 6335)
@@ -9,5 +9,4 @@
 
 import javax.swing.BorderFactory;
-import javax.swing.JCheckBox;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
@@ -23,9 +22,4 @@
     private JosmTextField tfUserName;
     private JosmPasswordField tfPassword;
-
-    private JCheckBox cbWriteMapData;
-    private JCheckBox cbWriteGpsTraces;
-    private JCheckBox cbReadGpsTraces;
-
 
     protected JPanel buildUserNamePasswordPanel() {
Index: trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java	(revision 6334)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java	(revision 6335)
@@ -1500,10 +1500,8 @@
     abstract public static class SourcePrefHelper {
 
-        private final String prefOld;
         private final String pref;
 
         public SourcePrefHelper(String pref, String prefOld) {
             this.pref = pref;
-            this.prefOld = prefOld;
         }
 
Index: trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java	(revision 6334)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java	(revision 6335)
@@ -57,38 +57,4 @@
     // table of shortcuts
     private AbstractTableModel model;
-    // comboboxes of modifier groups, mapping selectedIndex to real data
-    private static int[] modifInts = new int[]{
-        -1,
-        0,
-        KeyEvent.SHIFT_DOWN_MASK,
-        KeyEvent.CTRL_DOWN_MASK,
-        KeyEvent.ALT_DOWN_MASK,
-        KeyEvent.META_DOWN_MASK,
-        KeyEvent.CTRL_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK,
-        KeyEvent.ALT_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK,
-        KeyEvent.META_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK,
-        KeyEvent.CTRL_DOWN_MASK | KeyEvent.ALT_DOWN_MASK,
-        KeyEvent.CTRL_DOWN_MASK | KeyEvent.META_DOWN_MASK,
-        KeyEvent.ALT_DOWN_MASK | KeyEvent.META_DOWN_MASK,
-        KeyEvent.CTRL_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK | KeyEvent.ALT_DOWN_MASK,
-        KeyEvent.META_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK | KeyEvent.ALT_DOWN_MASK
-    };
-    // and here are the texts fro the comboboxes
-    private static String[] modifList = new String[] {
-        tr("disabled"),
-        tr("no modifier"),
-        KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A, modifInts[2]).getModifiers()),
-        KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A, modifInts[3]).getModifiers()),
-        KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A, modifInts[4]).getModifiers()),
-        KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A, modifInts[5]).getModifiers()),
-        KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A, modifInts[6]).getModifiers()),
-        KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A, modifInts[7]).getModifiers()),
-        KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A, modifInts[8]).getModifiers()),
-        KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A, modifInts[9]).getModifiers()),
-        KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A, modifInts[10]).getModifiers()),
-        KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A, modifInts[11]).getModifiers()),
-        KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A, modifInts[12]).getModifiers()),
-        KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A, modifInts[13]).getModifiers())
-    };
     // this are the display(!) texts for the checkboxes. Let the JVM do the i18n for us <g>.
     // Ok, there's a real reason for this: The JVM should know best how the keys are labelled
@@ -140,5 +106,4 @@
 
     /** Creates new form prefJPanel */
-    // Ain't those auto-generated comments helpful or what? <g>
     public PrefJPanel(AbstractTableModel model) {
         this.model = model;