Index: applications/editors/josm/plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java
===================================================================
--- applications/editors/josm/plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java	(revision 30738)
+++ applications/editors/josm/plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java	(revision 32174)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.osmarender;
 
@@ -67,5 +68,5 @@
             try {
                 writeGenerated(b);
-            } catch (Exception ex) {
+            } catch (IOException ex) {
                 // how handle the exception?
             	Main.error(ex);
@@ -124,5 +125,6 @@
                 Runtime.getRuntime().exec(new String[]{firefox, argument});
             } catch (IOException e1) {
-                JOptionPane.showMessageDialog(Main.parent, tr("Firefox not found. Please set firefox executable in the Map Settings page of the preferences."));
+                JOptionPane.showMessageDialog(Main.parent, 
+                        tr("Firefox not found. Please set firefox executable in the Map Settings page of the preferences."));
             }
         }
@@ -131,4 +133,9 @@
     private JMenuItem osmarenderMenu;
 
+    /**
+     * Constructs a new {@code OsmarenderPlugin}.
+     * @param info plugin info
+     * @throws IOException if files cannot be copied
+     */
     public OsmarenderPlugin(PluginInformation info) throws IOException {
         super(info);
@@ -156,5 +163,5 @@
     }
 
-    private class OsmarenderPreferenceSetting implements SubPreferenceSetting {
+    private static class OsmarenderPreferenceSetting implements SubPreferenceSetting {
 
         private JTextField firefox = new JTextField(10);
@@ -191,5 +198,5 @@
 
     private void writeGenerated(Bounds b) throws IOException {
-        String bounds_tag = "<bounds " +
+        String boundsTag = "<bounds " +
             "minlat=\"" + b.getMin().lat() + "\" " +
             "maxlat=\"" + b.getMax().lat() + "\" " +
@@ -204,9 +211,9 @@
             // osm-map-features.xml contain two placemark
             // (bounds_mkr1 and bounds_mkr2). We write the bounds tag between the two
-            String str = null;
+            String str;
             while( (str = reader.readLine()) != null ) {
                 if(str.contains("<!--bounds_mkr1-->")) {
                     writer.println(str);
-                    writer.println("    " + bounds_tag);
+                    writer.println("    " + boundsTag);
                     while(!str.contains("<!--bounds_mkr2-->")) {
                         str = reader.readLine();