diff options
Diffstat (limited to 'netx')
8 files changed, 14 insertions, 13 deletions
diff --git a/netx/net/sourceforge/jnlp/cache/CacheUtil.java b/netx/net/sourceforge/jnlp/cache/CacheUtil.java index ad90977..c5bb372 100644 --- a/netx/net/sourceforge/jnlp/cache/CacheUtil.java +++ b/netx/net/sourceforge/jnlp/cache/CacheUtil.java @@ -80,7 +80,7 @@ public class CacheUtil { rt.addResource(location, version, policy); try { File f = rt.getCacheFile(location); - return f.toURL(); + return f.toURI().toURL(); } catch (MalformedURLException ex) { return location; diff --git a/netx/net/sourceforge/jnlp/cache/ResourceTracker.java b/netx/net/sourceforge/jnlp/cache/ResourceTracker.java index df923f2..1e74f17 100644 --- a/netx/net/sourceforge/jnlp/cache/ResourceTracker.java +++ b/netx/net/sourceforge/jnlp/cache/ResourceTracker.java @@ -331,7 +331,7 @@ public class ResourceTracker { try { File f = getCacheFile(location); if (f != null) - return f.toURL(); + return f.toURI().toURL(); } catch (MalformedURLException ex) { if (JNLPRuntime.isDebug()) diff --git a/netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java b/netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java index a8c7638..99b576d 100644 --- a/netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java +++ b/netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java @@ -267,6 +267,7 @@ public class ApplicationInstance { /** * Stop the application and destroy its resources. */ + @SuppressWarnings("deprecation") public void destroy() { if (stopped) return; diff --git a/netx/net/sourceforge/jnlp/runtime/Boot.java b/netx/net/sourceforge/jnlp/runtime/Boot.java index 50ab81f..9f7c092 100644 --- a/netx/net/sourceforge/jnlp/runtime/Boot.java +++ b/netx/net/sourceforge/jnlp/runtime/Boot.java @@ -258,7 +258,7 @@ public final class Boot implements PrivilegedAction<Void> { try { if (new File(location).exists()) - url = new File(location).toURL(); // Why use file.getCanonicalFile? + url = new File(location).toURI().toURL(); // Why use file.getCanonicalFile? else url = new URL(ServiceUtil.getBasicService().getCodeBase(), location); } catch (Exception e) { diff --git a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java index b353a9d..e0d4d7a 100644 --- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java +++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java @@ -463,13 +463,13 @@ public class JNLPClassLoader extends URLClassLoader { for (JARDesc jarDesc: file.getResources().getJARs()) { try { File cachedFile = tracker.getCacheFile(jarDesc.getLocation()); - + if (cachedFile == null) { - System.err.println("JAR " + jarDesc.getLocation() + " not found. Continuing."); - continue; // JAR not found. Keep going. + System.err.println("JAR " + jarDesc.getLocation() + " not found. Continuing."); + continue; // JAR not found. Keep going. } - URL location = cachedFile.toURL(); + URL location = cachedFile.toURI().toURL(); SecurityDesc jarSecurity = file.getSecurity(); if (file instanceof PluginBridge) { @@ -651,7 +651,7 @@ public class JNLPClassLoader extends URLClassLoader { try { URL location = jar.getLocation(); // non-cacheable, use source location if (localFile != null) { - location = localFile.toURL(); // cached file + location = localFile.toURI().toURL(); // cached file // This is really not the best way.. but we need some way for // PluginAppletViewer::getCachedImageRef() to check if the image diff --git a/netx/net/sourceforge/jnlp/security/PasswordAuthenticationDialog.java b/netx/net/sourceforge/jnlp/security/PasswordAuthenticationDialog.java index 1ba0803..0014f94 100644 --- a/netx/net/sourceforge/jnlp/security/PasswordAuthenticationDialog.java +++ b/netx/net/sourceforge/jnlp/security/PasswordAuthenticationDialog.java @@ -184,7 +184,7 @@ public class PasswordAuthenticationDialog extends JDialog { /** * Present a dialog to the user asking them for authentication information - * + * * @param hostThe host for with authentication is needed * @param port The port being accessed * @param prompt The prompt (realm) as presented by the server @@ -198,7 +198,8 @@ public class PasswordAuthenticationDialog extends JDialog { // This frame is reusable. So reset everything first. userCancelled = true; - jlInfo.setText("<html>The " + type + " server at " + host + " is requesting authentication. It says \"" + prompt + "\"</html>"); + jlInfo.setText("<html>The " + type + " server at " + host + + " is requesting authentication. It says \"" + prompt + "\"</html>"); try { SwingUtilities.invokeAndWait( new Runnable() { @@ -225,7 +226,7 @@ public class PasswordAuthenticationDialog extends JDialog { } if (!userCancelled) { - auth = new PasswordAuthentication(jtfUserName.getText(), jpfPassword.getText().toCharArray()); + auth = new PasswordAuthentication(jtfUserName.getText(), jpfPassword.getPassword()); } } catch (Exception e) { e.printStackTrace(); diff --git a/netx/net/sourceforge/jnlp/tools/JarSigner.java b/netx/net/sourceforge/jnlp/tools/JarSigner.java index f841fc7..da7cf13 100644 --- a/netx/net/sourceforge/jnlp/tools/JarSigner.java +++ b/netx/net/sourceforge/jnlp/tools/JarSigner.java @@ -83,8 +83,6 @@ public class JarSigner implements CertVerifier { PrivateKey privateKey; KeyStore store; - IdentityScope scope; - String keystore; // key store file boolean nullStream = false; // null keystore input stream (NONE) boolean token = false; // token-based keystore diff --git a/netx/net/sourceforge/nanoxml/XMLElement.java b/netx/net/sourceforge/nanoxml/XMLElement.java index b712f93..f8fd369 100644 --- a/netx/net/sourceforge/nanoxml/XMLElement.java +++ b/netx/net/sourceforge/nanoxml/XMLElement.java @@ -674,6 +674,7 @@ public class XMLElement case '\t': case '\n': result.append(ch); + break; case '\r': break; default: |