Index: trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java	(revision 3853)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java	(revision 3854)
@@ -5,11 +5,9 @@
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashSet;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map.Entry;
-import java.util.Set;
-
-import org.openstreetmap.josm.Main;
+
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -19,7 +17,5 @@
 import org.openstreetmap.josm.gui.NavigatableComponent;
 import org.openstreetmap.josm.gui.mappaint.StyleCache.StyleList;
-import org.openstreetmap.josm.tools.FilteredCollection;
 import org.openstreetmap.josm.tools.Pair;
-import org.openstreetmap.josm.tools.Predicate;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -44,25 +40,5 @@
 
     public Collection<StyleSource> getStyleSources() {
-        return new FilteredCollection<StyleSource>(styleSources, new Predicate<StyleSource>() {
-
-            String name = Main.pref.get("mappaint.style", "standard");
-
-            @Override
-            public boolean evaluate(StyleSource s) {
-                return Utils.equal(s.getPrefName(), name);
-            }
-
-        });
-    }
-
-    public Collection<String> getStyleNames() {
-        Set<String> names = new HashSet<String>();
-        names.add("standard");
-        for (StyleSource s : styleSources) {
-            if (s.name != null) {
-                names.add(s.name);
-            }
-        }
-        return names;
+        return Collections.<StyleSource>unmodifiableCollection(styleSources);
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java	(revision 3853)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java	(revision 3854)
@@ -28,5 +28,4 @@
     private SourceEditor sources;
     private JCheckBox enableIconDefault;
-    private JComboBox styleCombo = new JComboBox();
 
     public static class Factory implements PreferenceSettingFactory {
@@ -42,25 +41,6 @@
         sources = new MapPaintSourceEditor();
 
-        Collection<String> styles = new TreeSet<String>(MapPaintStyles.getStyles().getStyleNames());
-        String defstyle = Main.pref.get("mappaint.style", "standard");
-        styles.add(defstyle);
-        for(String style : styles) {
-            styleCombo.addItem(style);
-        }
-
-        styleCombo.setEditable(true);
-        for (int i = 0; i < styleCombo.getItemCount(); ++i) {
-            if (((String)styleCombo.getItemAt(i)).equals(defstyle)) {
-                styleCombo.setSelectedIndex(i);
-                break;
-            }
-        }
-
         final JPanel panel = new JPanel(new GridBagLayout());
         panel.setBorder(BorderFactory.createEmptyBorder( 0, 0, 0, 0 ));
-
-        panel.add(new JLabel(tr("Used style")), GBC.std().insets(5,5,0,5));
-        panel.add(GBC.glue(5,0), GBC.std().fill(GBC.HORIZONTAL));
-        panel.add(styleCombo, GBC.eop().fill(GBC.HORIZONTAL).insets(0,0,5,0));
 
         panel.add(sources, GBC.eol().fill(GBC.BOTH));
@@ -170,6 +150,5 @@
             restart = true;
         }
-        if(Main.pref.put("mappaint.style", styleCombo.getEditor().getItem().toString())
-        && Main.isDisplayingMapView())
+        if(Main.isDisplayingMapView())
         {
             MapPaintStyles.getStyles().clearCached();