From 8ddaf6d039146a442d35a7a31bfd48b061d456ff Mon Sep 17 00:00:00 2001
From: Andrew John Hughes <ahughes@redhat.com>
Date: Fri, 3 Dec 2010 00:30:45 +0000
Subject: Fix warnings produced by NetX and the plugin (both Java and C++).
2010-12-01 Andrew John Hughes <ahughes@redhat.com>
* netx/net/sourceforge/jnlp/cache/CacheUtil.java:
(getCachedResource(URL,Version,UpdatePolicy)): Use
toURI().toURL() to avoid broken escaping.
* netx/net/sourceforge/jnlp/cache/ResourceTracker.java:
(getCacheURL(URL)): Likewise.
* netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java:
(destroy()): Suppress deprecated warning from use of thread.stop().
Only use when interrupt() has already been tried.
* netx/net/sourceforge/jnlp/runtime/Boot.java:
(getFile()): Use toURI.toURL() to avoid broken escaping.
* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java:
(initializeResources()): Likewise.
* netx/net/sourceforge/jnlp/security/PasswordAuthenticationDialog.java:
(askUser(String,int,String,String)): Use getPassword() to retrieve
a character array directly. Fix overrunning line.
* netx/net/sourceforge/jnlp/tools/JarSigner.java:
Remove unused IdentityScope variable, scope.
* netx/net/sourceforge/nanoxml/XMLElement.java:
(scanWhitespace(StringBuffer)): Don't fallthrough.
* plugin/icedteanp/IcedTeaPluginRequestProcessor.cc:
Fix warnings where std::string is used in printf
rather than char* by invoking c_str on these strings.
* plugin/icedteanp/java/netscape/javascript/JSException.java:
(JSException()): Mark with @Deprecated annotation.
(JSException(String)): Likewise.
(JSException(String,String,int,String,int)): Likewise.
* plugin/icedteanp/java/netscape/javascript/JSObject.java:
(JSObject(String)): Remove redundant cast.
(getWindow(Applet)): Likewise.
* plugin/icedteanp/java/sun/applet/AppletSecurityContextManager.java:
(contexts): Initialise properly with generic typing.
* plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java:
(getMatchingMethod(Object[]): Add missing generic type to Class
instances.
(getMatchingConstructor(Object[])): Likewise.
(getCostAndCastedObject(Object,Class<?>)): Likewise.
(getMatchingMethods(Class<?>,String,int)): Likewise.
(getMatchingConstructors(Class<?>,int)): Likewise.
(getNum(String,Class<?>)): Likewise.
* plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java:
(parseCall(String,ClassLoader,Class<V>)): Use c.cast rather than (V).
(handleMessage(int,String,AccessControlContext,String)): Add
missing generic type to Class instances. Remove redundant casts.
(prepopulateField(int,String)): Add missing generic type to Class instance.
* plugin/icedteanp/java/sun/applet/PluginAppletViewer.java:
(createPanel(PluginStreamHandler,int,long,URL,Hashtable<String,String>)):
Add missing generic types on Hashtable and PrivilegedAction.
(initEventQueue(AppletPanel)): Add missing generic type to PrivilegedAction.
(splitSeparator(String,String)): Use an ArrayList rather than Vector
to avoid locking and use generic types.
(requests): Initialise properly with generic typing.
(applets): Likewise.
(appletStateChanged(AppletEvent)): Use setSize and getPreferredSize.
(handleMessage(int,String)): Remove redundant casts.
(audioClips): Add generic types.
(getAudioClip): Remove redundant cast.
(imageRefs): Add generic types.
(getCachedImageRef(URL)): Remove redundant cast.
(appletPanels): Add generic types.
(getApplets()): Likewise.
(getStream(String)): Mark with @Override.
(getStreamKeys()): Likewise.
(systemParam): Add generic types.
(printTag(PrintStream,Hashtable<String,String>)): Likewise.
Remove redundant casts.
(updateAtts()): Use getSize() and getInsets(). Use Integer.valueOf().
(appletReload()): Add generic types to PrivilegedAction.
(scanIdentifier(int[],Reader)): Use StringBuilder to avoid unnecessary
locking.
(skipComment(int[],Reader)): Likewise.
(scanTag(int[],Reader)): Likewise. Add generic types.
(parse(int,long,String,String,Reader,URL)): Use PrivilegedExceptionAction
to avoid catching and rethrowing the exception manually. Add generic types.
(parse(int,long,String,String,Reader,URL,PrintStream,PluginAppletPanelFactory)):
Add generic types. Remove unnecessary casts. Fix overlong lines.
* plugin/icedteanp/java/sun/applet/PluginMain.java:
(init()): Add generic types. Remove unnecessary cast.
* plugin/icedteanp/java/sun/applet/PluginObjectStore.java:
(objects): Initialise properly with generic typing.
(counts): Likewise.
(identifiers): Likewise.
* plugin/icedteanp/java/sun/applet/PluginProxySelector.java:
(get(Object)): Suppress unchecked warning arising from cast to K.
---
netx/net/sourceforge/jnlp/cache/CacheUtil.java | 2 +-
netx/net/sourceforge/jnlp/cache/ResourceTracker.java | 2 +-
netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java | 1 +
netx/net/sourceforge/jnlp/runtime/Boot.java | 2 +-
netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 10 +++++-----
.../jnlp/security/PasswordAuthenticationDialog.java | 7 ++++---
netx/net/sourceforge/jnlp/tools/JarSigner.java | 2 --
netx/net/sourceforge/nanoxml/XMLElement.java | 1 +
8 files changed, 14 insertions(+), 13 deletions(-)
(limited to 'netx')
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:
--
cgit v1.2.3