aboutsummaryrefslogtreecommitdiffstats
path: root/plugin/icedteanp/java/netscape/javascript/JSException.java
diff options
context:
space:
mode:
authorAndrew John Hughes <[email protected]>2010-12-03 00:30:45 +0000
committerAndrew John Hughes <[email protected]>2010-12-03 00:30:45 +0000
commit8ddaf6d039146a442d35a7a31bfd48b061d456ff (patch)
tree023d91ea69877ae494e83bc01711c26c2ba41245 /plugin/icedteanp/java/netscape/javascript/JSException.java
parentcad9500675e6a5dd9600a55fbe6dcb9523d23609 (diff)
Fix warnings produced by NetX and the plugin (both Java and C++).
2010-12-01 Andrew John Hughes <[email protected]> * 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.
Diffstat (limited to 'plugin/icedteanp/java/netscape/javascript/JSException.java')
-rw-r--r--plugin/icedteanp/java/netscape/javascript/JSException.java29
1 files changed, 16 insertions, 13 deletions
diff --git a/plugin/icedteanp/java/netscape/javascript/JSException.java b/plugin/icedteanp/java/netscape/javascript/JSException.java
index 96ba310..5fbb750 100644
--- a/plugin/icedteanp/java/netscape/javascript/JSException.java
+++ b/plugin/icedteanp/java/netscape/javascript/JSException.java
@@ -68,13 +68,14 @@ class JSException extends RuntimeException {
*
* @deprecated Not for public use in future versions.
*/
+ @Deprecated
public JSException() {
- super();
+ super();
filename = "unknown";
lineno = 0;
source = "";
tokenIndex = 0;
- wrappedExceptionType = EXCEPTION_TYPE_EMPTY;
+ wrappedExceptionType = EXCEPTION_TYPE_EMPTY;
}
/**
@@ -84,26 +85,27 @@ class JSException extends RuntimeException {
*
* @deprecated Not for public use in future versions.
*/
+ @Deprecated
public JSException(String s) {
- super(s);
+ super(s);
filename = "unknown";
lineno = 0;
source = "";
tokenIndex = 0;
- wrappedExceptionType = EXCEPTION_TYPE_EMPTY;
+ wrappedExceptionType = EXCEPTION_TYPE_EMPTY;
}
/**
* Constructs a JSException with a wrapped JavaScript exception object.
- * This constructor needs to be public so that Java users can throw
+ * This constructor needs to be public so that Java users can throw
* exceptions to JS cleanly.
*/
public JSException(int wrappedExceptionType, Object wrappedException) {
- super();
- this.wrappedExceptionType = wrappedExceptionType;
- this.wrappedException = wrappedException;
+ super();
+ this.wrappedExceptionType = wrappedExceptionType;
+ this.wrappedException = wrappedException;
}
-
+
/**
* Constructs a JSException with a detail message and all the
* other info that usually comes with a JavaScript error.
@@ -111,14 +113,15 @@ class JSException extends RuntimeException {
*
* @deprecated Not for public use in future versions.
*/
+ @Deprecated
public JSException(String s, String filename, int lineno,
String source, int tokenIndex) {
- super(s);
+ super(s);
this.filename = filename;
this.lineno = lineno;
this.source = source;
this.tokenIndex = tokenIndex;
- wrappedExceptionType = EXCEPTION_TYPE_EMPTY;
+ wrappedExceptionType = EXCEPTION_TYPE_EMPTY;
}
/**
@@ -126,14 +129,14 @@ class JSException extends RuntimeException {
* type of the wrappedException Object.
*/
public int getWrappedExceptionType() {
- return wrappedExceptionType;
+ return wrappedExceptionType;
}
/**
* Instance method getWrappedException.
*/
public Object getWrappedException() {
- return wrappedException;
+ return wrappedException;
}
}