Changeset 30731 in osm for applications/editors/josm/plugins/opendata/src/org/openstreetmap

Timestamp:

2014-10-18T15:31:53+02:00 (10 years ago)

Author:

donvip

Message:

[josm_opendata] fix some sonar issues

Location:

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules

Files:

• AbstractModule.java (modified) (5 diffs)
• ModuleHandler.java (modified) (2 diffs)
• ModuleInformation.java (modified) (5 diffs)

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/AbstractModule.java

@@ -10 +10 @@
 import java.util.List;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.preferences.SourceEditor.ExtendedSourceEntry;
 import org.openstreetmap.josm.gui.preferences.SourceEntry;
@@ -24 +25 @@
 
     protected final ModuleInformation info;
-    
+
     public AbstractModule(ModuleInformation info) {
         this.info = info;
@@ -50 +51 @@
             ExtendedSourceEntry src;
             if (handler != null && (src = handler.getMapPaintStyle()) != null) {
-                try {
-                    // Copy style sheet to disk to allow JOSM to load it at startup (even making the plugin "early" does not allow it)
-                    String path = OdPlugin.getInstance().getResourcesDirectory()+File.separator+src.url.replace(OdConstants.PROTO_RSRC, "").replace('/', File.separatorChar);
-                    
-                    int n = 0;
-                    byte[] buffer = new byte[4096];
-                    InputStream in = getClass().getResourceAsStream(src.url.substring(OdConstants.PROTO_RSRC.length()-1));
-                    new File(path.substring(0, path.lastIndexOf(File.separatorChar))).mkdirs();
-                    FileOutputStream out = new FileOutputStream(path);
+                // Copy style sheet to disk to allow JOSM to load it at startup
+                // (even making the plugin "early" does not allow it)
+                String path = OdPlugin.getInstance().getResourcesDirectory() + File.separator
+                        + src.url.replace(OdConstants.PROTO_RSRC, "").replace('/', File.separatorChar);
+
+                int n = 0;
+                byte[] buffer = new byte[4096];
+                try (InputStream in = getClass().getResourceAsStream(
+                        src.url.substring(OdConstants.PROTO_RSRC.length()-1));
+                     FileOutputStream out = new FileOutputStream(path)) {
+                    String dir = path.substring(0, path.lastIndexOf(File.separatorChar));
+                    if (new File(dir).mkdirs() && Main.isDebugEnabled()) {
+                        Main.debug("Created directory: "+dir);
+                    }
                     while ((n = in.read(buffer)) > 0) {
                         out.write(buffer, 0, n);
                     }
-                    out.close();
-                    in.close();
-
                     // Add source pointing to the local file
                     src.url = OdConstants.PROTO_FILE+path;
                     sources.add(src);
                 } catch (IOException e) {
-                    System.err.println(e.getMessage());
+                    Main.error(e.getMessage());
                 }
             }
@@ -96 +99 @@
         };
     }
-    
+
     @Override
     public final List<AbstractDataSetHandler> getNewlyInstanciatedHandlers() {
@@ -104 +107 @@
                 try {
                     result.add(handlerClass.newInstance());
-                } catch (Throwable t) {
-                    System.err.println("Cannot instantiate "+handlerClass+" because of "+t.getClass().getName()+": "+t.getMessage());
+                } catch (InstantiationException | IllegalAccessException t) {
+                    Main.error("Cannot instantiate "+handlerClass+" because of "+t.getClass().getName()+": "+t.getMessage());
                 }
             }

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleHandler.java

@@ -247 +247 @@
                         + "Delete from preferences?</html>", module.name, module.className);
             }
-        }  catch (Throwable e) {
-            e.printStackTrace();
+        }  catch (Exception e) {
+            Main.error(e);
         }
         if (msg != null && confirmDisableModule(parent, msg, module.name)) {
@@ -550 +550 @@
 
         final File[] files = moduleDir.listFiles(new FilenameFilter() {
+            @Override
             public boolean accept(File dir, String name) {
                 return name.endsWith(".jar.new");

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleInformation.java

@@ -143 +143 @@
         this.attr.putAll(other.attr);
     }
-    
+
     private static final ImageIcon extractIcon(String iconPath, File jarFile, boolean suppressWarnings) {
         return new ImageProvider(iconPath).setArchive(jarFile).setMaxWidth(24).setMaxHeight(24).setOptional(true).setSuppressWarnings(suppressWarnings).get();
@@ -234 +234 @@
         try {
             return klass.getConstructor(ModuleInformation.class).newInstance(this);
-        } catch (Throwable t) {
+        } catch (Exception t) {
             throw new ModuleException(name, t);
         }
@@ -251 +251 @@
         try{
             return (Class<? extends Module>) Class.forName(className, true, classLoader);
-        } catch (Throwable t) {
+        } catch (Exception t) {
             throw new ModuleException(name, t);
         }
@@ -260 +260 @@
             return f.toURI().toURL();
         } catch (MalformedURLException ex) {
+            Main.warn(ex.getMessage());
             return null;
         }
@@ -337 +338 @@
     }
 
-    /**
-     * Sets the name
-     * @param name
-     */
-    /*public void setName(String name) {
-        this.name = name;
-    }*/
-
     public ImageIcon getScaledIcon() {
         if (icon == null)