Changeset 30738 in osm for applications/editors/josm/plugins/opendata/util

Timestamp:

2014-10-19T01:27:04+02:00 (10 years ago)

Author:

donvip

Message:

[josm_plugins] fix java 7 warnings / global usage of try-with-resource

File:

• applications/editors/josm/plugins/opendata/util/opendata/ModuleListGenerator.java (modified) (5 diffs)

applications/editors/josm/plugins/opendata/util/opendata/ModuleListGenerator.java

@@ -15 +15 @@
 import java.util.zip.ZipOutputStream;
 
+import org.openstreetmap.josm.Main;
+
 public class ModuleListGenerator {
 
@@ -26 +28 @@
                         baseDir = args[0];
                 }
-                try {
+                try (
                         BufferedWriter list = new BufferedWriter(new FileWriter(baseDir+"modules.txt"));
                         ZipOutputStream zip = new ZipOutputStream(new FileOutputStream(baseDir+"modules-icons.zip"));
+                ) {
                         for (File file : new File(baseDir+"dist").listFiles(new FilenameFilter() {
                                 @Override
@@ -37 +40 @@
                                 try {
                                         String filename = file.getName();
-                                        System.out.println("Processing "+filename);
+                                        Main.info("Processing "+filename);
                                         list.write(filename+";"+url+filename); list.newLine();
                                         Manifest mf = new JarFile(file).getManifest();
@@ -77 +80 @@
                                                                         }
                                                                 } catch (IOException e) {
-                                                                        System.err.println("Cannot load Image-Icon: "+value.toString());
+                                                                        Main.error("Cannot load Image-Icon: "+value.toString());
                                                                 } finally {
                                                                         zip.closeEntry();
@@ -84 +87 @@
                                                 }
                                         }
-                                        
+
                                 } catch (IOException e) {
-                                        e.printStackTrace();
+                                    Main.error(e);
                                 }
                         }
-                        System.out.println("Done");
-                        zip.close();
-                        list.close();
                 } catch (IOException e) {
-                        e.printStackTrace();
+                        Main.error(e);
                 }
         }