Index: /applications/editors/josm/plugins/ywms/src/org/openstreetmap/josm/plugins/ywms/ImageLoader.java
===================================================================
--- /applications/editors/josm/plugins/ywms/src/org/openstreetmap/josm/plugins/ywms/ImageLoader.java	(revision 3573)
+++ /applications/editors/josm/plugins/ywms/src/org/openstreetmap/josm/plugins/ywms/ImageLoader.java	(revision 3574)
@@ -51,11 +51,19 @@
 	public static final String GECKO_DEBUG_LINE = "GECKO: PAINT FORCED AFTER ONLOAD:";
 
+	/** THe yahoo URL request */
 	private URL yahooUrl;
+	/** Original bounding box */
 	double[] orig_bbox = null;
+	/** Original width */
     int width = -1;
+	/** Original height */
     int height = -1;
+	/** Final image width */
     int final_width = -1;
+	/** Final image width */
     int final_height = -1;
+    /** The loaded image */
 	Image image;
+	/** Files created by firefox, that can be deleted */
 	List<String> firefoxFiles = new ArrayList<String>();
 
@@ -67,5 +75,4 @@
 	 * 
 	 * @param wmsUrl The WMS request
-	 * @param pluginDir The directory of the plugin
 	 * @throws ImageLoaderException When error loading the image
 	 */
@@ -76,5 +83,5 @@
 			URL request = new URL("file:///page" + wmsUrl);
 			String query = request.getQuery().toLowerCase();
-			yahooUrl = new File(YWMSPlugin.getStaticPluginDir(), "ymap.html").toURI().toURL();
+			yahooUrl = new File(Util.getPluginDir(), "ymap.html").toURI().toURL();
 			yahooUrl = new URL( yahooUrl.toExternalForm() + "?" + query);
 			
@@ -260,5 +267,4 @@
 	 * Saves the current image as a PNG file
 	 * @param fileName The name of the new file 
-	 * @throws IOException When error saving the file
 	 */
 	public void save(String fileName)
Index: /applications/editors/josm/plugins/ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPlugin.java
===================================================================
--- /applications/editors/josm/plugins/ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPlugin.java	(revision 3573)
+++ /applications/editors/josm/plugins/ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPlugin.java	(revision 3574)
@@ -6,5 +6,4 @@
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
 import org.openstreetmap.josm.plugins.Plugin;
-import org.openstreetmap.josm.plugins.PluginProxy;
 
 /**
@@ -77,4 +76,5 @@
 public class YWMSPlugin extends Plugin 
 {
+	/** The HTTP server this plugin launches */
 	static HTTPServer server;
     
@@ -84,8 +84,4 @@
 	public YWMSPlugin()
 	{
-        WARNING. This compilation error is made on purpose. 
-        We are not allowed to use this plugin at present.
-        Please, don not use it until all legal issues are resolved.
-        
 		try
 		{
@@ -136,34 +132,3 @@
 		}
 	}
-	
-    /** 
-     * Returns the plugin's directory
-     * <p>
-     * Utility method for classes that can't acces the plugin object
-     * 
-     * @return The directory of the plugin
-     */
-    public static String getStaticPluginDir()
-    {
-        YWMSPlugin plugin = getPlugin();
-        return ( plugin != null ) ? plugin.getPluginDir() : null;
-    }
-
-    /**
-     * Utility method to retrieve the plugin for classes that can't access to the plugin object directly.
-     * 
-     * @return The YWMS plugin
-     */
-    public static YWMSPlugin getPlugin()
-    {
-        for (PluginProxy plugin : Main.plugins)
-        {
-            if( plugin.info.className.equals(YWMSPlugin.class.getName()) )
-            {
-                return (YWMSPlugin)plugin.plugin;
-            }
-        }
-        
-        return null;
-    }
 }
Index: /applications/editors/josm/plugins/ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java
===================================================================
--- /applications/editors/josm/plugins/ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java	(revision 3573)
+++ /applications/editors/josm/plugins/ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java	(revision 3574)
@@ -14,4 +14,5 @@
 import org.openstreetmap.josm.gui.preferences.PreferenceDialog;
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
+import org.openstreetmap.josm.plugins.ywms.Util.Version;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.I18n;
@@ -29,6 +30,9 @@
     public static final String WMS_URL_PARAMS = "/ymap?request=GetMap&format=image/jpeg";
 
+    /** Firefox path text field */
     private JTextField firefox = new JTextField(10);
+    /** Server port text field */
     private JTextField port    = new JTextField(10);
+    /** Firefox profile text field */
     private JTextField profile = new JTextField(10);
     
@@ -46,5 +50,9 @@
     							 ));
 
-    	JPanel ywms = gui.createPreferenceTab("yahoo.gif", I18n.tr("Yahoo! WMS server"), I18n.tr("Settings for the Yahoo! imagery server."));
+		Version ver = Util.getVersion();
+		String description = tr("A WMS server for Yahoo imagery based on Firefox.");
+		if( ver != null )
+			description += "<br><br>" + tr("Version: {0}<br>Last change at {1}", ver.revision, ver.time);
+    	JPanel ywms = gui.createPreferenceTab("yahoo.gif", I18n.tr("Yahoo! WMS server"), description + I18n.tr("Settings for the Yahoo! imagery server."));
     	ywms.add(new JLabel(tr("YWMS options")), GBC.eol().insets(0,5,0,0));
 
@@ -79,5 +87,5 @@
         if( !oldPort.equals(port.getText()) )
         {
-            YWMSPlugin plugin = YWMSPlugin.getPlugin();
+            YWMSPlugin plugin = (YWMSPlugin)Util.getPlugin(YWMSPlugin.class);
             plugin.restartServer();
         }
@@ -90,4 +98,5 @@
     private final class WMSConfigurationActionListener implements ActionListener, FocusListener
     {
+    	/** If the action is already handled */
         boolean alreadyHandled = false;
         public void actionPerformed(ActionEvent e) 
@@ -145,5 +154,5 @@
                         }
                         
-                        String configFile = new File(YWMSPlugin.getStaticPluginDir(), "config.html").toURL().toString(); 
+                        String configFile = new File(Util.getPluginDir(), "config.html").toURL().toString(); 
                         GeckoSupport.browse(firefox.getText(), profile.getText(), configFile, false);
                         configureWMSPluginPreferences();
@@ -171,5 +180,4 @@
     /**
      * Configures WMSPlugin preferences with a server "Yahoo" pointing to YWMS  
-     * @param gui 
      */
     private void configureWMSPluginPreferences()