Get rid of deprecated URL handling

Author: mgoellnitz

src/jfs/JFileSync.java

@@ -23,6 +23,7 @@
 import java.io.File;
 import java.io.PrintStream;
 import java.net.URL;
+import java.nio.file.Path;
 import javax.swing.ImageIcon;
 import javax.swing.UIManager;
 import jfs.conf.JFSConfig;
@@ -64,8 +65,16 @@ public static String getHome() {
 
             // JFS started from JAR:
             if (packageUrl.getProtocol().equals("jar")) {
-                URL jarUrl = new URL(packageUrl.getFile());
-                File jfsFile = new File(jarUrl.toURI());
+                String uriString = packageUrl.getFile();
+                int idx = uriString.indexOf('!');
+                if (idx>0) {
+                    uriString = uriString.substring(0, idx);
+                } // if
+                idx = uriString.lastIndexOf("file:");
+                if (idx>=0) {
+                    uriString=uriString.substring(idx+5);
+                }
+                File jfsFile = new File(uriString);
                 jfsLibDir = jfsFile.getParentFile().getParentFile();
             }
 

src/jfs/gui/JFSMainView.java

@@ -39,6 +39,7 @@
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.nio.file.Path;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Enumeration;
@@ -159,12 +160,15 @@ private String getAppTitle(String appName) {
             File jfsFile = null;
             // JFS started from JAR:
             if (packageUrl.getProtocol().equals("jar")) {
-                URL jarUrl = new URL(packageUrl.getFile());
-                String uriString = jarUrl.toURI().getPath();
+                String uriString = packageUrl.getFile();
                 int idx = uriString.indexOf('!');
                 if (idx>0) {
                     uriString = uriString.substring(0, idx);
                 } // if
+                idx = uriString.lastIndexOf("file:");
+                if (idx>=0) {
+                    uriString=uriString.substring(idx+5);
+                }
                 jfsFile = new File(uriString);
             }
             // JFS started from classes directory:
@@ -175,8 +179,6 @@ private String getAppTitle(String appName) {
             buildInfo += " - build date "+formatter.format(new Date(jfsFile.lastModified()))+" ";
         } catch (URISyntaxException use) {
             ;
-        } catch (MalformedURLException mue) {
-            ;
         } // try/catch
 
         String version = JFSConst.getInstance().getString("jfs.version");

src/jfs/sync/webdav/JFSWebDavFile.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2022 Martin Goellnitz
+ * Copyright (C) 2010-2026 Martin Goellnitz
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,8 +24,8 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
-import java.net.URL;
 import java.net.URLEncoder;
+import java.nio.file.Paths;
 import java.util.List;
 import jfs.conf.JFSConfig;
 import jfs.sync.JFSFile;
@@ -328,7 +328,7 @@ public JFSFile[] getList() {
                     List<DavResource> listing = ((JFSWebDavFileProducer)getFileProducer()).getListing(url);
                     if (listing.size()>1) {
                         list = new JFSWebDavFile[listing.size()-1];
-                        int rootLength = new URL(getFileProducer().getRootPath()).getPath().length();
+                        int rootLength = Paths.get(getFileProducer().getRootPath()).toUri().toURL().getPath().length();
 
                         int i = 0;
                         for (DavResource resource : listing) {