Index: trunk/src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java	(revision 15877)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java	(revision 15880)
@@ -74,4 +74,9 @@
     @Override
     public void addGui(PreferenceTabbedPane gui) {
+        addOsmPane(gui);
+        addGpxPane(gui);
+    }
+
+    private void addGpxPane(PreferenceTabbedPane gui) {
         gpxPanel = new GPXSettingsPanel();
         gui.addValidationListener(gpxPanel);
@@ -82,5 +87,8 @@
         GuiHelper.setDefaultIncrement(scrollpane);
         gui.getDisplayPreference().addSubTab(this, tr("GPS Points"), scrollpane);
-        panel = new JPanel(new GridBagLayout());
+    }
+
+    private void addOsmPane(PreferenceTabbedPane gui) {
+        JPanel panel = new JPanel(new GridBagLayout());
         panel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
 
@@ -201,5 +209,5 @@
 
         panel.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.BOTH));
-        scrollpane = new JScrollPane(panel);
+        JScrollPane scrollpane = new JScrollPane(panel);
         scrollpane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
         GuiHelper.setDefaultIncrement(scrollpane);