Jelajahi Sumber

New URL is deprecated

Toni Helenius 1 tahun lalu
induk
melakukan
f4847872ae

+ 3 - 2
ant-jme/src/com/jme/ant/LoadWikiImages.java

@@ -9,6 +9,7 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.FileReader;
 import java.io.InputStream;
+import java.net.URI;
 import java.net.URL;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Task;
@@ -48,7 +49,7 @@ public class LoadWikiImages extends Task {
                                 name = name.substring(0, markIdx);
                             }
                             name = name.replaceAll(":", "/");
-                            URL url = new URL(host + link);
+                            URL url = URI.create(host + link).toURL();
                             InputStream in = null;
                             FileOutputStream out = null;
                             try {
@@ -83,7 +84,7 @@ public class LoadWikiImages extends Task {
                             }
                             //make external folder and clean filename
                             name = "external/" + name.replaceAll("[_[^\\w\\däüöÄÜÖ\\/\\+\\-\\. ]]", "_");
-                            URL url = new URL(host + link);
+                            URL url = URI.create((host + link)).toURL();
                             InputStream in = url.openStream();
                             File file = new File(getLocation().getFileName().replaceAll("build.xml", "") + File.separator + targetFolder + File.separator + name.replaceAll("/", File.separator));
                             log("Getting external image: " + host + link);

+ 3 - 2
jme3-android/src/com/jme3/gde/android/Installer.java

@@ -33,6 +33,7 @@ package com.jme3.gde.android;
 
 import com.jme3.gde.core.errorreport.ExceptionUtils;
 import java.net.MalformedURLException;
+import java.net.URI;
 import java.net.URL;
 import org.netbeans.api.autoupdate.UpdateUnitProvider;
 import org.netbeans.api.autoupdate.UpdateUnitProviderFactory;
@@ -55,9 +56,9 @@ public class Installer extends ModuleInstall {
             if (implVers != null) {
                 try {
                     UpdateUnitProvider updateUnitProvider = UpdateUnitProviderFactory.getDefault()
-                                .create("NBANDROID", "NBANDROID Update Center", new URL(
+                                .create("NBANDROID", "NBANDROID Update Center", URI.create(
                                         String.format("http://server.arsi.sk:8080/updates/%s-updates.xml", implVers)
-                                ));
+                                ).toURL());
                     updateUnitProvider.setEnable(true);
                 } catch (MalformedURLException ex) {
                     ExceptionUtils.caughtException(ex, "Note: This could be a problem related to your internet connection/firewall etc.");

+ 2 - 1
jme3-assetpack-support/src/com/jme3/gde/assetpack/browser/OnlineBrowser.java

@@ -14,6 +14,7 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.URI;
 import java.net.URL;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -43,7 +44,7 @@ public class OnlineBrowser extends javax.swing.JPanel implements HyperlinkListen
         this.lib = lib;
         jEditorPane1.addHyperlinkListener(this);
         try {
-            URL url = new URL("http://jmonkeyengine.org/assetpacks/list.php");
+            URL url = URI.create("http://jmonkeyengine.org/assetpacks/list.php").toURL();
             jEditorPane1.setPage(url);
         } catch (IOException ex) {
             Exceptions.printStackTrace(ex);

+ 2 - 2
jme3-assetpack-support/src/com/jme3/gde/assetpack/online/OnlinePacksConnector.java

@@ -31,7 +31,7 @@ public class OnlinePacksConnector {
             int size = (int) FileUtil.toFileObject(file).getSize();
             Logger.getLogger(OnlinePacksConnector.class.getName()).log(Level.FINE, "Upload file size: {0}", size);
 
-            URL url = new URL(urlString);
+            URL url = URI.create(urlString).toURL();
             String boundary = MultiPartFormOutputStream.createBoundary();
             URLConnection urlConn = MultiPartFormOutputStream.createConnection(url);
             urlConn.setRequestProperty("Accept", "*/*");
@@ -77,7 +77,7 @@ public class OnlinePacksConnector {
 
     private static boolean test(String urlString, String user, String pass) {
         try {
-            URL url = new URL(urlString);
+            URL url = URI.create(urlString).toURL();
             String boundary = MultiPartFormOutputStream.createBoundary();
             URLConnection urlConn = MultiPartFormOutputStream.createConnection(url);
             urlConn.setRequestProperty("Accept", "*/*");

+ 2 - 1
jme3-blender/src/com/jme3/gde/blender/scripts/Scripts.java

@@ -7,6 +7,7 @@ package com.jme3.gde.blender.scripts;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.URI;
 import java.net.URL;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -41,7 +42,7 @@ public class Scripts {
                 InputStream in = null;
                 OutputStream out = null;
                 try {
-                    URL url = new URL("nbres:" + root + name);
+                    URL url = URI.create("nbres:" + root + name).toURL();
                     file = FileUtil.createData(folder, name);
                     in = url.openStream();
                     out = file.getOutputStream();

+ 3 - 2
jme3-core/src/com/jme3/gde/core/j2seproject/ProjectExtensionManager.java

@@ -39,6 +39,7 @@ import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.StringWriter;
 import java.net.MalformedURLException;
+import java.net.URI;
 import java.net.URL;
 import java.util.Properties;
 import java.util.logging.Level;
@@ -234,7 +235,7 @@ public class ProjectExtensionManager {
 
     public void setDataZip(String url) {
         try {
-            this.zipFile = new URL(url);
+            this.zipFile = URI.create(url).toURL();
         } catch (MalformedURLException ex) {
             Exceptions.printStackTrace(ex);
         }
@@ -251,7 +252,7 @@ public class ProjectExtensionManager {
      */
     public void loadTargets(String path) {
         try {
-            LineNumberReader in = new LineNumberReader(new InputStreamReader(new URL(path).openStream()));
+            LineNumberReader in = new LineNumberReader(new InputStreamReader(URI.create(path).toURL().openStream()));
             StringWriter out = new StringWriter();
             String line = in.readLine();
             while (line != null) {

+ 2 - 1
jme3-core/src/com/jme3/gde/core/scene/SceneApplication.java

@@ -67,6 +67,7 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.IOException;
 import java.net.MalformedURLException;
+import java.net.URI;
 import java.net.URL;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentLinkedQueue;
@@ -735,7 +736,7 @@ public class SceneApplication extends LegacyApplication implements LookupProvide
         @Override
         public void actionPerformed(ActionEvent e) {
             try {
-                HtmlBrowser.URLDisplayer.getDefault().showURL(new URL("https://wiki.jmonkeyengine.org/sdk/troubleshooting.html"));
+                HtmlBrowser.URLDisplayer.getDefault().showURL(URI.create("https://wiki.jmonkeyengine.org/sdk/troubleshooting.html").toURL());
             } catch (MalformedURLException ex) {
                 Exceptions.printStackTrace(ex);
             }

+ 2 - 1
jme3-core/src/com/jme3/gde/core/util/ZipExtensionTool.java

@@ -41,6 +41,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
+import java.net.URI;
 import java.net.URL;
 import java.util.Properties;
 import java.util.concurrent.ConcurrentHashMap;
@@ -177,7 +178,7 @@ public class ZipExtensionTool {
         URL url = null;
         try {
             String tempFileName = extractionPath + "_tmp.zip";
-            url = new URL("nbres:" + zipPath);
+            url = URI.create("nbres:" + zipPath).toURL();
             in = new BufferedInputStream(url.openStream());
             out = new BufferedOutputStream(new FileOutputStream(tempFileName));
             int inbyte = in.read();

+ 2 - 1
jme3-desktop-executables/src/com/jme3/gde/desktop/executables/JreDownloader.java

@@ -39,6 +39,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
+import java.net.URI;
 import java.net.URL;
 import java.util.concurrent.Callable;
 import java.util.logging.Level;
@@ -91,7 +92,7 @@ public class JreDownloader {
     private static void attemptDownload(String newUrl, File dest, int retry) {
         logger.log(Level.INFO, "Attempt to download JRE from {0}", newUrl);
         try {
-            HttpURLConnection connection = (HttpURLConnection) new URL(newUrl).openConnection();
+            HttpURLConnection connection = (HttpURLConnection) URI.create(newUrl).toURL().openConnection();
             connection.setRequestProperty("Cookie", "gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie");
             connection.setAllowUserInteraction(false);
             connection.setInstanceFollowRedirects(true);

+ 6 - 5
jme3-welcome-screen/src/com/jme3/gde/welcome/WelcomeScreenTopComponent.java

@@ -35,6 +35,7 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.MalformedURLException;
+import java.net.URI;
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.logging.Level;
@@ -96,7 +97,7 @@ public final class WelcomeScreenTopComponent extends TopComponent implements Hyp
             }
             while (checkOpenThread == null || checkOpenThread.isAlive()); /* Wait for first getModified (static executed from NB) to finish */
             
-            final URL startUrl = new URL(org.openide.util.NbBundle.getMessage(WelcomeScreenTopComponent.class, "WelcomeScreenTopComponent.http.link"));
+            final URL startUrl = URI.create(org.openide.util.NbBundle.getMessage(WelcomeScreenTopComponent.class, "WelcomeScreenTopComponent.http.link")).toURL();
             final long lastMod = getModified(startUrl);
             NbPreferences.forModule(getClass()).putLong("LAST_PAGE_UPDATE", lastMod);
             
@@ -107,11 +108,11 @@ public final class WelcomeScreenTopComponent extends TopComponent implements Hyp
                         if (lastMod != 0)
                             jEditorPane1.setPage(startUrl);
                         else
-                            jEditorPane1.setPage(new URL(org.openide.util.NbBundle.getMessage(WelcomeScreenTopComponent.class, "WelcomeScreenTopComponent.local.link")));
+                            jEditorPane1.setPage(URI.create(org.openide.util.NbBundle.getMessage(WelcomeScreenTopComponent.class, "WelcomeScreenTopComponent.local.link")).toURL());
                     } catch (IOException ex) {
                         logger.log(Level.INFO, "Loading welcome page from web failed", ex);
                         try {
-                            jEditorPane1.setPage(new URL(org.openide.util.NbBundle.getMessage(WelcomeScreenTopComponent.class, "WelcomeScreenTopComponent.local.link")));
+                            jEditorPane1.setPage(URI.create(org.openide.util.NbBundle.getMessage(WelcomeScreenTopComponent.class, "WelcomeScreenTopComponent.local.link")).toURL());
                         } catch (IOException ex1) {
                             logger.log(Level.SEVERE, "Could not open local help page!", ex1);
                         }
@@ -138,7 +139,7 @@ public final class WelcomeScreenTopComponent extends TopComponent implements Hyp
     public static void checkOpen(long lastMod) {
         try {
             long lastCheck = NbPreferences.forModule(WelcomeScreenTopComponent.class).getLong("LAST_PAGE_UPDATE", 0);
-            URL startUrl = new URL(org.openide.util.NbBundle.getMessage(WelcomeScreenTopComponent.class, "WelcomeScreenTopComponent.http.link"));
+            URL startUrl = URI.create(org.openide.util.NbBundle.getMessage(WelcomeScreenTopComponent.class, "WelcomeScreenTopComponent.http.link")).toURL();
             if (lastMod == 0) {
                 lastMod = getModified(startUrl);
             }
@@ -172,7 +173,7 @@ public final class WelcomeScreenTopComponent extends TopComponent implements Hyp
                 logger.log(Level.INFO, "Loading page failed", ex);
                 try {
                     logger.log(Level.WARNING, "Could not open web page!");
-                    URL startUrl = new URL(org.openide.util.NbBundle.getMessage(WelcomeScreenTopComponent.class, "WelcomeScreenTopComponent.local.link"));
+                    URL startUrl = URI.create(org.openide.util.NbBundle.getMessage(WelcomeScreenTopComponent.class, "WelcomeScreenTopComponent.local.link")).toURL();
                     jEditorPane1.setPage(startUrl);
                 } catch (IOException ex1) {
                     logger.log(Level.SEVERE, "Could not open local help page!", ex1);

+ 2 - 1
jme3-welcome-screen/src/com/jme3/gde/welcome/rss/RssFeedParser.java

@@ -6,6 +6,7 @@ package com.jme3.gde.welcome.rss;
  */
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URI;
 import java.net.URL;
 import java.util.List;
 import javax.swing.text.BadLocationException;
@@ -35,7 +36,7 @@ public class RssFeedParser {
 
     public RssFeedParser(String feedUrl) {
         try {
-            this.url = new URL(feedUrl);
+            this.url = URI.create(feedUrl).toURL();
             ekit = new HTMLEditorKit();
             doc = new HTMLDocument();
         } catch (Exception e) {