Author: doogie
Date: Mon Jan 11 22:21:12 2010
New Revision: 898090
URL: http://svn.apache.org/viewvc?rev=898090&view=rev
Log:
Fix several generics warnings.
Modified:
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/CacheLineTable.java
ofbiz/trunk/framework/birt/src/org/ofbiz/birt/BirtWorker.java
ofbiz/trunk/framework/birt/src/org/ofbiz/birt/container/BirtContainer.java
ofbiz/trunk/framework/birt/src/org/ofbiz/birt/email/BirtEmailServices.java
ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/service/OFBizBirtViewerReportService.java
ofbiz/trunk/framework/birt/src/org/ofbiz/birt/webapp/view/BirtViewHandler.java
ofbiz/trunk/framework/common/src/org/ofbiz/common/FindServices.java
ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/SOAPClientEngine.java
ofbiz/trunk/framework/service/src/org/ofbiz/service/test/ServiceSOAPTests.java
ofbiz/trunk/framework/sql/src/org/ofbiz/sql/test/SQLTest.java
ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/SeleniumXml.java
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/SOAPEventHandler.java
Modified:
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/CacheLineTable.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/CacheLineTable.java?rev=898090&r1=898089&r2=898090&view=diff
==============================================================================
---
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/CacheLineTable.java
(original)
+++
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/CacheLineTable.java
Mon Jan 11 22:21:12 2010
@@ -33,6 +33,7 @@
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.ObjectType;
+import org.ofbiz.base.util.UtilGenerics;
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.base.util.collections.LRUMap;
import org.ofbiz.base.util.collections.ReadOnlyMapEntry;
@@ -224,11 +225,11 @@
jdbm.helper.FastIterator iter = fileTable.keys();
Object key = iter.next();
while (key != null) {
- CacheLine<V> value = (CacheLine<V>) fileTable.get(key);
+ CacheLine<V> value = UtilGenerics.cast(fileTable.get(key));
if (key instanceof ObjectType.NullObject) {
key = null;
}
- list.add(new ReadOnlyMapEntry<K, CacheLine<V>>((K) key,
value));
+ list.add(new ReadOnlyMapEntry<K,
CacheLine<V>>(UtilGenerics.<K>cast(key), value));
key = iter.next();
}
} catch (IOException e) {
Modified: ofbiz/trunk/framework/birt/src/org/ofbiz/birt/BirtWorker.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/birt/src/org/ofbiz/birt/BirtWorker.java?rev=898090&r1=898089&r2=898090&view=diff
==============================================================================
--- ofbiz/trunk/framework/birt/src/org/ofbiz/birt/BirtWorker.java (original)
+++ ofbiz/trunk/framework/birt/src/org/ofbiz/birt/BirtWorker.java Mon Jan 11
22:21:12 2010
@@ -36,6 +36,7 @@
import org.eclipse.birt.report.engine.api.RenderOption;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.GeneralException;
+import org.ofbiz.base.util.UtilGenerics;
import org.ofbiz.birt.container.BirtContainer;
import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.jdbc.ConnectionFactory;
@@ -62,7 +63,7 @@
* @throws GeneralException
* @throws SQLException
*/
- public static void exportReport(IReportRunnable design, Map context,
String contentType, OutputStream output)
+ public static void exportReport(IReportRunnable design, Map<String, ?
extends Object> context, String contentType, OutputStream output)
throws EngineException, GeneralException, SQLException {
Locale birtLocale = (Locale)context.get(BIRT_LOCALE);
@@ -95,7 +96,7 @@
}
// set parameters if exists
- Map parameters = (Map)context.get(BirtWorker.BIRT_PARAMETERS);
+ Map<String, Object> parameters =
UtilGenerics.cast(context.get(BirtWorker.BIRT_PARAMETERS));
if (parameters != null) {
Debug.logInfo("Set birt parameters:" + parameters, module);
task.setParameterValues(parameters);
@@ -126,7 +127,7 @@
} else if
(options.getOutputFormat().equalsIgnoreCase(RenderOption.OUTPUT_FORMAT_PDF)) {
// set pdf render options
PDFRenderOption pdfOptions = new PDFRenderOption(options);
- pdfOptions.setOption(IPDFRenderOption.PAGE_OVERFLOW, new
Boolean(true) );
+ pdfOptions.setOption(IPDFRenderOption.PAGE_OVERFLOW, Boolean.TRUE
);
} else if (options.getOutputFormat().equalsIgnoreCase("xls")) {
// set excel render options
EXCELRenderOption excelOptions = new EXCELRenderOption(options);
Modified:
ofbiz/trunk/framework/birt/src/org/ofbiz/birt/container/BirtContainer.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/birt/src/org/ofbiz/birt/container/BirtContainer.java?rev=898090&r1=898089&r2=898090&view=diff
==============================================================================
--- ofbiz/trunk/framework/birt/src/org/ofbiz/birt/container/BirtContainer.java
(original)
+++ ofbiz/trunk/framework/birt/src/org/ofbiz/birt/container/BirtContainer.java
Mon Jan 11 22:21:12 2010
@@ -38,6 +38,7 @@
import org.ofbiz.base.container.ContainerException;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.FileUtil;
+import org.ofbiz.base.util.UtilGenerics;
import org.ofbiz.base.util.UtilObject;
import org.ofbiz.base.util.UtilProperties;
import org.ofbiz.entity.Delegator;
@@ -93,7 +94,7 @@
osgiConfig.put("osgi.configuration.area", new
File(System.getProperty("ofbiz.home"), "runtime" + File.separator +
"tempfiles").getPath());
config.setOSGiConfig(osgiConfig);
- HashMap context = config.getAppContext();
+ HashMap<String, Object> context =
UtilGenerics.cast(config.getAppContext());
// set delegator, dispatcher and security objects to report
Modified:
ofbiz/trunk/framework/birt/src/org/ofbiz/birt/email/BirtEmailServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/birt/src/org/ofbiz/birt/email/BirtEmailServices.java?rev=898090&r1=898089&r2=898090&view=diff
==============================================================================
--- ofbiz/trunk/framework/birt/src/org/ofbiz/birt/email/BirtEmailServices.java
(original)
+++ ofbiz/trunk/framework/birt/src/org/ofbiz/birt/email/BirtEmailServices.java
Mon Jan 11 22:21:12 2010
@@ -38,6 +38,7 @@
import org.eclipse.birt.report.engine.api.IReportRunnable;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.GeneralException;
+import org.ofbiz.base.util.UtilGenerics;
import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.base.util.collections.MapStack;
@@ -75,9 +76,9 @@
String birtReportLocation = (String)
serviceContext.remove("birtReportLocation");
String attachmentName = (String)
serviceContext.remove("attachmentName");
Locale locale = (Locale) serviceContext.get("locale");
- Map bodyParameters = (Map) serviceContext.remove("bodyParameters");
+ Map<String, Object> bodyParameters =
UtilGenerics.cast(serviceContext.remove("bodyParameters"));
Locale birtLocale = (Locale)
serviceContext.remove(BirtWorker.BIRT_LOCALE);
- Map birtParameters = (Map)
serviceContext.remove(BirtWorker.BIRT_PARAMETERS);
+ Map<String, Object> birtParameters =
UtilGenerics.cast(serviceContext.remove(BirtWorker.BIRT_PARAMETERS));
String birtImageDirectory = (String)
serviceContext.remove(BirtWorker.BIRT_IMAGE_DIRECTORY);
String birtContentType = (String)
serviceContext.remove(BirtWorker.BIRT_CONTENT_TYPE);
if (bodyParameters == null) {
@@ -99,7 +100,7 @@
}
StringWriter bodyWriter = new StringWriter();
- MapStack screenContext = MapStack.create();
+ MapStack<String> screenContext = MapStack.create();
screenContext.put("locale", locale);
ScreenRenderer screens = new ScreenRenderer(bodyWriter, screenContext,
htmlScreenRenderer);
screens.populateContextForService(ctx, bodyParameters);
@@ -137,7 +138,7 @@
// create the output stream for the generation
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- Map birtContext = FastMap.newInstance();
+ Map<String, Object> birtContext = FastMap.newInstance();
if (birtLocale == null) {
birtLocale = locale;
}
@@ -161,7 +162,7 @@
baos.close();
// store in the list of maps for sendmail....
- List bodyParts = FastList.newInstance();
+ List<Map<String, ? extends Object>> bodyParts =
FastList.newInstance();
if (bodyText != null) {
bodyText = FlexibleStringExpander.expandString(bodyText,
screenContext, locale);
bodyParts.add(UtilMisc.toMap("content", bodyText, "type",
"text/html"));
@@ -226,7 +227,7 @@
if (Debug.verboseOn()) Debug.logVerbose("sendMailFromScreen sendMail
context: " + serviceContext, module);
- Map result = ServiceUtil.returnSuccess();
+ Map<String, Object> result = ServiceUtil.returnSuccess();
try {
if (isMultiPart) {
dispatcher.runSync("sendMailMultiPart", serviceContext);
Modified:
ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/service/OFBizBirtViewerReportService.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/service/OFBizBirtViewerReportService.java?rev=898090&r1=898089&r2=898090&view=diff
==============================================================================
---
ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/service/OFBizBirtViewerReportService.java
(original)
+++
ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/service/OFBizBirtViewerReportService.java
Mon Jan 11 22:21:12 2010
@@ -49,6 +49,7 @@
import org.eclipse.birt.report.utility.DataUtil;
import org.eclipse.birt.report.utility.ParameterAccessor;
import org.ofbiz.base.util.Debug;
+import org.ofbiz.base.util.UtilGenerics;
import org.ofbiz.birt.container.BirtContainer;
import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
@@ -228,7 +229,7 @@
runTask.close( );
// check for non-fatal errors
- List<Exception> errors = (List<Exception>) runTask.getErrors( );
+ List<Exception> errors = UtilGenerics.cast(runTask.getErrors( ));
if ( !errors.isEmpty( ) )
{
return errors;
Modified:
ofbiz/trunk/framework/birt/src/org/ofbiz/birt/webapp/view/BirtViewHandler.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/birt/src/org/ofbiz/birt/webapp/view/BirtViewHandler.java?rev=898090&r1=898089&r2=898090&view=diff
==============================================================================
---
ofbiz/trunk/framework/birt/src/org/ofbiz/birt/webapp/view/BirtViewHandler.java
(original)
+++
ofbiz/trunk/framework/birt/src/org/ofbiz/birt/webapp/view/BirtViewHandler.java
Mon Jan 11 22:21:12 2010
@@ -36,6 +36,7 @@
import org.eclipse.birt.report.engine.api.IReportRunnable;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.GeneralException;
+import org.ofbiz.base.util.UtilGenerics;
import org.ofbiz.base.util.UtilHttp;
import org.ofbiz.base.util.UtilProperties;
import org.ofbiz.birt.BirtWorker;
@@ -84,9 +85,9 @@
design =
engine.openReportDesign(servletContext.getRealPath(page));
}
- Map context = FastMap.newInstance();
+ Map<String, Object> context = FastMap.newInstance();
// set parameters from request
- Map parameters =
(Map)request.getAttribute(BirtWorker.BIRT_PARAMETERS);
+ Map<String, Object> parameters =
UtilGenerics.cast(request.getAttribute(BirtWorker.BIRT_PARAMETERS));
if (parameters != null) {
context.put(BirtWorker.BIRT_PARAMETERS, parameters);
}
Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/FindServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/FindServices.java?rev=898090&r1=898089&r2=898090&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/src/org/ofbiz/common/FindServices.java
(original)
+++ ofbiz/trunk/framework/common/src/org/ofbiz/common/FindServices.java Mon Jan
11 22:21:12 2010
@@ -66,11 +66,10 @@
public static final String module = FindServices.class.getName();
- public static Map<String, EntityOperator> entityOperators;
+ public static Map<String, EntityComparisonOperator<?, ?>> entityOperators;
static {
entityOperators = FastMap.newInstance();
- entityOperators.put("and", EntityOperator.AND);
entityOperators.put("between", EntityOperator.BETWEEN);
entityOperators.put("equals", EntityOperator.EQUALS);
entityOperators.put("greaterThan", EntityOperator.GREATER_THAN);
@@ -81,7 +80,6 @@
entityOperators.put("like", EntityOperator.LIKE);
entityOperators.put("not", EntityOperator.NOT);
entityOperators.put("notEqual", EntityOperator.NOT_EQUAL);
- entityOperators.put("or", EntityOperator.OR);
}
public FindServices() {}
@@ -214,7 +212,7 @@
public static List<EntityCondition> createCondition(ModelEntity
modelEntity, Map<String, Map<String, Map<String, Object>>> normalizedFields,
Map<String, Object> queryStringMap, Map<String, List<Object[]>> origValueMap,
Delegator delegator, Map<String, ?> context) {
Map<String, Map<String, Object>> subMap = null;
Map<String, Object> subMap2 = null;
- EntityOperator fieldOp = null;
+ EntityComparisonOperator<?, ?> fieldOp = null;
Object fieldValue = null; // If it is a "value" field, it will be the
value to be used in the query.
// If it is an "op" field, it will be
"equals", "greaterThan", etc.
EntityExpr cond = null;
@@ -298,12 +296,12 @@
}
if (ignoreCase != null && ignoreCase.equals("Y") &&
"java.lang.String".equals(fieldObject.getClass().getName())) {
- cond =
EntityCondition.makeCondition(EntityFunction.UPPER_FIELD(fieldName),
(EntityComparisonOperator) fieldOp,
EntityFunction.UPPER(((String)fieldValue).toUpperCase()));
+ cond =
EntityCondition.makeCondition(EntityFunction.UPPER_FIELD(fieldName), fieldOp,
EntityFunction.UPPER(((String)fieldValue).toUpperCase()));
} else {
if (fieldObject.equals(GenericEntity.NULL_FIELD.toString())) {
fieldObject = null;
}
- cond = EntityCondition.makeCondition(fieldName,
(EntityComparisonOperator) fieldOp, fieldObject);
+ cond = EntityCondition.makeCondition(fieldName, fieldOp,
fieldObject);
}
if (EntityOperator.NOT_EQUAL.equals(fieldOp) && fieldObject !=
null) {
@@ -357,7 +355,7 @@
}
// String rhs = fieldValue.toString();
fieldObject = modelEntity.convertFieldValue(modelField,
fieldValue, delegator, context);
- cond = EntityCondition.makeCondition(fieldName,
(EntityComparisonOperator) fieldOp, fieldObject);
+ cond = EntityCondition.makeCondition(fieldName, fieldOp,
fieldObject);
tmpList.add(cond);
// add to queryStringMap
Modified:
ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/SOAPClientEngine.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/SOAPClientEngine.java?rev=898090&r1=898089&r2=898090&view=diff
==============================================================================
---
ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/SOAPClientEngine.java
(original)
+++
ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/SOAPClientEngine.java
Mon Jan 11 22:21:12 2010
@@ -37,6 +37,7 @@
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
import org.ofbiz.base.util.Debug;
+import org.ofbiz.base.util.UtilGenerics;
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.serialize.XmlSerializer;
@@ -135,7 +136,7 @@
OMElement payload = factory.createOMElement(serviceName);
payload.addChild(parameterSer.getFirstElement());
OMElement respOMElement = client.sendReceive(payload);
- results = (Map<String, Object>)
XmlSerializer.deserialize(respOMElement.toString(), delegator);
+ results =
UtilGenerics.cast(XmlSerializer.deserialize(respOMElement.toString(),
delegator));
} catch (Exception e) {
Debug.logError(e, module);
}
Modified:
ofbiz/trunk/framework/service/src/org/ofbiz/service/test/ServiceSOAPTests.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/test/ServiceSOAPTests.java?rev=898090&r1=898089&r2=898090&view=diff
==============================================================================
---
ofbiz/trunk/framework/service/src/org/ofbiz/service/test/ServiceSOAPTests.java
(original)
+++
ofbiz/trunk/framework/service/src/org/ofbiz/service/test/ServiceSOAPTests.java
Mon Jan 11 22:21:12 2010
@@ -6,6 +6,7 @@
import javolution.util.FastMap;
import org.ofbiz.base.util.UtilDateTime;
+import org.ofbiz.base.util.UtilGenerics;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.service.testtools.OFBizTestCase;
@@ -35,7 +36,7 @@
testing.put("createdStamp", UtilDateTime.nowTimestamp());
serviceContext.put("testing", testing);
Map<String, Object> results = dispatcher.runSync("testSoap",
serviceContext);
- List<GenericValue> testingNodes = (List<GenericValue>)
results.get("testingNodes");
+ List<GenericValue> testingNodes =
UtilGenerics.cast(results.get("testingNodes"));
assertNotNull(testingNodes);
}
}
Modified: ofbiz/trunk/framework/sql/src/org/ofbiz/sql/test/SQLTest.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/sql/src/org/ofbiz/sql/test/SQLTest.java?rev=898090&r1=898089&r2=898090&view=diff
==============================================================================
--- ofbiz/trunk/framework/sql/src/org/ofbiz/sql/test/SQLTest.java (original)
+++ ofbiz/trunk/framework/sql/src/org/ofbiz/sql/test/SQLTest.java Mon Jan 11
22:21:12 2010
@@ -65,7 +65,7 @@
assertTrue("has first field all", fieldAllIt.hasNext());
FieldAll fieldAll = fieldAllIt.next();
assertEquals("first fieldAll.alias", "a", fieldAll.getAlias());
- assertEquals("no excludes", set(), set(fieldAll));
+ assertEquals("no excludes", GenericTestCaseBase.<FieldAll>set(),
set(fieldAll));
assertTrue("has second field all", fieldAllIt.hasNext());
fieldAll = fieldAllIt.next();
Modified:
ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/SeleniumXml.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/SeleniumXml.java?rev=898090&r1=898089&r2=898090&view=diff
==============================================================================
---
ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/SeleniumXml.java
(original)
+++
ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/SeleniumXml.java
Mon Jan 11 22:21:12 2010
@@ -226,7 +226,7 @@
public void runCommands() throws TestCaseException {
Element root = this.doc.getRootElement();
- List<Element> nodes = root.getChildren();
+ List<Element> nodes = UtilGenerics.cast(root.getChildren());
runCommands(nodes);
}
@@ -502,11 +502,11 @@
public void ifCmd(Element elem) throws TestCaseException {
String isRun = replaceParam(elem.getAttributeValue("condition"));
if (isRun != null && !isRun.equals("") && Boolean.valueOf(isRun)) {
- List <Element> children = elem.getChildren();
+ List <Element> children = UtilGenerics.cast(elem.getChildren());
this.runCommands(children);
}else{
Element child = elem.getChild("else");
- List <Element> children = child.getChildren();
+ List <Element> children = UtilGenerics.cast(child.getChildren());
this.runCommands(children);
}
}
@@ -514,7 +514,7 @@
public void partialRunDependency(Element elem) throws TestCaseException {
String isRun = replaceParam(elem.getAttributeValue("isRun"));
if (isRun != null && Boolean.valueOf(isRun)) {
- List <Element> children = elem.getChildren();
+ List <Element> children = UtilGenerics.cast(elem.getChildren());
this.runCommands(children);
}
}
Modified:
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/SOAPEventHandler.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/SOAPEventHandler.java?rev=898090&r1=898089&r2=898090&view=diff
==============================================================================
---
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/SOAPEventHandler.java
(original)
+++
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/SOAPEventHandler.java
Mon Jan 11 22:21:12 2010
@@ -45,6 +45,7 @@
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
import org.ofbiz.base.util.Debug;
+import org.ofbiz.base.util.UtilGenerics;
import org.ofbiz.base.util.UtilXml;
import org.ofbiz.entity.GenericDelegator;
import org.ofbiz.entity.serialize.XmlSerializer;
@@ -175,7 +176,7 @@
if (serviceObj instanceof OMElement) {
OMElement serviceElement = (OMElement) serviceObj;
String serviceName = serviceElement.getLocalName();
- Map<String, Object> parameters = (Map<String, Object>)
XmlSerializer.deserialize(serviceElement.toString(), delegator);
+ Map<String, Object> parameters =
UtilGenerics.cast(XmlSerializer.deserialize(serviceElement.toString(),
delegator));
try {
// verify the service is exported for remote execution
and invoke it
ModelService model =
dispatcher.getDispatchContext().getModelService(serviceName);
