Changeset 5874 in josm for trunk/src/org/openstreetmap/josm/gui/help

Timestamp:

2013-04-16T19:57:43+02:00 (11 years ago)

Author:

Don-vip

Message:

see #8570, #7406 - I/O refactorization:

• Move different file copy functions to Utils.copyFile (to be replaced later by Files.copy when switching to Java 7)
• Replace all Utils.close(XXX) by Utils.close(Closeable) -> impacted plugins: commandline, mirrored_download, opendata, piclayer
• Add new Utils.close(ZipFile)
• Use of Utils.close almost everywhere
• Javadoc fixes

Location:

trunk/src/org/openstreetmap/josm/gui/help

Files:

• HelpBrowser.java (modified) (2 diffs)
• HelpContentReader.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java

@@ -51 +51 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.OpenBrowser;
+import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.WindowGeometry;
 
@@ -141 +142 @@
                 css.append("\n");
             }
-            reader.close();
         } catch(Exception e) {
             System.err.println(tr("Failed to read CSS file ''help-browser.css''. Exception is: {0}", e.toString()));
             e.printStackTrace();
             return ss;
+        } finally {
+            Utils.close(reader);
         }
         ss.addRule(css.toString());

trunk/src/org/openstreetmap/josm/gui/help/HelpContentReader.java

@@ -62 +62 @@
             throw ex;
         } finally {
-            if (in != null) {
-                try {
-                    in.close();
-                } catch(IOException e) {
-                    // ignore
-                }
-            }
+            Utils.close(in);
         }
     }