Changeset 32174 in osm

Timestamp:

2016-05-12T01:30:36+02:00 (8 years ago)

Author:

donvip

Message:

add license, sonarlint configuration, code cleanup

Location:

applications/editors/josm/plugins/osmarender

Files:

• .project (modified) (1 diff)
• .settings/org.sonarlint.eclipse.core.prefs (added)
• GPL-3.0.txt (added)
• src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java (modified) (7 diffs)

applications/editors/josm/plugins/osmarender/.project

@@ -21 +21 @@
                         </arguments>
                 </buildCommand>
+                <buildCommand>
+                        <name>org.sonarlint.eclipse.core.sonarlintBuilder</name>
+                        <arguments>
+                        </arguments>
+                </buildCommand>
         </buildSpec>
         <natures>

applications/editors/josm/plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.osmarender;
 
@@ -67 +68 @@
             try {
                 writeGenerated(b);
-            } catch (Exception ex) {
+            } catch (IOException ex) {
                 // how handle the exception?
                 Main.error(ex);
@@ -124 +125 @@
                 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 +133 @@
     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 +163 @@
     }
 
-    private class OsmarenderPreferenceSetting implements SubPreferenceSetting {
+    private static class OsmarenderPreferenceSetting implements SubPreferenceSetting {
 
         private JTextField firefox = new JTextField(10);
@@ -191 +198 @@
 
     private void writeGenerated(Bounds b) throws IOException {
-        String bounds_tag = "<bounds " +
+        String boundsTag = "<bounds " +
             "minlat=\"" + b.getMin().lat() + "\" " +
             "maxlat=\"" + b.getMax().lat() + "\" " +
@@ -204 +211 @@
             // 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();