diff options
author | Andrew John Hughes <[email protected]> | 2010-10-21 21:12:21 +0100 |
---|---|---|
committer | Andrew John Hughes <[email protected]> | 2010-10-21 21:12:21 +0100 |
commit | 61aeaaf89164aa93280527c7eb80cf4c1432fbee (patch) | |
tree | 73a8266a319eadc6126f3196f35ccb28ef330bcf /netx/net/sourceforge/jnlp/ResourcesDesc.java | |
parent | 16d8de7b9030235bfc7e3cb8e6a480a08f6a46d8 (diff) |
Fix most warnings arising from NetX code.
2010-10-20 Andrew John Hughes <[email protected]>
* 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 (limited to 'netx/net/sourceforge/jnlp/ResourcesDesc.java')
-rw-r--r-- | netx/net/sourceforge/jnlp/ResourcesDesc.java | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/netx/net/sourceforge/jnlp/ResourcesDesc.java b/netx/net/sourceforge/jnlp/ResourcesDesc.java index 1d7c94c..ca6f1dd 100644 --- a/netx/net/sourceforge/jnlp/ResourcesDesc.java +++ b/netx/net/sourceforge/jnlp/ResourcesDesc.java @@ -43,8 +43,8 @@ public class ResourcesDesc { private JNLPFile jnlpFile; /** list of jars, packages, properties, and extensions */ - private List resources = new ArrayList(); // mixed list makes easier for lookup code - + private List<Object> resources = new ArrayList<Object>(); + // mixed list makes easier for lookup code /** * Create a representation of one information section of the @@ -66,8 +66,8 @@ public class ResourcesDesc { * Returns the JVMs. */ public JREDesc[] getJREs() { - List resources = getResources(JREDesc.class); - return (JREDesc[]) resources.toArray( new JREDesc[resources.size()] ); + List<JREDesc> resources = getResources(JREDesc.class); + return resources.toArray( new JREDesc[resources.size()] ); } /** @@ -92,8 +92,8 @@ public class ResourcesDesc { * Returns all of the JARs. */ public JARDesc[] getJARs() { - List resources = getResources(JARDesc.class); - return (JARDesc[]) resources.toArray( new JARDesc[resources.size()] ); + List<JARDesc> resources = getResources(JARDesc.class); + return resources.toArray( new JARDesc[resources.size()] ); } /** @@ -102,32 +102,32 @@ public class ResourcesDesc { * @param partName the part name, null and "" equivalent */ public JARDesc[] getJARs(String partName) { - List resources = getResources(JARDesc.class); + List<JARDesc> resources = getResources(JARDesc.class); for (int i = resources.size(); i-- > 0;) { - JARDesc jar = (JARDesc) resources.get(i); + JARDesc jar = resources.get(i); if (!(""+jar.getPart()).equals(""+partName)) resources.remove(i); } - return (JARDesc[]) resources.toArray( new JARDesc[resources.size()] ); + return resources.toArray( new JARDesc[resources.size()] ); } /** * Returns the Extensions. */ public ExtensionDesc[] getExtensions() { - List resources = getResources(ExtensionDesc.class); - return (ExtensionDesc[]) resources.toArray( new ExtensionDesc[resources.size()] ); + List<ExtensionDesc> resources = getResources(ExtensionDesc.class); + return resources.toArray( new ExtensionDesc[resources.size()] ); } /** * Returns the Packages. */ public PackageDesc[] getPackages() { - List resources = getResources(PackageDesc.class); - return (PackageDesc[]) resources.toArray( new PackageDesc[resources.size()] ); + List<PackageDesc> resources = getResources(PackageDesc.class); + return resources.toArray( new PackageDesc[resources.size()] ); } /** @@ -137,34 +137,34 @@ public class ResourcesDesc { * @return the PackageDesc objects matching the class name */ public PackageDesc[] getPackages(String className) { - List resources = getResources(PackageDesc.class); + List<PackageDesc> resources = getResources(PackageDesc.class); for (int i = resources.size(); i-- > 0;) { - PackageDesc pk = (PackageDesc) resources.get(i); + PackageDesc pk = resources.get(i); if (!pk.matches(className)) resources.remove(i); } - return (PackageDesc[]) resources.toArray( new PackageDesc[resources.size()] ); + return resources.toArray( new PackageDesc[resources.size()] ); } /** * Returns the Properties as a list. */ public PropertyDesc[] getProperties() { - List resources = getResources(PropertyDesc.class); - return (PropertyDesc[]) resources.toArray( new PropertyDesc[resources.size()] ); + List<PropertyDesc> resources = getResources(PropertyDesc.class); + return resources.toArray( new PropertyDesc[resources.size()] ); } /** * Returns the properties as a map. */ - public Map getPropertiesMap() { - Properties properties = new Properties(); - List resources = getResources(PropertyDesc.class); + public Map<String,String> getPropertiesMap() { + Map<String,String> properties = new HashMap<String,String>(); + List<PropertyDesc> resources = getResources(PropertyDesc.class); for (int i=0; i < resources.size(); i++) { - PropertyDesc prop = (PropertyDesc) resources.get(i); + PropertyDesc prop = resources.get(i); properties.put( prop.getKey(), prop.getValue() ); } @@ -205,12 +205,12 @@ public class ResourcesDesc { /** * Returns all resources of the specified type. */ - public List getResources(Class type) { - List result = new ArrayList(); + public <T> List<T> getResources(Class<T> type) { + List<T> result = new ArrayList<T>(); for (int i=0; i < resources.size(); i++) if ( type.isAssignableFrom(resources.get(i).getClass()) ) - result.add(resources.get(i)); + result.add(type.cast(resources.get(i))); return result; } |