You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ad...@apache.org on 2009/10/31 16:22:08 UTC
svn commit: r831550 - in /ofbiz/trunk/framework/base/src/org/ofbiz/base:
component/ config/ container/ location/ splash/ util/ util/cache/
util/collections/ util/string/ util/template/
Author: adrianc
Date: Sat Oct 31 15:22:05 2009
New Revision: 831550
URL: http://svn.apache.org/viewvc?rev=831550&view=rev
Log:
Remove Eclipse compiler warnings from framework/base component. Patch contributed by Marc Morin with additional work by me - https://issues.apache.org/jira/browse/OFBIZ-3102.
This commit requires an ant clean + build.
Modified:
ofbiz/trunk/framework/base/src/org/ofbiz/base/component/AlreadyLoadedException.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/component/ComponentException.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/component/ComponentResourceHandler.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/config/ClasspathLoader.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/config/FileLoader.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/config/GenericConfigException.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/config/MainResourceHandler.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/config/ResourceLoader.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/config/UrlLoader.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ComponentContainer.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ContainerConfig.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ContainerException.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ContainerLoader.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/container/JunitContainer.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/container/JustLoadComponentsContainer.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/location/FlexibleLocation.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/splash/SplashScreen.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/BshUtil.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/Debug.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/GeneralException.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/GeneralRuntimeException.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/HttpClient.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/HttpClientException.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/KeyStoreUtil.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/MultiTrustManager.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/NotifyLevel.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ObjectInputStream.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ObjectType.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/OfbizBshBsfEngine.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/SSLUtil.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/StringUtil.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/URLConnector.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilGenerics.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilHttp.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilJavaParse.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilMisc.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilProperties.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilURL.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilValidate.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilXml.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/CacheSoftReference.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/HardRefCacheLine.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/JdbmSerializer.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/SoftRefCacheLine.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/FlexibleServletAccessor.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/LifoSet.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/MapComparator.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/MapStack.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/ResourceBundleMapWrapper.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/UelUtil.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/component/AlreadyLoadedException.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/component/AlreadyLoadedException.java?rev=831550&r1=831549&r2=831550&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/component/AlreadyLoadedException.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/component/AlreadyLoadedException.java Sat Oct 31 15:22:05 2009
@@ -22,6 +22,7 @@
* Component Already Loaded Exception
*
*/
+@SuppressWarnings("serial")
public class AlreadyLoadedException extends ComponentException {
public AlreadyLoadedException() {
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/component/ComponentException.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/component/ComponentException.java?rev=831550&r1=831549&r2=831550&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/component/ComponentException.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/component/ComponentException.java Sat Oct 31 15:22:05 2009
@@ -24,6 +24,7 @@
* ComponentException
*
*/
+@SuppressWarnings("serial")
public class ComponentException extends GenericConfigException {
public ComponentException() {
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/component/ComponentResourceHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/component/ComponentResourceHandler.java?rev=831550&r1=831549&r2=831550&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/component/ComponentResourceHandler.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/component/ComponentResourceHandler.java Sat Oct 31 15:22:05 2009
@@ -33,6 +33,7 @@
* Contains resource information and provides for loading data
*
*/
+@SuppressWarnings("serial")
public class ComponentResourceHandler implements ResourceHandler {
public static final String module = ComponentResourceHandler.class.getName();
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/config/ClasspathLoader.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/config/ClasspathLoader.java?rev=831550&r1=831549&r2=831550&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/config/ClasspathLoader.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/config/ClasspathLoader.java Sat Oct 31 15:22:05 2009
@@ -26,6 +26,7 @@
* Loads resources from the classpath
*
*/
+@SuppressWarnings("serial")
public class ClasspathLoader extends ResourceLoader implements java.io.Serializable {
@Override
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/config/FileLoader.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/config/FileLoader.java?rev=831550&r1=831549&r2=831550&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/config/FileLoader.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/config/FileLoader.java Sat Oct 31 15:22:05 2009
@@ -26,6 +26,7 @@
* Loads resources from the file system
*
*/
+@SuppressWarnings("serial")
public class FileLoader extends ResourceLoader implements java.io.Serializable {
@Override
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/config/GenericConfigException.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/config/GenericConfigException.java?rev=831550&r1=831549&r2=831550&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/config/GenericConfigException.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/config/GenericConfigException.java Sat Oct 31 15:22:05 2009
@@ -24,6 +24,7 @@
* GenericConfigException
*
*/
+@SuppressWarnings("serial")
public class GenericConfigException extends GeneralException {
public GenericConfigException() {
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/config/MainResourceHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/config/MainResourceHandler.java?rev=831550&r1=831549&r2=831550&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/config/MainResourceHandler.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/config/MainResourceHandler.java Sat Oct 31 15:22:05 2009
@@ -31,6 +31,7 @@
* Contains resource information and provides for loading data
*
*/
+@SuppressWarnings("serial")
public final class MainResourceHandler implements ResourceHandler {
public static final String module = MainResourceHandler.class.getName();
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/config/ResourceLoader.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/config/ResourceLoader.java?rev=831550&r1=831549&r2=831550&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/config/ResourceLoader.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/config/ResourceLoader.java Sat Oct 31 15:22:05 2009
@@ -134,7 +134,7 @@
ResourceLoader loader = null;
try {
- Class lClass = null;
+ Class<?> lClass = null;
if (className != null && className.length() > 0) {
try {
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/config/UrlLoader.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/config/UrlLoader.java?rev=831550&r1=831549&r2=831550&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/config/UrlLoader.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/config/UrlLoader.java Sat Oct 31 15:22:05 2009
@@ -25,6 +25,7 @@
* Loads resources from a URL
*
*/
+@SuppressWarnings("serial")
public class UrlLoader extends ResourceLoader implements java.io.Serializable {
@Override
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ComponentContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ComponentContainer.java?rev=831550&r1=831549&r2=831550&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ComponentContainer.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ComponentContainer.java Sat Oct 31 15:22:05 2009
@@ -22,7 +22,6 @@
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
-import java.util.Iterator;
import java.util.List;
import org.ofbiz.base.component.AlreadyLoadedException;
@@ -242,7 +241,7 @@
if (path.isDirectory()) {
// load all .jar and .zip files in this directory
File files[] = path.listFiles();
- for (File file: path.listFiles()) {
+ for (File file: files) {
String fileName = file.getName();
if (fileName.endsWith(".jar") || fileName.endsWith(".zip")) {
classPath.addComponent(file);
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ContainerConfig.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ContainerConfig.java?rev=831550&r1=831549&r2=831550&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ContainerConfig.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ContainerConfig.java Sat Oct 31 15:22:05 2009
@@ -21,17 +21,16 @@
import java.io.IOException;
import java.net.URL;
import java.util.Collection;
-import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+
import javax.xml.parsers.ParserConfigurationException;
import org.ofbiz.base.util.UtilURL;
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.base.util.UtilXml;
-
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.xml.sax.SAXException;
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ContainerException.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ContainerException.java?rev=831550&r1=831549&r2=831550&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ContainerException.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ContainerException.java Sat Oct 31 15:22:05 2009
@@ -23,6 +23,7 @@
/**
* ContainerException
*/
+@SuppressWarnings("serial")
public class ContainerException extends GenericConfigException {
public ContainerException() {
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ContainerLoader.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ContainerLoader.java?rev=831550&r1=831549&r2=831550&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ContainerLoader.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ContainerLoader.java Sat Oct 31 15:22:05 2009
@@ -18,16 +18,15 @@
*******************************************************************************/
package org.ofbiz.base.container;
+import java.io.PrintWriter;
+import java.io.StringWriter;
import java.util.Collection;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
-import java.io.PrintWriter;
-import java.io.StringWriter;
+import org.ofbiz.base.start.Start;
import org.ofbiz.base.start.StartupException;
import org.ofbiz.base.start.StartupLoader;
-import org.ofbiz.base.start.Start;
import org.ofbiz.base.util.Debug;
/**
@@ -143,7 +142,6 @@
ThreadGroup g = t.getThreadGroup();
out.println("Thread: " + t.getName() + " [" + t.getId() + "] @ " + (g != null ? g.getName() : "[none]") + " : " + t.getPriority() + " [" + t.getState().name() + "]");
out.println("--- Alive: " + t.isAlive() + " Daemon: " + t.isDaemon());
- StackTraceElement[] stacks = t.getStackTrace();
for (StackTraceElement stack: t.getStackTrace()) {
out.println("### " + stack.toString());
}
@@ -159,7 +157,7 @@
Debug.logWarning("Unable to get context classloader; using system", module);
loader = ClassLoader.getSystemClassLoader();
}
- Class containerClass = null;
+ Class<?> containerClass = null;
try {
containerClass = loader.loadClass(containerCfg.className);
} catch (ClassNotFoundException e) {
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/container/JunitContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/container/JunitContainer.java?rev=831550&r1=831549&r2=831550&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/container/JunitContainer.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/container/JunitContainer.java Sat Oct 31 15:22:05 2009
@@ -54,7 +54,7 @@
TestSuite suite = new TestSuite();
while (ti.hasNext()) {
ContainerConfig.Container.Property prop = ti.next();
- Class clz = null;
+ Class<?> clz = null;
try {
clz = ObjectType.loadClass(prop.value);
suite.addTestSuite(clz);
@@ -74,7 +74,7 @@
results.failureCount() + " # Errors: " + results.errorCount(), module);
if (Debug.infoOn()) {
Debug.log("[JUNIT] ----------------------------- ERRORS ----------------------------- [JUNIT]", module);
- Enumeration err = results.errors();
+ Enumeration<?> err = results.errors();
if (!err.hasMoreElements()) {
Debug.log("None");
} else {
@@ -84,7 +84,7 @@
}
Debug.log("[JUNIT] ------------------------------------------------------------------ [JUNIT]", module);
Debug.log("[JUNIT] ---------------------------- FAILURES ---------------------------- [JUNIT]", module);
- Enumeration fail = results.failures();
+ Enumeration<?> fail = results.failures();
if (!fail.hasMoreElements()) {
Debug.log("None");
} else {
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/container/JustLoadComponentsContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/container/JustLoadComponentsContainer.java?rev=831550&r1=831549&r2=831550&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/container/JustLoadComponentsContainer.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/container/JustLoadComponentsContainer.java Sat Oct 31 15:22:05 2009
@@ -21,7 +21,6 @@
import org.ofbiz.base.component.AlreadyLoadedException;
import org.ofbiz.base.component.ComponentException;
import org.ofbiz.base.util.Debug;
-import org.ofbiz.base.util.UtilMisc;
/**
* A Container implementation to run the tests configured through this testtools stuff.
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/location/FlexibleLocation.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/location/FlexibleLocation.java?rev=831550&r1=831549&r2=831550&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/location/FlexibleLocation.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/location/FlexibleLocation.java Sat Oct 31 15:22:05 2009
@@ -96,7 +96,7 @@
// now create a new instance of the class...
try {
- Class lClass = null;
+ Class<?> lClass = null;
try {
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/splash/SplashScreen.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/splash/SplashScreen.java?rev=831550&r1=831549&r2=831550&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/splash/SplashScreen.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/splash/SplashScreen.java Sat Oct 31 15:22:05 2009
@@ -27,6 +27,7 @@
import java.awt.Toolkit;
import java.awt.Window;
+@SuppressWarnings("serial")
public final class SplashScreen extends Frame {
private final String fImageId;
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/BshUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/BshUtil.java?rev=831550&r1=831549&r2=831550&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/BshUtil.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/BshUtil.java Sat Oct 31 15:22:05 2009
@@ -25,9 +25,7 @@
import java.net.MalformedURLException;
import java.net.URL;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
-import java.util.Set;
import org.ofbiz.base.location.FlexibleLocation;
import org.ofbiz.base.util.cache.UtilCache;
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/Debug.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/Debug.java?rev=831550&r1=831549&r2=831550&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/Debug.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/Debug.java Sat Oct 31 15:22:05 2009
@@ -97,9 +97,9 @@
levelOnCache[x] = true;
}
LoggerRepository repo = root.getLoggerRepository();
- Enumeration en = repo.getCurrentLoggers();
+ Enumeration<Logger> en = UtilGenerics.cast(repo.getCurrentLoggers());
while (en.hasMoreElements()) {
- Logger thisLogger = (Logger) en.nextElement();
+ Logger thisLogger = en.nextElement();
thisLogger.setLevel(Level.DEBUG);
}
}
@@ -384,9 +384,9 @@
Appender foundAppender = logger.getAppender(name);
if (foundAppender == null) {
- Enumeration currentLoggerEnum = Logger.getRootLogger().getLoggerRepository().getCurrentLoggers();
+ Enumeration<Logger> currentLoggerEnum = UtilGenerics.cast(Logger.getRootLogger().getLoggerRepository().getCurrentLoggers());
while (currentLoggerEnum.hasMoreElements() && foundAppender == null) {
- Logger log = (Logger) currentLoggerEnum.nextElement();
+ Logger log = currentLoggerEnum.nextElement();
foundAppender = log.getAppender(name);
}
} else {
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/GeneralException.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/GeneralException.java?rev=831550&r1=831549&r2=831550&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/GeneralException.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/GeneralException.java Sat Oct 31 15:22:05 2009
@@ -26,6 +26,7 @@
* Base OFBiz Exception, provides nested exceptions, etc
*
*/
+@SuppressWarnings("serial")
public class GeneralException extends Exception {
public static <T> T checkException(Throwable t) throws GeneralException {
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/GeneralRuntimeException.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/GeneralRuntimeException.java?rev=831550&r1=831549&r2=831550&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/GeneralRuntimeException.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/GeneralRuntimeException.java Sat Oct 31 15:22:05 2009
@@ -25,6 +25,7 @@
* Base OFBiz Runtime Exception, provides nested exceptions, etc
*
*/
+@SuppressWarnings("serial")
public class GeneralRuntimeException extends RuntimeException {
Throwable nested = null;
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/HttpClient.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/HttpClient.java?rev=831550&r1=831549&r2=831550&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/HttpClient.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/HttpClient.java Sat Oct 31 15:22:05 2009
@@ -28,6 +28,7 @@
import java.net.URLConnection;
import java.security.cert.CertificateException;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -477,7 +478,7 @@
}
if (Debug.verboseOn() || debug) {
- Map headerFields = con.getHeaderFields();
+ Map<String, List<String>> headerFields = con.getHeaderFields();
Debug.log("Header Fields : " + headerFields, module);
}
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/HttpClientException.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/HttpClientException.java?rev=831550&r1=831549&r2=831550&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/HttpClientException.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/HttpClientException.java Sat Oct 31 15:22:05 2009
@@ -22,6 +22,7 @@
* HttpClient Exception.
*
*/
+@SuppressWarnings("serial")
public class HttpClientException extends GeneralException {
Throwable nested = null;
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/KeyStoreUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/KeyStoreUtil.java?rev=831550&r1=831549&r2=831550&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/KeyStoreUtil.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/KeyStoreUtil.java Sat Oct 31 15:22:05 2009
@@ -153,7 +153,7 @@
CertificateFactory cf = CertificateFactory.getInstance("X.509");
ByteArrayInputStream bais = new ByteArrayInputStream(certChain);
- Collection certCol = cf.generateCertificates(bais);
+ Collection<? extends Certificate> certCol = cf.generateCertificates(bais);
Certificate[] certs = new Certificate[certCol.toArray().length];
if (certCol.size() == 1) {
Debug.log("Single certificate; no chain", module);
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/MultiTrustManager.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/MultiTrustManager.java?rev=831550&r1=831549&r2=831550&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/MultiTrustManager.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/MultiTrustManager.java Sat Oct 31 15:22:05 2009
@@ -19,17 +19,17 @@
package org.ofbiz.base.util;
-import javolution.util.FastList;
-
-import javax.net.ssl.X509TrustManager;
-import java.security.cert.X509Certificate;
-import java.security.cert.CertificateException;
-import java.security.cert.Certificate;
import java.security.KeyStore;
import java.security.KeyStoreException;
-import java.util.List;
-import java.util.Iterator;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
import java.util.Enumeration;
+import java.util.List;
+
+import javax.net.ssl.X509TrustManager;
+
+import javolution.util.FastList;
/**
* MultiTrustManager
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/NotifyLevel.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/NotifyLevel.java?rev=831550&r1=831549&r2=831550&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/NotifyLevel.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/NotifyLevel.java Sat Oct 31 15:22:05 2009
@@ -25,6 +25,7 @@
/**
* NotifyLevel
*/
+@SuppressWarnings("serial")
public class NotifyLevel extends Level {
public static final int NOTIFY_INT = FATAL_INT + 10000;
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ObjectInputStream.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ObjectInputStream.java?rev=831550&r1=831549&r2=831550&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ObjectInputStream.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ObjectInputStream.java Sat Oct 31 15:22:05 2009
@@ -40,7 +40,7 @@
* @see java.io.ObjectInputStream#resolveClass(java.io.ObjectStreamClass)
*/
@Override
- protected Class resolveClass(ObjectStreamClass classDesc) throws IOException, ClassNotFoundException {
+ protected Class<?> resolveClass(ObjectStreamClass classDesc) throws IOException, ClassNotFoundException {
return ObjectType.loadClass(classDesc.getName(), classloader);
}
@@ -48,8 +48,8 @@
* @see java.io.ObjectInputStream#resolveProxyClass(java.lang.String[])
*/
@Override
- protected Class resolveProxyClass(String[] interfaces) throws IOException, ClassNotFoundException {
- Class[] cinterfaces = new Class[interfaces.length];
+ protected Class<?> resolveProxyClass(String[] interfaces) throws IOException, ClassNotFoundException {
+ Class<?>[] cinterfaces = new Class[interfaces.length];
for (int i = 0; i < interfaces.length; i++)
cinterfaces[i] = classloader.loadClass(interfaces[i]);
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ObjectType.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ObjectType.java?rev=831550&r1=831549&r2=831550&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ObjectType.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ObjectType.java Sat Oct 31 15:22:05 2009
@@ -90,7 +90,7 @@
}
className = "[" + prefix;
} else {
- Class arrayClass = loadClass(className.replace("[]", ""), loader);
+ Class<?> arrayClass = loadClass(className.replace("[]", ""), loader);
className = "[L" + arrayClass.getName().replace("[]", "") + ";";
}
}
@@ -182,7 +182,7 @@
sig[i] = parameters[i].getClass();
}
Class<?> c = loadClass(className);
- Constructor con = c.getConstructor(sig);
+ Constructor<?> con = c.getConstructor(sig);
Object o = con.newInstance(parameters);
if (Debug.verboseOn()) Debug.logVerbose("Instantiated object: " + o.toString(), module);
@@ -958,17 +958,17 @@
}
} else if (obj instanceof java.util.Map) {
fromType = "Map";
- Map map = (Map) obj;
+ Map<?,?> map = (Map<?,?>) obj;
if ("Map".equals(type) || "java.util.Map".equals(type)) {
return map;
} else if ("String".equals(type) || "java.lang.String".equals(type)) {
return map.toString();
} else if ("List".equals(type) || "java.util.List".equals(type)) {
- List<Map> tempList = FastList.newInstance();
+ List<Map<?,?>> tempList = FastList.newInstance();
tempList.add(map);
return tempList;
} else if ("Set".equals(type) || "java.util.Set".equals(type)) {
- Set<Map> tempSet = FastSet.newInstance();
+ Set<Map<?,?>> tempSet = FastSet.newInstance();
tempSet.add(map);
return tempSet;
} else {
@@ -976,7 +976,7 @@
}
} else if (obj instanceof java.util.List) {
fromType = "List";
- List list = (List) obj;
+ List<?> list = (List<?>) obj;
if ("List".equals(type) || "java.util.List".equals(type)) {
return list;
} else if ("String".equals(type) || "java.lang.String".equals(type)) {
@@ -1067,7 +1067,7 @@
// have converted value 2, now before converting value 1 see if it is a Collection and we are doing a contains comparison
if ("contains".equals(operator) && value1 instanceof Collection) {
- Collection col1 = (Collection) value1;
+ Collection<?> col1 = (Collection<?>) value1;
return col1.contains(convertedValue2) ? Boolean.TRUE : Boolean.FALSE;
}
@@ -1115,9 +1115,9 @@
return Boolean.TRUE;
if (convertedValue1 instanceof String && ((String) convertedValue1).length() == 0)
return Boolean.TRUE;
- if (convertedValue1 instanceof List && ((List) convertedValue1).size() == 0)
+ if (convertedValue1 instanceof List && ((List<?>) convertedValue1).size() == 0)
return Boolean.TRUE;
- if (convertedValue1 instanceof Map && ((Map) convertedValue1).size() == 0)
+ if (convertedValue1 instanceof Map && ((Map<?, ?>) convertedValue1).size() == 0)
return Boolean.TRUE;
return Boolean.FALSE;
} else if ("is-not-empty".equals(operator)) {
@@ -1125,9 +1125,9 @@
return Boolean.FALSE;
if (convertedValue1 instanceof String && ((String) convertedValue1).length() == 0)
return Boolean.FALSE;
- if (convertedValue1 instanceof List && ((List) convertedValue1).size() == 0)
+ if (convertedValue1 instanceof List && ((List<?>) convertedValue1).size() == 0)
return Boolean.FALSE;
- if (convertedValue1 instanceof Map && ((Map) convertedValue1).size() == 0)
+ if (convertedValue1 instanceof Map && ((Map<?, ?>) convertedValue1).size() == 0)
return Boolean.FALSE;
return Boolean.TRUE;
}
@@ -1236,11 +1236,11 @@
return true;
}
} else if (value instanceof Collection) {
- if (((Collection) value).size() == 0) {
+ if (((Collection<?>) value).size() == 0) {
return true;
}
} else if (value instanceof Map) {
- if (((Map) value).size() == 0) {
+ if (((Map<?,?>) value).size() == 0) {
return true;
}
}
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/OfbizBshBsfEngine.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/OfbizBshBsfEngine.java?rev=831550&r1=831549&r2=831550&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/OfbizBshBsfEngine.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/OfbizBshBsfEngine.java Sat Oct 31 15:22:05 2009
@@ -63,6 +63,7 @@
public static UtilCache<String, Interpreter.ParsedScript> parsedScripts = new UtilCache<String, Interpreter.ParsedScript>("script.BshBsfParsedCache", 0, 0, false);
+ @SuppressWarnings("unchecked")
@Override
public void initialize(BSFManager mgr, String lang, Vector declaredBeans) throws BSFException {
super.initialize(mgr, lang, declaredBeans);
@@ -136,6 +137,7 @@
* It executes the funcBody text in an "anonymous" method call with
* arguments.
*/
+ @SuppressWarnings("unchecked")
@Override
public Object apply(String source, int lineNo, int columnNo, Object funcBody, Vector namesVec, Vector argsVec) throws BSFException {
if (namesVec.size() != argsVec.size()) throw new BSFException("number of params/names mismatch");
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/SSLUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/SSLUtil.java?rev=831550&r1=831549&r2=831550&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/SSLUtil.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/SSLUtil.java Sat Oct 31 15:22:05 2009
@@ -208,7 +208,7 @@
}
for (javax.security.cert.X509Certificate peerCert: peerCerts) {
Principal x500s = peerCert.getSubjectDN();
- Map subjectMap = KeyStoreUtil.getX500Map(x500s);
+ Map<String, String> subjectMap = KeyStoreUtil.getX500Map(x500s);
if (Debug.infoOn())
Debug.logInfo(peerCert.getSerialNumber().toString(16) + " :: " + subjectMap.get("CN"), module);
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/StringUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/StringUtil.java?rev=831550&r1=831549&r2=831550&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/StringUtil.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/StringUtil.java Sat Oct 31 15:22:05 2009
@@ -725,7 +725,7 @@
protected static final ObjectFactory<HtmlEncodingMapWrapper<?>> mapStackFactory = new ObjectFactory<HtmlEncodingMapWrapper<?>>() {
@Override
protected HtmlEncodingMapWrapper<?> create() {
- return new HtmlEncodingMapWrapper();
+ return new HtmlEncodingMapWrapper<Object>();
}
};
public static <K> HtmlEncodingMapWrapper<K> getHtmlEncodingMapWrapper(Map<K, Object> mapToWrap, SimpleEncoder encoder) {
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/URLConnector.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/URLConnector.java?rev=831550&r1=831549&r2=831550&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/URLConnector.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/URLConnector.java Sat Oct 31 15:22:05 2009
@@ -18,16 +18,16 @@
*******************************************************************************/
package org.ofbiz.base.util;
-import org.ofbiz.base.config.GenericConfigException;
-import org.ofbiz.base.util.Base64;
-
import java.io.IOException;
import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLConnection;
import java.security.GeneralSecurityException;
-import javax.net.ssl.*;
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.HttpsURLConnection;
+
+import org.ofbiz.base.config.GenericConfigException;
/**
* URLConnector.java
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilGenerics.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilGenerics.java?rev=831550&r1=831549&r2=831550&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilGenerics.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilGenerics.java Sat Oct 31 15:22:05 2009
@@ -43,7 +43,7 @@
if (object != null) {
if (!(clz.isInstance(object))) throw new ClassCastException("Not a " + clz.getName());
int i = 0;
- for (Object value: (Collection) object) {
+ for (Object value: (Collection<?>) object) {
if (value != null && !type.isInstance(value)) {
throw new IllegalArgumentException("Value(" + i + "), with value(" + value + ") is not a " + type.getName());
}
@@ -81,7 +81,7 @@
public static <K, V> Map<K, V> checkMap(Object object, Class<K> keyType, Class<V> valueType) {
if (object != null) {
if (!(object instanceof Map)) throw new ClassCastException("Not a map");
- Map<?, ?> map = (Map) object;
+ Map<?, ?> map = (Map<?,?>) object;
int i = 0;
for (Map.Entry<?, ?> entry: map.entrySet()) {
if (entry.getKey() != null && !keyType.isInstance(entry.getKey())) {
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilHttp.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilHttp.java?rev=831550&r1=831549&r2=831550&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilHttp.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilHttp.java Sat Oct 31 15:22:05 2009
@@ -292,7 +292,7 @@
Map<String, Object> attributeMap = FastMap.newInstance();
// look at all request attributes
- Enumeration requestAttrNames = request.getAttributeNames();
+ Enumeration<String> requestAttrNames = UtilGenerics.cast(request.getAttributeNames());
while (requestAttrNames.hasMoreElements()) {
String attrName = (String) requestAttrNames.nextElement();
if (namesToSkip != null && namesToSkip.contains(attrName))
@@ -327,9 +327,9 @@
HttpSession session = request.getSession();
// look at all the session attributes
- Enumeration sessionAttrNames = session.getAttributeNames();
+ Enumeration<String> sessionAttrNames = UtilGenerics.cast(session.getAttributeNames());
while (sessionAttrNames.hasMoreElements()) {
- String attrName = (String) sessionAttrNames.nextElement();
+ String attrName = sessionAttrNames.nextElement();
if (namesToSkip != null && namesToSkip.contains(attrName))
continue;
@@ -362,9 +362,9 @@
// look at all servlet context attributes
ServletContext servletContext = (ServletContext) request.getAttribute("servletContext");
- Enumeration applicationAttrNames = servletContext.getAttributeNames();
+ Enumeration<String> applicationAttrNames = UtilGenerics.cast(servletContext.getAttributeNames());
while (applicationAttrNames.hasMoreElements()) {
- String attrName = (String) applicationAttrNames.nextElement();
+ String attrName = applicationAttrNames.nextElement();
if (namesToSkip != null && namesToSkip.contains(attrName))
continue;
@@ -485,9 +485,9 @@
public static List<Object> makeParamListWithSuffix(HttpServletRequest request, Map<String, ? extends Object> additionalFields, String suffix, String prefix) {
List<Object> paramList = new ArrayList<Object>();
- Enumeration parameterNames = request.getParameterNames();
+ Enumeration<String> parameterNames = UtilGenerics.cast(request.getParameterNames());
while (parameterNames.hasMoreElements()) {
- String parameterName = (String) parameterNames.nextElement();
+ String parameterName = parameterNames.nextElement();
if (parameterName.endsWith(suffix)) {
if (prefix != null && prefix.length() > 0) {
if (parameterName.startsWith(prefix)) {
@@ -556,9 +556,9 @@
* @param request
*/
public static void parametersToAttributes(HttpServletRequest request) {
- java.util.Enumeration e = request.getParameterNames();
+ java.util.Enumeration<String> e = UtilGenerics.cast(request.getParameterNames());
while (e.hasMoreElements()) {
- String name = (String) e.nextElement();
+ String name = e.nextElement();
request.setAttribute(name, request.getParameter(name));
}
}
@@ -587,9 +587,9 @@
// next see if the userLogin has a value
if (localeObject == null) {
- Map userLogin = (Map) session.getAttribute("userLogin");
+ Map<?, ?> userLogin = (Map<?, ?>) session.getAttribute("userLogin");
if (userLogin == null) {
- userLogin = (Map) session.getAttribute("autoUserLogin");
+ userLogin = (Map<?,?>) session.getAttribute("autoUserLogin");
}
if (userLogin != null) {
@@ -658,9 +658,9 @@
TimeZone timeZone = (TimeZone) session.getAttribute("timeZone");
if (timeZone == null) {
String tzId = null;
- Map userLogin = (Map) session.getAttribute("userLogin");
+ Map<String, String> userLogin = UtilGenerics.cast(session.getAttribute("userLogin"));
if (userLogin != null) {
- tzId = (String) userLogin.get("lastTimeZone");
+ tzId = userLogin.get("lastTimeZone");
}
timeZone = UtilDateTime.toTimeZone(tzId);
session.setAttribute("timeZone", timeZone);
@@ -679,9 +679,9 @@
// check userLogin next, ie if nothing to override in the session
if (iso == null) {
- Map userLogin = (Map) session.getAttribute("userLogin");
+ Map<String, ?> userLogin = UtilGenerics.cast(session.getAttribute("userLogin"));
if (userLogin == null) {
- userLogin = (Map) session.getAttribute("autoUserLogin");
+ userLogin = UtilGenerics.cast(session.getAttribute("autoUserLogin"));
}
if (userLogin != null) {
@@ -1179,8 +1179,8 @@
// collect the composite fields into a map
Map<String, String> data = FastMap.newInstance();
- for (Enumeration names = request.getParameterNames(); names.hasMoreElements();) {
- String name = (String) names.nextElement();
+ for (Enumeration<String> names = UtilGenerics.cast(request.getParameterNames()); names.hasMoreElements();) {
+ String name = names.nextElement();
if (!name.startsWith(prefix + COMPOSITE_DELIMITER)) continue;
// extract the suffix of the composite name
@@ -1288,8 +1288,6 @@
/** Returns the number or rows submitted by a multi form.
*/
public static int getMultiFormRowCount(HttpServletRequest request) {
- // The number of multi form rows is computed selecting the maximum index
- int rowCount = 0;
return UtilHttp.getMultiFormRowCount(UtilHttp.getParameterMap(request));
}
/** Returns the number or rows submitted by a multi form.
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilJavaParse.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilJavaParse.java?rev=831550&r1=831549&r2=831550&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilJavaParse.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilJavaParse.java Sat Oct 31 15:22:05 2009
@@ -100,7 +100,7 @@
int nextOpen = javaFile.indexOf("{", blockStart+1);
int nextClose = javaFile.indexOf("}", blockStart+1);
if (nextOpen > 0 && nextClose > 0 && nextClose > nextOpen) {
- String javaFragment = javaFile.substring(nextOpen, nextClose);
+ javaFile.substring(nextOpen, nextClose);
}
// if no close, end with couldn't find
if (nextClose < 0) return -1;
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilMisc.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilMisc.java?rev=831550&r1=831549&r2=831550&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilMisc.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilMisc.java Sat Oct 31 15:22:05 2009
@@ -57,7 +57,7 @@
return throwable;
}
- public static <T> int compare(T obj1, T obj2) {
+ public static <T> int compare(Comparable<T> obj1, T obj2) {
if (obj1 == null) {
if (obj2 == null) {
return 0;
@@ -65,20 +65,21 @@
return 1;
}
} else {
- return ((Comparable<T>) obj1).compareTo(obj2);
+ return obj1.compareTo(obj2);
}
}
- public static <T> int compare(Comparable<T> obj1, T obj2) {
- if (obj1 == null) {
- if (obj2 == null) {
+ public static <E> int compare(List<E> obj1, List<E> obj2) {
+ if (obj1 == obj2) {
+ return 0;
+ }
+ try {
+ if (obj1.size() == obj2.size() && obj1.containsAll(obj2) && obj2.containsAll(obj1)) {
return 0;
- } else {
- return 1;
}
- } else {
- return obj1.compareTo(obj2);
- }
+
+ } catch (Exception e) {}
+ return 1;
}
/**
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilProperties.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilProperties.java?rev=831550&r1=831549&r2=831550&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilProperties.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilProperties.java Sat Oct 31 15:22:05 2009
@@ -472,7 +472,7 @@
* @param arguments A List of Objects to insert into the message argument place holders
* @return The value of the property in the properties file
*/
- public static String getMessage(String resource, String name, List arguments, Locale locale) {
+ public static <E> String getMessage(String resource, String name, List<E> arguments, Locale locale) {
String value = getMessage(resource, name, locale);
if (value == null || value.length() == 0) {
@@ -944,12 +944,12 @@
@Override
public Enumeration<String> getKeys() {
return new Enumeration<String>() {
- Iterator i = properties.keySet().iterator();
+ Iterator<String> i = UtilGenerics.cast(properties.keySet().iterator());
public boolean hasMoreElements() {
return (i.hasNext());
}
public String nextElement() {
- return (String) i.next();
+ return i.next();
}
};
}
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilURL.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilURL.java?rev=831550&r1=831549&r2=831550&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilURL.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilURL.java Sat Oct 31 15:22:05 2009
@@ -20,7 +20,6 @@
import java.io.BufferedReader;
import java.io.File;
-import java.io.FileReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -35,7 +34,7 @@
public static final String module = UtilURL.class.getName();
- public static URL fromClass(Class contextClass) {
+ public static <C> URL fromClass(Class<C> contextClass) {
String resourceName = contextClass.getName();
int dotIndex = resourceName.lastIndexOf('.');
@@ -49,7 +48,7 @@
return fromResource(resourceName, null);
}
- public static URL fromResource(Class contextClass, String resourceName) {
+ public static <C> URL fromResource(Class<C> contextClass, String resourceName) {
if (contextClass == null)
return fromResource(resourceName, null);
else
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilValidate.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilValidate.java?rev=831550&r1=831549&r2=831550&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilValidate.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilValidate.java Sat Oct 31 15:22:05 2009
@@ -197,7 +197,7 @@
}
/** Check whether collection c is empty. */
- public static boolean isEmpty(Collection c) {
+ public static <E> boolean isEmpty(Collection<E> c) {
return ((c == null) || (c.size() == 0));
}
@@ -207,7 +207,7 @@
}
/** Check whether collection c is NOT empty. */
- public static boolean isNotEmpty(Collection c) {
+ public static <E> boolean isNotEmpty(Collection<E> c) {
return ((c != null) && (c.size() > 0));
}
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilXml.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilXml.java?rev=831550&r1=831549&r2=831550&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilXml.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilXml.java Sat Oct 31 15:22:05 2009
@@ -45,6 +45,15 @@
import javolution.util.FastList;
+import org.apache.xerces.parsers.DOMParser;
+import org.apache.xerces.xni.Augmentations;
+import org.apache.xerces.xni.NamespaceContext;
+import org.apache.xerces.xni.QName;
+import org.apache.xerces.xni.XMLAttributes;
+import org.apache.xerces.xni.XMLLocator;
+import org.apache.xerces.xni.XMLResourceIdentifier;
+import org.apache.xerces.xni.XMLString;
+import org.apache.xerces.xni.XNIException;
import org.apache.xml.serialize.OutputFormat;
import org.w3c.dom.DOMConfiguration;
import org.w3c.dom.Document;
@@ -62,16 +71,6 @@
import org.xml.sax.SAXParseException;
import org.xml.sax.helpers.DefaultHandler;
-import org.apache.xerces.parsers.DOMParser;
-import org.apache.xerces.xni.Augmentations;
-import org.apache.xerces.xni.NamespaceContext;
-import org.apache.xerces.xni.QName;
-import org.apache.xerces.xni.XNIException;
-import org.apache.xerces.xni.XMLAttributes;
-import org.apache.xerces.xni.XMLLocator;
-import org.apache.xerces.xni.XMLResourceIdentifier;
-import org.apache.xerces.xni.XMLString;
-
/**
* Utilities methods to simplify dealing with JAXP & DOM XML parsing
*
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/CacheSoftReference.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/CacheSoftReference.java?rev=831550&r1=831549&r2=831550&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/CacheSoftReference.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/CacheSoftReference.java Sat Oct 31 15:22:05 2009
@@ -24,6 +24,7 @@
import org.ofbiz.base.util.Debug;
+@SuppressWarnings("serial")
public class CacheSoftReference<V> extends SoftReference<V> implements Serializable {
public static final String module = CacheSoftReference.class.getName();
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/HardRefCacheLine.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/HardRefCacheLine.java?rev=831550&r1=831549&r2=831550&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/HardRefCacheLine.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/HardRefCacheLine.java Sat Oct 31 15:22:05 2009
@@ -18,6 +18,7 @@
*******************************************************************************/
package org.ofbiz.base.util.cache;
+@SuppressWarnings("serial")
public final class HardRefCacheLine<V> extends CacheLine<V> {
public final V value;
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/JdbmSerializer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/JdbmSerializer.java?rev=831550&r1=831549&r2=831550&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/JdbmSerializer.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/JdbmSerializer.java Sat Oct 31 15:22:05 2009
@@ -27,6 +27,7 @@
* (needed do to the fact that we do dynamic class loading)
*
*/
+@SuppressWarnings("serial")
public class JdbmSerializer implements jdbm.helper.Serializer {
public byte[] serialize(Object o) throws IOException {
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/SoftRefCacheLine.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/SoftRefCacheLine.java?rev=831550&r1=831549&r2=831550&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/SoftRefCacheLine.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/SoftRefCacheLine.java Sat Oct 31 15:22:05 2009
@@ -18,6 +18,7 @@
*******************************************************************************/
package org.ofbiz.base.util.cache;
+@SuppressWarnings("serial")
public final class SoftRefCacheLine<V> extends CacheLine<V> {
public final CacheSoftReference<V> ref;
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/FlexibleServletAccessor.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/FlexibleServletAccessor.java?rev=831550&r1=831549&r2=831550&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/FlexibleServletAccessor.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/FlexibleServletAccessor.java Sat Oct 31 15:22:05 2009
@@ -34,6 +34,7 @@
* list elements. See individual Map operations for more information.
*
*/
+@SuppressWarnings("serial")
public class FlexibleServletAccessor<T> implements Serializable {
protected String name;
@@ -170,7 +171,7 @@
@Override
public boolean equals(Object obj) {
if (obj instanceof FlexibleServletAccessor) {
- FlexibleServletAccessor flexibleServletAccessor = (FlexibleServletAccessor) obj;
+ FlexibleServletAccessor<?> flexibleServletAccessor = (FlexibleServletAccessor<?>) obj;
if (this.name == null) {
return flexibleServletAccessor.name == null;
}
@@ -248,7 +249,7 @@
public T get(ServletRequest request) {
Object theValue = null;
if (isListReference) {
- List lst = (List) request.getAttribute(attributeName);
+ List<T> lst = UtilGenerics.cast(request.getAttribute(attributeName));
theValue = lst.get(listIndex);
} else {
theValue = request.getAttribute(attributeName);
@@ -264,7 +265,7 @@
public T get(HttpSession session) {
Object theValue = null;
if (isListReference) {
- List lst = (List) session.getAttribute(attributeName);
+ List<T> lst = UtilGenerics.cast(session.getAttribute(attributeName));
theValue = lst.get(listIndex);
} else {
theValue = session.getAttribute(attributeName);
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/LifoSet.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/LifoSet.java?rev=831550&r1=831549&r2=831550&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/LifoSet.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/LifoSet.java Sat Oct 31 15:22:05 2009
@@ -28,6 +28,7 @@
* LifoSet - Set interface wrapper around a LinkedList
*
*/
+@SuppressWarnings("serial")
public class LifoSet<V> extends AbstractSet<V> implements Serializable {
// This set's back LinkedList
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/MapComparator.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/MapComparator.java?rev=831550&r1=831549&r2=831550&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/MapComparator.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/MapComparator.java Sat Oct 31 15:22:05 2009
@@ -19,7 +19,6 @@
package org.ofbiz.base.util.collections;
import java.util.Comparator;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/MapStack.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/MapStack.java?rev=831550&r1=831549&r2=831550&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/MapStack.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/MapStack.java Sat Oct 31 15:22:05 2009
@@ -46,7 +46,7 @@
protected static final ObjectFactory<MapStack<?>> mapStackFactory = new ObjectFactory<MapStack<?>>() {
@Override
protected MapStack<?> create() {
- return new MapStack();
+ return new MapStack<Object>();
}
};
@@ -236,7 +236,7 @@
// only return if the curMap contains the key, rather than checking for null; this allows a null at a lower level to override a value at a higher level
if (curMap.containsKey(name)) {
if (curMap instanceof LocalizedMap) {
- LocalizedMap lmap = (LocalizedMap) curMap;
+ LocalizedMap<Object> lmap = UtilGenerics.cast(curMap);
return lmap.get(name, locale);
} else {
return curMap.get(name);
@@ -284,8 +284,7 @@
*/
public void clear() {
// all write operations are local: only clear the Map on the top of the stack
- Map currentMap = (Map) this.stackList.get(0);
- currentMap.clear();
+ this.stackList.get(0).clear();
}
/* (non-Javadoc)
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/ResourceBundleMapWrapper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/ResourceBundleMapWrapper.java?rev=831550&r1=831549&r2=831550&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/ResourceBundleMapWrapper.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/ResourceBundleMapWrapper.java Sat Oct 31 15:22:05 2009
@@ -34,6 +34,7 @@
* Generic ResourceBundle Map Wrapper, given ResourceBundle allows it to be used as a Map
*
*/
+@SuppressWarnings("serial")
public class ResourceBundleMapWrapper implements Map<String, Object>, Serializable {
protected MapStack<String> rbmwStack;
@@ -261,7 +262,7 @@
/* (non-Javadoc)
* @see java.util.Map#putAll(java.util.Map)
*/
- public void putAll(Map arg0) {
+ public void putAll(Map<? extends String, ? extends Object> arg0) {
throw new RuntimeException("Not implemented for ResourceBundleMapWrapper");
}
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java?rev=831550&r1=831549&r2=831550&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java Sat Oct 31 15:22:05 2009
@@ -109,7 +109,8 @@
if (locale == null) {
locale = (Locale) context.get("locale");
if (locale == null && context.containsKey("autoUserLogin")) {
- locale = UtilMisc.ensureLocale(((Map) context.get("autoUserLogin")).get("lastLocale"));
+ Map<String, Object> autoUserLogin = UtilGenerics.cast(context.get("autoUserLogin"));
+ locale = UtilMisc.ensureLocale(autoUserLogin.get("lastLocale"));
}
if (locale == null) {
locale = Locale.getDefault();
@@ -118,7 +119,8 @@
if (timeZone == null) {
timeZone = (TimeZone) context.get("timeZone");
if (timeZone == null && context.containsKey("autoUserLogin")) {
- timeZone = UtilDateTime.toTimeZone((String)((Map) context.get("autoUserLogin")).get("lastTimeZone"));
+ Map<String, String> autoUserLogin = UtilGenerics.cast(context.get("autoUserLogin"));
+ timeZone = UtilDateTime.toTimeZone(autoUserLogin.get("lastTimeZone"));
}
if (timeZone == null) {
timeZone = TimeZone.getDefault();
@@ -312,7 +314,7 @@
protected static class GroovyElem implements StrElem {
protected final String originalString;
- protected final Class parsedScript;
+ protected final Class<?> parsedScript;
protected GroovyElem(String script) {
this.originalString = script;
this.parsedScript = GroovyUtil.groovyClassLoader.parseClass(script);
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/UelUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/UelUtil.java?rev=831550&r1=831549&r2=831550&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/UelUtil.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/UelUtil.java Sat Oct 31 15:22:05 2009
@@ -371,7 +371,6 @@
return result;
}
- @SuppressWarnings("unchecked")
public static Object resolveVariable(String variable, Map<String, Object> variables, Locale locale) {
Object obj = null;
String createObjectType = null;
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java?rev=831550&r1=831549&r2=831550&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java Sat Oct 31 15:22:05 2009
@@ -388,9 +388,9 @@
Debug.logInfo(e.getMessage(), module);
return returnObj;
}
- Map ctx = null;
+ Map<String, ?> ctx = null;
if (ctxObj instanceof BeanModel) {
- ctx = (Map)((BeanModel)ctxObj).getWrappedObject();
+ ctx = UtilGenerics.cast(((BeanModel)ctxObj).getWrappedObject());
returnObj = ctx.get(key);
}
/*
Re: svn commit: r831550 - in /ofbiz/trunk/framework/base/src/org/ofbiz/base: component/ config/ container/ location/ splash/ util/ util/cache/ util/collections/ util/string/ util/template/
Posted by Jacques Le Roux <ja...@les7arts.com>.
Why have
File files[] = path.listFiles();
- for (File file: path.listFiles()) {
+ for (File file: files) {
and
- StackTraceElement[] stacks = t.getStackTrace();
for (StackTraceElement stack: t.getStackTrace()) {
?
No other remarks
Jacques
----- Original Message -----
From: <ad...@apache.org>
To: <co...@ofbiz.apache.org>
Sent: Saturday, October 31, 2009 4:22 PM
Subject: svn commit: r831550 - in /ofbiz/trunk/framework/base/src/org/ofbiz/base: component/ config/ container/ location/ splash/
util/ util/cache/ util/collections/ util/string/ util/template/
> Author: adrianc
> Date: Sat Oct 31 15:22:05 2009
> New Revision: 831550
>
> URL: http://svn.apache.org/viewvc?rev=831550&view=rev
> Log:
> Remove Eclipse compiler warnings from framework/base component. Patch contributed by Marc Morin with additional work by me -
> https://issues.apache.org/jira/browse/OFBIZ-3102.
>
> This commit requires an ant clean + build.
>
> Modified:
> ofbiz/trunk/framework/base/src/org/ofbiz/base/component/AlreadyLoadedException.java
> ofbiz/trunk/framework/base/src/org/ofbiz/base/component/ComponentException.java
> ofbiz/trunk/framework/base/src/org/ofbiz/base/component/ComponentResourceHandler.java
> ofbiz/trunk/framework/base/src/org/ofbiz/base/config/ClasspathLoader.java
> ofbiz/trunk/framework/base/src/org/ofbiz/base/config/FileLoader.java
> ofbiz/trunk/framework/base/src/org/ofbiz/base/config/GenericConfigException.java
> ofbiz/trunk/framework/base/src/org/ofbiz/base/config/MainResourceHandler.java
> ofbiz/trunk/framework/base/src/org/ofbiz/base/config/ResourceLoader.java
> ofbiz/trunk/framework/base/src/org/ofbiz/base/config/UrlLoader.java
> ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ComponentContainer.java
> ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ContainerConfig.java
> ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ContainerException.java
> ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ContainerLoader.java
> ofbiz/trunk/framework/base/src/org/ofbiz/base/container/JunitContainer.java
> ofbiz/trunk/framework/base/src/org/ofbiz/base/container/JustLoadComponentsContainer.java
> ofbiz/trunk/framework/base/src/org/ofbiz/base/location/FlexibleLocation.java
> ofbiz/trunk/framework/base/src/org/ofbiz/base/splash/SplashScreen.java
> ofbiz/trunk/framework/base/src/org/ofbiz/base/util/BshUtil.java
> ofbiz/trunk/framework/base/src/org/ofbiz/base/util/Debug.java
> ofbiz/trunk/framework/base/src/org/ofbiz/base/util/GeneralException.java
> ofbiz/trunk/framework/base/src/org/ofbiz/base/util/GeneralRuntimeException.java
> ofbiz/trunk/framework/base/src/org/ofbiz/base/util/HttpClient.java
> ofbiz/trunk/framework/base/src/org/ofbiz/base/util/HttpClientException.java
> ofbiz/trunk/framework/base/src/org/ofbiz/base/util/KeyStoreUtil.java
> ofbiz/trunk/framework/base/src/org/ofbiz/base/util/MultiTrustManager.java
> ofbiz/trunk/framework/base/src/org/ofbiz/base/util/NotifyLevel.java
> ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ObjectInputStream.java
> ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ObjectType.java
> ofbiz/trunk/framework/base/src/org/ofbiz/base/util/OfbizBshBsfEngine.java
> ofbiz/trunk/framework/base/src/org/ofbiz/base/util/SSLUtil.java
> ofbiz/trunk/framework/base/src/org/ofbiz/base/util/StringUtil.java
> ofbiz/trunk/framework/base/src/org/ofbiz/base/util/URLConnector.java
> ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilGenerics.java
> ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilHttp.java
> ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilJavaParse.java
> ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilMisc.java
> ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilProperties.java
> ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilURL.java
> ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilValidate.java
> ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilXml.java
> ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/CacheSoftReference.java
> ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/HardRefCacheLine.java
> ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/JdbmSerializer.java
> ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/SoftRefCacheLine.java
> ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/FlexibleServletAccessor.java
> ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/LifoSet.java
> ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/MapComparator.java
> ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/MapStack.java
> ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/ResourceBundleMapWrapper.java
> ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java
> ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/UelUtil.java
> ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/component/AlreadyLoadedException.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/component/AlreadyLoadedException.java?rev=831550&r1=831549&r2=831550&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/component/AlreadyLoadedException.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/component/AlreadyLoadedException.java Sat Oct 31 15:22:05 2009
> @@ -22,6 +22,7 @@
> * Component Already Loaded Exception
> *
> */
> +@SuppressWarnings("serial")
> public class AlreadyLoadedException extends ComponentException {
>
> public AlreadyLoadedException() {
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/component/ComponentException.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/component/ComponentException.java?rev=831550&r1=831549&r2=831550&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/component/ComponentException.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/component/ComponentException.java Sat Oct 31 15:22:05 2009
> @@ -24,6 +24,7 @@
> * ComponentException
> *
> */
> +@SuppressWarnings("serial")
> public class ComponentException extends GenericConfigException {
>
> public ComponentException() {
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/component/ComponentResourceHandler.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/component/ComponentResourceHandler.java?rev=831550&r1=831549&r2=831550&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/component/ComponentResourceHandler.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/component/ComponentResourceHandler.java Sat Oct 31 15:22:05 2009
> @@ -33,6 +33,7 @@
> * Contains resource information and provides for loading data
> *
> */
> +@SuppressWarnings("serial")
> public class ComponentResourceHandler implements ResourceHandler {
>
> public static final String module = ComponentResourceHandler.class.getName();
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/config/ClasspathLoader.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/config/ClasspathLoader.java?rev=831550&r1=831549&r2=831550&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/config/ClasspathLoader.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/config/ClasspathLoader.java Sat Oct 31 15:22:05 2009
> @@ -26,6 +26,7 @@
> * Loads resources from the classpath
> *
> */
> +@SuppressWarnings("serial")
> public class ClasspathLoader extends ResourceLoader implements java.io.Serializable {
>
> @Override
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/config/FileLoader.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/config/FileLoader.java?rev=831550&r1=831549&r2=831550&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/config/FileLoader.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/config/FileLoader.java Sat Oct 31 15:22:05 2009
> @@ -26,6 +26,7 @@
> * Loads resources from the file system
> *
> */
> +@SuppressWarnings("serial")
> public class FileLoader extends ResourceLoader implements java.io.Serializable {
>
> @Override
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/config/GenericConfigException.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/config/GenericConfigException.java?rev=831550&r1=831549&r2=831550&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/config/GenericConfigException.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/config/GenericConfigException.java Sat Oct 31 15:22:05 2009
> @@ -24,6 +24,7 @@
> * GenericConfigException
> *
> */
> +@SuppressWarnings("serial")
> public class GenericConfigException extends GeneralException {
>
> public GenericConfigException() {
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/config/MainResourceHandler.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/config/MainResourceHandler.java?rev=831550&r1=831549&r2=831550&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/config/MainResourceHandler.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/config/MainResourceHandler.java Sat Oct 31 15:22:05 2009
> @@ -31,6 +31,7 @@
> * Contains resource information and provides for loading data
> *
> */
> +@SuppressWarnings("serial")
> public final class MainResourceHandler implements ResourceHandler {
>
> public static final String module = MainResourceHandler.class.getName();
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/config/ResourceLoader.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/config/ResourceLoader.java?rev=831550&r1=831549&r2=831550&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/config/ResourceLoader.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/config/ResourceLoader.java Sat Oct 31 15:22:05 2009
> @@ -134,7 +134,7 @@
> ResourceLoader loader = null;
>
> try {
> - Class lClass = null;
> + Class<?> lClass = null;
>
> if (className != null && className.length() > 0) {
> try {
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/config/UrlLoader.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/config/UrlLoader.java?rev=831550&r1=831549&r2=831550&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/config/UrlLoader.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/config/UrlLoader.java Sat Oct 31 15:22:05 2009
> @@ -25,6 +25,7 @@
> * Loads resources from a URL
> *
> */
> +@SuppressWarnings("serial")
> public class UrlLoader extends ResourceLoader implements java.io.Serializable {
>
> @Override
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ComponentContainer.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ComponentContainer.java?rev=831550&r1=831549&r2=831550&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ComponentContainer.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ComponentContainer.java Sat Oct 31 15:22:05 2009
> @@ -22,7 +22,6 @@
> import java.io.IOException;
> import java.net.MalformedURLException;
> import java.net.URL;
> -import java.util.Iterator;
> import java.util.List;
>
> import org.ofbiz.base.component.AlreadyLoadedException;
> @@ -242,7 +241,7 @@
> if (path.isDirectory()) {
> // load all .jar and .zip files in this directory
> File files[] = path.listFiles();
> - for (File file: path.listFiles()) {
> + for (File file: files) {
> String fileName = file.getName();
> if (fileName.endsWith(".jar") || fileName.endsWith(".zip")) {
> classPath.addComponent(file);
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ContainerConfig.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ContainerConfig.java?rev=831550&r1=831549&r2=831550&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ContainerConfig.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ContainerConfig.java Sat Oct 31 15:22:05 2009
> @@ -21,17 +21,16 @@
> import java.io.IOException;
> import java.net.URL;
> import java.util.Collection;
> -import java.util.Iterator;
> import java.util.LinkedHashMap;
> import java.util.LinkedList;
> import java.util.List;
> import java.util.Map;
> +
> import javax.xml.parsers.ParserConfigurationException;
>
> import org.ofbiz.base.util.UtilURL;
> import org.ofbiz.base.util.UtilValidate;
> import org.ofbiz.base.util.UtilXml;
> -
> import org.w3c.dom.Document;
> import org.w3c.dom.Element;
> import org.xml.sax.SAXException;
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ContainerException.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ContainerException.java?rev=831550&r1=831549&r2=831550&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ContainerException.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ContainerException.java Sat Oct 31 15:22:05 2009
> @@ -23,6 +23,7 @@
> /**
> * ContainerException
> */
> +@SuppressWarnings("serial")
> public class ContainerException extends GenericConfigException {
>
> public ContainerException() {
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ContainerLoader.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ContainerLoader.java?rev=831550&r1=831549&r2=831550&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ContainerLoader.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ContainerLoader.java Sat Oct 31 15:22:05 2009
> @@ -18,16 +18,15 @@
> *******************************************************************************/
> package org.ofbiz.base.container;
>
> +import java.io.PrintWriter;
> +import java.io.StringWriter;
> import java.util.Collection;
> -import java.util.Iterator;
> import java.util.LinkedList;
> import java.util.List;
> -import java.io.PrintWriter;
> -import java.io.StringWriter;
>
> +import org.ofbiz.base.start.Start;
> import org.ofbiz.base.start.StartupException;
> import org.ofbiz.base.start.StartupLoader;
> -import org.ofbiz.base.start.Start;
> import org.ofbiz.base.util.Debug;
>
> /**
> @@ -143,7 +142,6 @@
> ThreadGroup g = t.getThreadGroup();
> out.println("Thread: " + t.getName() + " [" + t.getId() + "] @ " + (g != null ? g.getName() : "[none]") + " : " +
> t.getPriority() + " [" + t.getState().name() + "]");
> out.println("--- Alive: " + t.isAlive() + " Daemon: " + t.isDaemon());
> - StackTraceElement[] stacks = t.getStackTrace();
> for (StackTraceElement stack: t.getStackTrace()) {
> out.println("### " + stack.toString());
> }
> @@ -159,7 +157,7 @@
> Debug.logWarning("Unable to get context classloader; using system", module);
> loader = ClassLoader.getSystemClassLoader();
> }
> - Class containerClass = null;
> + Class<?> containerClass = null;
> try {
> containerClass = loader.loadClass(containerCfg.className);
> } catch (ClassNotFoundException e) {
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/container/JunitContainer.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/container/JunitContainer.java?rev=831550&r1=831549&r2=831550&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/container/JunitContainer.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/container/JunitContainer.java Sat Oct 31 15:22:05 2009
> @@ -54,7 +54,7 @@
> TestSuite suite = new TestSuite();
> while (ti.hasNext()) {
> ContainerConfig.Container.Property prop = ti.next();
> - Class clz = null;
> + Class<?> clz = null;
> try {
> clz = ObjectType.loadClass(prop.value);
> suite.addTestSuite(clz);
> @@ -74,7 +74,7 @@
> results.failureCount() + " # Errors: " + results.errorCount(), module);
> if (Debug.infoOn()) {
> Debug.log("[JUNIT] ----------------------------- ERRORS ----------------------------- [JUNIT]", module);
> - Enumeration err = results.errors();
> + Enumeration<?> err = results.errors();
> if (!err.hasMoreElements()) {
> Debug.log("None");
> } else {
> @@ -84,7 +84,7 @@
> }
> Debug.log("[JUNIT] ------------------------------------------------------------------ [JUNIT]", module);
> Debug.log("[JUNIT] ---------------------------- FAILURES ---------------------------- [JUNIT]", module);
> - Enumeration fail = results.failures();
> + Enumeration<?> fail = results.failures();
> if (!fail.hasMoreElements()) {
> Debug.log("None");
> } else {
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/container/JustLoadComponentsContainer.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/container/JustLoadComponentsContainer.java?rev=831550&r1=831549&r2=831550&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/container/JustLoadComponentsContainer.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/container/JustLoadComponentsContainer.java Sat Oct 31 15:22:05 2009
> @@ -21,7 +21,6 @@
> import org.ofbiz.base.component.AlreadyLoadedException;
> import org.ofbiz.base.component.ComponentException;
> import org.ofbiz.base.util.Debug;
> -import org.ofbiz.base.util.UtilMisc;
>
> /**
> * A Container implementation to run the tests configured through this testtools stuff.
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/location/FlexibleLocation.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/location/FlexibleLocation.java?rev=831550&r1=831549&r2=831550&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/location/FlexibleLocation.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/location/FlexibleLocation.java Sat Oct 31 15:22:05 2009
> @@ -96,7 +96,7 @@
>
> // now create a new instance of the class...
> try {
> - Class lClass = null;
> + Class<?> lClass = null;
>
> try {
> ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/splash/SplashScreen.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/splash/SplashScreen.java?rev=831550&r1=831549&r2=831550&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/splash/SplashScreen.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/splash/SplashScreen.java Sat Oct 31 15:22:05 2009
> @@ -27,6 +27,7 @@
> import java.awt.Toolkit;
> import java.awt.Window;
>
> +@SuppressWarnings("serial")
> public final class SplashScreen extends Frame {
>
> private final String fImageId;
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/BshUtil.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/BshUtil.java?rev=831550&r1=831549&r2=831550&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/BshUtil.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/BshUtil.java Sat Oct 31 15:22:05 2009
> @@ -25,9 +25,7 @@
> import java.net.MalformedURLException;
> import java.net.URL;
> import java.util.HashMap;
> -import java.util.Iterator;
> import java.util.Map;
> -import java.util.Set;
>
> import org.ofbiz.base.location.FlexibleLocation;
> import org.ofbiz.base.util.cache.UtilCache;
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/Debug.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/Debug.java?rev=831550&r1=831549&r2=831550&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/Debug.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/Debug.java Sat Oct 31 15:22:05 2009
> @@ -97,9 +97,9 @@
> levelOnCache[x] = true;
> }
> LoggerRepository repo = root.getLoggerRepository();
> - Enumeration en = repo.getCurrentLoggers();
> + Enumeration<Logger> en = UtilGenerics.cast(repo.getCurrentLoggers());
> while (en.hasMoreElements()) {
> - Logger thisLogger = (Logger) en.nextElement();
> + Logger thisLogger = en.nextElement();
> thisLogger.setLevel(Level.DEBUG);
> }
> }
> @@ -384,9 +384,9 @@
>
> Appender foundAppender = logger.getAppender(name);
> if (foundAppender == null) {
> - Enumeration currentLoggerEnum = Logger.getRootLogger().getLoggerRepository().getCurrentLoggers();
> + Enumeration<Logger> currentLoggerEnum =
> UtilGenerics.cast(Logger.getRootLogger().getLoggerRepository().getCurrentLoggers());
> while (currentLoggerEnum.hasMoreElements() && foundAppender == null) {
> - Logger log = (Logger) currentLoggerEnum.nextElement();
> + Logger log = currentLoggerEnum.nextElement();
> foundAppender = log.getAppender(name);
> }
> } else {
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/GeneralException.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/GeneralException.java?rev=831550&r1=831549&r2=831550&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/GeneralException.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/GeneralException.java Sat Oct 31 15:22:05 2009
> @@ -26,6 +26,7 @@
> * Base OFBiz Exception, provides nested exceptions, etc
> *
> */
> +@SuppressWarnings("serial")
> public class GeneralException extends Exception {
>
> public static <T> T checkException(Throwable t) throws GeneralException {
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/GeneralRuntimeException.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/GeneralRuntimeException.java?rev=831550&r1=831549&r2=831550&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/GeneralRuntimeException.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/GeneralRuntimeException.java Sat Oct 31 15:22:05 2009
> @@ -25,6 +25,7 @@
> * Base OFBiz Runtime Exception, provides nested exceptions, etc
> *
> */
> +@SuppressWarnings("serial")
> public class GeneralRuntimeException extends RuntimeException {
>
> Throwable nested = null;
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/HttpClient.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/HttpClient.java?rev=831550&r1=831549&r2=831550&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/HttpClient.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/HttpClient.java Sat Oct 31 15:22:05 2009
> @@ -28,6 +28,7 @@
> import java.net.URLConnection;
> import java.security.cert.CertificateException;
> import java.util.HashMap;
> +import java.util.List;
> import java.util.Map;
>
> /**
> @@ -477,7 +478,7 @@
> }
>
> if (Debug.verboseOn() || debug) {
> - Map headerFields = con.getHeaderFields();
> + Map<String, List<String>> headerFields = con.getHeaderFields();
> Debug.log("Header Fields : " + headerFields, module);
> }
>
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/HttpClientException.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/HttpClientException.java?rev=831550&r1=831549&r2=831550&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/HttpClientException.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/HttpClientException.java Sat Oct 31 15:22:05 2009
> @@ -22,6 +22,7 @@
> * HttpClient Exception.
> *
> */
> +@SuppressWarnings("serial")
> public class HttpClientException extends GeneralException {
>
> Throwable nested = null;
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/KeyStoreUtil.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/KeyStoreUtil.java?rev=831550&r1=831549&r2=831550&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/KeyStoreUtil.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/KeyStoreUtil.java Sat Oct 31 15:22:05 2009
> @@ -153,7 +153,7 @@
> CertificateFactory cf = CertificateFactory.getInstance("X.509");
> ByteArrayInputStream bais = new ByteArrayInputStream(certChain);
>
> - Collection certCol = cf.generateCertificates(bais);
> + Collection<? extends Certificate> certCol = cf.generateCertificates(bais);
> Certificate[] certs = new Certificate[certCol.toArray().length];
> if (certCol.size() == 1) {
> Debug.log("Single certificate; no chain", module);
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/MultiTrustManager.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/MultiTrustManager.java?rev=831550&r1=831549&r2=831550&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/MultiTrustManager.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/MultiTrustManager.java Sat Oct 31 15:22:05 2009
> @@ -19,17 +19,17 @@
>
> package org.ofbiz.base.util;
>
> -import javolution.util.FastList;
> -
> -import javax.net.ssl.X509TrustManager;
> -import java.security.cert.X509Certificate;
> -import java.security.cert.CertificateException;
> -import java.security.cert.Certificate;
> import java.security.KeyStore;
> import java.security.KeyStoreException;
> -import java.util.List;
> -import java.util.Iterator;
> +import java.security.cert.Certificate;
> +import java.security.cert.CertificateException;
> +import java.security.cert.X509Certificate;
> import java.util.Enumeration;
> +import java.util.List;
> +
> +import javax.net.ssl.X509TrustManager;
> +
> +import javolution.util.FastList;
>
> /**
> * MultiTrustManager
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/NotifyLevel.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/NotifyLevel.java?rev=831550&r1=831549&r2=831550&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/NotifyLevel.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/NotifyLevel.java Sat Oct 31 15:22:05 2009
> @@ -25,6 +25,7 @@
> /**
> * NotifyLevel
> */
> +@SuppressWarnings("serial")
> public class NotifyLevel extends Level {
>
> public static final int NOTIFY_INT = FATAL_INT + 10000;
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ObjectInputStream.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ObjectInputStream.java?rev=831550&r1=831549&r2=831550&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ObjectInputStream.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ObjectInputStream.java Sat Oct 31 15:22:05 2009
> @@ -40,7 +40,7 @@
> * @see java.io.ObjectInputStream#resolveClass(java.io.ObjectStreamClass)
> */
> @Override
> - protected Class resolveClass(ObjectStreamClass classDesc) throws IOException, ClassNotFoundException {
> + protected Class<?> resolveClass(ObjectStreamClass classDesc) throws IOException, ClassNotFoundException {
> return ObjectType.loadClass(classDesc.getName(), classloader);
> }
>
> @@ -48,8 +48,8 @@
> * @see java.io.ObjectInputStream#resolveProxyClass(java.lang.String[])
> */
> @Override
> - protected Class resolveProxyClass(String[] interfaces) throws IOException, ClassNotFoundException {
> - Class[] cinterfaces = new Class[interfaces.length];
> + protected Class<?> resolveProxyClass(String[] interfaces) throws IOException, ClassNotFoundException {
> + Class<?>[] cinterfaces = new Class[interfaces.length];
> for (int i = 0; i < interfaces.length; i++)
> cinterfaces[i] = classloader.loadClass(interfaces[i]);
>
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ObjectType.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ObjectType.java?rev=831550&r1=831549&r2=831550&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ObjectType.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ObjectType.java Sat Oct 31 15:22:05 2009
> @@ -90,7 +90,7 @@
> }
> className = "[" + prefix;
> } else {
> - Class arrayClass = loadClass(className.replace("[]", ""), loader);
> + Class<?> arrayClass = loadClass(className.replace("[]", ""), loader);
> className = "[L" + arrayClass.getName().replace("[]", "") + ";";
> }
> }
> @@ -182,7 +182,7 @@
> sig[i] = parameters[i].getClass();
> }
> Class<?> c = loadClass(className);
> - Constructor con = c.getConstructor(sig);
> + Constructor<?> con = c.getConstructor(sig);
> Object o = con.newInstance(parameters);
>
> if (Debug.verboseOn()) Debug.logVerbose("Instantiated object: " + o.toString(), module);
> @@ -958,17 +958,17 @@
> }
> } else if (obj instanceof java.util.Map) {
> fromType = "Map";
> - Map map = (Map) obj;
> + Map<?,?> map = (Map<?,?>) obj;
> if ("Map".equals(type) || "java.util.Map".equals(type)) {
> return map;
> } else if ("String".equals(type) || "java.lang.String".equals(type)) {
> return map.toString();
> } else if ("List".equals(type) || "java.util.List".equals(type)) {
> - List<Map> tempList = FastList.newInstance();
> + List<Map<?,?>> tempList = FastList.newInstance();
> tempList.add(map);
> return tempList;
> } else if ("Set".equals(type) || "java.util.Set".equals(type)) {
> - Set<Map> tempSet = FastSet.newInstance();
> + Set<Map<?,?>> tempSet = FastSet.newInstance();
> tempSet.add(map);
> return tempSet;
> } else {
> @@ -976,7 +976,7 @@
> }
> } else if (obj instanceof java.util.List) {
> fromType = "List";
> - List list = (List) obj;
> + List<?> list = (List<?>) obj;
> if ("List".equals(type) || "java.util.List".equals(type)) {
> return list;
> } else if ("String".equals(type) || "java.lang.String".equals(type)) {
> @@ -1067,7 +1067,7 @@
>
> // have converted value 2, now before converting value 1 see if it is a Collection and we are doing a contains comparison
> if ("contains".equals(operator) && value1 instanceof Collection) {
> - Collection col1 = (Collection) value1;
> + Collection<?> col1 = (Collection<?>) value1;
> return col1.contains(convertedValue2) ? Boolean.TRUE : Boolean.FALSE;
> }
>
> @@ -1115,9 +1115,9 @@
> return Boolean.TRUE;
> if (convertedValue1 instanceof String && ((String) convertedValue1).length() == 0)
> return Boolean.TRUE;
> - if (convertedValue1 instanceof List && ((List) convertedValue1).size() == 0)
> + if (convertedValue1 instanceof List && ((List<?>) convertedValue1).size() == 0)
> return Boolean.TRUE;
> - if (convertedValue1 instanceof Map && ((Map) convertedValue1).size() == 0)
> + if (convertedValue1 instanceof Map && ((Map<?, ?>) convertedValue1).size() == 0)
> return Boolean.TRUE;
> return Boolean.FALSE;
> } else if ("is-not-empty".equals(operator)) {
> @@ -1125,9 +1125,9 @@
> return Boolean.FALSE;
> if (convertedValue1 instanceof String && ((String) convertedValue1).length() == 0)
> return Boolean.FALSE;
> - if (convertedValue1 instanceof List && ((List) convertedValue1).size() == 0)
> + if (convertedValue1 instanceof List && ((List<?>) convertedValue1).size() == 0)
> return Boolean.FALSE;
> - if (convertedValue1 instanceof Map && ((Map) convertedValue1).size() == 0)
> + if (convertedValue1 instanceof Map && ((Map<?, ?>) convertedValue1).size() == 0)
> return Boolean.FALSE;
> return Boolean.TRUE;
> }
> @@ -1236,11 +1236,11 @@
> return true;
> }
> } else if (value instanceof Collection) {
> - if (((Collection) value).size() == 0) {
> + if (((Collection<?>) value).size() == 0) {
> return true;
> }
> } else if (value instanceof Map) {
> - if (((Map) value).size() == 0) {
> + if (((Map<?,?>) value).size() == 0) {
> return true;
> }
> }
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/OfbizBshBsfEngine.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/OfbizBshBsfEngine.java?rev=831550&r1=831549&r2=831550&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/OfbizBshBsfEngine.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/OfbizBshBsfEngine.java Sat Oct 31 15:22:05 2009
> @@ -63,6 +63,7 @@
>
> public static UtilCache<String, Interpreter.ParsedScript> parsedScripts = new UtilCache<String,
> Interpreter.ParsedScript>("script.BshBsfParsedCache", 0, 0, false);
>
> + @SuppressWarnings("unchecked")
> @Override
> public void initialize(BSFManager mgr, String lang, Vector declaredBeans) throws BSFException {
> super.initialize(mgr, lang, declaredBeans);
> @@ -136,6 +137,7 @@
> * It executes the funcBody text in an "anonymous" method call with
> * arguments.
> */
> + @SuppressWarnings("unchecked")
> @Override
> public Object apply(String source, int lineNo, int columnNo, Object funcBody, Vector namesVec, Vector argsVec) throws
> BSFException {
> if (namesVec.size() != argsVec.size()) throw new BSFException("number of params/names mismatch");
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/SSLUtil.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/SSLUtil.java?rev=831550&r1=831549&r2=831550&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/SSLUtil.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/SSLUtil.java Sat Oct 31 15:22:05 2009
> @@ -208,7 +208,7 @@
> }
> for (javax.security.cert.X509Certificate peerCert: peerCerts) {
> Principal x500s = peerCert.getSubjectDN();
> - Map subjectMap = KeyStoreUtil.getX500Map(x500s);
> + Map<String, String> subjectMap = KeyStoreUtil.getX500Map(x500s);
>
> if (Debug.infoOn())
> Debug.logInfo(peerCert.getSerialNumber().toString(16) + " :: " + subjectMap.get("CN"), module);
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/StringUtil.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/StringUtil.java?rev=831550&r1=831549&r2=831550&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/StringUtil.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/StringUtil.java Sat Oct 31 15:22:05 2009
> @@ -725,7 +725,7 @@
> protected static final ObjectFactory<HtmlEncodingMapWrapper<?>> mapStackFactory = new
> ObjectFactory<HtmlEncodingMapWrapper<?>>() {
> @Override
> protected HtmlEncodingMapWrapper<?> create() {
> - return new HtmlEncodingMapWrapper();
> + return new HtmlEncodingMapWrapper<Object>();
> }
> };
> public static <K> HtmlEncodingMapWrapper<K> getHtmlEncodingMapWrapper(Map<K, Object> mapToWrap, SimpleEncoder encoder) {
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/URLConnector.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/URLConnector.java?rev=831550&r1=831549&r2=831550&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/URLConnector.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/URLConnector.java Sat Oct 31 15:22:05 2009
> @@ -18,16 +18,16 @@
> *******************************************************************************/
> package org.ofbiz.base.util;
>
> -import org.ofbiz.base.config.GenericConfigException;
> -import org.ofbiz.base.util.Base64;
> -
> import java.io.IOException;
> import java.net.HttpURLConnection;
> import java.net.URL;
> import java.net.URLConnection;
> import java.security.GeneralSecurityException;
>
> -import javax.net.ssl.*;
> +import javax.net.ssl.HostnameVerifier;
> +import javax.net.ssl.HttpsURLConnection;
> +
> +import org.ofbiz.base.config.GenericConfigException;
>
> /**
> * URLConnector.java
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilGenerics.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilGenerics.java?rev=831550&r1=831549&r2=831550&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilGenerics.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilGenerics.java Sat Oct 31 15:22:05 2009
> @@ -43,7 +43,7 @@
> if (object != null) {
> if (!(clz.isInstance(object))) throw new ClassCastException("Not a " + clz.getName());
> int i = 0;
> - for (Object value: (Collection) object) {
> + for (Object value: (Collection<?>) object) {
> if (value != null && !type.isInstance(value)) {
> throw new IllegalArgumentException("Value(" + i + "), with value(" + value + ") is not a " + type.getName());
> }
> @@ -81,7 +81,7 @@
> public static <K, V> Map<K, V> checkMap(Object object, Class<K> keyType, Class<V> valueType) {
> if (object != null) {
> if (!(object instanceof Map)) throw new ClassCastException("Not a map");
> - Map<?, ?> map = (Map) object;
> + Map<?, ?> map = (Map<?,?>) object;
> int i = 0;
> for (Map.Entry<?, ?> entry: map.entrySet()) {
> if (entry.getKey() != null && !keyType.isInstance(entry.getKey())) {
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilHttp.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilHttp.java?rev=831550&r1=831549&r2=831550&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilHttp.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilHttp.java Sat Oct 31 15:22:05 2009
> @@ -292,7 +292,7 @@
> Map<String, Object> attributeMap = FastMap.newInstance();
>
> // look at all request attributes
> - Enumeration requestAttrNames = request.getAttributeNames();
> + Enumeration<String> requestAttrNames = UtilGenerics.cast(request.getAttributeNames());
> while (requestAttrNames.hasMoreElements()) {
> String attrName = (String) requestAttrNames.nextElement();
> if (namesToSkip != null && namesToSkip.contains(attrName))
> @@ -327,9 +327,9 @@
> HttpSession session = request.getSession();
>
> // look at all the session attributes
> - Enumeration sessionAttrNames = session.getAttributeNames();
> + Enumeration<String> sessionAttrNames = UtilGenerics.cast(session.getAttributeNames());
> while (sessionAttrNames.hasMoreElements()) {
> - String attrName = (String) sessionAttrNames.nextElement();
> + String attrName = sessionAttrNames.nextElement();
> if (namesToSkip != null && namesToSkip.contains(attrName))
> continue;
>
> @@ -362,9 +362,9 @@
>
> // look at all servlet context attributes
> ServletContext servletContext = (ServletContext) request.getAttribute("servletContext");
> - Enumeration applicationAttrNames = servletContext.getAttributeNames();
> + Enumeration<String> applicationAttrNames = UtilGenerics.cast(servletContext.getAttributeNames());
> while (applicationAttrNames.hasMoreElements()) {
> - String attrName = (String) applicationAttrNames.nextElement();
> + String attrName = applicationAttrNames.nextElement();
> if (namesToSkip != null && namesToSkip.contains(attrName))
> continue;
>
> @@ -485,9 +485,9 @@
>
> public static List<Object> makeParamListWithSuffix(HttpServletRequest request, Map<String, ? extends Object> additionalFields,
> String suffix, String prefix) {
> List<Object> paramList = new ArrayList<Object>();
> - Enumeration parameterNames = request.getParameterNames();
> + Enumeration<String> parameterNames = UtilGenerics.cast(request.getParameterNames());
> while (parameterNames.hasMoreElements()) {
> - String parameterName = (String) parameterNames.nextElement();
> + String parameterName = parameterNames.nextElement();
> if (parameterName.endsWith(suffix)) {
> if (prefix != null && prefix.length() > 0) {
> if (parameterName.startsWith(prefix)) {
> @@ -556,9 +556,9 @@
> * @param request
> */
> public static void parametersToAttributes(HttpServletRequest request) {
> - java.util.Enumeration e = request.getParameterNames();
> + java.util.Enumeration<String> e = UtilGenerics.cast(request.getParameterNames());
> while (e.hasMoreElements()) {
> - String name = (String) e.nextElement();
> + String name = e.nextElement();
> request.setAttribute(name, request.getParameter(name));
> }
> }
> @@ -587,9 +587,9 @@
>
> // next see if the userLogin has a value
> if (localeObject == null) {
> - Map userLogin = (Map) session.getAttribute("userLogin");
> + Map<?, ?> userLogin = (Map<?, ?>) session.getAttribute("userLogin");
> if (userLogin == null) {
> - userLogin = (Map) session.getAttribute("autoUserLogin");
> + userLogin = (Map<?,?>) session.getAttribute("autoUserLogin");
> }
>
> if (userLogin != null) {
> @@ -658,9 +658,9 @@
> TimeZone timeZone = (TimeZone) session.getAttribute("timeZone");
> if (timeZone == null) {
> String tzId = null;
> - Map userLogin = (Map) session.getAttribute("userLogin");
> + Map<String, String> userLogin = UtilGenerics.cast(session.getAttribute("userLogin"));
> if (userLogin != null) {
> - tzId = (String) userLogin.get("lastTimeZone");
> + tzId = userLogin.get("lastTimeZone");
> }
> timeZone = UtilDateTime.toTimeZone(tzId);
> session.setAttribute("timeZone", timeZone);
> @@ -679,9 +679,9 @@
>
> // check userLogin next, ie if nothing to override in the session
> if (iso == null) {
> - Map userLogin = (Map) session.getAttribute("userLogin");
> + Map<String, ?> userLogin = UtilGenerics.cast(session.getAttribute("userLogin"));
> if (userLogin == null) {
> - userLogin = (Map) session.getAttribute("autoUserLogin");
> + userLogin = UtilGenerics.cast(session.getAttribute("autoUserLogin"));
> }
>
> if (userLogin != null) {
> @@ -1179,8 +1179,8 @@
>
> // collect the composite fields into a map
> Map<String, String> data = FastMap.newInstance();
> - for (Enumeration names = request.getParameterNames(); names.hasMoreElements();) {
> - String name = (String) names.nextElement();
> + for (Enumeration<String> names = UtilGenerics.cast(request.getParameterNames()); names.hasMoreElements();) {
> + String name = names.nextElement();
> if (!name.startsWith(prefix + COMPOSITE_DELIMITER)) continue;
>
> // extract the suffix of the composite name
> @@ -1288,8 +1288,6 @@
> /** Returns the number or rows submitted by a multi form.
> */
> public static int getMultiFormRowCount(HttpServletRequest request) {
> - // The number of multi form rows is computed selecting the maximum index
> - int rowCount = 0;
> return UtilHttp.getMultiFormRowCount(UtilHttp.getParameterMap(request));
> }
> /** Returns the number or rows submitted by a multi form.
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilJavaParse.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilJavaParse.java?rev=831550&r1=831549&r2=831550&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilJavaParse.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilJavaParse.java Sat Oct 31 15:22:05 2009
> @@ -100,7 +100,7 @@
> int nextOpen = javaFile.indexOf("{", blockStart+1);
> int nextClose = javaFile.indexOf("}", blockStart+1);
> if (nextOpen > 0 && nextClose > 0 && nextClose > nextOpen) {
> - String javaFragment = javaFile.substring(nextOpen, nextClose);
> + javaFile.substring(nextOpen, nextClose);
> }
> // if no close, end with couldn't find
> if (nextClose < 0) return -1;
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilMisc.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilMisc.java?rev=831550&r1=831549&r2=831550&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilMisc.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilMisc.java Sat Oct 31 15:22:05 2009
> @@ -57,7 +57,7 @@
> return throwable;
> }
>
> - public static <T> int compare(T obj1, T obj2) {
> + public static <T> int compare(Comparable<T> obj1, T obj2) {
> if (obj1 == null) {
> if (obj2 == null) {
> return 0;
> @@ -65,20 +65,21 @@
> return 1;
> }
> } else {
> - return ((Comparable<T>) obj1).compareTo(obj2);
> + return obj1.compareTo(obj2);
> }
> }
>
> - public static <T> int compare(Comparable<T> obj1, T obj2) {
> - if (obj1 == null) {
> - if (obj2 == null) {
> + public static <E> int compare(List<E> obj1, List<E> obj2) {
> + if (obj1 == obj2) {
> + return 0;
> + }
> + try {
> + if (obj1.size() == obj2.size() && obj1.containsAll(obj2) && obj2.containsAll(obj1)) {
> return 0;
> - } else {
> - return 1;
> }
> - } else {
> - return obj1.compareTo(obj2);
> - }
> +
> + } catch (Exception e) {}
> + return 1;
> }
>
> /**
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilProperties.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilProperties.java?rev=831550&r1=831549&r2=831550&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilProperties.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilProperties.java Sat Oct 31 15:22:05 2009
> @@ -472,7 +472,7 @@
> * @param arguments A List of Objects to insert into the message argument place holders
> * @return The value of the property in the properties file
> */
> - public static String getMessage(String resource, String name, List arguments, Locale locale) {
> + public static <E> String getMessage(String resource, String name, List<E> arguments, Locale locale) {
> String value = getMessage(resource, name, locale);
>
> if (value == null || value.length() == 0) {
> @@ -944,12 +944,12 @@
> @Override
> public Enumeration<String> getKeys() {
> return new Enumeration<String>() {
> - Iterator i = properties.keySet().iterator();
> + Iterator<String> i = UtilGenerics.cast(properties.keySet().iterator());
> public boolean hasMoreElements() {
> return (i.hasNext());
> }
> public String nextElement() {
> - return (String) i.next();
> + return i.next();
> }
> };
> }
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilURL.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilURL.java?rev=831550&r1=831549&r2=831550&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilURL.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilURL.java Sat Oct 31 15:22:05 2009
> @@ -20,7 +20,6 @@
>
> import java.io.BufferedReader;
> import java.io.File;
> -import java.io.FileReader;
> import java.io.IOException;
> import java.io.InputStream;
> import java.io.InputStreamReader;
> @@ -35,7 +34,7 @@
>
> public static final String module = UtilURL.class.getName();
>
> - public static URL fromClass(Class contextClass) {
> + public static <C> URL fromClass(Class<C> contextClass) {
> String resourceName = contextClass.getName();
> int dotIndex = resourceName.lastIndexOf('.');
>
> @@ -49,7 +48,7 @@
> return fromResource(resourceName, null);
> }
>
> - public static URL fromResource(Class contextClass, String resourceName) {
> + public static <C> URL fromResource(Class<C> contextClass, String resourceName) {
> if (contextClass == null)
> return fromResource(resourceName, null);
> else
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilValidate.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilValidate.java?rev=831550&r1=831549&r2=831550&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilValidate.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilValidate.java Sat Oct 31 15:22:05 2009
> @@ -197,7 +197,7 @@
> }
>
> /** Check whether collection c is empty. */
> - public static boolean isEmpty(Collection c) {
> + public static <E> boolean isEmpty(Collection<E> c) {
> return ((c == null) || (c.size() == 0));
> }
>
> @@ -207,7 +207,7 @@
> }
>
> /** Check whether collection c is NOT empty. */
> - public static boolean isNotEmpty(Collection c) {
> + public static <E> boolean isNotEmpty(Collection<E> c) {
> return ((c != null) && (c.size() > 0));
> }
>
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilXml.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilXml.java?rev=831550&r1=831549&r2=831550&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilXml.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilXml.java Sat Oct 31 15:22:05 2009
> @@ -45,6 +45,15 @@
>
> import javolution.util.FastList;
>
> +import org.apache.xerces.parsers.DOMParser;
> +import org.apache.xerces.xni.Augmentations;
> +import org.apache.xerces.xni.NamespaceContext;
> +import org.apache.xerces.xni.QName;
> +import org.apache.xerces.xni.XMLAttributes;
> +import org.apache.xerces.xni.XMLLocator;
> +import org.apache.xerces.xni.XMLResourceIdentifier;
> +import org.apache.xerces.xni.XMLString;
> +import org.apache.xerces.xni.XNIException;
> import org.apache.xml.serialize.OutputFormat;
> import org.w3c.dom.DOMConfiguration;
> import org.w3c.dom.Document;
> @@ -62,16 +71,6 @@
> import org.xml.sax.SAXParseException;
> import org.xml.sax.helpers.DefaultHandler;
>
> -import org.apache.xerces.parsers.DOMParser;
> -import org.apache.xerces.xni.Augmentations;
> -import org.apache.xerces.xni.NamespaceContext;
> -import org.apache.xerces.xni.QName;
> -import org.apache.xerces.xni.XNIException;
> -import org.apache.xerces.xni.XMLAttributes;
> -import org.apache.xerces.xni.XMLLocator;
> -import org.apache.xerces.xni.XMLResourceIdentifier;
> -import org.apache.xerces.xni.XMLString;
> -
> /**
> * Utilities methods to simplify dealing with JAXP & DOM XML parsing
> *
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/CacheSoftReference.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/CacheSoftReference.java?rev=831550&r1=831549&r2=831550&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/CacheSoftReference.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/CacheSoftReference.java Sat Oct 31 15:22:05 2009
> @@ -24,6 +24,7 @@
>
> import org.ofbiz.base.util.Debug;
>
> +@SuppressWarnings("serial")
> public class CacheSoftReference<V> extends SoftReference<V> implements Serializable {
>
> public static final String module = CacheSoftReference.class.getName();
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/HardRefCacheLine.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/HardRefCacheLine.java?rev=831550&r1=831549&r2=831550&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/HardRefCacheLine.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/HardRefCacheLine.java Sat Oct 31 15:22:05 2009
> @@ -18,6 +18,7 @@
> *******************************************************************************/
> package org.ofbiz.base.util.cache;
>
> +@SuppressWarnings("serial")
> public final class HardRefCacheLine<V> extends CacheLine<V> {
> public final V value;
>
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/JdbmSerializer.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/JdbmSerializer.java?rev=831550&r1=831549&r2=831550&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/JdbmSerializer.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/JdbmSerializer.java Sat Oct 31 15:22:05 2009
> @@ -27,6 +27,7 @@
> * (needed do to the fact that we do dynamic class loading)
> *
> */
> +@SuppressWarnings("serial")
> public class JdbmSerializer implements jdbm.helper.Serializer {
>
> public byte[] serialize(Object o) throws IOException {
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/SoftRefCacheLine.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/SoftRefCacheLine.java?rev=831550&r1=831549&r2=831550&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/SoftRefCacheLine.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/SoftRefCacheLine.java Sat Oct 31 15:22:05 2009
> @@ -18,6 +18,7 @@
> *******************************************************************************/
> package org.ofbiz.base.util.cache;
>
> +@SuppressWarnings("serial")
> public final class SoftRefCacheLine<V> extends CacheLine<V> {
> public final CacheSoftReference<V> ref;
>
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/FlexibleServletAccessor.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/FlexibleServletAccessor.java?rev=831550&r1=831549&r2=831550&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/FlexibleServletAccessor.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/FlexibleServletAccessor.java Sat Oct 31 15:22:05 2009
> @@ -34,6 +34,7 @@
> * list elements. See individual Map operations for more information.
> *
> */
> +@SuppressWarnings("serial")
> public class FlexibleServletAccessor<T> implements Serializable {
>
> protected String name;
> @@ -170,7 +171,7 @@
> @Override
> public boolean equals(Object obj) {
> if (obj instanceof FlexibleServletAccessor) {
> - FlexibleServletAccessor flexibleServletAccessor = (FlexibleServletAccessor) obj;
> + FlexibleServletAccessor<?> flexibleServletAccessor = (FlexibleServletAccessor<?>) obj;
> if (this.name == null) {
> return flexibleServletAccessor.name == null;
> }
> @@ -248,7 +249,7 @@
> public T get(ServletRequest request) {
> Object theValue = null;
> if (isListReference) {
> - List lst = (List) request.getAttribute(attributeName);
> + List<T> lst = UtilGenerics.cast(request.getAttribute(attributeName));
> theValue = lst.get(listIndex);
> } else {
> theValue = request.getAttribute(attributeName);
> @@ -264,7 +265,7 @@
> public T get(HttpSession session) {
> Object theValue = null;
> if (isListReference) {
> - List lst = (List) session.getAttribute(attributeName);
> + List<T> lst = UtilGenerics.cast(session.getAttribute(attributeName));
> theValue = lst.get(listIndex);
> } else {
> theValue = session.getAttribute(attributeName);
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/LifoSet.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/LifoSet.java?rev=831550&r1=831549&r2=831550&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/LifoSet.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/LifoSet.java Sat Oct 31 15:22:05 2009
> @@ -28,6 +28,7 @@
> * LifoSet - Set interface wrapper around a LinkedList
> *
> */
> +@SuppressWarnings("serial")
> public class LifoSet<V> extends AbstractSet<V> implements Serializable {
>
> // This set's back LinkedList
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/MapComparator.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/MapComparator.java?rev=831550&r1=831549&r2=831550&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/MapComparator.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/MapComparator.java Sat Oct 31 15:22:05 2009
> @@ -19,7 +19,6 @@
> package org.ofbiz.base.util.collections;
>
> import java.util.Comparator;
> -import java.util.Iterator;
> import java.util.List;
> import java.util.Map;
>
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/MapStack.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/MapStack.java?rev=831550&r1=831549&r2=831550&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/MapStack.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/MapStack.java Sat Oct 31 15:22:05 2009
> @@ -46,7 +46,7 @@
> protected static final ObjectFactory<MapStack<?>> mapStackFactory = new ObjectFactory<MapStack<?>>() {
> @Override
> protected MapStack<?> create() {
> - return new MapStack();
> + return new MapStack<Object>();
> }
> };
>
> @@ -236,7 +236,7 @@
> // only return if the curMap contains the key, rather than checking for null; this allows a null at a lower level to
> override a value at a higher level
> if (curMap.containsKey(name)) {
> if (curMap instanceof LocalizedMap) {
> - LocalizedMap lmap = (LocalizedMap) curMap;
> + LocalizedMap<Object> lmap = UtilGenerics.cast(curMap);
> return lmap.get(name, locale);
> } else {
> return curMap.get(name);
> @@ -284,8 +284,7 @@
> */
> public void clear() {
> // all write operations are local: only clear the Map on the top of the stack
> - Map currentMap = (Map) this.stackList.get(0);
> - currentMap.clear();
> + this.stackList.get(0).clear();
> }
>
> /* (non-Javadoc)
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/ResourceBundleMapWrapper.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/ResourceBundleMapWrapper.java?rev=831550&r1=831549&r2=831550&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/ResourceBundleMapWrapper.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/ResourceBundleMapWrapper.java Sat Oct 31 15:22:05 2009
> @@ -34,6 +34,7 @@
> * Generic ResourceBundle Map Wrapper, given ResourceBundle allows it to be used as a Map
> *
> */
> +@SuppressWarnings("serial")
> public class ResourceBundleMapWrapper implements Map<String, Object>, Serializable {
>
> protected MapStack<String> rbmwStack;
> @@ -261,7 +262,7 @@
> /* (non-Javadoc)
> * @see java.util.Map#putAll(java.util.Map)
> */
> - public void putAll(Map arg0) {
> + public void putAll(Map<? extends String, ? extends Object> arg0) {
> throw new RuntimeException("Not implemented for ResourceBundleMapWrapper");
> }
>
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java?rev=831550&r1=831549&r2=831550&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java Sat Oct 31 15:22:05 2009
> @@ -109,7 +109,8 @@
> if (locale == null) {
> locale = (Locale) context.get("locale");
> if (locale == null && context.containsKey("autoUserLogin")) {
> - locale = UtilMisc.ensureLocale(((Map) context.get("autoUserLogin")).get("lastLocale"));
> + Map<String, Object> autoUserLogin = UtilGenerics.cast(context.get("autoUserLogin"));
> + locale = UtilMisc.ensureLocale(autoUserLogin.get("lastLocale"));
> }
> if (locale == null) {
> locale = Locale.getDefault();
> @@ -118,7 +119,8 @@
> if (timeZone == null) {
> timeZone = (TimeZone) context.get("timeZone");
> if (timeZone == null && context.containsKey("autoUserLogin")) {
> - timeZone = UtilDateTime.toTimeZone((String)((Map) context.get("autoUserLogin")).get("lastTimeZone"));
> + Map<String, String> autoUserLogin = UtilGenerics.cast(context.get("autoUserLogin"));
> + timeZone = UtilDateTime.toTimeZone(autoUserLogin.get("lastTimeZone"));
> }
> if (timeZone == null) {
> timeZone = TimeZone.getDefault();
> @@ -312,7 +314,7 @@
>
> protected static class GroovyElem implements StrElem {
> protected final String originalString;
> - protected final Class parsedScript;
> + protected final Class<?> parsedScript;
> protected GroovyElem(String script) {
> this.originalString = script;
> this.parsedScript = GroovyUtil.groovyClassLoader.parseClass(script);
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/UelUtil.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/UelUtil.java?rev=831550&r1=831549&r2=831550&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/UelUtil.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/UelUtil.java Sat Oct 31 15:22:05 2009
> @@ -371,7 +371,6 @@
> return result;
> }
>
> - @SuppressWarnings("unchecked")
> public static Object resolveVariable(String variable, Map<String, Object> variables, Locale locale) {
> Object obj = null;
> String createObjectType = null;
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java?rev=831550&r1=831549&r2=831550&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java Sat Oct 31 15:22:05 2009
> @@ -388,9 +388,9 @@
> Debug.logInfo(e.getMessage(), module);
> return returnObj;
> }
> - Map ctx = null;
> + Map<String, ?> ctx = null;
> if (ctxObj instanceof BeanModel) {
> - ctx = (Map)((BeanModel)ctxObj).getWrappedObject();
> + ctx = UtilGenerics.cast(((BeanModel)ctxObj).getWrappedObject());
> returnObj = ctx.get(key);
> }
> /*
>
>