midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-455 Discover and fix FindBugs problems / Eclipse warning -> raw type

This commit is contained in:
Richard Morales 2012-12-21 10:06:34 -05:00
parent 0646e28b82
commit 147d3626cb
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.adempiere.eclipse.equinox.servletbridge/src/org/eclipse/equinox/servletbridge/BridgeFilter.java
View File

@ -73,7 +73,7 @@ public class BridgeFilter extends BridgeServlet implements Filter {
return filterConfig.getInitParameter(arg0); return filterConfig.getInitParameter(arg0);
} }
public Enumeration getInitParameterNames() { public Enumeration<String> getInitParameterNames() {
return filterConfig.getInitParameterNames(); return filterConfig.getInitParameterNames();
} }

40
org.adempiere.eclipse.equinox.servletbridge/src/org/eclipse/equinox/servletbridge/CloseableURLClassLoader.java
View File

@ -37,9 +37,9 @@ public class CloseableURLClassLoader extends URLClassLoader {
static final String JAR = "jar"; //$NON-NLS-1$ static final String JAR = "jar"; //$NON-NLS-1$
// @GuardedBy("loaders") // @GuardedBy("loaders")
final ArrayList loaders = new ArrayList(); // package private to avoid synthetic access. final ArrayList<CloseableJarFileLoader> loaders = new ArrayList<CloseableJarFileLoader>(); // package private to avoid synthetic access.
// @GuardedBy("loaders") // @GuardedBy("loaders")
private final ArrayList loaderURLs = new ArrayList(); // note: protected by loaders private final ArrayList<URL> loaderURLs = new ArrayList<URL>(); // note: protected by loaders
// @GuardedBy("loaders") // @GuardedBy("loaders")
boolean closed = false; // note: protected by loaders, package private to avoid synthetic access. boolean closed = false; // note: protected by loaders, package private to avoid synthetic access.
@ -187,7 +187,7 @@ public class CloseableURLClassLoader extends URLClassLoader {
} }
private static URL[] excludeFileJarURLS(URL[] urls) { private static URL[] excludeFileJarURLS(URL[] urls) {
ArrayList urlList = new ArrayList(); ArrayList<URL> urlList = new ArrayList<URL>();
for (int i = 0; i < urls.length; i++) { for (int i = 0; i < urls.length; i++) {
if (!isFileJarURL(urls[i])) if (!isFileJarURL(urls[i]))
urlList.add(urls[i]); urlList.add(urls[i]);
@ -209,9 +209,9 @@ public class CloseableURLClassLoader extends URLClassLoader {
/* (non-Javadoc) /* (non-Javadoc)
* @see java.net.URLClassLoader#findClass(java.lang.String) * @see java.net.URLClassLoader#findClass(java.lang.String)
*/ */
protected Class findClass(final String name) throws ClassNotFoundException { protected Class<?> findClass(final String name) throws ClassNotFoundException {
try { try {
Class clazz = (Class) AccessController.doPrivileged(new PrivilegedExceptionAction() { Class<?> clazz = (Class<?>) AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
public Object run() throws ClassNotFoundException { public Object run() throws ClassNotFoundException {
String resourcePath = name.replace('.', '/') + DOT_CLASS; String resourcePath = name.replace('.', '/') + DOT_CLASS;
CloseableJarFileLoader loader = null; CloseableJarFileLoader loader = null;
@ -219,8 +219,8 @@ public class CloseableURLClassLoader extends URLClassLoader {
synchronized (loaders) { synchronized (loaders) {
if (closed) if (closed)
return null; return null;
for (Iterator iterator = loaders.iterator(); iterator.hasNext();) { for (Iterator<CloseableJarFileLoader> iterator = loaders.iterator(); iterator.hasNext();) {
loader = (CloseableJarFileLoader) iterator.next(); loader = iterator.next();
resourceURL = loader.getURL(resourcePath); resourceURL = loader.getURL(resourcePath);
if (resourceURL != null) if (resourceURL != null)
break; break;
@ -245,7 +245,7 @@ public class CloseableURLClassLoader extends URLClassLoader {
} }
// package private to avoid synthetic access. // package private to avoid synthetic access.
Class defineClass(String name, URL resourceURL, Manifest manifest) throws IOException { Class<?> defineClass(String name, URL resourceURL, Manifest manifest) throws IOException {
JarURLConnection connection = (JarURLConnection) resourceURL.openConnection(); JarURLConnection connection = (JarURLConnection) resourceURL.openConnection();
int lastDot = name.lastIndexOf('.'); int lastDot = name.lastIndexOf('.');
if (lastDot != -1) { if (lastDot != -1) {
@ -298,13 +298,13 @@ public class CloseableURLClassLoader extends URLClassLoader {
* @see java.net.URLClassLoader#findResource(java.lang.String) * @see java.net.URLClassLoader#findResource(java.lang.String)
*/ */
public URL findResource(final String name) { public URL findResource(final String name) {
URL url = (URL) AccessController.doPrivileged(new PrivilegedAction() { URL url = (URL) AccessController.doPrivileged(new PrivilegedAction<Object>() {
public Object run() { public Object run() {
synchronized (loaders) { synchronized (loaders) {
if (closed) if (closed)
return null; return null;
for (Iterator iterator = loaders.iterator(); iterator.hasNext();) { for (Iterator<CloseableJarFileLoader> iterator = loaders.iterator(); iterator.hasNext();) {
CloseableJarFileLoader loader = (CloseableJarFileLoader) iterator.next(); CloseableJarFileLoader loader = iterator.next();
URL resourceURL = loader.getURL(name); URL resourceURL = loader.getURL(name);
if (resourceURL != null) if (resourceURL != null)
return resourceURL; return resourceURL;
@ -321,15 +321,15 @@ public class CloseableURLClassLoader extends URLClassLoader {
/* (non-Javadoc) /* (non-Javadoc)
* @see java.net.URLClassLoader#findResources(java.lang.String) * @see java.net.URLClassLoader#findResources(java.lang.String)
*/ */
public Enumeration findResources(final String name) throws IOException { public Enumeration<URL> findResources(final String name) throws IOException {
final List resources = new ArrayList(); final List<URL> resources = new ArrayList<URL>();
AccessController.doPrivileged(new PrivilegedAction() { AccessController.doPrivileged(new PrivilegedAction<Object>() {
public Object run() { public Object run() {
synchronized (loaders) { synchronized (loaders) {
if (closed) if (closed)
return null; return null;
for (Iterator iterator = loaders.iterator(); iterator.hasNext();) { for (Iterator<CloseableJarFileLoader> iterator = loaders.iterator(); iterator.hasNext();) {
CloseableJarFileLoader loader = (CloseableJarFileLoader) iterator.next(); CloseableJarFileLoader loader = iterator.next();
URL resourceURL = loader.getURL(name); URL resourceURL = loader.getURL(name);
if (resourceURL != null) if (resourceURL != null)
resources.add(resourceURL); resources.add(resourceURL);
@ -338,7 +338,7 @@ public class CloseableURLClassLoader extends URLClassLoader {
return null; return null;
} }
}, context); }, context);
Enumeration e = super.findResources(name); Enumeration<URL> e = super.findResources(name);
while (e.hasMoreElements()) while (e.hasMoreElements())
resources.add(e.nextElement()); resources.add(e.nextElement());
@ -353,8 +353,8 @@ public class CloseableURLClassLoader extends URLClassLoader {
synchronized (loaders) { synchronized (loaders) {
if (closed) if (closed)
return; return;
for (Iterator iterator = loaders.iterator(); iterator.hasNext();) { for (Iterator<CloseableJarFileLoader> iterator = loaders.iterator(); iterator.hasNext();) {
CloseableJarFileLoader loader = (CloseableJarFileLoader) iterator.next(); CloseableJarFileLoader loader = iterator.next();
loader.close(); loader.close();
} }
closed = true; closed = true;
@ -381,7 +381,7 @@ public class CloseableURLClassLoader extends URLClassLoader {
* @see java.net.URLClassLoader#getURLs() * @see java.net.URLClassLoader#getURLs()
*/ */
public URL[] getURLs() { public URL[] getURLs() {
List result = new ArrayList(); List<URL> result = new ArrayList<URL>();
synchronized (loaders) { synchronized (loaders) {
result.addAll(loaderURLs); result.addAll(loaderURLs);
} }