Changeset 4996 in josm

Timestamp:

2012-02-19T16:30:47+01:00 (13 years ago)

Author:

Don-vip

Message:

fix #2012 - Download from URL dropped on main window

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• OpenFileAction.java (modified) (6 diffs)
• OpenLocationAction.java (modified) (2 diffs)
• downloadtasks/DownloadOsmUrlTask.java (added)

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

@@ -8 +8 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
+import java.io.BufferedReader;
 import java.io.File;
+import java.io.FileReader;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -19 +21 @@
 import java.util.List;
 import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import javax.swing.JFileChooser;
@@ -43 +47 @@
  */
 public class OpenFileAction extends DiskAccessAction {
+
+    public static final ExtensionFileFilter urlFileFilter = new ExtensionFileFilter("url", "url", tr("URL Files") + " (*.url)");
 
     /**
@@ -237 +243 @@
                 MultiMap<FileImporter, File> importerMap = new MultiMap<FileImporter, File>();
                 List<File> filesWithUnknownImporter = new LinkedList<File>();
+                List<File> urlFiles = new LinkedList<File>();
                 FILES: for (File f : files) {
                     for (FileImporter importer : ExtensionFileFilter.importers) {
@@ -244 +251 @@
                         }
                     }
-                    filesWithUnknownImporter.add(f);
+                    if (urlFileFilter.accept(f)) {
+                        urlFiles.add(f);
+                    } else {
+                        filesWithUnknownImporter.add(f);
+                    }
                 }
                 if (!filesWithUnknownImporter.isEmpty()) {
@@ -271 +282 @@
                             failedAll.add(f.getCanonicalPath());
                         }
+                    }
+                }
+                
+                for (File urlFile: urlFiles) {
+                    try {
+                        BufferedReader reader = new BufferedReader(new FileReader(urlFile));
+                        String line;
+                        while ((line = reader.readLine()) != null) {
+                            Matcher m = Pattern.compile(".*(http://.*)").matcher(line);
+                            if (m.matches()) {
+                                String url = m.group(1);
+                                Main.main.menu.openLocation.openUrl(false, url);
+                            }
+                        }
+                        reader.close();
+                    } catch (Exception e) {
+                        System.err.println(e.getMessage());
                     }
                 }

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

@@ -25 +25 @@
 import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmChangeTask;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask;
+import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmUrlTask;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadTask;
 import org.openstreetmap.josm.actions.downloadtasks.PostDownloadHandler;
@@ -53 +54 @@
         addDownloadTaskClass(DownloadGpsTask.class);
         addDownloadTaskClass(DownloadOsmChangeTask.class);
+        addDownloadTaskClass(DownloadOsmUrlTask.class);
     }