Index: applications/editors/josm/plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/InstallPanel.java
===================================================================
--- applications/editors/josm/plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/InstallPanel.java	(revision 12707)
+++ applications/editors/josm/plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/InstallPanel.java	(revision 12778)
@@ -1,4 +1,4 @@
 /**
- * 
+ *
  */
 package at.dallermassl.josm.plugin.pluginmanager;
@@ -30,5 +30,5 @@
     /**
      * @param pluginUpdateFrame
-     * @param descriptions 
+     * @param descriptions
      */
     public InstallPanel(PluginUpdateFrame pluginUpdateFrame, List<SiteDescription> descriptions) {
@@ -36,5 +36,5 @@
         setBorder(new javax.swing.border.EmptyBorder(12,12,12,12));
         final JSplitPane split = new JSplitPane(JSplitPane.VERTICAL_SPLIT, true);
-        
+
         /* Setup the table */
         table = new JTable(pluginModel = new PluginTableModel(descriptions));
@@ -44,5 +44,5 @@
         table.setPreferredScrollableViewportSize(new Dimension(500,200));
         table.getSelectionModel().addListSelectionListener(this);
-        
+
         TableColumn col1 = table.getColumnModel().getColumn(0);
         TableColumn col2 = table.getColumnModel().getColumn(1);
@@ -82,5 +82,5 @@
 
     /**
-     * 
+     *
      */
     public void install() {
@@ -101,5 +101,5 @@
         infoBox.setText(text);
         infoBox.setCaretPosition(0);
-        
+
     }
 
Index: applications/editors/josm/plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginDescription.java
===================================================================
--- applications/editors/josm/plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginDescription.java	(revision 12707)
+++ applications/editors/josm/plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginDescription.java	(revision 12778)
@@ -1,4 +1,4 @@
 /**
- * 
+ *
  */
 package at.dallermassl.josm.plugin.pluginmanager;
@@ -23,5 +23,5 @@
     private String description;
     private List<PluginResource> resources = new ArrayList<PluginResource>();
-    
+
     /**
      * Add a resource to the plugin description.
@@ -31,5 +31,5 @@
         resources.add(resource);
     }
-    
+
     /**
      * @return the id
@@ -87,5 +87,5 @@
         return this.resources;
     }
-    
+
     /**
      * @return the installedVersion
@@ -136,17 +136,17 @@
         }
         if(errorReported) {
-            JOptionPane.showMessageDialog(Main.parent, "One or more installs had an error: " + errorMessages.toString());            
+            JOptionPane.showMessageDialog(Main.parent, "One or more installs had an error: " + errorMessages.toString());
         }
     }
-    
+
     /* (non-Javadoc)
      * @see java.lang.Object#toString()
      */
     public String toString() {
-        return getClass().getSimpleName() + "[id=" + id 
-                                          + ", name=" + name 
-                                          + ", version=" + version 
-                                          + ", desc=" + description 
-                                          + ", resources=" + resources 
+        return getClass().getSimpleName() + "[id=" + id
+                                          + ", name=" + name
+                                          + ", version=" + version
+                                          + ", desc=" + description
+                                          + ", resources=" + resources
                                           + "]";
     }
Index: applications/editors/josm/plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginHelper.java
===================================================================
--- applications/editors/josm/plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginHelper.java	(revision 12707)
+++ applications/editors/josm/plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginHelper.java	(revision 12778)
@@ -1,4 +1,4 @@
 /**
- * 
+ *
  */
 package at.dallermassl.josm.plugin.pluginmanager;
@@ -18,9 +18,9 @@
  */
 public class PluginHelper {
-    
+
     private static PluginHelper INSTANCE = new PluginHelper();
     private Map<String, JMenu>menus;
     private VariableHelper variableHelper;
-    
+
     /**
      * Private constructor
@@ -35,10 +35,10 @@
 //        registerMenu("layer", Main.main.menu.layerMenu);
         registerMenu("help", Main.main.menu.helpMenu);
-        
+
         variableHelper = new VariableHelper();
         variableHelper.addAll(Main.pref.getAllPrefix(""));
         variableHelper.add("josm.user.dir", Main.pref.getPreferencesDir());
     }
-    
+
     /**
      * Returns the singleton instance of this helper.
@@ -48,5 +48,5 @@
         return INSTANCE;
     }
-    
+
     /**
      * Adds a menu to the main menu of JOSM and registers it under the given id.
@@ -59,8 +59,8 @@
         registerMenu(menuId, menu);
     }
-    
+
     /**
      * Register the menu under the given id so other plugins can retrieve
-     * the menu with {@link #getMenu(String)}. 
+     * the menu with {@link #getMenu(String)}.
      * @param menuId
      * @param menu
@@ -69,7 +69,7 @@
         menus.put(menuId, menu);
     }
-    
+
     /**
-     * Returns the main menu that was registered with the given id or <code>null</code> 
+     * Returns the main menu that was registered with the given id or <code>null</code>
      * if no menu was registered with that id. The default menus have the ids:
      * <code>file</code>, <code>view</code>, <code>edit</code>, <code>tools</code>,
@@ -87,5 +87,5 @@
         return this.variableHelper;
     }
-    
+
     /**
      * Returns the plugin with the given id or <code>null</code>
@@ -104,7 +104,7 @@
         return null;
     }
-    
 
-    
+
+
 
 }
Index: applications/editors/josm/plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerAction.java
===================================================================
--- applications/editors/josm/plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerAction.java	(revision 12707)
+++ applications/editors/josm/plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerAction.java	(revision 12778)
@@ -1,4 +1,4 @@
 /**
- * 
+ *
  */
 package at.dallermassl.josm.plugin.pluginmanager;
@@ -16,5 +16,5 @@
  */
 public class PluginManagerAction extends AbstractAction {
-    
+
     /**
      * Constructor
@@ -36,5 +36,5 @@
         // left a list of sites, right buttons "add remote site"
         // list has checkboxes
-        // adding: name and url where site.xml can be found. 
+        // adding: name and url where site.xml can be found.
         // site.xml containing a list of plugin.xml files
         // plugin info holds name, version and dependencies (including versions)
@@ -43,12 +43,12 @@
         // page to download, page to install, page to enable new plugins
         // finish
-        
+
         // plugin.xml holds info
-        // name, version, dependencies, installpath, 
-        
+        // name, version, dependencies, installpath,
+
         // info about other resources: images, log4j.jar, ....
         // need source url and target dir (relative to .josm? or main app dir (for josm update))
         // need restart of josm afterwards
-        
+
         // pluginmanager could also load the plugins itself, so dependencies could be respected
     }
Index: applications/editors/josm/plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPlugin.java
===================================================================
--- applications/editors/josm/plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPlugin.java	(revision 12707)
+++ applications/editors/josm/plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPlugin.java	(revision 12778)
@@ -1,4 +1,4 @@
 /**
- * 
+ *
  */
 package at.dallermassl.josm.plugin.pluginmanager;
@@ -14,5 +14,5 @@
  */
 public class PluginManagerPlugin extends Plugin {
-    
+
     public PluginManagerPlugin() {
 //        JMenu menu = PluginHelper.getInstance().getMenu("tools");
@@ -20,5 +20,5 @@
 //        menu.add(new PluginManagerAction());
     }
-    
+
     @Override
     public PreferenceSetting getPreferenceSetting() {
Index: applications/editors/josm/plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java
===================================================================
--- applications/editors/josm/plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java	(revision 12707)
+++ applications/editors/josm/plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java	(revision 12778)
@@ -1,4 +1,4 @@
 /**
- * 
+ *
  */
 package at.dallermassl.josm.plugin.pluginmanager;
@@ -56,5 +56,5 @@
         if(sites.keySet().size() == 0) {
             // add default entry (for demonstration purpose)
-            sites.put(PREF_KEY_REMOTE_SITE_PREFIX + "0"+PREF_KEY_SITE_URL_SUFFIX, 
+            sites.put(PREF_KEY_REMOTE_SITE_PREFIX + "0"+PREF_KEY_SITE_URL_SUFFIX,
                 "http://www.tegmento.org/~cdaller/josm/");
         }
@@ -73,5 +73,5 @@
             }
             ++siteCount;
-        }        
+        }
         return listModel;
     }
@@ -82,5 +82,5 @@
     // only in 1.6 allowed @Override
     public void addGui(final PreferenceDialog gui) {
-        
+
         siteListModel = createListModel();
         siteList = new JList(siteListModel);
@@ -114,5 +114,5 @@
                 else {
                     int[] selected = siteList.getSelectedIndices();
-                    for (int i = selected.length - 1; i >=0; --i) {                        
+                    for (int i = selected.length - 1; i >=0; --i) {
                         siteListModel.removeElementAt(selected[i]);
                     }
Index: applications/editors/josm/plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginResource.java
===================================================================
--- applications/editors/josm/plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginResource.java	(revision 12707)
+++ applications/editors/josm/plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginResource.java	(revision 12778)
@@ -1,4 +1,4 @@
 /**
- * 
+ *
  */
 package at.dallermassl.josm.plugin.pluginmanager;
@@ -22,5 +22,5 @@
     private String errorMessage;
     private Exception errorException;
-    
+
     /**
      * @return the resourceUrl
@@ -47,5 +47,5 @@
         this.target = target;
     }
-    
+
     /**
      * @return the errorMessage
@@ -73,11 +73,11 @@
     }
     /**
-     * Installs the resource into to the target location. 
-     * @throws IOException if the resource could not be read or written. 
+     * Installs the resource into to the target location.
+     * @throws IOException if the resource could not be read or written.
      */
     public void install() {
        File targetFile = new File(target);
-       if(targetFile.isDirectory() 
-          || targetFile.getAbsolutePath().endsWith("/") 
+       if(targetFile.isDirectory()
+          || targetFile.getAbsolutePath().endsWith("/")
           || targetFile.getAbsolutePath().endsWith("\\")) {
            targetFile = new File(targetFile, resourceUrl.getFile());
@@ -88,5 +88,5 @@
            return;
        }
-       
+
        // copy resource to local filesystem:
        System.out.println("Install " + resourceUrl + " to " + targetFile);
@@ -112,5 +112,5 @@
              } catch(IOException ignore) {}
        }
-       
+
     }
     /* (non-Javadoc)
@@ -120,4 +120,4 @@
         return getClass().getSimpleName() + "[url=" + resourceUrl + ", target=" + target + "]";
     }
- 
+
 }
Index: applications/editors/josm/plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginTableModel.java
===================================================================
--- applications/editors/josm/plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginTableModel.java	(revision 12707)
+++ applications/editors/josm/plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginTableModel.java	(revision 12778)
@@ -1,4 +1,4 @@
 /**
- * 
+ *
  */
 package at.dallermassl.josm.plugin.pluginmanager;
@@ -17,10 +17,10 @@
     private List<SiteDescription> sites;
     private List<PluginDescription> plugins;
-    
+
     public PluginTableModel(List<SiteDescription> descriptions) {
         this.sites = descriptions;
         update();
     }
-    
+
     private void update() {
         plugins = new ArrayList<PluginDescription>();
@@ -29,6 +29,6 @@
         }
     }
-    
-    
+
+
 
     /* (non-Javadoc)
@@ -65,11 +65,11 @@
             return plugin.getInstalledVersion() + " -> " + plugin.getVersion();
         } else {
-            return plugin.getVersion();            
+            return plugin.getVersion();
         }
         default: throw new IllegalArgumentException("Illegal Column Index " + columnIndex);
         }
     }
-    
-    
+
+
 
     /* (non-Javadoc)
@@ -121,5 +121,5 @@
             }
         }
-        
+
     }
 
@@ -151,8 +151,8 @@
         this.plugins = plugins;
     }
-    
-    
-    
-    
+
+
+
+
 
 }
Index: applications/editors/josm/plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java
===================================================================
--- applications/editors/josm/plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java	(revision 12707)
+++ applications/editors/josm/plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java	(revision 12778)
@@ -1,4 +1,4 @@
 /**
- * 
+ *
  */
 package at.dallermassl.josm.plugin.pluginmanager;
@@ -32,5 +32,5 @@
     /**
      * @param title
-     * @param descriptions 
+     * @param descriptions
      * @throws HeadlessException
      */
@@ -39,7 +39,7 @@
         init(descriptions);
     }
-    
+
     public void init(List<SiteDescription> descriptions) {
-        
+
         /* Setup panes */
         JPanel content = new JPanel(new BorderLayout(12,12));
@@ -53,5 +53,5 @@
 
         content.add(BorderLayout.CENTER,tabPane);
-        
+
         JPanel buttonPannel = new JPanel();
         // <FIXXME date="23.06.2007" author="cdaller">
@@ -59,5 +59,5 @@
         JButton okButton = new JButton(tr("Install"));
         JButton cancelButton = new JButton(tr("Cancel"));
-        // </FIXXME> 
+        // </FIXXME>
         buttonPannel.add(okButton);
         buttonPannel.add(cancelButton);
@@ -68,15 +68,15 @@
                 setVisible(false);
                 dispose();
-            }   
+            }
         });
-        
+
         cancelButton.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent e) {
                 setVisible(false);
                 dispose();
-            }   
+            }
         });
         content.add(BorderLayout.SOUTH,buttonPannel);
-        
+
         pack();
     }
Index: applications/editors/josm/plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/SiteDescription.java
===================================================================
--- applications/editors/josm/plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/SiteDescription.java	(revision 12707)
+++ applications/editors/josm/plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/SiteDescription.java	(revision 12778)
@@ -1,4 +1,4 @@
 /**
- * 
+ *
  */
 package at.dallermassl.josm.plugin.pluginmanager;
@@ -30,5 +30,5 @@
     private URL url;
     List<PluginDescription>plugins = new ArrayList<PluginDescription>();
-    
+
     /**
      * Default Constructor
@@ -47,5 +47,5 @@
         this.url = new URL(url);
     }
-    
+
     /**
      * @param name
@@ -56,5 +56,5 @@
         this.name = name;
     }
-    
+
 
     /**
@@ -71,8 +71,8 @@
     }
 
-    
+
     /**
      * Load the site description from the url.
-     * @throws IOException 
+     * @throws IOException
      */
     public void loadFromUrl() throws IOException {
@@ -84,6 +84,6 @@
         // TODO check and remember modified since date to compare and not load sites that did not change
         // connection.getIfModifiedSince()
-        // </FIXXME> 
-        
+        // </FIXXME>
+
         Reader in = new InputStreamReader(connection.getInputStream());
         SiteDescriptionParser parser = new SiteDescriptionParser(this);
@@ -111,5 +111,5 @@
             if(info != null) {
                 if(info.version == null) {
-                    plugin.setInstalledVersion("?");                    
+                    plugin.setInstalledVersion("?");
                 } else {
                     plugin.setInstalledVersion(info.version);
@@ -118,5 +118,5 @@
         }
     }
-    
+
     /**
      * @return the plugins
@@ -133,5 +133,5 @@
     }
 
-    
+
     /**
      * @return the url
@@ -158,7 +158,7 @@
             return name;
         }
-        
+
     }
-    
+
     /**
      * Used by ListCellRenderer, so not only a debug method!
@@ -168,5 +168,5 @@
         return getLabelName();
     }
-    
+
     public static void main(String[] args) {
         try {
Index: applications/editors/josm/plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/SiteDescriptionParser.java
===================================================================
--- applications/editors/josm/plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/SiteDescriptionParser.java	(revision 12707)
+++ applications/editors/josm/plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/SiteDescriptionParser.java	(revision 12778)
@@ -1,4 +1,4 @@
 /**
- * 
+ *
  */
 package at.dallermassl.josm.plugin.pluginmanager;
@@ -23,5 +23,5 @@
     private StringBuilder characters;
     private VariableHelper variableHelper;
-    
+
     /**
      * Constructor using a new SiteDescription object.
@@ -33,10 +33,10 @@
      * Constructor using a description object to fill.
      * @param siteDescription the object to fill.
-     * @param in the reader to fill the description with. 
+     * @param in the reader to fill the description with.
      */
     public SiteDescriptionParser(SiteDescription siteDescription) {
         this.siteDescription = siteDescription;
     }
-    
+
     /**
      * Returns the site description object.
@@ -117,6 +117,6 @@
         }
     }
-    
-    /** 
+
+    /**
      * Read characters for description.
      */
@@ -127,5 +127,5 @@
         characters.append(data, start, length);
     }
-    
+
     /* (non-Javadoc)
      * @see uk.co.wilson.xml.MinML2#endElement(java.lang.String, java.lang.String, java.lang.String)
@@ -158,5 +158,5 @@
        }
     }
-    
+
     /**
      * Clears the characters and returns the its previous content.
@@ -168,6 +168,6 @@
         return chars;
     }
-    
-    
+
+
 
 }
Index: applications/editors/josm/plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/VariableHelper.java
===================================================================
--- applications/editors/josm/plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/VariableHelper.java	(revision 12707)
+++ applications/editors/josm/plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/VariableHelper.java	(revision 12778)
@@ -1,4 +1,4 @@
 /**
- * 
+ *
  */
 package at.dallermassl.josm.plugin.pluginmanager;
@@ -10,8 +10,8 @@
 
 /**
- * Helper class that replaces variables in strings with its values. The variables are in the 
+ * Helper class that replaces variables in strings with its values. The variables are in the
  * form ${name}. Replacement values may be set. As a fallback (if the variable is not found)
  * the system properties are used. If neither is found, the variable is not replaced.
- * 
+ *
  * @author cdaller
  *
@@ -20,9 +20,9 @@
     private Pattern varPattern = Pattern.compile("\\$\\{(.+?)\\}");
     private Map<String, String> variables;
-    
+
     public VariableHelper() {
         variables = new HashMap<String, String>();
     }
-    
+
     /**
      * Adds all key/values as variables.
@@ -32,5 +32,5 @@
         variables.putAll(values);
     }
-    
+
     /**
      * Adds a single key/value pair.
@@ -41,5 +41,5 @@
         variables.put(key, value);
     }
-    
+
     /**
      * Replaces all variable placeholder in the given string with the replacement.
@@ -71,5 +71,5 @@
         return source.toString();
     }
-    
+
     public static void main(String[] args) {
         VariableHelper helper = new VariableHelper();