Index: /trunk/src/org/openstreetmap/josm/Main.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/Main.java	(revision 1103)
+++ /trunk/src/org/openstreetmap/josm/Main.java	(revision 1104)
@@ -66,446 +66,450 @@
 
 abstract public class Main {
-	/**
-	 * Global parent component for all dialogs and message boxes
-	 */
-	public static Component parent;
-	/**
-	 * Global application.
-	 */
-	public static Main main;
-	/**
-	 * The worker thread slave. This is for executing all long and intensive
-	 * calculations. The executed runnables are guaranteed to be executed separately
-	 * and sequential.
-	 */
-	public final static Executor worker = Executors.newSingleThreadExecutor();
-	/**
-	 * Global application preferences
-	 */
-	public static Preferences pref = new Preferences();
-	/**
-	 * The global dataset.
-	 */
-	public static DataSet ds = new DataSet();
-	/**
-	 * The global paste buffer.
-	 */
-	public static DataSet pasteBuffer = new DataSet();
-	/**
-	 * The projection method used.
-	 */
-	public static Projection proj;
-	/**
-	 * The MapFrame. Use setMapFrame to set or clear it.
-	 */
-	public static MapFrame map;
-	/**
-	 * All installed and loaded plugins (resp. their main classes)
-	 */
-	public final static Collection<PluginProxy> plugins = new LinkedList<PluginProxy>();
-	/**
-	 * The dialog that gets displayed during background task execution.
-	 */
-	public static PleaseWaitDialog pleaseWaitDlg;
-
-	/**
-	 * True, when in applet mode
-	 */
-	public static boolean applet = false;
-
-	/**
-	 * The toolbar preference control to register new actions.
-	 */
-	public static ToolbarPreferences toolbar;
-
-
-	public UndoRedoHandler undoRedo = new UndoRedoHandler();
-
-	/**
-	 * The main menu bar at top of screen.
-	 */
-	public final MainMenu menu;
-
-	/**
-	 * Print a debug message if debugging is on.
-	 */
-	static public int debug_level = 1;
-	static public final void debug(String msg) {
-		if (debug_level <= 0)
-			return;
-		System.out.println(msg);
-	}
-
-	/**
-	 * Platform specific code goes in here.
-	 * Plugins may replace it, however, some hooks will be called before any plugins have been loeaded.
-	 * So if you need to hook into those early ones, split your class and send the one with the early hooks
-	 * to the JOSM team for inclusion.
-	 */
-	public static PlatformHook platform;
-
-	/**
-	 * Set or clear (if passed <code>null</code>) the map.
-	 */
-	public final void setMapFrame(final MapFrame map) {
-		MapFrame old = Main.map;
-		Main.map = map;
-		panel.setVisible(false);
-		panel.removeAll();
-		if (map != null)
-			map.fillPanel(panel);
-		else {
-			old.destroy();
-			panel.add(new GettingStarted(), BorderLayout.CENTER);
-		}
-		panel.setVisible(true);
-		redoUndoListener.commandChanged(0,0);
-
-		for (PluginProxy plugin : plugins)
-			plugin.mapFrameInitialized(old, map);
-	}
-
-	/**
-	 * Set the layer menu (changed when active layer changes).
-	 */
-	public final void setLayerMenu(Component[] entries) {
-		//if (entries == null || entries.length == 0)
-			//menu.layerMenu.setVisible(false);
-		//else {
-			//menu.layerMenu.removeAll();
-			//for (Component c : entries)
-				//menu.layerMenu.add(c);
-			//menu.layerMenu.setVisible(true);
-		//}
-	}
-
-	/**
-	 * Remove the specified layer from the map. If it is the last layer, 
+    /**
+     * Global parent component for all dialogs and message boxes
+     */
+    public static Component parent;
+    /**
+     * Global application.
+     */
+    public static Main main;
+    /**
+     * The worker thread slave. This is for executing all long and intensive
+     * calculations. The executed runnables are guaranteed to be executed separately
+     * and sequential.
+     */
+    public final static Executor worker = Executors.newSingleThreadExecutor();
+    /**
+     * Global application preferences
+     */
+    public static Preferences pref = new Preferences();
+    /**
+     * The global dataset.
+     */
+    public static DataSet ds = new DataSet();
+    /**
+     * The global paste buffer.
+     */
+    public static DataSet pasteBuffer = new DataSet();
+    /**
+     * The projection method used.
+     */
+    public static Projection proj;
+    /**
+     * The MapFrame. Use setMapFrame to set or clear it.
+     */
+    public static MapFrame map;
+    /**
+     * All installed and loaded plugins (resp. their main classes)
+     */
+    public final static Collection<PluginProxy> plugins = new LinkedList<PluginProxy>();
+    /**
+     * The dialog that gets displayed during background task execution.
+     */
+    public static PleaseWaitDialog pleaseWaitDlg;
+
+    /**
+     * True, when in applet mode
+     */
+    public static boolean applet = false;
+
+    /**
+     * The toolbar preference control to register new actions.
+     */
+    public static ToolbarPreferences toolbar;
+
+
+    public UndoRedoHandler undoRedo = new UndoRedoHandler();
+
+    /**
+     * The main menu bar at top of screen.
+     */
+    public final MainMenu menu;
+
+    /**
+     * Print a debug message if debugging is on.
+     */
+    static public int debug_level = 1;
+    static public final void debug(String msg) {
+        if (debug_level <= 0)
+            return;
+        System.out.println(msg);
+    }
+
+    /**
+     * Platform specific code goes in here.
+     * Plugins may replace it, however, some hooks will be called before any plugins have been loeaded.
+     * So if you need to hook into those early ones, split your class and send the one with the early hooks
+     * to the JOSM team for inclusion.
+     */
+    public static PlatformHook platform;
+
+    /**
+     * Set or clear (if passed <code>null</code>) the map.
+     */
+    public final void setMapFrame(final MapFrame map) {
+        MapFrame old = Main.map;
+        Main.map = map;
+        panel.setVisible(false);
+        panel.removeAll();
+        if (map != null)
+            map.fillPanel(panel);
+        else {
+            old.destroy();
+            panel.add(new GettingStarted(), BorderLayout.CENTER);
+        }
+        panel.setVisible(true);
+        redoUndoListener.commandChanged(0,0);
+
+        for (PluginProxy plugin : plugins)
+            plugin.mapFrameInitialized(old, map);
+    }
+
+    /**
+     * Set the layer menu (changed when active layer changes).
+     */
+    public final void setLayerMenu(Component[] entries) {
+        //if (entries == null || entries.length == 0)
+            //menu.layerMenu.setVisible(false);
+        //else {
+            //menu.layerMenu.removeAll();
+            //for (Component c : entries)
+                //menu.layerMenu.add(c);
+            //menu.layerMenu.setVisible(true);
+        //}
+    }
+
+    /**
+     * Remove the specified layer from the map. If it is the last layer, 
      * remove the map as well.
-	 */
-	public final void removeLayer(final Layer layer) {
-		map.mapView.removeLayer(layer);
-		if (layer instanceof OsmDataLayer)
-			ds = new DataSet();
-		if (map.mapView.getAllLayers().isEmpty())
-			setMapFrame(null);
-	}
-
-	public Main() {
-		main = this;
-//		platform = determinePlatformHook();
-		platform.startupHook();
-		contentPane.add(panel, BorderLayout.CENTER);
-		panel.add(new GettingStarted(), BorderLayout.CENTER);
-		menu = new MainMenu();
-
-		undoRedo.listenerCommands.add(redoUndoListener);
-
-		// creating toolbar
-		contentPane.add(toolbar.control, BorderLayout.NORTH);
-
-		contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(Shortcut.registerShortcut("system:help", tr("Help"), KeyEvent.VK_F1, Shortcut.GROUP_DIRECT).getKeyStroke(), "Help");
-		contentPane.getActionMap().put("Help", menu.help);
-
-		TaggingPresetPreference.initialize();
-		MapPaintPreference.initialize();
-
-		toolbar.refreshToolbarControl();
-
-		toolbar.control.updateUI();
-		contentPane.updateUI();
-	}
-
-	/**
-	 * Load all plugins specified in preferences. If the parameter is 
+     */
+    public final void removeLayer(final Layer layer) {
+        map.mapView.removeLayer(layer);
+        if (layer instanceof OsmDataLayer)
+            ds = new DataSet();
+        if (map.mapView.getAllLayers().isEmpty())
+            setMapFrame(null);
+    }
+
+    public Main() {
+        main = this;
+//        platform = determinePlatformHook();
+        platform.startupHook();
+        contentPane.add(panel, BorderLayout.CENTER);
+        panel.add(new GettingStarted(), BorderLayout.CENTER);
+        menu = new MainMenu();
+
+        undoRedo.listenerCommands.add(redoUndoListener);
+
+        // creating toolbar
+        contentPane.add(toolbar.control, BorderLayout.NORTH);
+
+        contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(Shortcut.registerShortcut("system:help", tr("Help"), KeyEvent.VK_F1, Shortcut.GROUP_DIRECT).getKeyStroke(), "Help");
+        contentPane.getActionMap().put("Help", menu.help);
+
+        TaggingPresetPreference.initialize();
+        MapPaintPreference.initialize();
+
+        toolbar.refreshToolbarControl();
+
+        toolbar.control.updateUI();
+        contentPane.updateUI();
+    }
+
+    /**
+     * Load all plugins specified in preferences. If the parameter is 
      * <code>true</code>, all early plugins are loaded (before constructor).
-	 */
-	public static void loadPlugins(boolean early) {
-		List<String> plugins = new LinkedList<String>();
-		Collection<String> cp = Main.pref.getCollection("plugins", null);
-		if (cp != null)
-			plugins.addAll(cp);
-		if (System.getProperty("josm.plugins") != null)
-			plugins.addAll(Arrays.asList(System.getProperty("josm.plugins").split(",")));
-
-		String [] oldplugins = new String[] {"mappaint", "unglueplugin", "lang-de","lang-en_GB","lang-fr","lang-it","lang-pl","lang-ro","lang-ru"};
-		for (String p : oldplugins) {
-			if (plugins.contains(p)) {
-				plugins.remove(p);
-				Main.pref.removeFromCollection("plugins", p);
-				System.out.println(tr("Warning - loading of {0} plugin was requested. This plugin is no longer required.", p));
-			}
-		}
-
-		if (plugins.isEmpty())
-			return;
-		
-		SortedMap<Integer, Collection<PluginInformation>> p = new TreeMap<Integer, Collection<PluginInformation>>();
-		for (String pluginName : plugins) {
-			PluginInformation info = PluginInformation.findPlugin(pluginName);
-			if (info != null) {
-				if (info.early != early)
-					continue;
-				if (info.mainversion != null && info.mainversion.compareTo(AboutAction.version) > 0) {
-					JOptionPane.showMessageDialog(Main.parent, tr("Plugin requires JOSM update: {0}.", pluginName));
-					continue;
-				}
-				if (!p.containsKey(info.stage))
-					p.put(info.stage, new LinkedList<PluginInformation>());
-				p.get(info.stage).add(info);
-			} else {
-				if (early)
-					System.out.println("Plugin not found: "+pluginName); // do not translate
-				else
-					JOptionPane.showMessageDialog(Main.parent, tr("Plugin not found: {0}.", pluginName));
-			}
-		}
-
-		if (!early) {
-			long tim = System.currentTimeMillis();
-			long last = Main.pref.getLong("pluginmanager.lastupdate", 0);
-			Integer maxTime = Main.pref.getInteger("pluginmanager.warntime", 30);
-			if (last <= 0) {
-				Main.pref.put("pluginmanager.lastupdate",Long.toString(tim));
-			} else if (tim - last >= maxTime*1000l*24*60*60) {
-				long d = (tim - last)/(24*60*60*1000l);
-				JOptionPane.showMessageDialog(Main.parent, 
-                    tr("Last plugin update more than {0} days ago.", d));
-			}
-		}
-
-		// iterate all plugins and collect all libraries of all plugins:
-		List<URL> allPluginLibraries = new ArrayList<URL>();
-		for (Collection<PluginInformation> c : p.values())
-			for (PluginInformation info : c)
-				allPluginLibraries.addAll(info.libraries);
-		// create a classloader for all plugins:
-		URL[] jarUrls = new URL[allPluginLibraries.size()];
-		jarUrls = allPluginLibraries.toArray(jarUrls);
-		URLClassLoader pluginClassLoader = new URLClassLoader(jarUrls, Main.class.getClassLoader());
-		ImageProvider.sources.add(0, pluginClassLoader);
-
-		for (Collection<PluginInformation> c : p.values()) {
-			for (PluginInformation info : c) {
-				try {
-					Class<?> klass = info.loadClass(pluginClassLoader);
-					if (klass != null) {
-						System.out.println("loading "+info.name);
-						Main.plugins.add(info.load(klass));
-					}
-				} catch (Throwable e) {
-					e.printStackTrace();
-					boolean remove = true;
-					if (early)
-						System.out.println("Could not load plugin: "+info.name+" - deleted from preferences"); // do not translate
-					else {
-						int answer = JOptionPane.showConfirmDialog(Main.parent,
-							tr("Could not load plugin {0}. Delete from preferences?", info.name,
-							JOptionPane.YES_NO_OPTION));
-						if (answer != JOptionPane.OK_OPTION) {
-							remove = false;
-						}
-					}
-					if (remove) {
-						plugins.remove(info.name);
-						String plist = null;
-						for (String pn : plugins) {
-							if (plist==null) plist=""; else plist=plist+",";
-							plist=plist+pn;
-						}
-						Main.pref.put("plugins", plist);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Add a new layer to the map. If no map exists, create one.
-	 */
-	public final void addLayer(final Layer layer) {
-		if (map == null) {
-			final MapFrame mapFrame = new MapFrame();
-			setMapFrame(mapFrame);
-			mapFrame.selectMapMode((MapMode)mapFrame.getDefaultButtonAction());
-			mapFrame.setVisible(true);
-			mapFrame.setVisibleDialogs();
-		}
-		map.mapView.addLayer(layer);
-	}
-	/**
-	 * @return The edit osm layer. If none exists, it will be created.
-	 */
-	public final OsmDataLayer editLayer() {
-		if (map == null || map.mapView.editLayer == null)
-			menu.newAction.actionPerformed(null);
-		return map.mapView.editLayer;
-	}
-
-	/**
-	 * Use this to register shortcuts to
-	 */
-	public static final JPanel contentPane = new JPanel(new BorderLayout());
-
-
-	///////////////////////////////////////////////////////////////////////////
-	//  Implementation part
-	///////////////////////////////////////////////////////////////////////////
-
-	public static JPanel panel = new JPanel(new BorderLayout());
-
-	protected static Rectangle bounds;
-
-	private final CommandQueueListener redoUndoListener = new CommandQueueListener(){
-		public void commandChanged(final int queueSize, final int redoSize) {
-			menu.undo.setEnabled(queueSize > 0);
-			menu.redo.setEnabled(redoSize > 0);
-		}
-	};
-	/**
-	 * Should be called before the main constructor to setup some parameter stuff
-	 * @param args The parsed argument list.
-	 */
-	public static void preConstructorInit(Map<String, Collection<String>> args) {
-		try {
-			Main.proj = (Projection)Class.forName(Main.pref.get("projection")).newInstance();
-		} catch (final Exception e) {
-			e.printStackTrace();
-			JOptionPane.showMessageDialog(null, tr("The projection could not be read from preferences. Using EPSG:4263."));
-			Main.proj = new Epsg4326();
-		}
-
-		try {
-			UIManager.setLookAndFeel(Main.pref.get("laf"));
-			toolbar = new ToolbarPreferences();
-			contentPane.updateUI();
-			panel.updateUI();
-		} catch (final Exception e) {
-			e.printStackTrace();
-		}
-		UIManager.put("OptionPane.okIcon", ImageProvider.get("ok"));
-		UIManager.put("OptionPane.yesIcon", UIManager.get("OptionPane.okIcon"));
-		UIManager.put("OptionPane.cancelIcon", ImageProvider.get("cancel"));
-		UIManager.put("OptionPane.noIcon", UIManager.get("OptionPane.cancelIcon"));
-
-		Dimension screenDimension = Toolkit.getDefaultToolkit().getScreenSize();
-		if (args.containsKey("geometry")) {
-			String geometry = args.get("geometry").iterator().next();
-			final Matcher m = Pattern.compile("(\\d+)x(\\d+)(([+-])(\\d+)([+-])(\\d+))?").matcher(geometry);
-			if (m.matches()) {
-				int w = Integer.valueOf(m.group(1));
-				int h = Integer.valueOf(m.group(2));
-				int x = 0, y = 0;
-				if (m.group(3) != null) {
-					x = Integer.valueOf(m.group(5));
-					y = Integer.valueOf(m.group(7));
-					if (m.group(4).equals("-"))
-						x = screenDimension.width - x - w;
-					if (m.group(6).equals("-"))
-						y = screenDimension.height - y - h;
-				}
-				bounds = new Rectangle(x,y,w,h);
-			} else
-				System.out.println("Ignoring malformed geometry: "+geometry);
-		}
-		if (bounds == null)
-			bounds = !args.containsKey("no-fullscreen") ? new Rectangle(0,0,screenDimension.width,screenDimension.height) : new Rectangle(1000,740);
-
-			// preinitialize a wait dialog for all early downloads (e.g. via command line)
-			pleaseWaitDlg = new PleaseWaitDialog(null);
-	}
-
-	public void postConstructorProcessCmdLine(Map<String, Collection<String>> args) {
-		// initialize the pleaseWaitDialog with the application as parent to handle focus stuff
-		pleaseWaitDlg = new PleaseWaitDialog(parent);
-
-		if (args.containsKey("download"))
-			for (String s : args.get("download"))
-				downloadFromParamString(false, s);
-		if (args.containsKey("downloadgps"))
-			for (String s : args.get("downloadgps"))
-				downloadFromParamString(true, s);
-		if (args.containsKey("selection"))
-			for (String s : args.get("selection"))
-				SearchAction.search(s, SearchAction.SearchMode.add, false);
-	}
-
-	public static boolean breakBecauseUnsavedChanges() {
-		Shortcut.savePrefs();
-		if (map != null) {
-			boolean modified = false;
-			boolean uploadedModified = false;
-			for (final Layer l : map.mapView.getAllLayers()) {
-				if (l instanceof OsmDataLayer && ((OsmDataLayer)l).isModified()) {
-					modified = true;
-					uploadedModified = ((OsmDataLayer)l).uploadedModified;
-					break;
-				}
-			}
-			if (modified) {
-				final String msg = uploadedModified ? "\n"+tr("Hint: Some changes came from uploading new data to the server.") : "";
-				final int answer = JOptionPane.showConfirmDialog(
-						parent, tr("There are unsaved changes. Discard the changes and continue?")+msg,
-						tr("Unsaved Changes"), JOptionPane.YES_NO_OPTION);
-				if (answer != JOptionPane.YES_OPTION)
-					return true;
-			}
-		}
-		return false;
-	}
-
-	private static void downloadFromParamString(final boolean rawGps, String s) {
-		if (s.startsWith("http:")) {
-			final Bounds b = BoundingBoxSelection.osmurl2bounds(s);
-			if (b == null)
-				JOptionPane.showMessageDialog(Main.parent, tr("Ignoring malformed url: \"{0}\"", s));
-			else {
-				//DownloadTask osmTask = main.menu.download.downloadTasks.get(0);
-				DownloadTask osmTask = new DownloadOsmTask();
-				osmTask.download(main.menu.download, b.min.lat(), b.min.lon(), b.max.lat(), b.max.lon());
-			}
-			return;
-		}
-
-		if (s.startsWith("file:")) {
-			try {
-				main.menu.open.openFile(new File(new URI(s)));
-			} catch (URISyntaxException e) {
-				JOptionPane.showMessageDialog(Main.parent, tr("Ignoring malformed file url: \"{0}\"", s));
-			}
-			return;
-		}
-
-		final StringTokenizer st = new StringTokenizer(s, ",");
-		if (st.countTokens() == 4) {
-			try {
-				DownloadTask task = rawGps ? new DownloadGpsTask() : new DownloadOsmTask();
-				task.download(main.menu.download, Double.parseDouble(st.nextToken()), Double.parseDouble(st.nextToken()), Double.parseDouble(st.nextToken()), Double.parseDouble(st.nextToken()));
-				return;
-			} catch (final NumberFormatException e) {
-			}
-		}
-
-		main.menu.open.openFile(new File(s));
-	}
-
-	protected static void determinePlatformHook() {
-		String os = System.getProperty("os.name");
-		if (os == null) {
-			System.err.println("Your operating system has no name, so I'm guessing its some kind of *nix.");
-			platform = new PlatformHookUnixoid();
-		} else if (os.toLowerCase().startsWith("windows")) {
-			platform = new PlatformHookWindows();
-		} else if (os.equals("Linux") || os.equals("Solaris") || 
-			os.equals("SunOS") || os.equals("AIX") || 
-			os.equals("FreeBSD") || os.equals("NetBSD") || os.equals("OpenBSD")) {
-			platform = new PlatformHookUnixoid();
-		} else if (os.toLowerCase().startsWith("mac os x")) {
-			platform = new PlatformHookOsx();
-		} else {
-			System.err.println("I don't know your operating system '"+os+"', so I'm guessing its some kind of *nix.");
-			platform = new PlatformHookUnixoid();
-		}
-	}
+     */
+    public static void loadPlugins(boolean early) {
+        List<String> plugins = new LinkedList<String>();
+        Collection<String> cp = Main.pref.getCollection("plugins", null);
+        if (cp != null)
+            plugins.addAll(cp);
+        if (System.getProperty("josm.plugins") != null)
+            plugins.addAll(Arrays.asList(System.getProperty("josm.plugins").split(",")));
+
+        String [] oldplugins = new String[] {"mappaint", "unglueplugin", "lang-de","lang-en_GB","lang-fr","lang-it","lang-pl","lang-ro","lang-ru"};
+        for (String p : oldplugins) {
+            if (plugins.contains(p)) {
+                plugins.remove(p);
+                Main.pref.removeFromCollection("plugins", p);
+                System.out.println(tr("Warning - loading of {0} plugin was requested. This plugin is no longer required.", p));
+            }
+        }
+
+        if (plugins.isEmpty())
+            return;
+        
+        SortedMap<Integer, Collection<PluginInformation>> p = new TreeMap<Integer, Collection<PluginInformation>>();
+        for (String pluginName : plugins) {
+            PluginInformation info = PluginInformation.findPlugin(pluginName);
+            if (info != null) {
+                if (info.early != early)
+                    continue;
+                if (info.mainversion != null && info.mainversion.compareTo(AboutAction.version) > 0) {
+                    JOptionPane.showMessageDialog(Main.parent, tr("Plugin requires JOSM update: {0}.", pluginName));
+                    continue;
+                }
+                if (!p.containsKey(info.stage))
+                    p.put(info.stage, new LinkedList<PluginInformation>());
+                p.get(info.stage).add(info);
+            } else {
+                if (early)
+                    System.out.println("Plugin not found: "+pluginName); // do not translate
+                else
+                    JOptionPane.showMessageDialog(Main.parent, tr("Plugin not found: {0}.", pluginName));
+            }
+        }
+
+        if (!early) {
+            long tim = System.currentTimeMillis();
+            long last = Main.pref.getLong("pluginmanager.lastupdate", 0);
+            Integer maxTime = Main.pref.getInteger("pluginmanager.warntime", 30);
+            long d = (tim - last)/(24*60*60*1000l);
+            if ((last <= 0) || (maxTime <= 0)) {
+                Main.pref.put("pluginmanager.lastupdate",Long.toString(tim));
+            } else if (d > maxTime) {
+                JOptionPane.showMessageDialog(Main.parent, 
+                   "<html>" + 
+                   tr("Last plugin update more than {0} days ago.", d) +
+                   "<br><em>" + 
+                   tr("(You can change the number of days after which this warning appears<br>by setting the config option 'pluginmanager.warntime'.)") +
+                   "</html>");
+            }
+        }
+
+        // iterate all plugins and collect all libraries of all plugins:
+        List<URL> allPluginLibraries = new ArrayList<URL>();
+        for (Collection<PluginInformation> c : p.values())
+            for (PluginInformation info : c)
+                allPluginLibraries.addAll(info.libraries);
+        // create a classloader for all plugins:
+        URL[] jarUrls = new URL[allPluginLibraries.size()];
+        jarUrls = allPluginLibraries.toArray(jarUrls);
+        URLClassLoader pluginClassLoader = new URLClassLoader(jarUrls, Main.class.getClassLoader());
+        ImageProvider.sources.add(0, pluginClassLoader);
+
+        for (Collection<PluginInformation> c : p.values()) {
+            for (PluginInformation info : c) {
+                try {
+                    Class<?> klass = info.loadClass(pluginClassLoader);
+                    if (klass != null) {
+                        System.out.println("loading "+info.name);
+                        Main.plugins.add(info.load(klass));
+                    }
+                } catch (Throwable e) {
+                    e.printStackTrace();
+                    boolean remove = true;
+                    if (early)
+                        System.out.println("Could not load plugin: "+info.name+" - deleted from preferences"); // do not translate
+                    else {
+                        int answer = JOptionPane.showConfirmDialog(Main.parent,
+                            tr("Could not load plugin {0}. Delete from preferences?", info.name,
+                            JOptionPane.YES_NO_OPTION));
+                        if (answer != JOptionPane.OK_OPTION) {
+                            remove = false;
+                        }
+                    }
+                    if (remove) {
+                        plugins.remove(info.name);
+                        String plist = null;
+                        for (String pn : plugins) {
+                            if (plist==null) plist=""; else plist=plist+",";
+                            plist=plist+pn;
+                        }
+                        Main.pref.put("plugins", plist);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Add a new layer to the map. If no map exists, create one.
+     */
+    public final void addLayer(final Layer layer) {
+        if (map == null) {
+            final MapFrame mapFrame = new MapFrame();
+            setMapFrame(mapFrame);
+            mapFrame.selectMapMode((MapMode)mapFrame.getDefaultButtonAction());
+            mapFrame.setVisible(true);
+            mapFrame.setVisibleDialogs();
+        }
+        map.mapView.addLayer(layer);
+    }
+    /**
+     * @return The edit osm layer. If none exists, it will be created.
+     */
+    public final OsmDataLayer editLayer() {
+        if (map == null || map.mapView.editLayer == null)
+            menu.newAction.actionPerformed(null);
+        return map.mapView.editLayer;
+    }
+
+    /**
+     * Use this to register shortcuts to
+     */
+    public static final JPanel contentPane = new JPanel(new BorderLayout());
+
+
+    ///////////////////////////////////////////////////////////////////////////
+    //  Implementation part
+    ///////////////////////////////////////////////////////////////////////////
+
+    public static JPanel panel = new JPanel(new BorderLayout());
+
+    protected static Rectangle bounds;
+
+    private final CommandQueueListener redoUndoListener = new CommandQueueListener(){
+        public void commandChanged(final int queueSize, final int redoSize) {
+            menu.undo.setEnabled(queueSize > 0);
+            menu.redo.setEnabled(redoSize > 0);
+        }
+    };
+    /**
+     * Should be called before the main constructor to setup some parameter stuff
+     * @param args The parsed argument list.
+     */
+    public static void preConstructorInit(Map<String, Collection<String>> args) {
+        try {
+            Main.proj = (Projection)Class.forName(Main.pref.get("projection")).newInstance();
+        } catch (final Exception e) {
+            e.printStackTrace();
+            JOptionPane.showMessageDialog(null, tr("The projection could not be read from preferences. Using EPSG:4263."));
+            Main.proj = new Epsg4326();
+        }
+
+        try {
+            UIManager.setLookAndFeel(Main.pref.get("laf"));
+            toolbar = new ToolbarPreferences();
+            contentPane.updateUI();
+            panel.updateUI();
+        } catch (final Exception e) {
+            e.printStackTrace();
+        }
+        UIManager.put("OptionPane.okIcon", ImageProvider.get("ok"));
+        UIManager.put("OptionPane.yesIcon", UIManager.get("OptionPane.okIcon"));
+        UIManager.put("OptionPane.cancelIcon", ImageProvider.get("cancel"));
+        UIManager.put("OptionPane.noIcon", UIManager.get("OptionPane.cancelIcon"));
+
+        Dimension screenDimension = Toolkit.getDefaultToolkit().getScreenSize();
+        if (args.containsKey("geometry")) {
+            String geometry = args.get("geometry").iterator().next();
+            final Matcher m = Pattern.compile("(\\d+)x(\\d+)(([+-])(\\d+)([+-])(\\d+))?").matcher(geometry);
+            if (m.matches()) {
+                int w = Integer.valueOf(m.group(1));
+                int h = Integer.valueOf(m.group(2));
+                int x = 0, y = 0;
+                if (m.group(3) != null) {
+                    x = Integer.valueOf(m.group(5));
+                    y = Integer.valueOf(m.group(7));
+                    if (m.group(4).equals("-"))
+                        x = screenDimension.width - x - w;
+                    if (m.group(6).equals("-"))
+                        y = screenDimension.height - y - h;
+                }
+                bounds = new Rectangle(x,y,w,h);
+            } else
+                System.out.println("Ignoring malformed geometry: "+geometry);
+        }
+        if (bounds == null)
+            bounds = !args.containsKey("no-fullscreen") ? new Rectangle(0,0,screenDimension.width,screenDimension.height) : new Rectangle(1000,740);
+
+            // preinitialize a wait dialog for all early downloads (e.g. via command line)
+            pleaseWaitDlg = new PleaseWaitDialog(null);
+    }
+
+    public void postConstructorProcessCmdLine(Map<String, Collection<String>> args) {
+        // initialize the pleaseWaitDialog with the application as parent to handle focus stuff
+        pleaseWaitDlg = new PleaseWaitDialog(parent);
+
+        if (args.containsKey("download"))
+            for (String s : args.get("download"))
+                downloadFromParamString(false, s);
+        if (args.containsKey("downloadgps"))
+            for (String s : args.get("downloadgps"))
+                downloadFromParamString(true, s);
+        if (args.containsKey("selection"))
+            for (String s : args.get("selection"))
+                SearchAction.search(s, SearchAction.SearchMode.add, false);
+    }
+
+    public static boolean breakBecauseUnsavedChanges() {
+        Shortcut.savePrefs();
+        if (map != null) {
+            boolean modified = false;
+            boolean uploadedModified = false;
+            for (final Layer l : map.mapView.getAllLayers()) {
+                if (l instanceof OsmDataLayer && ((OsmDataLayer)l).isModified()) {
+                    modified = true;
+                    uploadedModified = ((OsmDataLayer)l).uploadedModified;
+                    break;
+                }
+            }
+            if (modified) {
+                final String msg = uploadedModified ? "\n"+tr("Hint: Some changes came from uploading new data to the server.") : "";
+                final int answer = JOptionPane.showConfirmDialog(
+                        parent, tr("There are unsaved changes. Discard the changes and continue?")+msg,
+                        tr("Unsaved Changes"), JOptionPane.YES_NO_OPTION);
+                if (answer != JOptionPane.YES_OPTION)
+                    return true;
+            }
+        }
+        return false;
+    }
+
+    private static void downloadFromParamString(final boolean rawGps, String s) {
+        if (s.startsWith("http:")) {
+            final Bounds b = BoundingBoxSelection.osmurl2bounds(s);
+            if (b == null)
+                JOptionPane.showMessageDialog(Main.parent, tr("Ignoring malformed url: \"{0}\"", s));
+            else {
+                //DownloadTask osmTask = main.menu.download.downloadTasks.get(0);
+                DownloadTask osmTask = new DownloadOsmTask();
+                osmTask.download(main.menu.download, b.min.lat(), b.min.lon(), b.max.lat(), b.max.lon());
+            }
+            return;
+        }
+
+        if (s.startsWith("file:")) {
+            try {
+                main.menu.open.openFile(new File(new URI(s)));
+            } catch (URISyntaxException e) {
+                JOptionPane.showMessageDialog(Main.parent, tr("Ignoring malformed file url: \"{0}\"", s));
+            }
+            return;
+        }
+
+        final StringTokenizer st = new StringTokenizer(s, ",");
+        if (st.countTokens() == 4) {
+            try {
+                DownloadTask task = rawGps ? new DownloadGpsTask() : new DownloadOsmTask();
+                task.download(main.menu.download, Double.parseDouble(st.nextToken()), Double.parseDouble(st.nextToken()), Double.parseDouble(st.nextToken()), Double.parseDouble(st.nextToken()));
+                return;
+            } catch (final NumberFormatException e) {
+            }
+        }
+
+        main.menu.open.openFile(new File(s));
+    }
+
+    protected static void determinePlatformHook() {
+        String os = System.getProperty("os.name");
+        if (os == null) {
+            System.err.println("Your operating system has no name, so I'm guessing its some kind of *nix.");
+            platform = new PlatformHookUnixoid();
+        } else if (os.toLowerCase().startsWith("windows")) {
+            platform = new PlatformHookWindows();
+        } else if (os.equals("Linux") || os.equals("Solaris") || 
+            os.equals("SunOS") || os.equals("AIX") || 
+            os.equals("FreeBSD") || os.equals("NetBSD") || os.equals("OpenBSD")) {
+            platform = new PlatformHookUnixoid();
+        } else if (os.toLowerCase().startsWith("mac os x")) {
+            platform = new PlatformHookOsx();
+        } else {
+            System.err.println("I don't know your operating system '"+os+"', so I'm guessing its some kind of *nix.");
+            platform = new PlatformHookUnixoid();
+        }
+    }
 
 }