Changeset 13692 in josm

Timestamp:

2018-05-01T15:35:00+02:00 (7 years ago)

Author:

Don-vip

Message:

see #16243 - do not rely on internal JDK classes, not available on Linux

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• PlatformHookWindows.java (modified) (4 diffs)
• WindowsShortcut.java (added)

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;
@@ -61 +60 @@
 import java.security.spec.InvalidKeySpecException;
 import java.security.spec.X509EncodedKeySpec;
+import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -81 +81 @@
 import org.openstreetmap.josm.io.CertificateAmendment.NativeCertAmend;
 import org.openstreetmap.josm.spi.preferences.Config;
-
-import sun.awt.shell.Win32ShellFolderManager2;
 
 /**
@@ -775 +773 @@
         if (file.getName().endsWith(".lnk")) {
             try {
-                return new Win32ShellFolderManager2().createShellFolder(file).getLinkLocation();
-            } catch (FileNotFoundException e) {
+                return new File(new WindowsShortcut(file).getRealFilename());
+            } catch (IOException | ParseException e) {
                 Logging.error(e);
             }