Index: applications/editors/josm/plugins/turnrestrictions/build.xml
===================================================================
--- applications/editors/josm/plugins/turnrestrictions/build.xml	(revision 27676)
+++ applications/editors/josm/plugins/turnrestrictions/build.xml	(revision 27857)
@@ -32,5 +32,5 @@
     <property name="commit.message" value="Adapt to JOSM core change (DefaultNameFormatter)"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4549"/>
+    <property name="plugin.main.version" value="4968"/>
     <!--
       ************************************************
Index: applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceEditor.java
===================================================================
--- applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceEditor.java	(revision 27676)
+++ applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceEditor.java	(revision 27857)
@@ -19,5 +19,5 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
+import org.openstreetmap.josm.gui.preferences.DefaultTabPreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
 import org.openstreetmap.josm.gui.widgets.HtmlPanel;
@@ -30,11 +30,17 @@
  *
  */
-public class PreferenceEditor extends JPanel implements PreferenceSetting{
-    
+public class PreferenceEditor extends DefaultTabPreferenceSetting {
+
     private PreferencesPanel pnlIconPreferences;
+    private JPanel mainPanel;
+
+    public PreferenceEditor() {
+        super("turnrestrictions", tr("Turn Restrictions"), tr("An OSM plugin for editing turn restrictions."));
+        build();
+    }
 
     /**
-     * builds the panel with the sponsoring information 
-     * 
+     * builds the panel with the sponsoring information
+     *
      * @return
      */
@@ -50,15 +56,15 @@
         pnl.add(lbl, gc);
         lbl.setIcon(ImageProvider.get("skobbler-logo"));
-        
+
         gc.gridx = 1;
         gc.weightx = 1.0;
         HtmlPanel msg  =new HtmlPanel();
         msg.setText("<html><body>"
-                + tr("Development of the turn restriction plugin was sponsored " 
+                + tr("Development of the turn restriction plugin was sponsored "
                 + "by <a href=\"http://www.skobbler.de\">skobbler GmbH</a>.")
                 +"</body></html>");
         pnl.add(msg, gc);
-        
-        // filler - grab remaining space 
+
+        // filler - grab remaining space
         gc.gridy = 1;
         gc.gridx = 0;
@@ -67,5 +73,5 @@
         gc.weighty = 1.0;
         pnl.add(new JPanel(), gc);
-        
+
         SkobblerUrlLauncher urlLauncher = new SkobblerUrlLauncher();
         msg.getEditorPane().addHyperlinkListener(urlLauncher);
@@ -76,35 +82,31 @@
     protected JPanel buildIconPreferencePanel() {
         JPanel pnl = new JPanel(new BorderLayout());
-        
+
         pnlIconPreferences = new PreferencesPanel();
         pnlIconPreferences.initFromPreferences(Main.pref);
-        
+
         JScrollPane sp = new JScrollPane(pnlIconPreferences);
         sp.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
         sp.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
-        
+
         pnl.add(sp, BorderLayout.CENTER);
         return pnl;
     }
-    
+
     protected void build() {
-        setLayout(new BorderLayout());
+        mainPanel = new JPanel();
+        mainPanel.setLayout(new BorderLayout());
         JTabbedPane tp = new JTabbedPane();
         tp.add(buildIconPreferencePanel());
-        tp.add(buildCreditPanel());     
+        tp.add(buildCreditPanel());
         tp.setTitleAt(0, tr("Preferences"));
         tp.setToolTipTextAt(0,tr("Configure the preferences for the turnrestrictions plugin"));
         tp.setTitleAt(1, tr("Sponsor"));
-        add(tp, BorderLayout.CENTER);
+        mainPanel.add(tp, BorderLayout.CENTER);
     }
-    
-    public PreferenceEditor() {
-        build();
-    }
-    
+
     public void addGui(PreferenceTabbedPane gui) {
-        String description = tr("An OSM plugin for editing turn restrictions.");
-        JPanel tab = gui.createPreferenceTab("turnrestrictions", tr("Turn Restrictions"), description);
-        tab.add(this, GBC.eol().fill(GBC.BOTH));
+        JPanel tab = gui.createPreferenceTab(this);
+        tab.add(mainPanel, GBC.eol().fill(GBC.BOTH));
     }
 
@@ -113,7 +115,7 @@
         return false;
     }
-    
+
     /**
-     * Launches an external browser with the sponsors home page 
+     * Launches an external browser with the sponsors home page
      */
     class SkobblerUrlLauncher extends MouseAdapter implements HyperlinkListener {
@@ -121,5 +123,5 @@
             OpenBrowser.displayUrl("http://www.skobbler.de");
         }
-        
+
         public void hyperlinkUpdate(HyperlinkEvent e) {
             if (e.getEventType().equals(HyperlinkEvent.EventType.ACTIVATED)) {
