Changeset 5874 in josm for trunk/src/org/openstreetmap/josm/actions

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

File:

• trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java

@@ -38 +38 @@
 import org.openstreetmap.josm.tools.MultiMap;
 import org.openstreetmap.josm.tools.Shortcut;
+import org.openstreetmap.josm.tools.Utils;
 import org.xml.sax.SAXException;
 
@@ -48 +49 @@
 public class OpenFileAction extends DiskAccessAction {
 
+    /**
+     * The {@link ExtensionFileFilter} matching .url files
+     */
     public static final ExtensionFileFilter urlFileFilter = new ExtensionFileFilter("url", "url", tr("URL Files") + " (*.url)");
 
@@ -57 +61 @@
                 Shortcut.registerShortcut("system:open", tr("File: {0}", tr("Open...")), KeyEvent.VK_O, Shortcut.CTRL));
         putValue("help", ht("/Action/Open"));
-
     }
 
@@ -296 +299 @@
                             }
                         }
-                        reader.close();
+                        Utils.close(reader);
                     } catch (Exception e) {
                         System.err.println(e.getMessage());
@@ -333 +336 @@
         }
 
+        /**
+         * Replies the list of files that have been successfully opened.
+         * @return The list of files that have been successfully opened.
+         */
         public List<File> getSuccessfullyOpenedFiles() {
             return successfullyOpenedFiles;