/hg/icedtea-web: itw itself warning cleanup: fixed rawtypes and ...
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Fri Dec 13 01:40:21 PST 2013
changeset eb344d690bf1 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=eb344d690bf1
author: Jiri Vanek <jvanek at redhat.com>
date: Fri Dec 13 10:47:07 2013 +0100
itw itself warning cleanup: fixed rawtypes and unchecks, added braces and Override
After this clean up only "internal proprietary API and may be removed in a future release" warnings remain fro make check. Please keep itw in this way :)
remaining issues:
icedtea-web/netx/net/sourceforge/jnlp/cache/ResourceTracker.java:357: warning: [deprecation] toURL() in File has been deprecated
icedtea-web/netx/net/sourceforge/jnlp/cache/CacheUtil.java:128: warning: [deprecation] toURL() in File has been deprecated
icedtea-web/netx/net/sourceforge/jnlp/runtime/Boot.java:261: warning: [deprecation] toURL() in File has been deprecated
There have been a lot of work around cach x file x url escaping, and as main difference between file.tourl and file.touri.tourl is escapin, I rather left it.
icedtea-web/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java:804: warning: [deprecation] Ref in sun.misc has been deprecated
icedtea-web/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java:121: warning: [deprecation] Ref in sun.misc has been deprecated
What can be done?
icedtea-web/netx/net/sourceforge/jnlp/browser/BrowserAwareProxySelector.java:205: warning: [fallthrough] possible fall-through into case
icedtea-web/netx/net/sourceforge/jnlp/browser/BrowserAwareProxySelector.java:211: warning: [fallthrough] possible fall-through into case
This have to be fixed
diffstat:
ChangeLog | 36 +
netx/net/sourceforge/jnlp/JREDesc.java | 16 +-
netx/net/sourceforge/jnlp/Launcher.java | 91 ++-
netx/net/sourceforge/jnlp/Node.java | 29 +-
netx/net/sourceforge/jnlp/Parser.java | 2 +-
netx/net/sourceforge/jnlp/PluginBridge.java | 5 +-
netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java | 5 +-
netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java | 6 +-
netx/net/sourceforge/jnlp/controlpanel/CachePane.java | 27 +-
netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java | 10 +-
netx/net/sourceforge/jnlp/controlpanel/DebuggingPanel.java | 5 +-
netx/net/sourceforge/jnlp/controlpanel/DesktopShortcutPanel.java | 5 +-
netx/net/sourceforge/jnlp/controlpanel/TemporaryInternetFilesPanel.java | 2 +-
netx/net/sourceforge/jnlp/controlpanel/UnsignedAppletsTrustingListPanel.java | 25 +-
netx/net/sourceforge/jnlp/runtime/AppletEnvironment.java | 42 +-
netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java | 2 +-
netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java | 9 +-
netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java | 54 +-
netx/net/sourceforge/jnlp/security/CertWarningPane.java | 1 -
netx/net/sourceforge/jnlp/security/CertsInfoPane.java | 22 +-
netx/net/sourceforge/jnlp/security/appletextendedsecurity/impl/UnsignedAppletActionStorageImpl.java | 2 +-
netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java | 32 +-
netx/net/sourceforge/jnlp/services/ServiceUtil.java | 21 +-
netx/net/sourceforge/jnlp/splashscreen/impls/DefaultErrorSplashScreen2012.java | 12 +-
netx/net/sourceforge/jnlp/splashscreen/impls/defaultsplashscreen2012/NatCubic.java | 2 +-
netx/net/sourceforge/jnlp/splashscreen/impls/defaultsplashscreen2012/SplinesDefs.java | 10 +-
netx/net/sourceforge/jnlp/util/Reflect.java | 18 +-
netx/net/sourceforge/jnlp/util/ui/NonEditableTableModel.java | 4 +-
netx/net/sourceforge/nanoxml/XMLElement.java | 4 +-
plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java | 5 +-
plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java | 218 ++++++---
plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 70 ++-
tests/netx/unit/net/sourceforge/jnlp/ParserCornerCases.java | 2 +-
33 files changed, 509 insertions(+), 285 deletions(-)
diffs (truncated from 2715 to 500 lines):
diff -r 540234db8ce7 -r eb344d690bf1 ChangeLog
--- a/ChangeLog Fri Dec 13 09:54:16 2013 +0100
+++ b/ChangeLog Fri Dec 13 10:47:07 2013 +0100
@@ -1,3 +1,39 @@
+2013-12-13 Jiri Vanek <jvanek at redhat.com>
+
+ itw itself warning cleanup: fixed rawtypes and unchecks, added braces and Override
+ * netx/net/sourceforge/jnlp/JREDesc.java
+ * netx/net/sourceforge/jnlp/Launcher.java
+ * netx/net/sourceforge/jnlp/Node.java
+ * netx/net/sourceforge/jnlp/Parser.java
+ * netx/net/sourceforge/jnlp/PluginBridge.java
+ * netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java
+ * netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java
+ * netx/net/sourceforge/jnlp/controlpanel/CachePane.java
+ * netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java
+ * netx/net/sourceforge/jnlp/controlpanel/DebuggingPanel.java
+ * netx/net/sourceforge/jnlp/controlpanel/DesktopShortcutPanel.java
+ * netx/net/sourceforge/jnlp/controlpanel/TemporaryInternetFilesPanel.java
+ * netx/net/sourceforge/jnlp/controlpanel/UnsignedAppletsTrustingListPanel.java
+ * netx/net/sourceforge/jnlp/runtime/AppletEnvironment.java
+ * netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java
+ * netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java
+ * netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java
+ * netx/net/sourceforge/jnlp/security/CertWarningPane.java
+ * netx/net/sourceforge/jnlp/security/CertsInfoPane.java
+ * netx/net/sourceforge/jnlp/security/appletextendedsecurity/impl/UnsignedAppletActionStorageImpl.java
+ * netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java
+ * netx/net/sourceforge/jnlp/services/ServiceUtil.java
+ * netx/net/sourceforge/jnlp/splashscreen/impls/DefaultErrorSplashScreen2012.java
+ * netx/net/sourceforge/jnlp/splashscreen/impls/defaultsplashscreen2012/NatCubic.java
+ * netx/net/sourceforge/jnlp/splashscreen/impls/defaultsplashscreen2012/SplinesDefs.java
+ * netx/net/sourceforge/jnlp/util/Reflect.java
+ * netx/net/sourceforge/jnlp/util/ui/NonEditableTableModel.java
+ * netx/net/sourceforge/nanoxml/XMLElement.java
+ * plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java
+ * plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java
+ * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
+ * tests/netx/unit/net/sourceforge/jnlp/ParserCornerCases.java
+
2013-12-13 Jiri Vanek <jvanek at redhat.com>
unittests warning cleanup: fixed typechecks, rawtypes, redundant casts...
diff -r 540234db8ce7 -r eb344d690bf1 netx/net/sourceforge/jnlp/JREDesc.java
--- a/netx/net/sourceforge/jnlp/JREDesc.java Fri Dec 13 09:54:16 2013 +0100
+++ b/netx/net/sourceforge/jnlp/JREDesc.java Fri Dec 13 10:47:07 2013 +0100
@@ -30,22 +30,22 @@
public class JREDesc {
/** the platform version or the product version if location is not null */
- private Version version;
+ final private Version version;
/** the location of a JRE product or null */
- private URL location;
+ final private URL location;
/** inital heap size */
- private String initialHeapSize;
+ final private String initialHeapSize;
/** maximum head size */
- private String maximumHeapSize;
+ final private String maximumHeapSize;
/** args to pass to the vm */
- private String vmArgs;
+ final private String vmArgs;
/** list of ResourceDesc objects */
- private List resources;
+ final private List<ResourcesDesc> resources;
/**
* Create a JRE descriptor.
@@ -59,7 +59,7 @@
*/
public JREDesc(Version version, URL location,
String vmArgs, String initialHeapSize,
- String maximumHeapSize, List resources) throws ParseException {
+ String maximumHeapSize, List<ResourcesDesc> resources) throws ParseException {
this.version = version;
this.location = location;
this.vmArgs = vmArgs;
@@ -112,7 +112,7 @@
/**
* Returns the resources defined for this JRE.
*/
- public List getResourcesDesc() {
+ public List<ResourcesDesc> getResourcesDesc() {
return resources;
}
diff -r 540234db8ce7 -r eb344d690bf1 netx/net/sourceforge/jnlp/Launcher.java
--- a/netx/net/sourceforge/jnlp/Launcher.java Fri Dec 13 09:54:16 2013 +0100
+++ b/netx/net/sourceforge/jnlp/Launcher.java Fri Dec 13 10:47:07 2013 +0100
@@ -44,7 +44,6 @@
import javax.swing.SwingUtilities;
import javax.swing.text.html.parser.ParserDelegator;
-import net.sourceforge.jnlp.runtime.AppletEnvironment;
import net.sourceforge.jnlp.splashscreen.SplashUtils;
import net.sourceforge.jnlp.util.logging.OutputController;
@@ -92,8 +91,9 @@
public Launcher() {
this(null, null);
- if (handler == null)
+ if (handler == null) {
handler = JNLPRuntime.getDefaultLaunchHandler();
+ }
}
/**
@@ -105,8 +105,9 @@
public Launcher(boolean exitOnFailure) {
this(null, null);
- if (handler == null)
+ if (handler == null) {
handler = JNLPRuntime.getDefaultLaunchHandler();
+ }
this.exitOnFailure = exitOnFailure;
}
@@ -141,8 +142,9 @@
* Sets the update policy used by launched applications.
*/
public void setUpdatePolicy(UpdatePolicy policy) {
- if (policy == null)
+ if (policy == null) {
throw new IllegalArgumentException(R("LNullUpdatePolicy"));
+ }
this.updatePolicy = policy;
}
@@ -237,12 +239,15 @@
}
}
- if (file instanceof PluginBridge && cont != null)
+ if (file instanceof PluginBridge && cont != null) {
tg = new TgThread(file, cont, true);
- else if (cont == null)
+ }
+ else if (cont == null) {
tg = new TgThread(file);
- else
+ }
+ else {
tg = new TgThread(file, cont);
+ }
tg.start();
@@ -253,11 +258,13 @@
throw launchWarning(new LaunchException(file, ex, R("LSMinor"), R("LCSystem"), R("LThreadInterrupted"), R("LThreadInterruptedInfo")));
}
- if (tg.getException() != null)
- throw tg.getException(); // passed to handler when first created
+ if (tg.getException() != null) {
+ throw tg.getException();
+ } // passed to handler when first created
- if (handler != null)
+ if (handler != null) {
handler.launchCompleted(tg.getApplication());
+ }
return tg.getApplication();
}
@@ -378,12 +385,15 @@
public void launchExternal(List<String> vmArgs, JNLPFile file, List<String> javawsArgs) throws LaunchException {
List<String> updatedArgs = new LinkedList<String>(javawsArgs);
- if (file.getFileLocation() != null)
+ if (file.getFileLocation() != null) {
updatedArgs.add(file.getFileLocation().toString());
- else if (file.getSourceLocation() != null)
+ }
+ else if (file.getSourceLocation() != null) {
updatedArgs.add(file.getFileLocation().toString());
- else
+ }
+ else {
launchError(new LaunchException(file, null, R("LSFatal"), R("LCExternalLaunch"), R("LNullLocation"), R("LNullLocationInfo")));
+ }
launchExternal(vmArgs, updatedArgs);
@@ -444,9 +454,7 @@
*/
private JNLPFile fromUrl(URL location) throws LaunchException {
try {
- JNLPFile file = null;
-
- file = new JNLPFile(location, parserSettings);
+ JNLPFile file = new JNLPFile(location, parserSettings);
boolean isLocal = false;
boolean haveHref = false;
@@ -476,8 +484,9 @@
* from a thread in the application's thread group.
*/
protected ApplicationInstance launchApplication(JNLPFile file) throws LaunchException {
- if (!file.isApplication())
+ if (!file.isApplication()) {
throw launchError(new LaunchException(file, null, R("LSFatal"), R("LCClient"), R("LNotApplication"), R("LNotApplicationInfo")));
+ }
try {
@@ -521,10 +530,11 @@
}
}
- if (mainName == null)
+ if (mainName == null) {
throw launchError(new LaunchException(file, null,
R("LSFatal"), R("LCClient"), R("LCantDetermineMainClass"),
R("LCantDetermineMainClassInfo")));
+ }
Class<?> mainClass = app.getClassLoader().loadClass(mainName);
@@ -533,6 +543,7 @@
SwingUtilities.invokeAndWait(new Runnable() {
// dummy method to force Event Dispatch Thread creation
+ @Override
public void run() {
}
});
@@ -696,17 +707,18 @@
// appletInstance is needed by ServiceManager when looking up
// services. This could potentially be done in applet constructor
// so initialize appletInstance before creating applet.
- if (cont == null)
- appletInstance = new AppletInstance(file, group, loader, null);
- else
- appletInstance = new AppletInstance(file, group, loader, null, cont);
+ if (cont == null) {
+ appletInstance = new AppletInstance(file, group, loader, null);
+ } else {
+ appletInstance = new AppletInstance(file, group, loader, null, cont);
+ }
loader.setApplication(appletInstance);
// Initialize applet now that ServiceManager has access to its
// appletInstance.
String appletName = file.getApplet().getMainClass();
- Class appletClass = loader.loadClass(appletName);
+ Class<?> appletClass = loader.loadClass(appletName);
Applet applet = (Applet) appletClass.newInstance();
applet.setStub((AppletStub)cont);
// Finish setting up appletInstance.
@@ -738,7 +750,7 @@
}
String appletName = file.getApplet().getMainClass();
- Class appletClass = loader.loadClass(appletName);
+ Class<?> appletClass = loader.loadClass(appletName);
Applet applet = (Applet) appletClass.newInstance();
return applet;
@@ -772,7 +784,7 @@
* ThreadGroup has to be created at an earlier point in the applet code.
*/
protected ThreadGroup createThreadGroup(JNLPFile file) {
- ThreadGroup tg = null;
+ final ThreadGroup tg;
if (file instanceof PluginBridge) {
tg = Thread.currentThread().getThreadGroup();
@@ -795,8 +807,9 @@
if (applet != null) {
SplashUtils.showErrorCaught(ex, applet);
}
- if (handler != null)
+ if (handler != null) {
handler.launchError(ex);
+ }
return ex;
}
@@ -809,10 +822,11 @@
* @return an exception to throw if the launch should be aborted, or null otherwise
*/
private LaunchException launchWarning(LaunchException ex) {
- if (handler != null)
+ if (handler != null) {
if (!handler.launchWarning(ex))
// no need to destroy the app b/c it hasn't started
- return ex; // chose to abort
+ return ex;
+ } // chose to abort
return null; // chose to continue, or no handler
}
@@ -863,12 +877,14 @@
this.isPlugin = isPlugin;
}
+ @Override
public void run() {
try {
// Do not create new AppContext if we're using NetX and icedteaplugin.
// The plugin needs an AppContext too, but it has to be created earlier.
- if (context && !isPlugin)
+ if (context && !isPlugin) {
SunToolkit.createNewAppContext();
+ }
doPerApplicationAppContextHacks();
@@ -877,23 +893,28 @@
JNLPRuntime.setDefaultDownloadIndicator(null);
application = getApplet(file, ((PluginBridge)file).codeBaseLookup(), cont);
} else {
- if (file.isApplication())
+ if (file.isApplication()) {
application = launchApplication(file);
- else if (file.isApplet())
- application = launchApplet(file, true, cont); // enable applet code base
- else if (file.isInstaller())
+ }
+ else if (file.isApplet()) {
+ application = launchApplet(file, true, cont);
+ } // enable applet code base
+ else if (file.isInstaller()) {
application = launchInstaller(file);
- else
+ }
+ else {
throw launchError(new LaunchException(file, null,
R("LSFatal"), R("LCClient"), R("LNotLaunchable"),
R("LNotLaunchableInfo")));
+ }
}
} catch (LaunchException ex) {
OutputController.getLogger().log(OutputController.Level.ERROR_ALL, ex);
exception = ex;
// Exit if we can't launch the application.
- if (exitOnFailure)
+ if (exitOnFailure) {
JNLPRuntime.exit(1);
+ }
}
}
diff -r 540234db8ce7 -r eb344d690bf1 netx/net/sourceforge/jnlp/Node.java
--- a/netx/net/sourceforge/jnlp/Node.java Fri Dec 13 09:54:16 2013 +0100
+++ b/netx/net/sourceforge/jnlp/Node.java Fri Dec 13 10:47:07 2013 +0100
@@ -63,13 +63,16 @@
}
Node getFirstChild() {
- if (children == null)
+ if (children == null) {
getChildNodes();
+ }
- if (children.length == 0)
+ if (children.length == 0) {
return null;
- else
+ }
+ else {
return children[0];
+ }
}
Node getNextSibling() {
@@ -87,13 +90,15 @@
if (children == null) {
List<Node> list = new ArrayList<Node>();
- for (Enumeration e = xml.enumerateChildren(); e.hasMoreElements();)
- list.add(new Node((XMLElement) e.nextElement()));
+ for (Enumeration<XMLElement> e = xml.enumerateChildren(); e.hasMoreElements();) {
+ list.add(new Node(e.nextElement()));
+ }
children = list.toArray(new Node[list.size()]);
- for (int i = 0; i < children.length - 1; i++)
+ for (int i = 0; i < children.length - 1; i++) {
children[i].next = children[i + 1];
+ }
}
return children;
@@ -107,8 +112,9 @@
if (attributeNames == null) {
attributeNames= new ArrayList<String>();
- for (Enumeration e = xml.enumerateAttributeNames(); e.hasMoreElements();)
- attributeNames.add(new String((String) e.nextElement()));
+ for (Enumeration<String> e = xml.enumerateAttributeNames(); e.hasMoreElements();) {
+ attributeNames.add(new String(e.nextElement()));
+ }
}
return attributeNames;
@@ -119,12 +125,15 @@
}
String getNodeName() {
- if (xml.getName() == null)
+ if (xml.getName() == null) {
return "";
- else
+ }
+ else {
return xml.getName();
+ }
}
+ @Override
public String toString() {
return getNodeName();
}
diff -r 540234db8ce7 -r eb344d690bf1 netx/net/sourceforge/jnlp/Parser.java
--- a/netx/net/sourceforge/jnlp/Parser.java Fri Dec 13 09:54:16 2013 +0100
+++ b/netx/net/sourceforge/jnlp/Parser.java Fri Dec 13 10:47:07 2013 +0100
@@ -345,7 +345,7 @@
}
String initialHeap = getAttribute(node, "initial-heap-size", null);
String maxHeap = getAttribute(node, "max-heap-size", null);
- List resources = getResources(node, true);
+ List<ResourcesDesc> resources = getResources(node, true);
// require version attribute
getRequiredAttribute(node, "version", null);
diff -r 540234db8ce7 -r eb344d690bf1 netx/net/sourceforge/jnlp/PluginBridge.java
--- a/netx/net/sourceforge/jnlp/PluginBridge.java Fri Dec 13 09:54:16 2013 +0100
+++ b/netx/net/sourceforge/jnlp/PluginBridge.java Fri Dec 13 10:47:07 2013 +0100
@@ -324,7 +324,10 @@
} catch (MalformedURLException ex) { /* Ignored */
}
} else if (launchType.equals(ExtensionDesc.class)) {
- return (List<T>) extensionJars; // this list is populated when the PluginBridge is first constructed
+ // We hope this is a safe list of JarDesc objects
+ @SuppressWarnings("unchecked")
+ List<T> castList = (List<T>) extensionJars; // this list is populated when the PluginBridge is first constructed
+ return castList;
}
return sharedResources.getResources(launchType);
}
diff -r 540234db8ce7 -r eb344d690bf1 netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java
--- a/netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java Fri Dec 13 09:54:16 2013 +0100
+++ b/netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java Fri Dec 13 10:47:07 2013 +0100
@@ -221,8 +221,11 @@
*
* @return List of Strings sorted by ascending order.
*/
+ @SuppressWarnings({"unchecked", "rawtypes"})
+ //although Properties are pretending to be <object,Object> they are always <String,String>
+ //bug in jdk?
public synchronized List<Entry<String, String>> getLRUSortedEntries() {
- ArrayList<Entry<String, String>> entries = new ArrayList(cacheOrder.entrySet());
+ List<Entry<String, String>> entries = new ArrayList(cacheOrder.entrySet());
// sort by keys in descending order.
Collections.sort(entries, new Comparator<Entry<String, String>>() {
@Override
diff -r 540234db8ce7 -r eb344d690bf1 netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java
--- a/netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java Fri Dec 13 09:54:16 2013 +0100
+++ b/netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java Fri Dec 13 10:47:07 2013 +0100
@@ -515,7 +515,7 @@
OutputController.getLogger().log("Using System level" + DEPLOYMENT_PROPERTIES + ": "
+ systemPropertiesFile);
Setting<String> mandatory = systemConfiguration.get("deployment.system.config.mandatory");
- systemPropertiesMandatory = Boolean.valueOf(mandatory == null ? null : (String) mandatory.getValue());
+ systemPropertiesMandatory = Boolean.valueOf(mandatory == null ? null : mandatory.getValue());
return true;
} else {
OutputController.getLogger().log("Remote + " + DEPLOYMENT_PROPERTIES + " not supported");
@@ -580,8 +580,8 @@
for (String key : currentConfiguration.keySet()) {
String oldValue = unchangeableConfiguration.get(key) == null ? null
- : (String) unchangeableConfiguration.get(key).getValue();
- String newValue = currentConfiguration.get(key) == null ? null : (String) currentConfiguration
+ : unchangeableConfiguration.get(key).getValue();
+ String newValue = currentConfiguration.get(key) == null ? null : currentConfiguration
.get(key).getValue();
if (oldValue == null && newValue == null) {
continue;
diff -r 540234db8ce7 -r eb344d690bf1 netx/net/sourceforge/jnlp/controlpanel/CachePane.java
--- a/netx/net/sourceforge/jnlp/controlpanel/CachePane.java Fri Dec 13 09:54:16 2013 +0100
+++ b/netx/net/sourceforge/jnlp/controlpanel/CachePane.java Fri Dec 13 10:47:07 2013 +0100
@@ -110,14 +110,15 @@
cacheTable = new JTable(model);
cacheTable.getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
cacheTable.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
+ @Override
final public void valueChanged(ListSelectionEvent listSelectionEvent) {
More information about the distro-pkg-dev
mailing list