Index: /applications/editors/josm/plugins/tagging-preset-tester/build.xml
===================================================================
--- /applications/editors/josm/plugins/tagging-preset-tester/build.xml	(revision 29759)
+++ /applications/editors/josm/plugins/tagging-preset-tester/build.xml	(revision 29760)
@@ -26,6 +26,6 @@
 -->
 <project name="tagging-preset-tester" default="dist" basedir=".">
-    <property name="commit.message" value="[josm_tagging_preset_tester] fix #josm8879: make all panels active by default and use current selection"/>
-    <property name="plugin.main.version" value="4980"/>
+    <property name="commit.message" value="[josm_tagging_preset_tester] fix #josm8853: use preset seach panel in the plugin instead of the compbobox"/>
+    <property name="plugin.main.version" value="6071"/>
     <property name="josm" location="../../core/dist/josm-custom.jar"/>
     <property name="plugin.dist.dir" value="../../dist"/>
Index: /applications/editors/josm/plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java
===================================================================
--- /applications/editors/josm/plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java	(revision 29759)
+++ /applications/editors/josm/plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java	(revision 29760)
@@ -4,4 +4,7 @@
 
 import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.GridBagLayout;
+import java.awt.GridLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -9,8 +12,6 @@
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Vector;
 
 import javax.swing.BorderFactory;
-import javax.swing.DefaultComboBoxModel;
 import javax.swing.JButton;
 import javax.swing.JComboBox;
@@ -26,4 +27,8 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.tagging.TaggingPreset;
+import org.openstreetmap.josm.gui.tagging.TaggingPresetReader;
+import org.openstreetmap.josm.gui.tagging.TaggingPresetSelector;
+import org.openstreetmap.josm.gui.tagging.TaggingPresetType;
+import org.openstreetmap.josm.tools.GBC;
 
 /**
@@ -32,17 +37,16 @@
 public class TaggingPresetTester extends JFrame {
 
-    private JComboBox taggingPresets;
+    private TaggingPresetSelector taggingPresets;
     private final String[] args;
     private JPanel taggingPresetPanel = new JPanel(new BorderLayout());
-    private JPanel panel = new JPanel(new BorderLayout());
+    private JPanel panel = new JPanel(new GridBagLayout());
 
     public final void reload() {
-        Vector<TaggingPreset> allPresets = new Vector<TaggingPreset>(TaggingPreset.readAll(Arrays.asList(args), true));
-        taggingPresets.setModel(new DefaultComboBoxModel(allPresets));
+        taggingPresets.init(TaggingPresetReader.readAll(Arrays.asList(args), true));
     }
 
     public final void reselect() {
         taggingPresetPanel.removeAll();
-        TaggingPreset preset = (TaggingPreset)taggingPresets.getSelectedItem();
+        TaggingPreset preset = taggingPresets.getSelectedPreset();
         if (preset == null)
             return;
@@ -65,11 +69,11 @@
         super(tr("Tagging Preset Tester"));
         this.args = args;
-        taggingPresets = new JComboBox();
-        taggingPresets.setRenderer(new TaggingCellRenderer());
+        taggingPresets = new TaggingPresetSelector();
+        taggingPresetPanel.setPreferredSize(new Dimension(300,500));
         reload();
 
-        panel.add(taggingPresets, BorderLayout.NORTH);
-        panel.add(taggingPresetPanel, BorderLayout.CENTER);
-        taggingPresets.addActionListener(new ActionListener(){
+        panel.add(taggingPresets, GBC.std(0,0).fill(GBC.BOTH));
+        panel.add(taggingPresetPanel, GBC.std(1,0).fill(GBC.BOTH));
+        taggingPresets.setClickListener(new ActionListener(){
             @Override
             public void actionPerformed(ActionEvent e) {
@@ -83,15 +87,13 @@
             @Override
             public void actionPerformed(ActionEvent e) {
-                int i = taggingPresets.getSelectedIndex();
+                TaggingPreset p = taggingPresets.getSelectedPreset();
                 reload();
-                if (i < taggingPresets.getItemCount()) {
-                	taggingPresets.setSelectedIndex(i);
-                }
+                if (p!=null)taggingPresets.setSelectedPreset(p);
             }
         });
-        panel.add(b, BorderLayout.SOUTH);
+        panel.add(b, GBC.std(0,1).span(2,1).fill(GBC.HORIZONTAL));
 
         setContentPane(panel);
-        setSize(300,500);
+        setSize(600,500);
     }
 
@@ -108,11 +110,11 @@
 
     private Collection<OsmPrimitive> makeFakeSuitablePrimitive(TaggingPreset preset) {
-        if (preset.typeMatches(Collections.singleton(TaggingPreset.PresetType.NODE))) {
+        if (preset.typeMatches(Collections.singleton(TaggingPresetType.NODE))) {
             return Collections.<OsmPrimitive>singleton(new Node());
-        } else if (preset.typeMatches(Collections.singleton(TaggingPreset.PresetType.WAY))) {
+        } else if (preset.typeMatches(Collections.singleton(TaggingPresetType.WAY))) {
             return Collections.<OsmPrimitive>singleton(new Way());
-        } else if (preset.typeMatches(Collections.singleton(TaggingPreset.PresetType.RELATION))) {
+        } else if (preset.typeMatches(Collections.singleton(TaggingPresetType.RELATION))) {
             return Collections.<OsmPrimitive>singleton(new Relation());
-        } else if (preset.typeMatches(Collections.singleton(TaggingPreset.PresetType.CLOSEDWAY))) {
+        } else if (preset.typeMatches(Collections.singleton(TaggingPresetType.CLOSEDWAY))) {
             Way w = new Way();
             w.addNode(new Node(new LatLon(0,0)));
Index: /applications/editors/josm/plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java
===================================================================
--- /applications/editors/josm/plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java	(revision 29759)
+++ /applications/editors/josm/plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java	(revision 29760)
@@ -12,5 +12,5 @@
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.gui.MainMenu;
-import org.openstreetmap.josm.gui.tagging.TaggingPreset;
+import org.openstreetmap.josm.gui.tagging.TaggingPresetReader;
 import org.openstreetmap.josm.plugins.PluginInformation;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -38,5 +38,5 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        Collection<String> coll = TaggingPreset.getPresetSources();
+        Collection<String> coll = TaggingPresetReader.getPresetSources();
 
         if (coll.isEmpty()) {