/hg/icedtea-web: Fix most warnings arising from NetX code.
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Oct 21 13:12:27 PDT 2010
changeset 85db7b3a1c93 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=85db7b3a1c93
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Oct 21 21:12:21 2010 +0100
Fix most warnings arising from NetX code.
2010-10-20 Andrew John Hughes <ahughes at redhat.com>
* netx/javax/jnlp/ServiceManager.java:
(lookupTable): Add generic types.
* netx/net/sourceforge/jnlp/AppletDesc.java: (parameters):
Likewise. (AppletDesc(String,String,URL,int,int,Map)):
Likewise. (getParameters()): Likewise.
* netx/net/sourceforge/jnlp/ApplicationDesc.java:
(getArguments()): Remove redundant cast.
(addArgument(String)): Add generic typing.
* netx/net/sourceforge/jnlp/ExtensionDesc.java: (extToPart):
Add generic types. (eagerExtParts): Likewise.
* netx/net/sourceforge/jnlp/InformationDesc.java: (info):
Likewise. (getIcons(Object)): Add generic typing.
(getAssociations()): Likewise. (getRelatedContents()):
Likewise. (getItem(Object)): Likewise.
(getItems(Object)): Likewise. (addItem(String,Object)):
Likewise.
* netx/net/sourceforge/jnlp/JNLPFile.java: (resources):
Likewise. (InformationDesc.getItems(Object)): Likewise.
(getResources(Class)): Likewise.
* netx/net/sourceforge/jnlp/LaunchException.java:
(getCauses()): Likewise.
* netx/net/sourceforge/jnlp/Launcher.java:
(launchApplication(JNLPFile)): Likewise.
* netx/net/sourceforge/jnlp/NetxPanel.java:
(NetxPanel(URL,Hashtable)): Likewise.
(NetxPanel(URL,Hashtable,boolean)): Likewise.
* netx/net/sourceforge/jnlp/Node.java: (getChildNodes()):
Likewise.
* netx/net/sourceforge/jnlp/Parser.java:
(getResources(Node,boolean)): Likewise. (getInfo(Node)):
Likewise. (getInformationDesc(Node)): Likewise.
(getApplet(Node)): Likewise. (getApplication(Node)):
Likewise. (splitString(String)): Likewise.
(getLocales(Node)): Likewise. (getChildNodes(Node,String)):
Likewise.
* netx/net/sourceforge/jnlp/PluginBridge.java: Fix variable
naming and add generic types. (cacheJars): Changed from
cache_jars. (cacheExJars): Changed from cache_ex-jars.
(atts): Add generic typing.
(PluginBridge(URL,URL,String,String,int,int,Hashtable)): Likewise.
(getInformation(Locale)): Likewise.
(getResources(Locale,String,String)): Likewise. (getJARs()):
Avoid excessive copying; filtering already performed by
getResources in JNLPFile.
* netx/net/sourceforge/jnlp/ResourcesDesc.java: (resources):
Add generic typing. (getJREs()): Likewise.
(getJARs()): Likewise. (getJARs(String)): Likewise.
(getExtensions()): Likewise. (getPackages()): Likewise.
(getPackages(String)): Likewise. (getProperties()):
Likewise. (getPropertiesMap()): Likewise.
(getResources(Class)): Make generic.
* netx/net/sourceforge/jnlp/Version.java: (matches(Version)):
Add generic types. (matchesAny(Version)): Likewise.
(matchesSingle(String)): Likewise. (matches(String,String)):
Likewise. (equal(List,List)): Likewise.
(greater(List,List)): Likewise. (compare(String,String)):
Use Integer.valueOf. (normalize(List,int)): Add generic
types, using a List of lists rather than an array of lists.
(getVersionStrings()): Add generic types. (getParts()):
Likewise.
* netx/net/sourceforge/jnlp/cache/CacheUtil.java:
(waitForResources(ApplicationInstance,ResourceTracker,
URL,String)): Likewise.
* netx/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java:
(getListener(ApplicatonInstance,String,URL)): Use setVisible instead
of show(). (disposeListener(DownloadServiceListener)): Use
setVisible instead of hide(). (DownloadPanel.urls):
Add generic typing. (DownloadPanel.panels): Likewise.
(DownloadPanel.update(URL,String,long,long,int)): Fix formatting.
Add generic types.
* netx/net/sourceforge/jnlp/cache/Resource.java: (resources):
Add generic typing. (trackers): Likewise.
(getResource(URL,Version,UpdatePolicy)): Use generic types.
(getTracker()): Likewise. (addTracker(ResourceTracker)):
Likewise. (fireDownloadEvent()): Likewise.
* netx/net/sourceforge/jnlp/cache/ResourceTracker.java:
(prefetchTrackers): Add generic typing. (queue): Likewise.
(active): Likewise. (resources): Likewise.
(listeners): Likewise. (fireDownloadEvent(Resource)): Remove
unneeded cast. (getPrefetch()): Use generic typing.
(selectByFlag(List,int,int)): Likewise. (getResource(URL)):
Likewise.
* netx/net/sourceforge/jnlp/runtime/AppletEnvironment.java:
(weakClips): Add generic types. (destroy()): Use generic
typing. (getApplets()): Likewise. (getStreamKeys()):
Likewise.
* netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java:
(weakWindows): Add generic types. (installEnvironment()):
Likewise. (destroy()): Remove redundant cast.
* netx/net/sourceforge/jnlp/runtime/Boot.java: Extend
PrivilegedAction<Void>. (run()): Add generic typing.
(getOptions(String)): Likewise.
* netx/net/sourceforge/jnlp/runtime/Boot13.java:
(main(String[]): Likewise.
* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: Fix
formatting. (urlToLoader): Add generic types.
(resourcePermissions): Likewise. (available): Likewise.
(jarEntries): Likewise.
(getInstance(JNLPFile,UpdatePolicy)): Remove redundant cast.
(getInstance(URL,String,Version,UpdatePolicy)): Likewise.
(initializeExtensions()): Add generic types.
(initializePermissions()): Likewise.
(initializeResources()): Likewise.
(getPermissions(CodeSource)): Likewise.
(fillInPartJars(List)): Likewise. (activateJars(List)):
Likewise. (loadClass(String)): Likewise. Suppress warnings
due to sun.misc.JarIndex usage.
(findResources(String)): Mark as overriding. Add generic
types. (getExtensionName()): Add @Deprecated annotation.
(getExtensionHREF()): Likewise.
* netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java:
(weakWindows): Add generic typing. (weakApplications):
Likewise. (getApplication(Window)): Remove redundant casts.
Add w, which is window cast to Window.
* netx/net/sourceforge/jnlp/services/ServiceUtil.java:
(invoke(Object,Method,Object[])): Use generic types.
* netx/net/sourceforge/jnlp/services/XPersistenceService.java:
(getNames(URL)): Likewise.
* netx/net/sourceforge/jnlp/tools/JarSigner.java:
(verifyJars(List,ResourceTracker)): Remove redundant cast.
* netx/net/sourceforge/jnlp/util/WeakList.java: Redesign as a
generic type. (refs): Add generic types.
(deref(WeakReference)): Likewise. (get(int)): Likewise.
(set(int,Object)): Likewise. (add(int,E)): Likewise.
(remove()): Likewise. (hardList()): Likewise.
* netx/net/sourceforge/nanoxml/XMLElement.java: (attributes):
Add generic typing. (children): Likewise.
(entities): Likewise. (XMLElement()): Use generic types.
(XMLElement(Hashtable): Likewise.
(resolveEntity(StringBuffer)): Remove redundant cast.
diffstat:
30 files changed, 484 insertions(+), 307 deletions(-)
ChangeLog | 169 ++++++++++
netx/javax/jnlp/ServiceManager.java | 3
netx/net/sourceforge/jnlp/AppletDesc.java | 11
netx/net/sourceforge/jnlp/ApplicationDesc.java | 6
netx/net/sourceforge/jnlp/ExtensionDesc.java | 4
netx/net/sourceforge/jnlp/InformationDesc.java | 25 -
netx/net/sourceforge/jnlp/JNLPFile.java | 12
netx/net/sourceforge/jnlp/LaunchException.java | 4
netx/net/sourceforge/jnlp/Launcher.java | 6
netx/net/sourceforge/jnlp/NetxPanel.java | 5
netx/net/sourceforge/jnlp/Node.java | 4
netx/net/sourceforge/jnlp/Parser.java | 35 +-
netx/net/sourceforge/jnlp/PluginBridge.java | 140 +++-----
netx/net/sourceforge/jnlp/ResourcesDesc.java | 50 +-
netx/net/sourceforge/jnlp/Version.java | 59 +--
netx/net/sourceforge/jnlp/cache/CacheUtil.java | 4
netx/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java | 14
netx/net/sourceforge/jnlp/cache/Resource.java | 17 -
netx/net/sourceforge/jnlp/cache/ResourceTracker.java | 25 -
netx/net/sourceforge/jnlp/runtime/AppletEnvironment.java | 10
netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java | 6
netx/net/sourceforge/jnlp/runtime/Boot.java | 8
netx/net/sourceforge/jnlp/runtime/Boot13.java | 4
netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 100 +++--
netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java | 11
netx/net/sourceforge/jnlp/services/ServiceUtil.java | 2
netx/net/sourceforge/jnlp/services/XPersistenceService.java | 4
netx/net/sourceforge/jnlp/tools/JarSigner.java | 2
netx/net/sourceforge/jnlp/util/WeakList.java | 28 -
netx/net/sourceforge/nanoxml/XMLElement.java | 23 -
diffs (truncated from 2010 to 500 lines):
diff -r 1b3abd2b1e4f -r 85db7b3a1c93 ChangeLog
--- a/ChangeLog Wed Oct 20 16:52:44 2010 -0400
+++ b/ChangeLog Thu Oct 21 21:12:21 2010 +0100
@@ -1,3 +1,172 @@ 2010-10-20 Omair Majid <omajid at redhat.
+2010-10-20 Andrew John Hughes <ahughes at redhat.com>
+
+ * netx/javax/jnlp/ServiceManager.java:
+ (lookupTable): Add generic types.
+ * netx/net/sourceforge/jnlp/AppletDesc.java:
+ (parameters): Likewise.
+ (AppletDesc(String,String,URL,int,int,Map)): Likewise.
+ (getParameters()): Likewise.
+ * netx/net/sourceforge/jnlp/ApplicationDesc.java:
+ (getArguments()): Remove redundant cast.
+ (addArgument(String)): Add generic typing.
+ * netx/net/sourceforge/jnlp/ExtensionDesc.java:
+ (extToPart): Add generic types.
+ (eagerExtParts): Likewise.
+ * netx/net/sourceforge/jnlp/InformationDesc.java:
+ (info): Likewise.
+ (getIcons(Object)): Add generic typing.
+ (getAssociations()): Likewise.
+ (getRelatedContents()): Likewise.
+ (getItem(Object)): Likewise.
+ (getItems(Object)): Likewise.
+ (addItem(String,Object)): Likewise.
+ * netx/net/sourceforge/jnlp/JNLPFile.java:
+ (resources): Likewise.
+ (InformationDesc.getItems(Object)): Likewise.
+ (getResources(Class)): Likewise.
+ * netx/net/sourceforge/jnlp/LaunchException.java:
+ (getCauses()): Likewise.
+ * netx/net/sourceforge/jnlp/Launcher.java:
+ (launchApplication(JNLPFile)): Likewise.
+ * netx/net/sourceforge/jnlp/NetxPanel.java:
+ (NetxPanel(URL,Hashtable)): Likewise.
+ (NetxPanel(URL,Hashtable,boolean)): Likewise.
+ * netx/net/sourceforge/jnlp/Node.java:
+ (getChildNodes()): Likewise.
+ * netx/net/sourceforge/jnlp/Parser.java:
+ (getResources(Node,boolean)): Likewise.
+ (getInfo(Node)): Likewise.
+ (getInformationDesc(Node)): Likewise.
+ (getApplet(Node)): Likewise.
+ (getApplication(Node)): Likewise.
+ (splitString(String)): Likewise.
+ (getLocales(Node)): Likewise.
+ (getChildNodes(Node,String)): Likewise.
+ * netx/net/sourceforge/jnlp/PluginBridge.java:
+ Fix variable naming and add generic types.
+ (cacheJars): Changed from cache_jars.
+ (cacheExJars): Changed from cache_ex-jars.
+ (atts): Add generic typing.
+ (PluginBridge(URL,URL,String,String,int,int,Hashtable)): Likewise.
+ (getInformation(Locale)): Likewise.
+ (getResources(Locale,String,String)): Likewise.
+ (getJARs()): Avoid excessive copying; filtering already performed
+ by getResources in JNLPFile.
+ * netx/net/sourceforge/jnlp/ResourcesDesc.java:
+ (resources): Add generic typing.
+ (getJREs()): Likewise.
+ (getJARs()): Likewise.
+ (getJARs(String)): Likewise.
+ (getExtensions()): Likewise.
+ (getPackages()): Likewise.
+ (getPackages(String)): Likewise.
+ (getProperties()): Likewise.
+ (getPropertiesMap()): Likewise.
+ (getResources(Class)): Make generic.
+ * netx/net/sourceforge/jnlp/Version.java:
+ (matches(Version)): Add generic types.
+ (matchesAny(Version)): Likewise.
+ (matchesSingle(String)): Likewise.
+ (matches(String,String)): Likewise.
+ (equal(List,List)): Likewise.
+ (greater(List,List)): Likewise.
+ (compare(String,String)): Use Integer.valueOf.
+ (normalize(List,int)): Add generic types, using
+ a List of lists rather than an array of lists.
+ (getVersionStrings()): Add generic types.
+ (getParts()): Likewise.
+ * netx/net/sourceforge/jnlp/cache/CacheUtil.java:
+ (waitForResources(ApplicationInstance,ResourceTracker,
+ URL,String)): Likewise.
+ * netx/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java:
+ (getListener(ApplicatonInstance,String,URL)): Use setVisible instead
+ of show().
+ (disposeListener(DownloadServiceListener)): Use setVisible instead
+ of hide().
+ (DownloadPanel.urls): Add generic typing.
+ (DownloadPanel.panels): Likewise.
+ (DownloadPanel.update(URL,String,long,long,int)): Fix formatting.
+ Add generic types.
+ * netx/net/sourceforge/jnlp/cache/Resource.java:
+ (resources): Add generic typing.
+ (trackers): Likewise.
+ (getResource(URL,Version,UpdatePolicy)): Use generic types.
+ (getTracker()): Likewise.
+ (addTracker(ResourceTracker)): Likewise.
+ (fireDownloadEvent()): Likewise.
+ * netx/net/sourceforge/jnlp/cache/ResourceTracker.java:
+ (prefetchTrackers): Add generic typing.
+ (queue): Likewise.
+ (active): Likewise.
+ (resources): Likewise.
+ (listeners): Likewise.
+ (fireDownloadEvent(Resource)): Remove unneeded cast.
+ (getPrefetch()): Use generic typing.
+ (selectByFlag(List,int,int)): Likewise.
+ (getResource(URL)): Likewise.
+ * netx/net/sourceforge/jnlp/runtime/AppletEnvironment.java:
+ (weakClips): Add generic types.
+ (destroy()): Use generic typing.
+ (getApplets()): Likewise.
+ (getStreamKeys()): Likewise.
+ * netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java:
+ (weakWindows): Add generic types.
+ (installEnvironment()): Likewise.
+ (destroy()): Remove redundant cast.
+ * netx/net/sourceforge/jnlp/runtime/Boot.java:
+ Extend PrivilegedAction<Void>.
+ (run()): Add generic typing.
+ (getOptions(String)): Likewise.
+ * netx/net/sourceforge/jnlp/runtime/Boot13.java:
+ (main(String[]): Likewise.
+ * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java:
+ Fix formatting.
+ (urlToLoader): Add generic types.
+ (resourcePermissions): Likewise.
+ (available): Likewise.
+ (jarEntries): Likewise.
+ (getInstance(JNLPFile,UpdatePolicy)): Remove redundant cast.
+ (getInstance(URL,String,Version,UpdatePolicy)): Likewise.
+ (initializeExtensions()): Add generic types.
+ (initializePermissions()): Likewise.
+ (initializeResources()): Likewise.
+ (getPermissions(CodeSource)): Likewise.
+ (fillInPartJars(List)): Likewise.
+ (activateJars(List)): Likewise.
+ (loadClass(String)): Likewise. Suppress warnings due to
+ sun.misc.JarIndex usage.
+ (findResources(String)): Mark as overriding. Add generic
+ types.
+ (getExtensionName()): Add @Deprecated annotation.
+ (getExtensionHREF()): Likewise.
+ * netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java:
+ (weakWindows): Add generic typing.
+ (weakApplications): Likewise.
+ (getApplication(Window)): Remove redundant casts. Add w,
+ which is window cast to Window.
+ * netx/net/sourceforge/jnlp/services/ServiceUtil.java:
+ (invoke(Object,Method,Object[])): Use generic types.
+ * netx/net/sourceforge/jnlp/services/XPersistenceService.java:
+ (getNames(URL)): Likewise.
+ * netx/net/sourceforge/jnlp/tools/JarSigner.java:
+ (verifyJars(List,ResourceTracker)): Remove redundant cast.
+ * netx/net/sourceforge/jnlp/util/WeakList.java:
+ Redesign as a generic type.
+ (refs): Add generic types.
+ (deref(WeakReference)): Likewise.
+ (get(int)): Likewise.
+ (set(int,Object)): Likewise.
+ (add(int,E)): Likewise.
+ (remove()): Likewise.
+ (hardList()): Likewise.
+ * netx/net/sourceforge/nanoxml/XMLElement.java:
+ (attributes): Add generic typing.
+ (children): Likewise.
+ (entities): Likewise.
+ (XMLElement()): Use generic types.
+ (XMLElement(Hashtable): Likewise.
+ (resolveEntity(StringBuffer)): Remove redundant cast.
+
2010-10-20 Omair Majid <omajid at redhat.com>
* AUTHORS: Add Francis Kung, Andrew Su, Joshua Sumali, Mark Wielaard and
diff -r 1b3abd2b1e4f -r 85db7b3a1c93 netx/javax/jnlp/ServiceManager.java
--- a/netx/javax/jnlp/ServiceManager.java Wed Oct 20 16:52:44 2010 -0400
+++ b/netx/javax/jnlp/ServiceManager.java Thu Oct 21 21:12:21 2010 +0100
@@ -10,7 +10,8 @@ public final class ServiceManager {
private static ServiceManagerStub stub = null;
- private static Map lookupTable = new HashMap(); // ensure lookup is idempotent
+ private static Map<String,Object> lookupTable
+ = new HashMap<String,Object>(); // ensure lookup is idempotent
private ServiceManager() {
// says it can't be instantiated
diff -r 1b3abd2b1e4f -r 85db7b3a1c93 netx/net/sourceforge/jnlp/AppletDesc.java
--- a/netx/net/sourceforge/jnlp/AppletDesc.java Wed Oct 20 16:52:44 2010 -0400
+++ b/netx/net/sourceforge/jnlp/AppletDesc.java Thu Oct 21 21:12:21 2010 +0100
@@ -45,7 +45,7 @@ public class AppletDesc {
private int height;
/** the parameters */
- private Map parameters;
+ private Map<String,String> parameters;
/**
@@ -58,13 +58,14 @@ public class AppletDesc {
* @param height the height
* @param parameters the parameters
*/
- public AppletDesc(String name, String mainClass, URL documentBase, int width, int height, Map parameters) {
+ public AppletDesc(String name, String mainClass, URL documentBase, int width, int height,
+ Map<String,String> parameters) {
this.name = name;
this.mainClass = mainClass;
this.documentBase = documentBase;
this.width = width;
this.height = height;
- this.parameters = new HashMap(parameters);
+ this.parameters = new HashMap<String,String>(parameters);
}
/**
@@ -105,8 +106,8 @@ public class AppletDesc {
/**
* Returns the applet parameters
*/
- public Map getParameters() {
- return new HashMap(parameters);
+ public Map<String,String> getParameters() {
+ return new HashMap<String,String>(parameters);
}
/**
diff -r 1b3abd2b1e4f -r 85db7b3a1c93 netx/net/sourceforge/jnlp/ApplicationDesc.java
--- a/netx/net/sourceforge/jnlp/ApplicationDesc.java Wed Oct 20 16:52:44 2010 -0400
+++ b/netx/net/sourceforge/jnlp/ApplicationDesc.java Thu Oct 21 21:12:21 2010 +0100
@@ -58,17 +58,17 @@ public class ApplicationDesc {
* Returns the arguments
*/
public String[] getArguments() {
- return (String[]) arguments.clone();
+ return arguments.clone();
}
/**
* Add an argument to the end of the arguments.
*/
public void addArgument(String arg) {
- ArrayList l = new ArrayList(Arrays.asList(arguments));
+ List<String> l = new ArrayList<String>(Arrays.asList(arguments));
l.add(arg);
- arguments = (String[]) l.toArray(arguments);
+ arguments = l.toArray(arguments);
}
}
diff -r 1b3abd2b1e4f -r 85db7b3a1c93 netx/net/sourceforge/jnlp/ExtensionDesc.java
--- a/netx/net/sourceforge/jnlp/ExtensionDesc.java Wed Oct 20 16:52:44 2010 -0400
+++ b/netx/net/sourceforge/jnlp/ExtensionDesc.java Thu Oct 21 21:12:21 2010 +0100
@@ -45,10 +45,10 @@ public class ExtensionDesc {
private JNLPFile file;
/** map from ext-part to local part */
- private Map extToPart = new HashMap();
+ private Map<String,String> extToPart = new HashMap<String,String>();
/** eager ext parts */
- private List eagerExtParts = new ArrayList();
+ private List<String> eagerExtParts = new ArrayList<String>();
/**
diff -r 1b3abd2b1e4f -r 85db7b3a1c93 netx/net/sourceforge/jnlp/InformationDesc.java
--- a/netx/net/sourceforge/jnlp/InformationDesc.java Wed Oct 20 16:52:44 2010 -0400
+++ b/netx/net/sourceforge/jnlp/InformationDesc.java Thu Oct 21 21:12:21 2010 +0100
@@ -52,7 +52,7 @@ public class InformationDesc {
private Locale locales[];
/** the data as list of key,value pairs */
- private List info;
+ private List<Object> info;
/** the JNLPFile this information is for */
private JNLPFile jnlpFile;
@@ -129,9 +129,9 @@ public class InformationDesc {
* @return an array of zero of more IconDescs of the specified icon type
*/
public IconDesc[] getIcons(Object kind) {
- List icons = getItems("icon-"+kind);
+ List<Object> icons = getItems("icon-"+kind);
- return (IconDesc[]) icons.toArray(new IconDesc[icons.size()]);
+ return icons.toArray(new IconDesc[icons.size()]);
};
/**
@@ -204,9 +204,9 @@ public class InformationDesc {
* Returns the associations specified in the JNLP file
*/
public AssociationDesc[] getAssociations() {
- List associations = getItems("association");
+ List<Object> associations = getItems("association");
- return (AssociationDesc[]) associations.toArray(new AssociationDesc[associations.size()]);
+ return associations.toArray(new AssociationDesc[associations.size()]);
}
/**
@@ -220,17 +220,16 @@ public class InformationDesc {
* Returns the related-contents specified by this JNLP file
*/
public RelatedContentDesc[] getRelatedContents() {
- List relatedContents = getItems("related-content");
+ List<Object> relatedContents = getItems("related-content");
- return (RelatedContentDesc[]) relatedContents.toArray(
- new RelatedContentDesc[relatedContents.size()]);
+ return relatedContents.toArray(new RelatedContentDesc[relatedContents.size()]);
}
/**
* Returns the last item matching the specified key.
*/
protected Object getItem(Object key) {
- List items = getItems(key);
+ List<Object> items = getItems(key);
if (items.size() == 0)
return null;
else
@@ -240,11 +239,11 @@ public class InformationDesc {
/**
* Returns all items matching the specified key.
*/
- protected List getItems(Object key) {
+ protected List<Object> getItems(Object key) {
if (info == null)
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
- List result = new ArrayList();
+ List<Object> result = new ArrayList<Object>();
for (int i=0; i < info.size(); i+=2)
if (info.get(i).equals(key))
result.add( info.get(i+1) );
@@ -258,7 +257,7 @@ public class InformationDesc {
*/
protected void addItem(String key, Object value) {
if (info == null)
- info = new ArrayList();
+ info = new ArrayList<Object>();
info.add(key);
info.add(value);
diff -r 1b3abd2b1e4f -r 85db7b3a1c93 netx/net/sourceforge/jnlp/JNLPFile.java
--- a/netx/net/sourceforge/jnlp/JNLPFile.java Wed Oct 20 16:52:44 2010 -0400
+++ b/netx/net/sourceforge/jnlp/JNLPFile.java Thu Oct 21 21:12:21 2010 +0100
@@ -86,7 +86,7 @@ public class JNLPFile {
protected UpdateDesc update;
/** resources */
- protected List resources;
+ protected List<ResourcesDesc> resources;
/** additional resources not in JNLP file (from command line) */
protected ResourcesDesc sharedResources = new ResourcesDesc(this, null, null, null);
@@ -330,8 +330,8 @@ public class JNLPFile {
*/
public InformationDesc getInformation(final Locale locale) {
return new InformationDesc(this, new Locale[] {locale}) {
- protected List getItems(Object key) {
- List result = new ArrayList();
+ protected List<Object> getItems(Object key) {
+ List<Object> result = new ArrayList<Object>();
for (int i=0; i < info.size(); i++) {
InformationDesc infoDesc = (InformationDesc) info.get(i);
@@ -375,11 +375,11 @@ public class JNLPFile {
*/
public ResourcesDesc getResources(final Locale locale, final String os, final String arch) {
return new ResourcesDesc(this, new Locale[] {locale}, new String[] {os}, new String[] {arch}) {
- public List getResources(Class launchType) {
- List result = new ArrayList();
+ public <T> List<T> getResources(Class<T> launchType) {
+ List<T> result = new ArrayList<T>();
for (int i=0; i < resources.size(); i++) {
- ResourcesDesc rescDesc = (ResourcesDesc) resources.get(i);
+ ResourcesDesc rescDesc = resources.get(i);
if (localMatches(locale, rescDesc.getLocales())
&& stringMatches(os, rescDesc.getOS())
diff -r 1b3abd2b1e4f -r 85db7b3a1c93 netx/net/sourceforge/jnlp/LaunchException.java
--- a/netx/net/sourceforge/jnlp/LaunchException.java Wed Oct 20 16:52:44 2010 -0400
+++ b/netx/net/sourceforge/jnlp/LaunchException.java Thu Oct 21 21:12:21 2010 +0100
@@ -146,7 +146,7 @@ public class LaunchException extends Exc
* and will be removed once netx no longer supports 1.3.
*/
public Throwable[] getCauses() {
- ArrayList result = new ArrayList();
+ ArrayList<Throwable> result = new ArrayList<Throwable>();
Reflect r = new Reflect();
Throwable cause = this.cause;
@@ -156,7 +156,7 @@ public class LaunchException extends Exc
cause = (Throwable) r.invoke(cause, "getCause");
}
- return (Throwable[]) result.toArray(new Throwable[0]);
+ return result.toArray(new Throwable[0]);
}
/**
diff -r 1b3abd2b1e4f -r 85db7b3a1c93 netx/net/sourceforge/jnlp/Launcher.java
--- a/netx/net/sourceforge/jnlp/Launcher.java Wed Oct 20 16:52:44 2010 -0400
+++ b/netx/net/sourceforge/jnlp/Launcher.java Thu Oct 21 21:12:21 2010 +0100
@@ -455,11 +455,11 @@ public class Launcher {
R("LSFatal"), R("LCClient"), R("LCantDetermineMainClass") ,
R("LCantDetermineMainClassInfo")));
- Class mainClass = app.getClassLoader().loadClass(mainName);
+ Class<?> mainClass = app.getClassLoader().loadClass(mainName);
- Method main = mainClass.getMethod("main", new Class[] {String[].class} );
+ Method main = mainClass.getMethod("main", new Class<?>[] {String[].class} );
String args[] = file.getApplication().getArguments();
-
+
SwingUtilities.invokeAndWait(new Runnable() {
// dummy method to force Event Dispatch Thread creation
public void run(){}
diff -r 1b3abd2b1e4f -r 85db7b3a1c93 netx/net/sourceforge/jnlp/NetxPanel.java
--- a/netx/net/sourceforge/jnlp/NetxPanel.java Wed Oct 20 16:52:44 2010 -0400
+++ b/netx/net/sourceforge/jnlp/NetxPanel.java Thu Oct 21 21:12:21 2010 +0100
@@ -45,13 +45,14 @@ public class NetxPanel extends AppletVie
private AppletInstance appInst = null;
private boolean appletAlive;
- public NetxPanel(URL documentURL, Hashtable atts)
+ public NetxPanel(URL documentURL, Hashtable<String,String> atts)
{
super(documentURL, atts);
}
// overloaded constructor, called when initialized via plugin
- public NetxPanel(URL documentURL, Hashtable atts, boolean exitOnFailure)
+ public NetxPanel(URL documentURL, Hashtable<String,String> atts,
+ boolean exitOnFailure)
{
this(documentURL, atts);
this.exitOnFailure = exitOnFailure;
diff -r 1b3abd2b1e4f -r 85db7b3a1c93 netx/net/sourceforge/jnlp/Node.java
--- a/netx/net/sourceforge/jnlp/Node.java Wed Oct 20 16:52:44 2010 -0400
+++ b/netx/net/sourceforge/jnlp/Node.java Thu Oct 21 21:12:21 2010 +0100
@@ -47,12 +47,12 @@ class Node {
Node[] getChildNodes() {
if (children == null) {
- List list = new ArrayList();
+ List<Node> list = new ArrayList<Node>();
for (Enumeration e = xml.enumerateChildren(); e.hasMoreElements();)
list.add( new Node((XMLElement)e.nextElement()) );
- children = (Node[]) list.toArray( new Node[list.size()] );
+ children = list.toArray( new Node[list.size()] );
for (int i=0; i < children.length-1; i++)
children[i].next = children[i+1];
diff -r 1b3abd2b1e4f -r 85db7b3a1c93 netx/net/sourceforge/jnlp/Parser.java
--- a/netx/net/sourceforge/jnlp/Parser.java Wed Oct 20 16:52:44 2010 -0400
+++ b/netx/net/sourceforge/jnlp/Parser.java Thu Oct 21 21:12:21 2010 +0100
@@ -239,8 +239,10 @@ class Parser {
* @param j2se true if the resources are located under a j2se or java node
* @throws ParseException if the JNLP file is invalid
*/
- public List getResources(Node parent, boolean j2se) throws ParseException {
- List result = new ArrayList();
+ public List<ResourcesDesc> getResources(Node parent, boolean j2se)
+ throws ParseException
+ {
+ List<ResourcesDesc> result = new ArrayList<ResourcesDesc>();
Node resources[] = getChildNodes(parent, "resources");
// ensure that there are at least one information section present
@@ -433,8 +435,10 @@ class Parser {
* @param parent the parent node (jnlp)
* @throws ParseException if the JNLP file is invalid
*/
- public List getInfo(Node parent) throws ParseException {
- List result = new ArrayList();
+ public List<InformationDesc> getInfo(Node parent)
+ throws ParseException
+ {
+ List<InformationDesc> result = new ArrayList<InformationDesc>();
Node info[] = getChildNodes(parent, "information");
// ensure that there are at least one information section present
@@ -455,7 +459,7 @@ class Parser {
* @throws ParseException if the JNLP file is invalid
*/
public InformationDesc getInformationDesc(Node node) throws ParseException {
- List descriptionsUsed = new ArrayList();
+ List<String> descriptionsUsed = new ArrayList<String>();
More information about the distro-pkg-dev
mailing list