Index: /src/org/openstreetmap/josm/actions/PreferencesAction.java
===================================================================
--- /src/org/openstreetmap/josm/actions/PreferencesAction.java	(revision 167)
+++ /src/org/openstreetmap/josm/actions/PreferencesAction.java	(revision 168)
@@ -3,8 +3,15 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
 
-import org.openstreetmap.josm.gui.PreferenceDialog;
+import javax.swing.JDialog;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.preferences.PreferenceDialog;
+import org.openstreetmap.josm.tools.GBC;
 
 /**
@@ -26,6 +33,13 @@
 	 */
 	public void actionPerformed(ActionEvent e) {
-		PreferenceDialog dlg = new PreferenceDialog();
+		PreferenceDialog prefDlg = new PreferenceDialog();
+		JPanel prefPanel = new JPanel(new GridBagLayout());
+		prefPanel.add(prefDlg, GBC.eol().fill(GBC.BOTH));
+		
+		JOptionPane pane = new JOptionPane(prefPanel, JOptionPane.PLAIN_MESSAGE, JOptionPane.OK_CANCEL_OPTION);
+		JDialog dlg = pane.createDialog(Main.parent, tr("Preferences"));
 		dlg.setVisible(true);
+		if (pane.getValue() instanceof Integer && (Integer)pane.getValue() == JOptionPane.OK_OPTION)
+			prefDlg.ok();
 	}
 }
Index: c/org/openstreetmap/josm/gui/PreferenceDialog.java
===================================================================
--- /src/org/openstreetmap/josm/gui/PreferenceDialog.java	(revision 167)
+++ 	(revision )
@@ -1,512 +1,0 @@
-package org.openstreetmap.josm.gui;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
-
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.GridBagLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.io.File;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.Map;
-import java.util.StringTokenizer;
-import java.util.TreeMap;
-import java.util.Vector;
-import java.util.Map.Entry;
-
-import javax.swing.AbstractAction;
-import javax.swing.BorderFactory;
-import javax.swing.Box;
-import javax.swing.DefaultListCellRenderer;
-import javax.swing.DefaultListModel;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JColorChooser;
-import javax.swing.JComboBox;
-import javax.swing.JDialog;
-import javax.swing.JLabel;
-import javax.swing.JList;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JPasswordField;
-import javax.swing.JScrollPane;
-import javax.swing.JTabbedPane;
-import javax.swing.JTable;
-import javax.swing.JTextField;
-import javax.swing.ListCellRenderer;
-import javax.swing.ListSelectionModel;
-import javax.swing.UIManager;
-import javax.swing.UIManager.LookAndFeelInfo;
-import javax.swing.table.TableCellRenderer;
-
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.projection.Projection;
-import org.openstreetmap.josm.plugins.PluginInformation;
-import org.openstreetmap.josm.tools.ColorHelper;
-import org.openstreetmap.josm.tools.GBC;
-import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.tools.UrlLabel;
-
-/**
- * The preference settings.
- *
- * @author imi
- */
-public class PreferenceDialog extends JDialog {
-
-	private final class RequireRestartAction implements ActionListener {
-		public void actionPerformed(ActionEvent e) {
-			requiresRestart = true;
-		}
-	}
-	private RequireRestartAction requireRestartAction = new RequireRestartAction();
-
-	/**
-	 * Action to take place when user pressed the ok button.
-	 */
-	class OkAction extends AbstractAction {
-		private static final String OKBUTTON_PROP = "OptionPane.okButtonText";
-
-		public OkAction() {
-			super(UIManager.getString(OKBUTTON_PROP), UIManager.getIcon("OptionPane.okIcon"));
-			try {
-				putValue(MNEMONIC_KEY, new Integer((String)UIManager.get("OptionPane.okButtonMnemonic")));
-			} catch (NumberFormatException e) {
-				// just don't set the mnemonic
-			}
-		}
-		public void actionPerformed(ActionEvent e) {
-			Main.pref.put("laf", ((LookAndFeelInfo)lafCombo.getSelectedItem()).getClassName());
-			Main.pref.put("projection", projectionCombo.getSelectedItem().getClass().getName());
-			Main.pref.put("osm-server.url", osmDataServer.getText());
-			Main.pref.put("osm-server.username", osmDataUsername.getText());
-			String pwd = String.valueOf(osmDataPassword.getPassword());
-			if (pwd.equals(""))
-				pwd = null;
-			Main.pref.put("osm-server.password", pwd);
-			Main.pref.put("wms.baseurl", wmsServerBaseUrl.getText());
-			Main.pref.put("csv.importstring", csvImportString.getText());
-			Main.pref.put("draw.rawgps.lines", drawRawGpsLines.isSelected());
-			Main.pref.put("draw.rawgps.lines.force", forceRawGpsLines.isSelected());
-			Main.pref.put("draw.rawgps.large", largeGpsPoints.isSelected());
-			Main.pref.put("draw.segment.direction", directionHint.isSelected());
-
-			if (annotationSources.getModel().getSize() > 0) {
-				StringBuilder sb = new StringBuilder();
-				for (int i = 0; i < annotationSources.getModel().getSize(); ++i)
-					sb.append(";"+annotationSources.getModel().getElementAt(i));
-				Main.pref.put("annotation.sources", sb.toString().substring(1));
-			} else
-				Main.pref.put("annotation.sources", null);
-
-			String plugins = "";
-			for (Entry<PluginInformation, Boolean> entry : pluginMap.entrySet())
-				if (entry.getValue())
-					plugins += entry.getKey().name + ",";
-			if (plugins.endsWith(","))
-				plugins = plugins.substring(0, plugins.length()-1);
-			Main.pref.put("plugins", plugins);
-
-			for (int i = 0; i < colors.getRowCount(); ++i) {
-				String name = (String)colors.getValueAt(i, 0);
-				Color col = (Color)colors.getValueAt(i, 1);
-				Main.pref.put("color."+name, ColorHelper.color2html(col));
-			}
-
-			if (requiresRestart)
-				JOptionPane.showMessageDialog(PreferenceDialog.this,tr("You have to restart JOSM for some settings to take effect."));
-			Main.parent.repaint();
-			setVisible(false);
-		}
-	}
-
-	/**
-	 * Action to take place when user pressed the cancel button.
-	 */
-	class CancelAction extends AbstractAction {
-		private static final String CANCELBUTTON_PROP = "OptionPane.cancelButtonText";
-		public CancelAction() {
-			super(UIManager.getString(CANCELBUTTON_PROP),
-					UIManager.getIcon("OptionPane.cancelIcon"));
-			try {
-				putValue(MNEMONIC_KEY, new Integer((String)UIManager.get("OptionPane.cancelButtonMnemonic")));
-			} catch (NumberFormatException e) {
-				// just don't set the mnemonic
-			}
-		}
-		public void actionPerformed(ActionEvent e) {
-			setVisible(false);
-		}
-	}
-
-	/**
-	 * Indicate, that the application has to be restarted for the settings to take effect.
-	 */
-	private boolean requiresRestart = false;
-	/**
-	 * ComboBox with all look and feels.
-	 */
-	private JComboBox lafCombo = new JComboBox(UIManager.getInstalledLookAndFeels());
-	/**
-	 * The main tab panel.
-	 */
-	private JTabbedPane tabPane = new JTabbedPane(JTabbedPane.LEFT);
-
-	/**
-	 * Editfield for the Base url to the REST API from OSM.
-	 */
-	private JTextField osmDataServer = new JTextField(20);
-	/**
-	 * Editfield for the username to the OSM account.
-	 */
-	private JTextField osmDataUsername = new JTextField(20);
-	/**
-	 * Passwordfield for the userpassword of the REST API.
-	 */
-	private JPasswordField osmDataPassword = new JPasswordField(20);
-	/**
-	 * Base url of the WMS server. Holds everything except the bbox= argument.
-	 */
-	private JTextField wmsServerBaseUrl = new JTextField(20);
-	/**
-	 * Comma seperated import string specifier or <code>null</code> if the first
-	 * data line should be interpreted as one.
-	 */
-	private JTextField csvImportString = new JTextField(20);
-	/**
-	 * The checkbox stating whether nodes should be merged together.
-	 */
-	private JCheckBox drawRawGpsLines = new JCheckBox(tr("Draw lines between raw gps points."));
-	/**
-	 * The checkbox stating whether raw gps lines should be forced.
-	 */
-	private JCheckBox forceRawGpsLines = new JCheckBox(tr("Force lines if no segments imported."));
-	private JCheckBox largeGpsPoints = new JCheckBox(tr("Draw large GPS points."));
-	private JCheckBox directionHint = new JCheckBox(tr("Draw Direction Arrows"));
-	private JTable colors;
-
-	/**
-	 * Combobox with all projections available
-	 */
-	private JComboBox projectionCombo = new JComboBox(Projection.allProjections);
-	private JList annotationSources = new JList(new DefaultListModel());
-	private Map<PluginInformation, Boolean> pluginMap = new HashMap<PluginInformation, Boolean>();
-
-
-	/**
-	 * Create a preference setting dialog from an preferences-file. If the file does not
-	 * exist, it will be created.
-	 * If the dialog is closed with Ok, the preferences will be stored to the preferences-
-	 * file, otherwise no change of the file happens.
-	 */
-	public PreferenceDialog() {
-		super(JOptionPane.getFrameForComponent(Main.parent), tr("Preferences"));
-
-		// look and feel combo box
-		String laf = Main.pref.get("laf");
-		for (int i = 0; i < lafCombo.getItemCount(); ++i) {
-			if (((LookAndFeelInfo)lafCombo.getItemAt(i)).getClassName().equals(laf)) {
-				lafCombo.setSelectedIndex(i);
-				break;
-			}
-		}
-		final ListCellRenderer oldRenderer = lafCombo.getRenderer();
-		lafCombo.setRenderer(new DefaultListCellRenderer(){
-			@Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
-				return oldRenderer.getListCellRendererComponent(list, ((LookAndFeelInfo)value).getName(), index, isSelected, cellHasFocus);
-			}
-		});
-		lafCombo.addActionListener(requireRestartAction);
-
-		// projection combo box
-		for (int i = 0; i < projectionCombo.getItemCount(); ++i) {
-			if (projectionCombo.getItemAt(i).getClass().getName().equals(Main.pref.get("projection"))) {
-				projectionCombo.setSelectedIndex(i);
-				break;
-			}
-		}
-		projectionCombo.addActionListener(requireRestartAction);
-
-		drawRawGpsLines.addActionListener(new ActionListener(){
-			public void actionPerformed(ActionEvent e) {
-				if (!drawRawGpsLines.isSelected())
-					forceRawGpsLines.setSelected(false);
-				forceRawGpsLines.setEnabled(drawRawGpsLines.isSelected());
-			}
-		});
-
-		osmDataServer.setText(Main.pref.get("osm-server.url"));
-		osmDataUsername.setText(Main.pref.get("osm-server.username"));
-		osmDataPassword.setText(Main.pref.get("osm-server.password"));
-		wmsServerBaseUrl.setText(Main.pref.get("wms.baseurl", "http://wms.jpl.nasa.gov/wms.cgi?request=GetMap&width=512&height=512&layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg&"));
-		csvImportString.setText(Main.pref.get("csv.importstring"));
-		drawRawGpsLines.setSelected(Main.pref.getBoolean("draw.rawgps.lines"));
-		forceRawGpsLines.setToolTipText(tr("Force drawing of lines if the imported data contain no line information."));
-		forceRawGpsLines.setSelected(Main.pref.getBoolean("draw.rawgps.lines.force"));
-		forceRawGpsLines.setEnabled(drawRawGpsLines.isSelected());
-		largeGpsPoints.setSelected(Main.pref.getBoolean("draw.rawgps.large"));
-		largeGpsPoints.setToolTipText(tr("Draw larger dots for the GPS points."));
-		directionHint.setToolTipText(tr("Draw direction hints for all segments."));
-		directionHint.setSelected(Main.pref.getBoolean("draw.segment.direction"));
-
-		String annos = Main.pref.get("annotation.sources");
-		StringTokenizer st = new StringTokenizer(annos, ";");
-		while (st.hasMoreTokens())
-			((DefaultListModel)annotationSources.getModel()).addElement(st.nextToken());
-
-		Box pluginPanel = Box.createVerticalBox();
-		Collection<PluginInformation> availablePlugins = new LinkedList<PluginInformation>();
-		File[] pluginFiles = new File(Main.pref.getPreferencesDir()+"plugins").listFiles();
-		if (pluginFiles != null) {
-			Arrays.sort(pluginFiles);
-			for (File f : pluginFiles)
-				if (f.isFile() && f.getName().endsWith(".jar"))
-					availablePlugins.add(new PluginInformation(f));
-		}
-
-		Collection<String> enabledPlugins = Arrays.asList(Main.pref.get("plugins").split(","));
-		for (final PluginInformation plugin : availablePlugins) {
-			boolean enabled = enabledPlugins.contains(plugin.name);
-			final JCheckBox pluginCheck = new JCheckBox(plugin.name, enabled);
-			pluginPanel.add(pluginCheck);
-
-			pluginCheck.setToolTipText(plugin.file.getAbsolutePath());
-			JLabel label = new JLabel("<html><i>"+(plugin.description==null?"no description available":plugin.description)+"</i></html>");
-			label.setBorder(BorderFactory.createEmptyBorder(0,20,0,0));
-			pluginPanel.add(label);
-			pluginPanel.add(Box.createVerticalStrut(5));
-
-			pluginMap.put(plugin, enabled);
-			pluginCheck.addActionListener(new ActionListener(){
-				public void actionPerformed(ActionEvent e) {
-					pluginMap.put(plugin, pluginCheck.isSelected());
-					requiresRestart = true;
-				}
-			});
-		}
-		JScrollPane pluginPane = new JScrollPane(pluginPanel, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
-		pluginPane.setBorder(null);
-
-		Map<String,String> allColors = new TreeMap<String, String>(Main.pref.getAllPrefix("color."));
-
-		Vector<Vector<Object>> rows = new Vector<Vector<Object>>();
-		for (Entry<String,String> e : allColors.entrySet()) {
-			Vector<Object> row = new Vector<Object>(2);
-			row.add(e.getKey().substring("color.".length()));
-			row.add(ColorHelper.html2color(e.getValue()));
-			rows.add(row);
-		}
-		Vector<Object> cols = new Vector<Object>(2);
-		cols.add(tr("Color"));
-		cols.add(tr("Name"));
-		colors = new JTable(rows, cols){
-			@Override public boolean isCellEditable(int row, int column) {
-				return false;
-			}
-		};
-		colors.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-		final TableCellRenderer oldColorsRenderer = colors.getDefaultRenderer(Object.class);
-		colors.setDefaultRenderer(Object.class, new TableCellRenderer(){
-			public Component getTableCellRendererComponent(JTable t, Object o, boolean selected, boolean focus, int row, int column) {
-				if (column == 1) {
-					JLabel l = new JLabel(ColorHelper.color2html((Color)o));
-					l.setBackground((Color)o);
-					l.setOpaque(true);
-					return l;
-				}
-				return oldColorsRenderer.getTableCellRendererComponent(t,tr(o.toString()),selected,focus,row,column);
-			}
-		});
-		colors.getColumnModel().getColumn(1).setWidth(100);
-
-		JButton colorEdit = new JButton(tr("Choose"));
-		colorEdit.addActionListener(new ActionListener(){
-			public void actionPerformed(ActionEvent e) {
-				if (colors.getSelectedRowCount() == 0) {
-					JOptionPane.showMessageDialog(PreferenceDialog.this, tr("Please select a color."));
-					return;
-				}
-				int sel = colors.getSelectedRow();
-				JColorChooser chooser = new JColorChooser((Color)colors.getValueAt(sel, 1));
-				int answer = JOptionPane.showConfirmDialog(PreferenceDialog.this, chooser, tr("Choose a color for {0}", colors.getValueAt(sel, 0)), JOptionPane.OK_CANCEL_OPTION);
-				if (answer == JOptionPane.OK_OPTION)
-					colors.setValueAt(chooser.getColor(), sel, 1);
-			}
-		});
-
-		// Annotation source panels
-		JButton addAnno = new JButton(tr("Add"));
-		addAnno.addActionListener(new ActionListener(){
-			public void actionPerformed(ActionEvent e) {
-				String source = JOptionPane.showInputDialog(Main.parent, tr("Annotation preset source"));
-				if (source == null)
-					return;
-				((DefaultListModel)annotationSources.getModel()).addElement(source);
-				requiresRestart = true;
-			}
-		});
-
-		JButton editAnno = new JButton(tr("Edit"));
-		editAnno.addActionListener(new ActionListener(){
-			public void actionPerformed(ActionEvent e) {
-				if (annotationSources.getSelectedIndex() == -1)
-					JOptionPane.showMessageDialog(Main.parent, tr("Please select the row to edit."));
-				else {
-					String source = JOptionPane.showInputDialog(Main.parent, tr("Annotation preset source"), annotationSources.getSelectedValue());
-					if (source == null)
-						return;
-					((DefaultListModel)annotationSources.getModel()).setElementAt(source, annotationSources.getSelectedIndex());
-					requiresRestart = true;
-				}
-			}
-		});
-
-		JButton deleteAnno = new JButton(tr("Delete"));
-		deleteAnno.addActionListener(new ActionListener(){
-			public void actionPerformed(ActionEvent e) {
-				if (annotationSources.getSelectedIndex() == -1)
-					JOptionPane.showMessageDialog(Main.parent, tr("Please select the row to delete."));
-				else {
-					((DefaultListModel)annotationSources.getModel()).remove(annotationSources.getSelectedIndex());
-					requiresRestart = true;
-				}
-			}
-		});
-		annotationSources.setVisibleRowCount(3);
-
-
-
-		// setting tooltips
-		osmDataServer.setToolTipText(tr("The base URL to the OSM server (REST API)"));
-		osmDataUsername.setToolTipText(tr("Login name (email) to the OSM account."));
-		osmDataPassword.setToolTipText(tr("Login password to the OSM account. Leave blank to not store any password."));
-		wmsServerBaseUrl.setToolTipText(tr("The base URL to the server retrieving WMS background pictures from."));
-		csvImportString.setToolTipText(tr("<html>Import string specification. lat/lon and time are imported.<br>" +
-				"<b>lat</b>: The latitude coordinate<br>" +
-				"<b>lon</b>: The longitude coordinate<br>" +
-				"<b>time</b>: The measured time as string<br>" +
-				"<b>ignore</b>: Skip this field<br>" +
-				"An example: \"ignore ignore lat lon\" will use ' ' as delimiter, skip the first two values and read then lat/lon.<br>" +
-		"Other example: \"lat,lon\" will just read lat/lon values comma seperated.</html>"));
-		drawRawGpsLines.setToolTipText(tr("If your gps device draw to few lines, select this to draw lines along your way."));
-		colors.setToolTipText(tr("Colors used by different objects in JOSM."));
-		annotationSources.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-		addAnno.setToolTipText(tr("Add a new annotation preset source to the list."));
-		deleteAnno.setToolTipText(tr("Delete the selected source from the list."));
-
-		// creating the gui
-
-		// Display tab
-		JPanel display = createPreferenceTab("display", tr("Display Settings"), tr("Various settings that influence the visual representation of the whole program."));
-		display.add(new JLabel(tr("Look and Feel")), GBC.std());
-		display.add(GBC.glue(5,0), GBC.std().fill(GBC.HORIZONTAL));
-		display.add(lafCombo, GBC.eol().fill(GBC.HORIZONTAL));
-		display.add(drawRawGpsLines, GBC.eol().insets(20,0,0,0));
-		display.add(forceRawGpsLines, GBC.eop().insets(40,0,0,0));
-		display.add(largeGpsPoints, GBC.eop().insets(20,0,0,0));
-		display.add(directionHint, GBC.eop().insets(20,0,0,0));
-		display.add(new JLabel(tr("Colors")), GBC.eol());
-		colors.setPreferredScrollableViewportSize(new Dimension(100,112));
-		display.add(new JScrollPane(colors), GBC.eol().fill(GBC.BOTH));
-		display.add(colorEdit, GBC.eol().anchor(GBC.EAST));
-		//display.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.VERTICAL));
-
-		// Connection tab
-		JPanel con = createPreferenceTab("connection", tr("Connection Settings"), tr("Connection Settings to the OSM server."));
-		con.add(new JLabel(tr("Base Server URL")), GBC.std());
-		con.add(osmDataServer, GBC.eol().fill(GBC.HORIZONTAL).insets(5,0,0,5));
-		con.add(new JLabel(tr("OSM username (email)")), GBC.std());
-		con.add(osmDataUsername, GBC.eol().fill(GBC.HORIZONTAL).insets(5,0,0,5));
-		con.add(new JLabel(tr("OSM password")), GBC.std());
-		con.add(osmDataPassword, GBC.eol().fill(GBC.HORIZONTAL).insets(5,0,0,0));
-		JLabel warning = new JLabel(tr("<html>" +
-				"WARNING: The password is stored in plain text in the preferences file.<br>" +
-				"The password is transfered in plain text to the server, encoded in the url.<br>" +
-		"<b>Do not use a valuable Password.</b></html>"));
-		warning.setFont(warning.getFont().deriveFont(Font.ITALIC));
-		con.add(warning, GBC.eop().fill(GBC.HORIZONTAL));
-		//con.add(new JLabel("WMS server base url (everything except bbox-parameter)"), GBC.eol());
-		//con.add(wmsServerBaseUrl, GBC.eop().fill(GBC.HORIZONTAL));
-		//con.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.VERTICAL));
-		con.add(new JLabel(tr("CSV import specification (empty: read from first line in data)")), GBC.eol());
-		con.add(csvImportString, GBC.eop().fill(GBC.HORIZONTAL));
-		con.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.VERTICAL));
-
-		// Map tab
-		JPanel map = createPreferenceTab("map", tr("Map Settings"), tr("Settings for the map projection and data interpretation."));
-		map.add(new JLabel(tr("Projection method")), GBC.std());
-		map.add(GBC.glue(5,0), GBC.std().fill(GBC.HORIZONTAL));
-		map.add(projectionCombo, GBC.eop().fill(GBC.HORIZONTAL).insets(0,0,0,5));
-		map.add(new JLabel(tr("Annotation preset sources")), GBC.eol().insets(0,5,0,0));
-		map.add(new JScrollPane(annotationSources), GBC.eol().fill(GBC.BOTH));
-		map.add(GBC.glue(5, 0), GBC.std().fill(GBC.HORIZONTAL));
-		map.add(addAnno, GBC.std());
-		map.add(editAnno, GBC.std().insets(5,0,5,0));
-		map.add(deleteAnno, GBC.std());
-
-		// I HATE SWING!
-		map.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.VERTICAL));
-		map.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.VERTICAL));
-		map.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.VERTICAL));
-		map.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.VERTICAL));
-		map.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.VERTICAL));
-
-
-		// Plugin tab
-		JPanel plugin = createPreferenceTab("plugin", tr("Plugins"), tr("Configure available Plugins."));
-		plugin.add(pluginPane, GBC.eol().fill(GBC.BOTH));
-		plugin.add(GBC.glue(0,10), GBC.eol());
-		plugin.add(new UrlLabel("http://josm.eigenheimstrasse.de/wiki/Plugins", tr("Get more plugins")), GBC.std().fill(GBC.HORIZONTAL));
-
-		tabPane.setTabLayoutPolicy(JTabbedPane.SCROLL_TAB_LAYOUT);
-
-		// OK/Cancel panel at bottom
-		JPanel okPanel = new JPanel(new GridBagLayout());
-		okPanel.add(Box.createHorizontalGlue(), GBC.std().fill(GBC.HORIZONTAL));
-		okPanel.add(new JButton(new OkAction()), GBC.std());
-		okPanel.add(new JButton(new CancelAction()), GBC.std());
-		okPanel.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
-
-		// merging all in the content pane
-		getContentPane().setLayout(new GridBagLayout());
-		getContentPane().add(tabPane, GBC.eol().fill());
-		getContentPane().add(okPanel, GBC.eol().fill(GBC.HORIZONTAL));
-
-		setModal(true);
-		pack();
-		if (getHeight() > 400)
-			setSize(getWidth(), 400);
-		if (getWidth() > 600)
-			setSize(600, getHeight());
-		setLocationRelativeTo(Main.parent);
-	}
-
-	/**
-	 * Construct a JPanel for the preference settings. Layout is GridBagLayout
-	 * and a centered title label and the description are added.
-	 * @param icon The name of the icon.
-	 * @param title The title of this preference tab.
-	 * @param desc A description in one sentence for this tab. Will be displayed
-	 * 		italic under the title.
-	 * @return The created panel ready to add other controls.
-	 */
-	private JPanel createPreferenceTab(String icon, String title, String desc) {
-		JPanel p = new JPanel(new GridBagLayout());
-		p.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
-		p.add(new JLabel(title), GBC.eol().anchor(GBC.CENTER).insets(0,5,0,10));
-
-		JLabel descLabel = new JLabel("<html>"+desc+"</html>");
-		descLabel.setFont(descLabel.getFont().deriveFont(Font.ITALIC));
-		p.add(descLabel, GBC.eol().insets(5,0,5,20).fill(GBC.HORIZONTAL));
-
-		tabPane.addTab(null, ImageProvider.get("preferences", icon), p);
-		tabPane.setToolTipTextAt(tabPane.getTabCount()-1, desc);
-		return p;
-	}
-}
Index: /src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java
===================================================================
--- /src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java	(revision 168)
+++ /src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java	(revision 168)
@@ -0,0 +1,122 @@
+package org.openstreetmap.josm.gui.preferences;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.Dimension;
+import java.awt.GridBagLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.Map;
+import java.util.TreeSet;
+import java.util.Map.Entry;
+
+import javax.swing.Box;
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.JTextField;
+import javax.swing.table.DefaultTableModel;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.GBC;
+
+public class AdvancedPreference implements PreferenceSetting {
+
+	private Map<String,String> orig;
+	private DefaultTableModel model;
+
+	public void addGui(final PreferenceDialog gui) {
+		JPanel p = gui.createPreferenceTab("advanced", tr("Advanced Preferences"), tr("Setting Preference entries directly. Use with caution!"));
+
+		model = new DefaultTableModel(new String[]{"Key", "Value"},0) {
+			@Override public boolean isCellEditable(int row, int column) {
+				return column != 0;
+			}
+		};
+		final JTable list = new JTable(model);
+		JScrollPane scroll = new JScrollPane(list);
+		p.add(scroll, GBC.eol().fill(GBC.BOTH));
+		scroll.setPreferredSize(new Dimension(400,200));
+
+		orig = Main.pref.getAllPrefix("");
+		orig.remove("osm-server.password");
+
+		for (String s : new TreeSet<String>(orig.keySet()))
+			model.addRow(new String[]{s, Main.pref.get(s)});
+		
+		JButton add = new JButton(tr("Add"));
+		p.add(Box.createHorizontalGlue(), GBC.std().fill(GBC.HORIZONTAL));
+		p.add(add, GBC.std().insets(0,5,0,0));
+		add.addActionListener(new ActionListener(){
+			public void actionPerformed(ActionEvent e) {
+				JPanel p = new JPanel(new GridBagLayout());
+				p.add(new JLabel("Key"), GBC.std().insets(0,0,5,0));
+				JTextField key = new JTextField(10);
+				JTextField value = new JTextField(10);
+				p.add(key, GBC.eop().insets(5,0,0,0).fill(GBC.HORIZONTAL));
+				p.add(new JLabel("Value"), GBC.std().insets(0,0,5,0));
+				p.add(value, GBC.eol().insets(5,0,0,0).fill(GBC.HORIZONTAL));
+				int answer = JOptionPane.showConfirmDialog(gui, p, tr("Enter a new key/value pair"), JOptionPane.OK_CANCEL_OPTION);
+				if (answer == JOptionPane.OK_OPTION)
+					model.addRow(new String[]{key.getText(), value.getText()});
+            }
+		});
+		
+		JButton edit = new JButton(tr("Edit"));
+		p.add(edit, GBC.std().insets(5,5,5,0));
+		edit.addActionListener(new ActionListener(){
+			public void actionPerformed(ActionEvent e) {
+				edit(gui, list);
+            }
+		});
+		
+		JButton delete = new JButton(tr("Delete"));
+		p.add(delete, GBC.std().insets(0,5,0,0));
+		delete.addActionListener(new ActionListener(){
+			public void actionPerformed(ActionEvent e) {
+				if (list.getSelectedRowCount() == 0) {
+					JOptionPane.showMessageDialog(gui, tr("Please select the row to delete."));
+					return;
+				}
+				while (list.getSelectedRow() != -1)
+					model.removeRow(list.getSelectedRow());
+            }
+		});
+		
+		list.addMouseListener(new MouseAdapter(){
+			@Override public void mouseClicked(MouseEvent e) {
+				if (e.getClickCount() == 2)
+					edit(gui, list);
+            }
+		});
+	}
+
+	public void ok() {
+		for (int i = 0; i < model.getRowCount(); ++i) {
+			String key = model.getValueAt(i,0).toString();
+			String value = model.getValueAt(i,1).toString();
+			String origValue = orig.get(key);
+			if (origValue == null || !origValue.equals(value))
+				Main.pref.put(key, value);
+			orig.remove(key); // processed.
+		}
+		for (Entry<String, String> e : orig.entrySet())
+			Main.pref.put(e.getKey(), e.getValue());
+	}
+
+
+	private void edit(final PreferenceDialog gui, final JTable list) {
+	    if (list.getSelectedRowCount() != 1) {
+	    	JOptionPane.showMessageDialog(gui, tr("Please select the row to edit."));
+	    	return;
+	    }
+	    String v = JOptionPane.showInputDialog(tr("New value for {0}", model.getValueAt(list.getSelectedRow(), 0)), model.getValueAt(list.getSelectedRow(), 1));
+	    if (v != null)
+	    	model.setValueAt(v, list.getSelectedRow(), 1);
+    }
+}
Index: /src/org/openstreetmap/josm/gui/preferences/AnnotationPresetPreference.java
===================================================================
--- /src/org/openstreetmap/josm/gui/preferences/AnnotationPresetPreference.java	(revision 168)
+++ /src/org/openstreetmap/josm/gui/preferences/AnnotationPresetPreference.java	(revision 168)
@@ -0,0 +1,94 @@
+package org.openstreetmap.josm.gui.preferences;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.GridBagLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.StringTokenizer;
+
+import javax.swing.Box;
+import javax.swing.DefaultListModel;
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.GBC;
+
+public class AnnotationPresetPreference implements PreferenceSetting {
+
+	private JList annotationSources = new JList(new DefaultListModel());
+
+	public void addGui(final PreferenceDialog gui) {
+		String annos = Main.pref.get("annotation.sources");
+		StringTokenizer st = new StringTokenizer(annos, ";");
+		while (st.hasMoreTokens())
+			((DefaultListModel)annotationSources.getModel()).addElement(st.nextToken());
+
+		JButton addAnno = new JButton(tr("Add"));
+		addAnno.addActionListener(new ActionListener(){
+			public void actionPerformed(ActionEvent e) {
+				String source = JOptionPane.showInputDialog(Main.parent, tr("Annotation preset source"));
+				if (source == null)
+					return;
+				((DefaultListModel)annotationSources.getModel()).addElement(source);
+				gui.requiresRestart = true;
+			}
+		});
+
+		JButton editAnno = new JButton(tr("Edit"));
+		editAnno.addActionListener(new ActionListener(){
+			public void actionPerformed(ActionEvent e) {
+				if (annotationSources.getSelectedIndex() == -1)
+					JOptionPane.showMessageDialog(Main.parent, tr("Please select the row to edit."));
+				else {
+					String source = JOptionPane.showInputDialog(Main.parent, tr("Annotation preset source"), annotationSources.getSelectedValue());
+					if (source == null)
+						return;
+					((DefaultListModel)annotationSources.getModel()).setElementAt(source, annotationSources.getSelectedIndex());
+					gui.requiresRestart = true;
+				}
+			}
+		});
+
+		JButton deleteAnno = new JButton(tr("Delete"));
+		deleteAnno.addActionListener(new ActionListener(){
+			public void actionPerformed(ActionEvent e) {
+				if (annotationSources.getSelectedIndex() == -1)
+					JOptionPane.showMessageDialog(Main.parent, tr("Please select the row to delete."));
+				else {
+					((DefaultListModel)annotationSources.getModel()).remove(annotationSources.getSelectedIndex());
+					gui.requiresRestart = true;
+				}
+			}
+		});
+		annotationSources.setVisibleRowCount(3);
+
+		annotationSources.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
+		addAnno.setToolTipText(tr("Add a new annotation preset source to the list."));
+		deleteAnno.setToolTipText(tr("Delete the selected source from the list."));
+
+		gui.map.add(new JLabel(tr("Annotation preset sources")), GBC.eol().insets(0,5,0,0));
+		gui.map.add(new JScrollPane(annotationSources), GBC.eol().fill(GBC.BOTH));
+		JPanel buttonPanel = new JPanel(new GridBagLayout());
+		gui.map.add(buttonPanel, GBC.eol().fill(GBC.HORIZONTAL));
+		buttonPanel.add(Box.createHorizontalGlue(), GBC.std().fill(GBC.HORIZONTAL));
+		buttonPanel.add(addAnno, GBC.std().insets(0,5,0,0));
+		buttonPanel.add(editAnno, GBC.std().insets(5,5,5,0));
+		buttonPanel.add(deleteAnno, GBC.std().insets(0,5,0,0));
+	}
+
+	public void ok() {
+		if (annotationSources.getModel().getSize() > 0) {
+			StringBuilder sb = new StringBuilder();
+			for (int i = 0; i < annotationSources.getModel().getSize(); ++i)
+				sb.append(";"+annotationSources.getModel().getElementAt(i));
+			Main.pref.put("annotation.sources", sb.toString().substring(1));
+		} else
+			Main.pref.put("annotation.sources", null);
+	}
+}
Index: /src/org/openstreetmap/josm/gui/preferences/ColorPreference.java
===================================================================
--- /src/org/openstreetmap/josm/gui/preferences/ColorPreference.java	(revision 168)
+++ /src/org/openstreetmap/josm/gui/preferences/ColorPreference.java	(revision 168)
@@ -0,0 +1,93 @@
+package org.openstreetmap.josm.gui.preferences;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.Vector;
+import java.util.Map.Entry;
+
+import javax.swing.JButton;
+import javax.swing.JColorChooser;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.ListSelectionModel;
+import javax.swing.table.TableCellRenderer;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.ColorHelper;
+import org.openstreetmap.josm.tools.GBC;
+
+public class ColorPreference implements PreferenceSetting {
+
+	private JTable colors;
+
+	public void addGui(final PreferenceDialog gui) {
+		Map<String,String> allColors = new TreeMap<String, String>(Main.pref.getAllPrefix("color."));
+
+		Vector<Vector<Object>> rows = new Vector<Vector<Object>>();
+		for (Entry<String,String> e : allColors.entrySet()) {
+			Vector<Object> row = new Vector<Object>(2);
+			row.add(e.getKey().substring("color.".length()));
+			row.add(ColorHelper.html2color(e.getValue()));
+			rows.add(row);
+		}
+		Vector<Object> cols = new Vector<Object>(2);
+		cols.add(tr("Color"));
+		cols.add(tr("Name"));
+		colors = new JTable(rows, cols){
+			@Override public boolean isCellEditable(int row, int column) {
+				return false;
+			}
+		};
+		colors.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+		final TableCellRenderer oldColorsRenderer = colors.getDefaultRenderer(Object.class);
+		colors.setDefaultRenderer(Object.class, new TableCellRenderer(){
+			public Component getTableCellRendererComponent(JTable t, Object o, boolean selected, boolean focus, int row, int column) {
+				if (column == 1) {
+					JLabel l = new JLabel(ColorHelper.color2html((Color)o));
+					l.setBackground((Color)o);
+					l.setOpaque(true);
+					return l;
+				}
+				return oldColorsRenderer.getTableCellRendererComponent(t,tr(o.toString()),selected,focus,row,column);
+			}
+		});
+		colors.getColumnModel().getColumn(1).setWidth(100);
+
+		JButton colorEdit = new JButton(tr("Choose"));
+		colorEdit.addActionListener(new ActionListener(){
+			public void actionPerformed(ActionEvent e) {
+				if (colors.getSelectedRowCount() == 0) {
+					JOptionPane.showMessageDialog(gui, tr("Please select a color."));
+					return;
+				}
+				int sel = colors.getSelectedRow();
+				JColorChooser chooser = new JColorChooser((Color)colors.getValueAt(sel, 1));
+				int answer = JOptionPane.showConfirmDialog(gui, chooser, tr("Choose a color for {0}", colors.getValueAt(sel, 0)), JOptionPane.OK_CANCEL_OPTION);
+				if (answer == JOptionPane.OK_OPTION)
+					colors.setValueAt(chooser.getColor(), sel, 1);
+			}
+		});
+		colors.setToolTipText(tr("Colors used by different objects in JOSM."));
+		colors.setPreferredScrollableViewportSize(new Dimension(100,112));
+		gui.display.add(new JLabel(tr("Colors")), GBC.eol());
+		gui.display.add(new JScrollPane(colors), GBC.eol().fill(GBC.BOTH));
+		gui.display.add(colorEdit, GBC.eol().anchor(GBC.EAST));
+    }
+
+	public void ok() {
+		for (int i = 0; i < colors.getRowCount(); ++i) {
+			String name = (String)colors.getValueAt(i, 0);
+			Color col = (Color)colors.getValueAt(i, 1);
+			Main.pref.put("color."+name, ColorHelper.color2html(col));
+		}
+    }
+}
Index: /src/org/openstreetmap/josm/gui/preferences/CsvPreference.java
===================================================================
--- /src/org/openstreetmap/josm/gui/preferences/CsvPreference.java	(revision 168)
+++ /src/org/openstreetmap/josm/gui/preferences/CsvPreference.java	(revision 168)
@@ -0,0 +1,39 @@
+package org.openstreetmap.josm.gui.preferences;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import javax.swing.Box;
+import javax.swing.JLabel;
+import javax.swing.JTextField;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.GBC;
+
+public class CsvPreference implements PreferenceSetting {
+
+	/**
+	 * Comma seperated import string specifier or <code>null</code> if the first
+	 * data line should be interpreted as one.
+	 */
+	private JTextField csvImportString = new JTextField(20);
+
+	public void addGui(PreferenceDialog gui) {
+		csvImportString.setText(Main.pref.get("csv.importstring"));
+		csvImportString.setToolTipText(tr("<html>Import string specification. lat/lon and time are imported.<br>" +
+				"<b>lat</b>: The latitude coordinate<br>" +
+				"<b>lon</b>: The longitude coordinate<br>" +
+				"<b>time</b>: The measured time as string<br>" +
+				"<b>ignore</b>: Skip this field<br>" +
+				"An example: \"ignore ignore lat lon\" will use ' ' as delimiter, skip the first two values and read then lat/lon.<br>" +
+		"Other example: \"lat,lon\" will just read lat/lon values comma seperated.</html>"));
+
+		gui.connection.add(new JLabel(tr("CSV import specification (empty: read from first line in data)")), GBC.eol());
+		gui.connection.add(csvImportString, GBC.eop().fill(GBC.HORIZONTAL));
+		gui.connection.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.VERTICAL));
+    }
+
+	public void ok() {
+		Main.pref.put("csv.importstring", csvImportString.getText());
+    }
+
+}
Index: /src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java
===================================================================
--- /src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java	(revision 168)
+++ /src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java	(revision 168)
@@ -0,0 +1,56 @@
+package org.openstreetmap.josm.gui.preferences;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.JCheckBox;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.GBC;
+
+public class DrawingPreference implements PreferenceSetting {
+
+	private JCheckBox drawRawGpsLines = new JCheckBox(tr("Draw lines between raw gps points."));
+	private JCheckBox forceRawGpsLines = new JCheckBox(tr("Force lines if no segments imported."));
+	private JCheckBox largeGpsPoints = new JCheckBox(tr("Draw large GPS points."));
+	private JCheckBox directionHint = new JCheckBox(tr("Draw Direction Arrows"));
+
+	public void addGui(PreferenceDialog gui) {
+		// drawRawGpsLines
+		drawRawGpsLines.addActionListener(new ActionListener(){
+			public void actionPerformed(ActionEvent e) {
+				if (!drawRawGpsLines.isSelected())
+					forceRawGpsLines.setSelected(false);
+				forceRawGpsLines.setEnabled(drawRawGpsLines.isSelected());
+			}
+		});
+		drawRawGpsLines.setSelected(Main.pref.getBoolean("draw.rawgps.lines"));
+		drawRawGpsLines.setToolTipText(tr("If your gps device draw to few lines, select this to draw lines along your way."));
+		gui.display.add(drawRawGpsLines, GBC.eol().insets(20,0,0,0));
+
+		// forceRawGpsLines
+		forceRawGpsLines.setToolTipText(tr("Force drawing of lines if the imported data contain no line information."));
+		forceRawGpsLines.setSelected(Main.pref.getBoolean("draw.rawgps.lines.force"));
+		forceRawGpsLines.setEnabled(drawRawGpsLines.isSelected());
+		gui.display.add(forceRawGpsLines, GBC.eop().insets(40,0,0,0));
+		
+		// largeGpsPoints
+		largeGpsPoints.setSelected(Main.pref.getBoolean("draw.rawgps.large"));
+		largeGpsPoints.setToolTipText(tr("Draw larger dots for the GPS points."));
+		gui.display.add(largeGpsPoints, GBC.eop().insets(20,0,0,0));
+		
+		// directionHint
+		directionHint.setToolTipText(tr("Draw direction hints for all segments."));
+		directionHint.setSelected(Main.pref.getBoolean("draw.segment.direction"));
+		gui.display.add(directionHint, GBC.eop().insets(20,0,0,0));
+	}
+
+	public void ok() {
+		Main.pref.put("draw.rawgps.lines", drawRawGpsLines.isSelected());
+		Main.pref.put("draw.rawgps.lines.force", forceRawGpsLines.isSelected());
+		Main.pref.put("draw.rawgps.large", largeGpsPoints.isSelected());
+		Main.pref.put("draw.segment.direction", directionHint.isSelected());
+    }
+}
Index: /src/org/openstreetmap/josm/gui/preferences/LafPreference.java
===================================================================
--- /src/org/openstreetmap/josm/gui/preferences/LafPreference.java	(revision 168)
+++ /src/org/openstreetmap/josm/gui/preferences/LafPreference.java	(revision 168)
@@ -0,0 +1,53 @@
+package org.openstreetmap.josm.gui.preferences;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.Component;
+
+import javax.swing.DefaultListCellRenderer;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.ListCellRenderer;
+import javax.swing.UIManager;
+import javax.swing.UIManager.LookAndFeelInfo;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.GBC;
+
+public class LafPreference implements PreferenceSetting {
+
+	/**
+	 * ComboBox with all look and feels.
+	 */
+	private JComboBox lafCombo;
+
+	public void addGui(PreferenceDialog gui) {
+		lafCombo = new JComboBox(UIManager.getInstalledLookAndFeels());
+		
+		String laf = Main.pref.get("laf");
+		for (int i = 0; i < lafCombo.getItemCount(); ++i) {
+			if (((LookAndFeelInfo)lafCombo.getItemAt(i)).getClassName().equals(laf)) {
+				lafCombo.setSelectedIndex(i);
+				break;
+			}
+		}
+
+		final ListCellRenderer oldRenderer = lafCombo.getRenderer();
+		lafCombo.setRenderer(new DefaultListCellRenderer(){
+			@Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
+				return oldRenderer.getListCellRendererComponent(list, ((LookAndFeelInfo)value).getName(), index, isSelected, cellHasFocus);
+			}
+		});
+		lafCombo.addActionListener(gui.requireRestartAction);
+
+		gui.display.add(new JLabel(tr("Look and Feel")), GBC.std());
+		gui.display.add(GBC.glue(5,0), GBC.std().fill(GBC.HORIZONTAL));
+		gui.display.add(lafCombo, GBC.eol().fill(GBC.HORIZONTAL));
+	}
+
+	public void ok() {
+		Main.pref.put("laf", ((LookAndFeelInfo)lafCombo.getSelectedItem()).getClassName());
+    }
+
+}
Index: /src/org/openstreetmap/josm/gui/preferences/PluginPreference.java
===================================================================
--- /src/org/openstreetmap/josm/gui/preferences/PluginPreference.java	(revision 168)
+++ /src/org/openstreetmap/josm/gui/preferences/PluginPreference.java	(revision 168)
@@ -0,0 +1,80 @@
+package org.openstreetmap.josm.gui.preferences;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import javax.swing.BorderFactory;
+import javax.swing.Box;
+import javax.swing.JCheckBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.plugins.PluginInformation;
+import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.UrlLabel;
+
+public class PluginPreference implements PreferenceSetting {
+
+	private Map<PluginInformation, Boolean> pluginMap = new HashMap<PluginInformation, Boolean>();
+
+	public void addGui(final PreferenceDialog gui) {
+		Box pluginPanel = Box.createVerticalBox();
+		Collection<PluginInformation> availablePlugins = new LinkedList<PluginInformation>();
+		File[] pluginFiles = new File(Main.pref.getPreferencesDir()+"plugins").listFiles();
+		if (pluginFiles != null) {
+			Arrays.sort(pluginFiles);
+			for (File f : pluginFiles)
+				if (f.isFile() && f.getName().endsWith(".jar"))
+					availablePlugins.add(new PluginInformation(f));
+		}
+
+		Collection<String> enabledPlugins = Arrays.asList(Main.pref.get("plugins").split(","));
+		for (final PluginInformation plugin : availablePlugins) {
+			boolean enabled = enabledPlugins.contains(plugin.name);
+			final JCheckBox pluginCheck = new JCheckBox(plugin.name, enabled);
+			pluginPanel.add(pluginCheck);
+
+			pluginCheck.setToolTipText(plugin.file.getAbsolutePath());
+			JLabel label = new JLabel("<html><i>"+(plugin.description==null?"no description available":plugin.description)+"</i></html>");
+			label.setBorder(BorderFactory.createEmptyBorder(0,20,0,0));
+			pluginPanel.add(label);
+			pluginPanel.add(Box.createVerticalStrut(5));
+
+			pluginMap.put(plugin, enabled);
+			pluginCheck.addActionListener(new ActionListener(){
+				public void actionPerformed(ActionEvent e) {
+					pluginMap.put(plugin, pluginCheck.isSelected());
+					gui.requiresRestart = true;
+				}
+			});
+		}
+		JScrollPane pluginPane = new JScrollPane(pluginPanel, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+		pluginPane.setBorder(null);
+
+		JPanel plugin = gui.createPreferenceTab("plugin", tr("Plugins"), tr("Configure available Plugins."));
+		plugin.add(pluginPane, GBC.eol().fill(GBC.BOTH));
+		plugin.add(GBC.glue(0,10), GBC.eol());
+		plugin.add(new UrlLabel("http://josm.eigenheimstrasse.de/wiki/Plugins", tr("Get more plugins")), GBC.std().fill(GBC.HORIZONTAL));
+	}
+
+	public void ok() {
+		String plugins = "";
+		for (Entry<PluginInformation, Boolean> entry : pluginMap.entrySet())
+			if (entry.getValue())
+				plugins += entry.getKey().name + ",";
+		if (plugins.endsWith(","))
+			plugins = plugins.substring(0, plugins.length()-1);
+		Main.pref.put("plugins", plugins);
+	}
+}
Index: /src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java
===================================================================
--- /src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java	(revision 168)
+++ /src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java	(revision 168)
@@ -0,0 +1,110 @@
+package org.openstreetmap.josm.gui.preferences;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.Font;
+import java.awt.GridBagLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Collection;
+import java.util.LinkedList;
+
+import javax.swing.BorderFactory;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JTabbedPane;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.plugins.PluginProxy;
+import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.ImageProvider;
+
+/**
+ * The preference settings.
+ *
+ * @author imi
+ */
+public class PreferenceDialog extends JTabbedPane {
+
+	public final static Collection<PreferenceSetting> settings = new LinkedList<PreferenceSetting>();
+
+	public boolean requiresRestart = false;
+	public final RequireRestartAction requireRestartAction = new RequireRestartAction();
+
+	// some common tabs
+	public final JPanel display = createPreferenceTab("display", tr("Display Settings"), tr("Various settings that influence the visual representation of the whole program."));
+	public final JPanel connection = createPreferenceTab("connection", tr("Connection Settings"), tr("Connection Settings to the OSM server."));
+	public final JPanel map = createPreferenceTab("map", tr("Map Settings"), tr("Settings for the map projection and data interpretation."));
+
+	/**
+	 * Construct a JPanel for the preference settings. Layout is GridBagLayout
+	 * and a centered title label and the description are added.
+	 * @param icon The name of the icon.
+	 * @param title The title of this preference tab.
+	 * @param desc A description in one sentence for this tab. Will be displayed
+	 * 		italic under the title.
+	 * @return The created panel ready to add other controls.
+	 */
+	public JPanel createPreferenceTab(String icon, String title, String desc) {
+		JPanel p = new JPanel(new GridBagLayout());
+		p.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+		p.add(new JLabel(title), GBC.eol().anchor(GBC.CENTER).insets(0,5,0,10));
+
+		JLabel descLabel = new JLabel("<html>"+desc+"</html>");
+		descLabel.setFont(descLabel.getFont().deriveFont(Font.ITALIC));
+		p.add(descLabel, GBC.eol().insets(5,0,5,20).fill(GBC.HORIZONTAL));
+
+		addTab(null, ImageProvider.get("preferences", icon), p);
+		setToolTipTextAt(getTabCount()-1, desc);
+		return p;
+	}
+
+
+
+
+	private final class RequireRestartAction implements ActionListener {
+		public void actionPerformed(ActionEvent e) {
+			requiresRestart = true;
+		}
+	}
+
+	public void ok() {
+		for (PreferenceSetting setting : settings)
+			setting.ok();
+		if (requiresRestart)
+			JOptionPane.showMessageDialog(PreferenceDialog.this,tr("You have to restart JOSM for some settings to take effect."));
+		Main.parent.repaint();
+	}
+
+	/**
+	 * If the dialog is closed with Ok, the preferences will be stored to the preferences-
+	 * file, otherwise no change of the file happens.
+	 */
+	public PreferenceDialog() {
+		super(JTabbedPane.LEFT, JTabbedPane.SCROLL_TAB_LAYOUT);
+		for (PreferenceSetting setting : settings)
+			setting.addGui(this);
+	}
+
+	static {
+		// order is important!
+		settings.add(new LafPreference());
+		settings.add(new DrawingPreference());
+		settings.add(new ColorPreference());
+		settings.add(new ServerAccessPreference());
+		settings.add(new CsvPreference());
+		settings.add(new ProjectionPreference());
+		settings.add(new AnnotationPresetPreference());
+		settings.add(new PluginPreference());
+		
+		for (PluginProxy plugin : Main.plugins) {
+			PreferenceSetting p = plugin.getPreferenceSetting();
+			if (p != null)
+				settings.add(p);
+		}
+
+		// always the last: advanced tab
+		settings.add(new AdvancedPreference());
+	}
+}
Index: /src/org/openstreetmap/josm/gui/preferences/PreferenceSetting.java
===================================================================
--- /src/org/openstreetmap/josm/gui/preferences/PreferenceSetting.java	(revision 168)
+++ /src/org/openstreetmap/josm/gui/preferences/PreferenceSetting.java	(revision 168)
@@ -0,0 +1,15 @@
+package org.openstreetmap.josm.gui.preferences;
+
+
+public interface PreferenceSetting {
+	/**
+	 * Add the GUI elements to the dialog. The elements should be initialized after
+	 * the current preferences.
+	 */
+	void addGui(PreferenceDialog gui);
+
+	/**
+	 * Called, when OK is pressed to save the setting in the Preferences file.
+	 */
+	void ok();
+}
Index: /src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java
===================================================================
--- /src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java	(revision 168)
+++ /src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java	(revision 168)
@@ -0,0 +1,36 @@
+package org.openstreetmap.josm.gui.preferences;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.tools.GBC;
+
+public class ProjectionPreference implements PreferenceSetting {
+
+	/**
+	 * Combobox with all projections available
+	 */
+	private JComboBox projectionCombo = new JComboBox(Projection.allProjections);
+
+	public void addGui(PreferenceDialog gui) {
+		for (int i = 0; i < projectionCombo.getItemCount(); ++i) {
+			if (projectionCombo.getItemAt(i).getClass().getName().equals(Main.pref.get("projection"))) {
+				projectionCombo.setSelectedIndex(i);
+				break;
+			}
+		}
+		projectionCombo.addActionListener(gui.requireRestartAction);
+
+		gui.map.add(new JLabel(tr("Projection method")), GBC.std());
+		gui.map.add(GBC.glue(5,0), GBC.std().fill(GBC.HORIZONTAL));
+		gui.map.add(projectionCombo, GBC.eop().fill(GBC.HORIZONTAL).insets(0,0,0,5));
+    }
+
+	public void ok() {
+		Main.pref.put("projection", projectionCombo.getSelectedItem().getClass().getName());
+    }
+}
Index: /src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java
===================================================================
--- /src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java	(revision 168)
+++ /src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java	(revision 168)
@@ -0,0 +1,60 @@
+package org.openstreetmap.josm.gui.preferences;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.Font;
+
+import javax.swing.JLabel;
+import javax.swing.JPasswordField;
+import javax.swing.JTextField;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.GBC;
+
+public class ServerAccessPreference implements PreferenceSetting {
+
+	/**
+	 * Editfield for the Base url to the REST API from OSM.
+	 */
+	private JTextField osmDataServer = new JTextField(20);
+	/**
+	 * Editfield for the username to the OSM account.
+	 */
+	private JTextField osmDataUsername = new JTextField(20);
+	/**
+	 * Passwordfield for the userpassword of the REST API.
+	 */
+	private JPasswordField osmDataPassword = new JPasswordField(20);
+
+	public void addGui(PreferenceDialog gui) {
+		osmDataServer.setText(Main.pref.get("osm-server.url"));
+		osmDataUsername.setText(Main.pref.get("osm-server.username"));
+		osmDataPassword.setText(Main.pref.get("osm-server.password"));
+
+		osmDataServer.setToolTipText(tr("The base URL to the OSM server (REST API)"));
+		osmDataUsername.setToolTipText(tr("Login name (email) to the OSM account."));
+		osmDataPassword.setToolTipText(tr("Login password to the OSM account. Leave blank to not store any password."));
+
+		gui.connection.add(new JLabel(tr("Base Server URL")), GBC.std());
+		gui.connection.add(osmDataServer, GBC.eol().fill(GBC.HORIZONTAL).insets(5,0,0,5));
+		gui.connection.add(new JLabel(tr("OSM username (email)")), GBC.std());
+		gui.connection.add(osmDataUsername, GBC.eol().fill(GBC.HORIZONTAL).insets(5,0,0,5));
+		gui.connection.add(new JLabel(tr("OSM password")), GBC.std());
+		gui.connection.add(osmDataPassword, GBC.eol().fill(GBC.HORIZONTAL).insets(5,0,0,0));
+		JLabel warning = new JLabel(tr("<html>" +
+				"WARNING: The password is stored in plain text in the preferences file.<br>" +
+				"The password is transfered in plain text to the server, encoded in the url.<br>" +
+		"<b>Do not use a valuable Password.</b></html>"));
+		warning.setFont(warning.getFont().deriveFont(Font.ITALIC));
+		gui.connection.add(warning, GBC.eop().fill(GBC.HORIZONTAL));
+	}
+
+	public void ok() {
+		Main.pref.put("osm-server.url", osmDataServer.getText());
+		Main.pref.put("osm-server.username", osmDataUsername.getText());
+		String pwd = String.valueOf(osmDataPassword.getPassword());
+		if (pwd.equals(""))
+			pwd = null;
+		Main.pref.put("osm-server.password", pwd);
+    }
+}
Index: /src/org/openstreetmap/josm/plugins/Plugin.java
===================================================================
--- /src/org/openstreetmap/josm/plugins/Plugin.java	(revision 167)
+++ /src/org/openstreetmap/josm/plugins/Plugin.java	(revision 168)
@@ -11,4 +11,5 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.MapFrame;
+import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
 
 /**
@@ -69,4 +70,11 @@
 
 	/**
+	 * Called in the preferences dialog to create a preferences page for the plugin,
+	 * if any available.
+	 */
+	public PreferenceSetting getPreferenceSetting() {return null;}
+	
+	
+	/**
 	 * Copies the ressource 'from' to the file in the plugin directory named 'to'.
 	 */
Index: /src/org/openstreetmap/josm/plugins/PluginProxy.java
===================================================================
--- /src/org/openstreetmap/josm/plugins/PluginProxy.java	(revision 167)
+++ /src/org/openstreetmap/josm/plugins/PluginProxy.java	(revision 168)
@@ -2,4 +2,5 @@
 
 import org.openstreetmap.josm.gui.MapFrame;
+import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
 
 
@@ -30,3 +31,13 @@
         }
     }
+
+	@Override public PreferenceSetting getPreferenceSetting() {
+		try {
+			return (PreferenceSetting)plugin.getClass().getMethod("getPreferenceSetting").invoke(plugin);
+		} catch (NoSuchMethodException e) {
+			return null;
+		} catch (Exception e) {
+			throw new PluginException(this, info.name, e);
+		}
+    }
 }