Changeset 5874 in josm for trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java

Timestamp:

2013-04-16T19:57:43+02:00 (13 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/data/CustomConfigurator.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java

@@ -1 +1 @@
 package org.openstreetmap.josm.data;
 
-import javax.script.ScriptException;
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.Preferences.Setting;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -12 +9 @@
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.IOException;
 import java.io.InputStream;
-
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -30 +24 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
 import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
@@ -42 +38 @@
 import javax.xml.transform.stream.StreamResult;
 
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Preferences.Setting;
 import org.openstreetmap.josm.gui.io.DownloadFileTask;
 import org.openstreetmap.josm.plugins.PluginDownloadTask;
@@ -47 +45 @@
 import org.openstreetmap.josm.plugins.ReadLocalPluginInformationTask;
 import org.openstreetmap.josm.tools.LanguageInfo;
+import org.openstreetmap.josm.tools.Utils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -441 +440 @@
                 log("Error reading custom preferences: "+ex.getMessage());
             } finally {
-                try {
-                    if (is != null) {
-                        is.close();
-                    }
-                } catch (IOException ex) {         }
+                Utils.close(is);
             }
             log("-- Reading complete --");