Index: applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/customurl/UtilsPluginPreferences.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/customurl/UtilsPluginPreferences.java	(revision 27855)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/customurl/UtilsPluginPreferences.java	(revision 27857)
@@ -1,6 +1,3 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
+// License: GPL. For details, see LICENSE file.
 package utilsplugin2.customurl;
 
@@ -22,5 +19,5 @@
 import javax.swing.event.TableModelListener;
 import javax.swing.table.DefaultTableModel;
-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.tools.GBC;
@@ -28,5 +25,5 @@
 import static org.openstreetmap.josm.tools.I18n.*;
 
-public class UtilsPluginPreferences  implements PreferenceSetting {
+public class UtilsPluginPreferences extends DefaultTabPreferenceSetting {
     HistoryComboBox combo1=new HistoryComboBox();
     JTable table;
@@ -35,20 +32,22 @@
     JButton saveButton;
 
+    public UtilsPluginPreferences() {
+        super("utils", tr("Utilsplugin2 settings [TESTING]"), tr("Here you can change some preferences of Utilsplugin2 functions"));
+    }
+
     @Override
     public void addGui(PreferenceTabbedPane gui) {
-        JPanel pp = gui.createPreferenceTab("utils", tr("Utilsplugin2 settings [TESTING]"),
-                tr("Here you can change some preferences of Utilsplugin2 functions"));
+        JPanel pp = gui.createPreferenceTab(this);
         JPanel all = new JPanel();
         GridBagLayout layout = new GridBagLayout();
         all.setLayout(layout);
-        
+
         // FIXME: get rid of hardcoded URLS
-        
+
         String addr =  URLList.getSelectedURL();
         table=new JTable(new DefaultTableModel(null,new String[]{"Title","URL"}));
-        
+
         List<String> items = URLList.getURLList();
-        //System.out.println("pref:"+addr);
-        
+
         resetButton = new JButton(tr("Reset"));
         resetButton.addActionListener(new ActionListener() {
@@ -57,5 +56,5 @@
             }
         });
-        
+
         saveButton = new JButton(tr("Save to file"));
         saveButton.addActionListener(new ActionListener() {
@@ -64,5 +63,5 @@
             }
         });
-        
+
         loadButton = new JButton(tr("Load from file"));
         loadButton.addActionListener(new ActionListener() {
@@ -71,7 +70,7 @@
             }
         });
-        
+
         fillRows(items);
-        
+
         HtmlPanel help = new HtmlPanel(tr("Please edit custom URLs and select one row to use with the tool<br/>"
                 + " <b>&#123;key&#125;</b> is replaced with the tag value<br/>"
@@ -80,5 +79,5 @@
                 + " <b>&#123;#lat&#125; , &#123;#lon&#125;</b> is replaced with map center latitude/longitude <br/>"
                 + " Your can manually load settings from file <b>customurl.txt</b> in JOSM folder"));
-        
+
         all.add(new JLabel(tr("Custom URL configuration")),GBC.std().insets(5,10,0,0));
         all.add(resetButton,GBC.std().insets(25,10,0,0));
@@ -86,5 +85,5 @@
         all.add(saveButton,GBC.eol().insets(25,10,0,0));
         all.add(help,GBC.eop().insets(5,10,0,0));
-        
+
         table.getColumnModel().getColumn(0).setPreferredWidth(150);
         table.getColumnModel().getColumn(0).setMaxWidth(300);
@@ -99,10 +98,10 @@
                 if (row<0  || column<0) return;
                 String data = (String)model.getValueAt(row, column);
-                if (data!=null && data.length()>0 && row==model.getRowCount()-1) 
+                if (data!=null && data.length()>0 && row==model.getRowCount()-1)
                     model.addRow(new String[]{"",""});
             }
         });
         all.add(table,GBC.eop().fill());
-        
+
         pp.add(all, GBC.eol().fill(GridBagConstraints.BOTH));
     }
@@ -135,10 +134,7 @@
         List<String> lst = readItemsFromTable();
         URLList.updateURLList(lst);
-       
+
         return false;
     }
-
-    
-   
 
     private List<String> readItemsFromTable() {