Changeset 13691 in josm for trunk/src

Timestamp:

2018-05-01T14:54:01+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #16243 - load files via Windows shortcut files (*.lnk)

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/OpenFileAction.java (modified) (1 diff)
• tools/PlatformHook.java (modified) (1 diff)
• tools/PlatformHookWindows.java (modified) (3 diffs)

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

@@ -134 +134 @@
             for (final File file : files) {
                 if (file.exists()) {
-                    this.files.add(file);
+                    this.files.add(Main.platform.resolveFileLink(file));
                 } else if (file.getParentFile() != null) {
                     // try to guess an extension using the specified fileFilter

trunk/src/org/openstreetmap/josm/tools/PlatformHook.java

@@ -358 +358 @@
         // To be implemented if needed
     }
+
+    /**
+     * Resolves a file link to its destination file.
+     * @param file file (link or regular file)
+     * @return destination file in case of a file link, file if regular
+     * @since 13691
+     */
+    default File resolveFileLink(File file) {
+        // Override if needed
+        return file;
+    }
 }

trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java

@@ -34 +34 @@
 import java.io.BufferedWriter;
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
@@ -80 +81 @@
 import org.openstreetmap.josm.io.CertificateAmendment.NativeCertAmend;
 import org.openstreetmap.josm.spi.preferences.Config;
+
+import sun.awt.shell.Win32ShellFolderManager2;
 
 /**
@@ -767 +770 @@
         return null;
     }
+
+    @Override
+    public File resolveFileLink(File file) {
+        if (file.getName().endsWith(".lnk")) {
+            try {
+                return new Win32ShellFolderManager2().createShellFolder(file).getLinkLocation();
+            } catch (FileNotFoundException e) {
+                Logging.error(e);
+            }
+        }
+        return file;
+    }
 }