You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by le...@apache.org on 2010/12/12 22:31:31 UTC
svn commit: r1044931 [2/4] - in /ofbiz/trunk:
applications/accounting/src/org/ofbiz/accounting/invoice/
applications/accounting/src/org/ofbiz/accounting/payment/
applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/
applications/...
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearchSession.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearchSession.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearchSession.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearchSession.java Sun Dec 12 21:31:27 2010
@@ -598,7 +598,7 @@ public class ProductSearchSession {
String keywordString = (String) parameters.get("SEARCH_STRING");
String searchOperator = (String) parameters.get("SEARCH_OPERATOR");
// defaults to true/Y, ie anything but N is true/Y
- boolean anyPrefixSuffix = !"N".equals((String) parameters.get("SEARCH_ANYPRESUF"));
+ boolean anyPrefixSuffix = !"N".equals(parameters.get("SEARCH_ANYPRESUF"));
searchAddConstraint(new ProductSearch.KeywordConstraint(keywordString, anyPrefixSuffix, anyPrefixSuffix, null, "AND".equals(searchOperator)), session);
constraintsChanged = true;
}
@@ -622,7 +622,7 @@ public class ProductSearchSession {
String keywordString = (String) parameters.get("SEARCH_STRING" + kwNum);
String searchOperator = (String) parameters.get("SEARCH_OPERATOR" + kwNum);
// defaults to true/Y, ie anything but N is true/Y
- boolean anyPrefixSuffix = !"N".equals((String) parameters.get("SEARCH_ANYPRESUF" + kwNum));
+ boolean anyPrefixSuffix = !"N".equals(parameters.get("SEARCH_ANYPRESUF" + kwNum));
searchAddConstraint(new ProductSearch.KeywordConstraint(keywordString, anyPrefixSuffix, anyPrefixSuffix, null, "AND".equals(searchOperator)), session);
constraintsChanged = true;
}
@@ -1227,7 +1227,7 @@ public class ProductSearchSession {
List<Map<String, String>> featureCountList = FastList.newInstance();
GenericValue searchResult = null;
- while ((searchResult = (GenericValue) eli.next()) != null) {
+ while ((searchResult = eli.next()) != null) {
featureCountList.add(UtilMisc.toMap("productFeatureId", (String) searchResult.get("pfacProductFeatureId"), "productFeatureTypeId", (String) searchResult.get("pfcProductFeatureTypeId"), "description", (String) searchResult.get("pfcDescription"), "featureCount", Long.toString((Long) searchResult.get("featureCount"))));
}
@@ -1305,7 +1305,7 @@ public class ProductSearchSession {
GenericValue searchResult = null;
Long priceRangeCount = Long.valueOf(0);
- while ((searchResult = (GenericValue) eli.next()) != null) {
+ while ((searchResult = eli.next()) != null) {
priceRangeCount = searchResult.getLong("priceRangeCount");
}
@@ -1371,7 +1371,7 @@ public class ProductSearchSession {
GenericValue searchResult = null;
Long categoryCount = Long.valueOf(0);
- while ((searchResult = (GenericValue) eli.next()) != null) {
+ while ((searchResult = eli.next()) != null) {
categoryCount = searchResult.getLong("categoryCount");
}
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java Sun Dec 12 21:31:27 2010
@@ -261,7 +261,7 @@ public class ProductServices {
Map<String, Object> invReqResult = dispatcher.runSync("isStoreInventoryAvailableOrNotRequired", UtilMisc.<String, Object>toMap("productStoreId", productStoreId, "productId", productIdTo, "quantity", BigDecimal.ONE));
if (ServiceUtil.isError(invReqResult)) {
return ServiceUtil.returnError("Error calling the isStoreInventoryRequired when building the variant product tree.", null, null, invReqResult);
- } else if ("Y".equals((String) invReqResult.get("availableOrNotRequired"))) {
+ } else if ("Y".equals(invReqResult.get("availableOrNotRequired"))) {
items.add(productIdTo);
if (productTo.getString("isVirtual") != null && productTo.getString("isVirtual").equals("Y")) {
virtualVariant.add(productIdTo);
@@ -542,7 +542,7 @@ public class ProductServices {
//List featureKey = FastList.newInstance();
Map<String, List<String>> tempGroup = FastMap.newInstance();
Map<String, Object> group = new LinkedHashMap<String, Object>();
- String orderKey = (String) order.get(index);
+ String orderKey = order.get(index);
if (featureList == null) {
throw new IllegalArgumentException("Cannot build feature tree: featureList is null");
@@ -1050,14 +1050,14 @@ public class ProductServices {
Map<String, Object> dataResourceCtx = FastMap.newInstance();
dataResourceCtx.put("objectInfo", imageUrl);
- dataResourceCtx.put("dataResourceName", (String) context.get("_uploadedFile_fileName"));
+ dataResourceCtx.put("dataResourceName", context.get("_uploadedFile_fileName"));
dataResourceCtx.put("userLogin", userLogin);
Map<String, Object> productContentCtx = FastMap.newInstance();
productContentCtx.put("productId", productId);
productContentCtx.put("productContentTypeId", productContentTypeId);
- productContentCtx.put("fromDate", (Timestamp) context.get("fromDate"));
- productContentCtx.put("thruDate", (Timestamp) context.get("thruDate"));
+ productContentCtx.put("fromDate", context.get("fromDate"));
+ productContentCtx.put("thruDate", context.get("thruDate"));
productContentCtx.put("userLogin", userLogin);
if (UtilValidate.isNotEmpty(contentId)) {
@@ -1254,14 +1254,14 @@ public class ProductServices {
if (UtilValidate.isNotEmpty(imageUrl) && imageUrl.length() > 0) {
Map<String, Object> dataResourceCtx = FastMap.newInstance();
dataResourceCtx.put("objectInfo", imageUrl);
- dataResourceCtx.put("dataResourceName", (String) context.get("_uploadedFile_fileName"));
+ dataResourceCtx.put("dataResourceName", context.get("_uploadedFile_fileName"));
dataResourceCtx.put("userLogin", userLogin);
Map<String, Object> productPromoContentCtx = FastMap.newInstance();
productPromoContentCtx.put("productPromoId", productPromoId);
productPromoContentCtx.put("productPromoContentTypeId", productPromoContentTypeId);
- productPromoContentCtx.put("fromDate", (Timestamp) context.get("fromDate"));
- productPromoContentCtx.put("thruDate", (Timestamp) context.get("thruDate"));
+ productPromoContentCtx.put("fromDate", context.get("fromDate"));
+ productPromoContentCtx.put("thruDate", context.get("thruDate"));
productPromoContentCtx.put("userLogin", userLogin);
if (UtilValidate.isNotEmpty(contentId)) {
@@ -1358,8 +1358,8 @@ public class ProductServices {
productPromoContentCtx.put("productPromoId", productPromoId);
productPromoContentCtx.put("productPromoContentTypeId", productPromoContentTypeId);
productPromoContentCtx.put("contentId", contentId);
- productPromoContentCtx.put("fromDate", (Timestamp) context.get("fromDate"));
- productPromoContentCtx.put("thruDate", (Timestamp) context.get("thruDate"));
+ productPromoContentCtx.put("fromDate", context.get("fromDate"));
+ productPromoContentCtx.put("thruDate", context.get("thruDate"));
productPromoContentCtx.put("userLogin", userLogin);
try {
dispatcher.runSync("updateProductPromoContent", productPromoContentCtx);
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java Sun Dec 12 21:31:27 2010
@@ -669,7 +669,7 @@ while (allCatIter.hasNext()) {
), EntityOperator.AND);
EntityListIterator productFeatureAndApplEli = delegator.find("ProductFeatureAndAppl", condition, null, null, null, null);
GenericValue productFeatureAndAppl = null;
- while ((productFeatureAndAppl = (GenericValue) productFeatureAndApplEli.next()) != null) {
+ while ((productFeatureAndAppl = productFeatureAndApplEli.next()) != null) {
String productFeatureId = productFeatureAndAppl.getString("productFeatureId");
String productFeatureTypeId = productFeatureAndAppl.getString("productFeatureTypeId");
if (UtilValidate.isNotEmpty(productFeatureTypeIdsToInclude) && !productFeatureTypeIdsToInclude.contains(productFeatureTypeId)) {
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/spreadsheetimport/ImportProductServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/spreadsheetimport/ImportProductServices.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/spreadsheetimport/ImportProductServices.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/spreadsheetimport/ImportProductServices.java Sun Dec 12 21:31:27 2010
@@ -109,11 +109,11 @@ public class ImportProductServices {
if (row != null) {
// read productId from first column "sheet column index
// starts from 0"
- HSSFCell cell2 = row.getCell((int) 2);
+ HSSFCell cell2 = row.getCell(2);
cell2.setCellType(HSSFCell.CELL_TYPE_STRING);
String productId = cell2.getRichStringCellValue().toString();
// read QOH from ninth column
- HSSFCell cell5 = row.getCell((int) 5);
+ HSSFCell cell5 = row.getCell(5);
BigDecimal quantityOnHand = BigDecimal.ZERO;
if (cell5 != null && cell5.getCellType() == HSSFCell.CELL_TYPE_NUMERIC)
quantityOnHand = new BigDecimal(cell5.getNumericCellValue());
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java Sun Dec 12 21:31:27 2010
@@ -610,7 +610,7 @@ public class ProductStoreWorker {
Debug.logError("Error calling isStoreInventoryRequired service, result is: " + invReqResult, module);
return false;
}
- requiredOkay = Boolean.valueOf(wantRequired.booleanValue() == "Y".equals((String) invReqResult.get("requireInventory")));
+ requiredOkay = Boolean.valueOf(wantRequired.booleanValue() == "Y".equals(invReqResult.get("requireInventory")));
}
Boolean availableOkay = null;
@@ -620,7 +620,7 @@ public class ProductStoreWorker {
Debug.logError("Error calling isStoreInventoryAvailable service, result is: " + invAvailResult, module);
return false;
}
- availableOkay = Boolean.valueOf(wantAvailable.booleanValue() == "Y".equals((String) invAvailResult.get("available")));
+ availableOkay = Boolean.valueOf(wantAvailable.booleanValue() == "Y".equals(invAvailResult.get("available")));
}
if ((requiredOkay == null || requiredOkay.booleanValue()) && (availableOkay == null || availableOkay.booleanValue())) {
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingServices.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingServices.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingServices.java Sun Dec 12 21:31:27 2010
@@ -153,7 +153,7 @@ public class PackingServices {
if (qtyStr == null) {
quantities = new String[packages.length];
for (int p = 0; p < packages.length; p++) {
- quantities[p] = (String) qtyInfo.get(rowKey + ":" + packages[p]);
+ quantities[p] = qtyInfo.get(rowKey + ":" + packages[p]);
}
if (quantities.length != packages.length) {
return ServiceUtil.returnError("Packages and quantities do not match.");
@@ -316,7 +316,7 @@ public class PackingServices {
String packageSeqId = entry.getKey();
String packageWeightStr = entry.getValue();
if (UtilValidate.isNotEmpty(packageWeightStr)) {
- BigDecimal packageWeight = new BigDecimal((String)packageWeights.get(packageSeqId));
+ BigDecimal packageWeight = new BigDecimal(packageWeights.get(packageSeqId));
session.setPackageWeight(Integer.parseInt(packageSeqId), packageWeight);
shippableWeight = shippableWeight.add(packageWeight);
} else {
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentWorker.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentWorker.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentWorker.java Sun Dec 12 21:31:27 2010
@@ -138,7 +138,7 @@ public class ShipmentWorker {
if (!addedToPackage) {
BigDecimal packageWeight = calcPackageWeight(dctx, packageMap, shippableItemInfo, weight);
if (packageWeight.compareTo(maxWeight) <= 0) {
- BigDecimal qty = (BigDecimal) packageMap.get(productId);
+ BigDecimal qty = packageMap.get(productId);
qty = UtilValidate.isEmpty(qty) ? BigDecimal.ZERO : qty;
packageMap.put(productId, qty.add(partialQty));
addedToPackage = true;
@@ -168,7 +168,7 @@ public class ShipmentWorker {
String productId = entry.getKey();
Map<String, Object> productInfo = getProductItemInfo(shippableItemInfo, productId);
BigDecimal productWeight = (BigDecimal) productInfo.get("weight");
- BigDecimal quantity = (BigDecimal) packageMap.get(productId);
+ BigDecimal quantity = packageMap.get(productId);
String weightUomId = (String) productInfo.get("weightUomId");
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java Sun Dec 12 21:31:27 2010
@@ -1138,7 +1138,7 @@ public class UpsServices {
if (shipmentPackageRouteSegIter.hasNext()) {
errorList.add("Error: There are more Packages on this Shipment than there were PackageResults returned from UPS");
while (shipmentPackageRouteSegIter.hasNext()) {
- GenericValue shipmentPackageRouteSeg = (GenericValue) shipmentPackageRouteSegIter.next();
+ GenericValue shipmentPackageRouteSeg = shipmentPackageRouteSegIter.next();
errorList.add("Error: No PackageResults were returned for the Package [" + shipmentPackageRouteSeg.getString("shipmentPackageSeqId") + "]");
}
}
Modified: ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/login/LoginEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/login/LoginEvents.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/login/LoginEvents.java (original)
+++ ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/login/LoginEvents.java Sun Dec 12 21:31:27 2010
@@ -302,7 +302,7 @@ public class LoginEvents {
try {
Map<String, Object> result = dispatcher.runSync("sendMailFromScreen", serviceContext);
- if (ModelService.RESPOND_ERROR.equals((String) result.get(ModelService.RESPONSE_MESSAGE))) {
+ if (ModelService.RESPOND_ERROR.equals(result.get(ModelService.RESPONSE_MESSAGE))) {
Map<String, Object> messageMap = UtilMisc.toMap("errorMessage", result.get(ModelService.ERROR_MESSAGE));
errMsg = UtilProperties.getMessage(resource, "loginevents.error_unable_email_password_contact_customer_service_errorwas", messageMap, UtilHttp.getLocale(request));
request.setAttribute("_ERROR_MESSAGE_", errMsg);
Modified: ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalConverter.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalConverter.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalConverter.java (original)
+++ ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalConverter.java Sun Dec 12 21:31:27 2010
@@ -261,7 +261,7 @@ public class ICalConverter {
if (iCalObj == null) {
return null;
}
- return new Long((long)iCalObj.getPercentage());
+ return new Long(iCalObj.getPercentage());
}
protected static Double fromPriority(PropertyList propertyList) {
Modified: ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalWorker.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalWorker.java (original)
+++ ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalWorker.java Sun Dec 12 21:31:27 2010
@@ -274,7 +274,7 @@ public class ICalWorker {
}
protected static void logInUser(HttpServletRequest request, HttpServletResponse response) throws GenericServiceException, GenericEntityException {
- Map<String, Object> serviceMap = (Map<String, Object>) WebDavUtil.getCredentialsFromRequest(request);
+ Map<String, Object> serviceMap = WebDavUtil.getCredentialsFromRequest(request);
if (serviceMap == null) {
return;
}
Modified: ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java (original)
+++ ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java Sun Dec 12 21:31:27 2010
@@ -390,7 +390,7 @@ public class WorkEffortSearch {
workEffortIds.add(searchResult.getString("workEffortId"));
workEffortIdSet.add(searchResult.getString("workEffortId"));
- while (((searchResult = (GenericValue) eli.next()) != null) && (maxResults == null || numRetreived < maxResults.intValue())) {
+ while (((searchResult = eli.next()) != null) && (maxResults == null || numRetreived < maxResults.intValue())) {
String workEffortId = searchResult.getString("workEffortId");
if (!workEffortIdSet.contains(workEffortId)) {
workEffortIds.add(workEffortId);
Modified: ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java (original)
+++ ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java Sun Dec 12 21:31:27 2010
@@ -238,7 +238,7 @@ public class WorkEffortSearchSession {
String keywordString = (String) parameters.get("SEARCH_STRING");
String searchOperator = (String) parameters.get("SEARCH_OPERATOR");
// defaults to true/Y, ie anything but N is true/Y
- boolean anyPrefixSuffix = !"N".equals((String) parameters.get("SEARCH_ANYPRESUF"));
+ boolean anyPrefixSuffix = !"N".equals(parameters.get("SEARCH_ANYPRESUF"));
searchAddConstraint(new WorkEffortSearch.KeywordConstraint(keywordString, anyPrefixSuffix, anyPrefixSuffix, null, "AND".equals(searchOperator)), session);
constraintsChanged = true;
}
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/json/JSONWriter.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/json/JSONWriter.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/json/JSONWriter.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/json/JSONWriter.java Sun Dec 12 21:31:27 2010
@@ -113,7 +113,7 @@ public class JSONWriter {
writer.write(c);
} else {
writer.write("\\u");
- String n = Integer.toString((int) c, 16);
+ String n = Integer.toString(c, 16);
for (int j = 4 - n.length(); j > 0; j--) writer.write('0');
writer.write(n);
}
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/json/test/JSONTests.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/json/test/JSONTests.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/json/test/JSONTests.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/json/test/JSONTests.java Sun Dec 12 21:31:27 2010
@@ -72,17 +72,17 @@ public class JSONTests extends GenericTe
protected void assertSimpleJSONByte(byte n, String json) throws Exception {
assertSimpleJSON("integer - byte", new Byte(n), json, new Long(n));
- assertSimpleJSONShort((short) n, json);
+ assertSimpleJSONShort(n, json);
}
protected void assertSimpleJSONShort(short n, String json) throws Exception {
assertSimpleJSON("integer - short", new Integer(n), json, new Long(n));
- assertSimpleJSONInteger((int) n, json);
+ assertSimpleJSONInteger(n, json);
}
protected void assertSimpleJSONInteger(int n, String json) throws Exception {
assertSimpleJSON("integer - int", new Short((short) n), json, new Long(n));
- assertSimpleJSONLong((long) n, json);
+ assertSimpleJSONLong(n, json);
}
protected void assertSimpleJSONLong(long n, String json) throws Exception {
@@ -91,7 +91,7 @@ public class JSONTests extends GenericTe
protected void assertSimpleJSONFloat(float n, String json) throws Exception {
assertSimpleJSON("float - float", new Float(n), json, new Double(n));
- assertSimpleJSONDouble((double) n, json);
+ assertSimpleJSONDouble(n, json);
}
protected void assertSimpleJSONDouble(double n, String json) throws Exception {
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/TimeDuration.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/TimeDuration.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/TimeDuration.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/TimeDuration.java Sun Dec 12 21:31:27 2010
@@ -307,10 +307,10 @@ public class TimeDuration implements Ser
}
long units = duration / 0x757B12C00L;
int years = (int) units;
- duration -= 0x757B12C00L * (long) years;
+ duration -= 0x757B12C00L * years;
units = duration / 0x9CA41900L;
int months = (int) units;
- duration -= 0x9CA41900L * (long) months;
+ duration -= 0x9CA41900L * months;
units = duration / 86400000;
int days = (int) units;
duration -= 86400000 * (long) days;
@@ -373,8 +373,8 @@ public class TimeDuration implements Ser
*/
public static long toLong(TimeDuration duration) {
return
- (0x757B12C00L * (long) duration.years) +
- (0x9CA41900L * (long) duration.months) +
+ (0x757B12C00L * duration.years) +
+ (0x9CA41900L * duration.months) +
(86400000 * (long) duration.days) +
(3600000 * (long) duration.hours) +
(60000 * (long) duration.minutes) +
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=1044931&r1=1044930&r2=1044931&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 Sun Dec 12 21:31:27 2010
@@ -118,7 +118,7 @@ public class UtilHttp {
// add all the actual HTTP request parameters
Enumeration<String> e = UtilGenerics.cast(request.getParameterNames());
while (e.hasMoreElements()) {
- String name = (String) e.nextElement();
+ String name = e.nextElement();
if (nameSet != null && (onlyIncludeOrSkipPrim ^ nameSet.contains(name))) {
continue;
}
@@ -248,7 +248,7 @@ public class UtilHttp {
} else if (paramEntry.getValue() instanceof Collection) {
List<String> newList = FastList.newInstance();
for (String listEntry: UtilGenerics.<String>checkCollection(paramEntry.getValue())) {
- newList.add(canonicalizeParameter((String) listEntry));
+ newList.add(canonicalizeParameter(listEntry));
}
paramEntry.setValue(newList);
}
@@ -306,7 +306,7 @@ public class UtilHttp {
// look at all request attributes
Enumeration<String> requestAttrNames = UtilGenerics.cast(request.getAttributeNames());
while (requestAttrNames.hasMoreElements()) {
- String attrName = (String) requestAttrNames.nextElement();
+ String attrName = requestAttrNames.nextElement();
if (namesToSkip != null && namesToSkip.contains(attrName))
continue;
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilNumber.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilNumber.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilNumber.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilNumber.java Sun Dec 12 21:31:27 2010
@@ -213,7 +213,7 @@ public class UtilNumber {
* @return formatted string or an empty string if there was an error
*/
public static String formatRuleBasedAmount(double amount, String rule, Locale locale) {
- String ruleSet = (String) rbnfRuleSets.get(locale);
+ String ruleSet = rbnfRuleSets.get(locale);
if (ruleSet == null) {
Debug.logWarning("Cannot format rule based amount for locale " + locale.toString() + " because rule set for that locale does not exist", module);
return "";
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilObject.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilObject.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilObject.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilObject.java Sun Dec 12 21:31:27 2010
@@ -121,7 +121,7 @@ public final class UtilObject {
ObjectOutputStream oos = new ObjectOutputStream(bos);
oos.writeObject(obj);
oos.flush();
- long size = (long) bos.size();
+ long size = bos.size();
bos.close();
return size;
}
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=1044931&r1=1044930&r2=1044931&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 Sun Dec 12 21:31:27 2010
@@ -448,7 +448,7 @@ public class UtilProperties implements S
String value = null;
try {
- value = (String) bundle.getString(name);
+ value = bundle.getString(name);
} catch (Exception e) {
//Debug.log(e, module);
}
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilTimer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilTimer.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilTimer.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilTimer.java Sun Dec 12 21:31:27 2010
@@ -124,14 +124,14 @@ public class UtilTimer {
* @return The number of seconds since the timer started
*/
public double secondsSinceStart() {
- return ((double) timeSinceStart()) / 1000.0;
+ return (timeSinceStart()) / 1000.0;
}
/** Returns the number of seconds since the last time timerString was called
* @return The number of seconds since the last time timerString was called
*/
public double secondsSinceLast() {
- return ((double) timeSinceLast()) / 1000.0;
+ return (timeSinceLast()) / 1000.0;
}
/** Returns the number of milliseconds since the timer started
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/XslTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/XslTransform.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/XslTransform.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/XslTransform.java Sun Dec 12 21:31:27 2010
@@ -123,7 +123,7 @@ public final class XslTransform {
Transformer transformer = translet.newTransformer();
if (params != null) {
for (Map.Entry<String, Object> entry: params.entrySet()) {
- String key = (String)entry.getKey();
+ String key = entry.getKey();
Object val = entry.getValue();
transformer.setParameter(key, val);
}
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/IndentingWriterTests.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/IndentingWriterTests.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/IndentingWriterTests.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/IndentingWriterTests.java Sun Dec 12 21:31:27 2010
@@ -48,13 +48,13 @@ public class IndentingWriterTests extend
} else {
iw = new IndentingWriter(sw);
}
- iw.write((int) 'a');
+ iw.write('a');
iw.push();
iw.write("b\nm");
iw.newline();
iw.write(new char[] {'1', '\n', '2'});
iw.space();
- iw.write((int) '\n');
+ iw.write('\n');
iw.pop();
iw.write("e");
iw.close();
Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/Captcha.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/Captcha.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/src/org/ofbiz/common/Captcha.java (original)
+++ ofbiz/trunk/framework/common/src/org/ofbiz/common/Captcha.java Sun Dec 12 21:31:27 2010
@@ -107,7 +107,7 @@ public class Captcha {
// we can rotate it independently
int charWidth = fontMetrics.charWidth(characterToShow.charAt(i));
int charDim = Math.max(maxAdvance, fontHeight);
- int halfCharDim = (int) (charDim / 2);
+ int halfCharDim = (charDim / 2);
BufferedImage charImage =
new BufferedImage(charDim, charDim, BufferedImage.TYPE_INT_ARGB);
@@ -121,10 +121,10 @@ public class Captcha {
int charX = (int) (0.5 * charDim - 0.5 * charWidth);
charGraphics.drawString("" + characterToShow.charAt(i), charX,
- (int) ((charDim - fontMetrics.getAscent()) / 2 + fontMetrics.getAscent()));
+ ((charDim - fontMetrics.getAscent()) / 2 + fontMetrics.getAscent()));
float x = horizMargin + spacePerChar * (i) - charDim / 2.0f;
- int y = (int) ((height - charDim) / 2);
+ int y = ((height - charDim) / 2);
g.drawImage(charImage, (int) x, y, charDim, charDim, null, null);
Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonEvents.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonEvents.java (original)
+++ ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonEvents.java Sun Dec 12 21:31:27 2010
@@ -137,7 +137,7 @@ public class CommonEvents {
String followSessionId = request.getParameter("followSid");
Map<String, String> follow = appletSessions.get(followSessionId);
if (follow == null) follow = FastMap.newInstance();
- String followerListStr = (String) follow.get("followers");
+ String followerListStr = follow.get("followers");
if (followerListStr == null) {
followerListStr = followerSessionId;
} else {
Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java (original)
+++ ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java Sun Dec 12 21:31:27 2010
@@ -452,7 +452,7 @@ public class CommonServices {
Map<String, String> mapOfStrings = checkMap(context.get("mapOfStrings"), String.class, String.class);
for (String str: listOfStrings) {
- String v = (String) mapOfStrings.get(str);
+ String v = mapOfStrings.get(str);
Debug.log("SimpleMapListTest: " + str + " -> " + v, module);
}
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=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/src/org/ofbiz/common/FindServices.java (original)
+++ ofbiz/trunk/framework/common/src/org/ofbiz/common/FindServices.java Sun Dec 12 21:31:27 2010
@@ -593,8 +593,8 @@ public class FindServices {
String entityName = (String) context.get("entityName");
EntityConditionList entityConditionList = (EntityConditionList) context.get("entityConditionList");
List<String> orderByList = checkList(context.get("orderByList"), String.class);
- boolean noConditionFind = "Y".equals((String) context.get("noConditionFind"));
- boolean distinct = "Y".equals((String) context.get("distinct"));
+ boolean noConditionFind = "Y".equals(context.get("noConditionFind"));
+ boolean distinct = "Y".equals(context.get("distinct"));
List<String> fieldList = UtilGenerics.checkList(context.get("fieldList"));
Set<String> fieldSet = null;
if (fieldList != null) {
Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/KeywordSearchUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/KeywordSearchUtil.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/src/org/ofbiz/common/KeywordSearchUtil.java (original)
+++ ofbiz/trunk/framework/common/src/org/ofbiz/common/KeywordSearchUtil.java Sun Dec 12 21:31:27 2010
@@ -164,7 +164,7 @@ public class KeywordSearchUtil {
}
// group by word, add up weight
- Long curWeight = (Long) keywords.get(token);
+ Long curWeight = keywords.get(token);
if (curWeight == null) {
keywords.put(token, Long.valueOf(1));
} else {
Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/preferences/PreferenceServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/preferences/PreferenceServices.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/src/org/ofbiz/common/preferences/PreferenceServices.java (original)
+++ ofbiz/trunk/framework/common/src/org/ofbiz/common/preferences/PreferenceServices.java Sun Dec 12 21:31:27 2010
@@ -171,7 +171,7 @@ public class PreferenceServices {
String userLoginId = PreferenceWorker.getUserLoginId(context, false);
String userPrefTypeId = (String) context.get("userPrefTypeId");
- Object userPrefValue = (String) context.get("userPrefValue");
+ Object userPrefValue = context.get("userPrefValue");
if (UtilValidate.isEmpty(userLoginId) || UtilValidate.isEmpty(userPrefTypeId) || userPrefValue == null) {
return ServiceUtil.returnError(UtilProperties.getMessage(resource, "setPreference.invalidArgument", locale));
}
Modified: ofbiz/trunk/framework/datafile/src/org/ofbiz/datafile/Record.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/datafile/src/org/ofbiz/datafile/Record.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/framework/datafile/src/org/ofbiz/datafile/Record.java (original)
+++ ofbiz/trunk/framework/datafile/src/org/ofbiz/datafile/Record.java Sun Dec 12 21:31:27 2010
@@ -199,7 +199,7 @@ public class Record implements Serializa
(long)(byteArray[3]&0xff) << 24 |
(long)(byteArray[2]&0xff) << 16 |
(long)(byteArray[1]&0xff) << 8 |
- (long)(byteArray[0]&0xff);
+ (byteArray[0]&0xff);
}
/** Sets the named field to the passed value, converting the value from a String to the current type using <code>Type.valueOf()</code>
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/cache/AbstractEntityConditionCache.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/cache/AbstractEntityConditionCache.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/cache/AbstractEntityConditionCache.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/cache/AbstractEntityConditionCache.java Sun Dec 12 21:31:27 2010
@@ -150,7 +150,7 @@ public abstract class AbstractEntityCond
protected List<? extends Map<String, Object>> convert(boolean isPK, String targetEntityName, GenericEntity entity) {
if (isNull(entity)) return null;
if (isPK) {
- return entity.getModelEntity().convertToViewValues(targetEntityName, (GenericPK) entity);
+ return entity.getModelEntity().convertToViewValues(targetEntityName, entity);
} else {
return entity.getModelEntity().convertToViewValues(targetEntityName, entity);
}
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java Sun Dec 12 21:31:27 2010
@@ -439,7 +439,7 @@ public class GenericDAO {
}
} else if (meResult.size() == 1) {
// Update existing value
- meGenericValue = (GenericValue) meResult.iterator().next();
+ meGenericValue = meResult.iterator().next();
} else {
throw new GenericEntityException("Found more than one result for member entity " + meName + " in view " + modelViewEntity.getEntityName() + " - this is no updatable view");
}
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/DatabaseUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/DatabaseUtil.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/DatabaseUtil.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/DatabaseUtil.java Sun Dec 12 21:31:27 2010
@@ -356,7 +356,7 @@ public class DatabaseUtil {
// -list all fields that do not have a corresponding column
for (String colName: fieldColNames.keySet()) {
- ModelField field = (ModelField) fieldColNames.get(colName);
+ ModelField field = fieldColNames.get(colName);
String message = "Field [" + field.getName() + "] of entity [" + entity.getEntityName() + "] is missing its corresponding column [" + field.getColName() + "]" + (field.getIsPk() ? " (and it is a PRIMARY KEY FIELD)" : "");
Debug.logWarning(message, module);
@@ -2105,7 +2105,7 @@ public class DatabaseUtil {
String entityName = fieldInfo.substring(0, fieldInfo.indexOf('.'));
String fieldName = fieldInfo.substring(fieldInfo.indexOf('.') + 1);
- ModelEntity modelEntity = (ModelEntity) modelEntities.get(entityName);
+ ModelEntity modelEntity = modelEntities.get(entityName);
ModelField modelField = modelEntity.getField(fieldName);
repairColumnSize(modelEntity, modelField, messages);
}
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelReader.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelReader.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelReader.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelReader.java Sun Dec 12 21:31:27 2010
@@ -259,7 +259,7 @@ public class ModelReader implements Seri
// all entity elements in, now go through extend-entity elements and add their stuff
for (Element extendEntityElement: tempExtendEntityElementList) {
String entityName = UtilXml.checkEmpty(extendEntityElement.getAttribute("entity-name"));
- ModelEntity modelEntity = (ModelEntity) entityCache.get(entityName);
+ ModelEntity modelEntity = entityCache.get(entityName);
if (modelEntity == null) throw new GenericEntityConfException("Entity to extend does not exist: " + entityName);
modelEntity.addExtendEntity(this, extendEntityElement);
}
@@ -271,7 +271,7 @@ public class ModelReader implements Seri
curViewEntity.populateFields(this);
for (ModelViewEntity.ModelMemberEntity mve: curViewEntity.getAllModelMemberEntities()) {
- ModelEntity me = (ModelEntity) entityCache.get(mve.getEntityName());
+ ModelEntity me = entityCache.get(mve.getEntityName());
if (me == null) throw new GenericEntityConfException("View " + curViewEntity.getEntityName() + " references non-existant entity: " + mve.getEntityName());
me.addViewEntity(curViewEntity);
}
@@ -498,7 +498,7 @@ public class ModelReader implements Seri
//put the entityNames TreeSets in a HashMap by packageName
Iterator<String> ecIter = this.getEntityNames().iterator();
while (ecIter.hasNext()) {
- String entityName = (String) ecIter.next();
+ String entityName = ecIter.next();
ModelEntity entity = this.getModelEntity(entityName);
String packageName = entity.getPackageName();
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/sql/EntityPlanner.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/sql/EntityPlanner.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/sql/EntityPlanner.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/sql/EntityPlanner.java Sun Dec 12 21:31:27 2010
@@ -121,7 +121,7 @@ public class EntityPlanner extends Plann
if (value instanceof FieldValue) {
addFieldDef(dve, groupBy, fieldDef.getAlias(), (FieldValue) value, null);
} else if (value instanceof ConstantValue) {
- addFieldDef(dve, groupBy, fieldDef.getAlias(), (ConstantValue) value);
+ addFieldDef(dve, groupBy, fieldDef.getAlias(), value);
} else {
throw new UnsupportedOperationException(alias + "[" + fieldDef + "]:" + fieldDef.getClass());
}
Modified: ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java (original)
+++ ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java Sun Dec 12 21:31:27 2010
@@ -336,7 +336,7 @@ public class EntityDataLoadContainer imp
// add in the defined extra files
for (String fileName: this.files) {
- URL fileUrl = UtilURL.fromResource((String) fileName);
+ URL fileUrl = UtilURL.fromResource(fileName);
if (fileUrl != null) {
urlList.add(fileUrl);
}
Modified: ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java (original)
+++ ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java Sun Dec 12 21:31:27 2010
@@ -1066,14 +1066,14 @@ public class EntityPermissionChecker {
buf.append(StringUtil.join(this.operationList, ","));
buf.append("\n");
for (String fld: fieldNames) {
- wid = (Integer)widths.get(fld);
+ wid = widths.get(fld);
buf.append(fld);
for (int i=0; i < (wid.intValue() - fld.length()); i++) buf.append("^");
buf.append(" ");
}
buf.append("\n");
for (String fld: fieldNames) {
- wid = (Integer)widths.get(fld);
+ wid = widths.get(fld);
for (int i=0; i < wid.intValue(); i++) buf.append("-");
buf.append(" ");
}
@@ -1095,7 +1095,7 @@ public class EntityPermissionChecker {
if (UtilValidate.isEmpty(roleTypeId)) {
roleTypeId = "";
}
- wid = (Integer)widths.get("roleFieldName");
+ wid = widths.get("roleFieldName");
buf.append(roleTypeId);
for (int i=0; i < (wid.intValue() - roleTypeId.length()); i++) buf.append("^");
buf.append(" ");
@@ -1104,7 +1104,7 @@ public class EntityPermissionChecker {
if (UtilValidate.isEmpty(auxiliaryFieldValue)) {
auxiliaryFieldValue = "";
}
- wid = (Integer)widths.get("auxiliaryFieldName");
+ wid = widths.get("auxiliaryFieldName");
buf.append(auxiliaryFieldValue);
for (int i=0; i < (wid.intValue() - auxiliaryFieldValue.length()); i++) buf.append("^");
buf.append(" ");
Modified: ofbiz/trunk/framework/geronimo/src/org/ofbiz/geronimo/GeronimoTransactionFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/geronimo/src/org/ofbiz/geronimo/GeronimoTransactionFactory.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/framework/geronimo/src/org/ofbiz/geronimo/GeronimoTransactionFactory.java (original)
+++ ofbiz/trunk/framework/geronimo/src/org/ofbiz/geronimo/GeronimoTransactionFactory.java Sun Dec 12 21:31:27 2010
@@ -53,7 +53,7 @@ public class GeronimoTransactionFactory
// creates an instance of Geronimo transaction context, etc with a local transaction factory which is not bound to a registry
try {
transactionLog = new UnrecoverableLog();
- geronimoTransactionManager = new GeronimoTransactionManager(defaultTransactionTimeoutSeconds, (XidFactory)new XidFactoryImpl(), transactionLog);
+ geronimoTransactionManager = new GeronimoTransactionManager(defaultTransactionTimeoutSeconds, new XidFactoryImpl(), transactionLog);
} catch (XAException e) {
Debug.logError(e, "Error initializing Geronimo transaction manager: " + e.toString(), module);
}
Modified: ofbiz/trunk/framework/guiapp/src/org/ofbiz/guiapp/xui/XuiSession.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/guiapp/src/org/ofbiz/guiapp/xui/XuiSession.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/framework/guiapp/src/org/ofbiz/guiapp/xui/XuiSession.java (original)
+++ ofbiz/trunk/framework/guiapp/src/org/ofbiz/guiapp/xui/XuiSession.java Sun Dec 12 21:31:27 2010
@@ -47,7 +47,7 @@ public class XuiSession {
protected Map<String, Object> attributes = FastMap.newInstance();
protected String id = null;
protected final boolean IS_SAME_LOGIN = UtilProperties.propertyValueEqualsIgnoreCase("xui.properties", "isSameLogin", "true");
- private Locale locale = (Locale) Locale.getDefault();
+ private Locale locale = Locale.getDefault();
public XuiSession(String id, Delegator delegator, LocalDispatcher dispatcher, XuiContainer container) {
this.id = id;
Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/StringAppend.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/StringAppend.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/StringAppend.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/StringAppend.java Sun Dec 12 21:31:27 2010
@@ -76,10 +76,10 @@ public class StringAppend extends Method
mapAcsr.put(methodContext, toMap);
}
- String oldValue = (String) fieldAcsr.get(toMap, methodContext);
+ String oldValue = fieldAcsr.get(toMap, methodContext);
fieldAcsr.put(toMap, this.appendString(oldValue, methodContext), methodContext);
} else {
- String oldValue = (String) fieldAcsr.get(methodContext);
+ String oldValue = fieldAcsr.get(methodContext);
fieldAcsr.put(methodContext, this.appendString(oldValue, methodContext));
}
Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/CheckPermission.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/CheckPermission.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/CheckPermission.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/CheckPermission.java Sun Dec 12 21:31:27 2010
@@ -122,7 +122,7 @@ public class CheckPermission extends Met
}
if (!hasPermission && acceptUlPartyIdEnvNameAcsr != null) {
- String acceptPartyId = (String) acceptUlPartyIdEnvNameAcsr.get(methodContext);
+ String acceptPartyId = acceptUlPartyIdEnvNameAcsr.get(methodContext);
if (UtilValidate.isEmpty(acceptPartyId)) {
// try the parameters Map
Map<String, Object> parameters = methodContext.getEnv("parameters");
Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/otherops/Calculate.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/otherops/Calculate.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/otherops/Calculate.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/otherops/Calculate.java Sun Dec 12 21:31:27 2010
@@ -245,7 +245,7 @@ public class Calculate extends MethodOpe
public BigDecimal calcValue(MethodContext methodContext, int scale, int roundingMode) {
String valueStr = methodContext.expandString(this.valueStr);
- Locale locale = (Locale) methodContext.getLocale();
+ Locale locale = methodContext.getLocale();
if (locale == null) locale = Locale.getDefault();
Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceRule.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceRule.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceRule.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceRule.java Sun Dec 12 21:31:27 2010
@@ -171,7 +171,7 @@ public class RecurrenceRule {
Debug.logVerbose("Stamp value: " + stamp, module);
if (stamp != null) {
- long nanos = (long) stamp.getNanos();
+ long nanos = stamp.getNanos();
time = stamp.getTime();
time += (nanos / 1000000);
}
Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/config/ServiceConfigUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/config/ServiceConfigUtil.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/config/ServiceConfigUtil.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/config/ServiceConfigUtil.java Sun Dec 12 21:31:27 2010
@@ -161,7 +161,7 @@ public class ServiceConfigUtil implement
for (int index = 0; index < params.getLength(); index++) {
Element param = (Element) params.item(index);
if (param != null && name.equals(param.getAttribute("name"))) {
- return (String) param.getAttribute("value");
+ return param.getAttribute("value");
}
}
}
Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/group/GroupModel.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/group/GroupModel.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/group/GroupModel.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/group/GroupModel.java Sun Dec 12 21:31:27 2010
@@ -127,7 +127,7 @@ public class GroupModel {
} else if (this.getSendMode().equals("round-robin")) {
return runIndex(dispatcher, localName, context, (++lastServiceRan % services.size()));
} else if (this.getSendMode().equals("random")) {
- int randomIndex = (int) (Math.random() * (double) (services.size()));
+ int randomIndex = (int) (Math.random() * (services.size()));
return runIndex(dispatcher, localName, context, randomIndex);
} else if (this.getSendMode().equals("first-available")) {
return runOne(dispatcher, localName, context);
Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/semaphore/ServiceSemaphore.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/semaphore/ServiceSemaphore.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/semaphore/ServiceSemaphore.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/semaphore/ServiceSemaphore.java Sun Dec 12 21:31:27 2010
@@ -100,7 +100,7 @@ public class ServiceSemaphore {
}
}
if (timedOut) {
- double waitTimeSec = ((double) (System.currentTimeMillis() - lockTime.getTime()) / 1000.0);
+ double waitTimeSec = ((System.currentTimeMillis() - lockTime.getTime()) / 1000.0);
String errMsg = "Service [" + model.name + "] with wait semaphore exceeded wait timeout, waited [" + waitTimeSec + "], wait started at " + lockTime;
Debug.logWarning(errMsg, module);
throw new SemaphoreWaitException(errMsg);
Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java Sun Dec 12 21:31:27 2010
@@ -428,7 +428,7 @@ public class ConfigXMLReader {
}
String cacheId = controllerPartialPath != null ? controllerPartialPath : "NOPARTIALPATH";
- List<ControllerConfig> controllerConfigs = (List<ControllerConfig>) controllerSearchResultsCache.get(cacheId);
+ List<ControllerConfig> controllerConfigs = controllerSearchResultsCache.get(cacheId);
if (controllerConfigs == null) {
try {
Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java Sun Dec 12 21:31:27 2010
@@ -851,7 +851,7 @@ public class LoginWorker {
Map<String, String> x500Map = KeyStoreUtil.getCertX500Map(clientCerts[i]);
if (i == 0) {
- String cn = (String) x500Map.get("CN");
+ String cn = x500Map.get("CN");
cn = cn.replaceAll("\\\\", "");
Matcher m = pattern.matcher(cn);
if (m.matches()) {
@@ -933,7 +933,7 @@ public class LoginWorker {
String externalKey = request.getParameter(LoginWorker.EXTERNAL_LOGIN_KEY_ATTR);
if (externalKey == null) return "success";
- GenericValue userLogin = (GenericValue) LoginWorker.externalLoginKeys.get(externalKey);
+ GenericValue userLogin = LoginWorker.externalLoginKeys.get(externalKey);
if (userLogin != null) {
//to check it's the right tenant
//in case username and password are the same in different tenants
Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ProtectViewWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ProtectViewWorker.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ProtectViewWorker.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ProtectViewWorker.java Sun Dec 12 21:31:27 2010
@@ -87,13 +87,13 @@ public class ProtectViewWorker {
}
GenericValue protectedView = protectedViews.get(0);
// 1st hit ?
- Long curMaxHits = (Long) hitsByViewAccessed.get(viewNameUserLoginId);
+ Long curMaxHits = hitsByViewAccessed.get(viewNameUserLoginId);
if (UtilValidate.isEmpty(curMaxHits)) {
hitsByViewAccessed.put(viewNameUserLoginId, one);
Long maxHitsDuration = (Long) protectedView.get("maxHitsDuration") * 1000;
durationByViewAccessed.put(viewNameUserLoginId, now + maxHitsDuration);
} else {
- Long maxDuration = (Long) durationByViewAccessed.get(viewNameUserLoginId);
+ Long maxDuration = durationByViewAccessed.get(viewNameUserLoginId);
Long newMaxHits = (Long) curMaxHits + one;
hitsByViewAccessed.put(viewNameUserLoginId, newMaxHits);
// Are we in a period of time where we need to check if there was too much hits ?
Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/WfsEventHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/WfsEventHandler.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/WfsEventHandler.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/WfsEventHandler.java Sun Dec 12 21:31:27 2010
@@ -88,10 +88,10 @@ public class WfsEventHandler implements
Element queryElem = null;
try {
- typeName = (String)request.getParameter("typename");
+ typeName = request.getParameter("typename");
//determine if "get" or "post" and get "filter" param accordingly
if (UtilValidate.isNotEmpty(typeName)) {
- String queryFieldCoded = (String)request.getParameter("filter");
+ String queryFieldCoded = request.getParameter("filter");
String queryFieldDecoded = UtilFormatOut.decodeQueryValue(queryFieldCoded);
Document doc = UtilXml.readXmlDocument(queryFieldDecoded);
queryElem = doc.getDocumentElement();
Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/XmlRpcEventHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/XmlRpcEventHandler.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/XmlRpcEventHandler.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/XmlRpcEventHandler.java Sun Dec 12 21:31:27 2010
@@ -300,7 +300,7 @@ public class XmlRpcEventHandler extends
context = checkMap(param, String.class, Object.class);
} else {
if (model.getDefinedInCount() == 1) {
- String paramName = (String) model.getInParamNames().iterator().next();
+ String paramName = model.getInParamNames().iterator().next();
context.put(paramName, xmlRpcReq.getParameter(0));
} else {
throw new XmlRpcException("More than one parameter defined on service; cannot call via RPC with parameter list");
Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/RegionManager.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/RegionManager.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/RegionManager.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/RegionManager.java Sun Dec 12 21:31:27 2010
@@ -117,7 +117,7 @@ public class RegionManager {
newRegion = new Region(idAttr, templateAttr, null);
} else {
if (UtilValidate.isNotEmpty(regionAttr)) {
- Region parentRegion = (Region) regions.get(regionAttr);
+ Region parentRegion = regions.get(regionAttr);
if (parentRegion == null) {
throw new IllegalArgumentException("can't find page definition attribute with this key: " + regionAttr);
Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/stats/ServerHitBin.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/stats/ServerHitBin.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/stats/ServerHitBin.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/stats/ServerHitBin.java Sun Dec 12 21:31:27 2010
@@ -247,23 +247,23 @@ public class ServerHitBin {
// save in global, and try to get bin by id
switch (type) {
case REQUEST:
- bin = (ServerHitBin) requestSinceStarted.get(id);
+ bin = requestSinceStarted.get(id);
break;
case EVENT:
- bin = (ServerHitBin) eventSinceStarted.get(id);
+ bin = eventSinceStarted.get(id);
break;
case VIEW:
- bin = (ServerHitBin) viewSinceStarted.get(id);
+ bin = viewSinceStarted.get(id);
break;
case ENTITY:
- bin = (ServerHitBin) entitySinceStarted.get(id);
+ bin = entitySinceStarted.get(id);
break;
case SERVICE:
- bin = (ServerHitBin) serviceSinceStarted.get(id);
+ bin = serviceSinceStarted.get(id);
break;
}
@@ -271,23 +271,23 @@ public class ServerHitBin {
synchronized (ServerHitBin.class) {
switch (type) {
case REQUEST:
- bin = (ServerHitBin) requestSinceStarted.get(id);
+ bin = requestSinceStarted.get(id);
break;
case EVENT:
- bin = (ServerHitBin) eventSinceStarted.get(id);
+ bin = eventSinceStarted.get(id);
break;
case VIEW:
- bin = (ServerHitBin) viewSinceStarted.get(id);
+ bin = viewSinceStarted.get(id);
break;
case ENTITY:
- bin = (ServerHitBin) entitySinceStarted.get(id);
+ bin = entitySinceStarted.get(id);
break;
case SERVICE:
- bin = (ServerHitBin) serviceSinceStarted.get(id);
+ bin = serviceSinceStarted.get(id);
break;
}
@@ -477,7 +477,7 @@ public class ServerHitBin {
/** returns (endTime - startTime)/60000 */
public double getBinLengthMinutes() {
- return ((double) this.getBinLength()) / 60000.0;
+ return (this.getBinLength()) / 60000.0;
}
public long getNumberHits() {
@@ -493,7 +493,7 @@ public class ServerHitBin {
}
public double getMinTimeSeconds() {
- return ((double) this.minTime) / 1000.0;
+ return (this.minTime) / 1000.0;
}
public long getMaxTime() {
@@ -501,7 +501,7 @@ public class ServerHitBin {
}
public double getMaxTimeSeconds() {
- return ((double) this.maxTime) / 1000.0;
+ return (this.maxTime) / 1000.0;
}
public double getAvgTime() {
@@ -514,7 +514,7 @@ public class ServerHitBin {
/** return the hits per minute using the entire length of the bin as returned by getBinLengthMinutes() */
public double getHitsPerMinute() {
- return ((double) this.numberHits) / this.getBinLengthMinutes();
+ return (this.numberHits) / this.getBinLengthMinutes();
}
synchronized void addHit(long startTime, long runningTime) {
Modified: ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java (original)
+++ ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java Sun Dec 12 21:31:27 2010
@@ -319,10 +319,10 @@ public class WebToolsServices {
String readers = (String) context.get("readers");
String overrideDelegator = (String) context.get("overrideDelegator");
String overrideGroup = (String) context.get("overrideGroup");
- boolean useDummyFks = "true".equals((String) context.get("createDummyFks"));
- boolean maintainTxs = "true".equals((String) context.get("maintainTimeStamps"));
- boolean tryInserts = "true".equals((String) context.get("mostlyInserts"));
- boolean checkDataOnly = "true".equals((String) context.get("checkDataOnly"));
+ boolean useDummyFks = "true".equals(context.get("createDummyFks"));
+ boolean maintainTxs = "true".equals(context.get("maintainTimeStamps"));
+ boolean tryInserts = "true".equals(context.get("mostlyInserts"));
+ boolean checkDataOnly = "true".equals(context.get("checkDataOnly"));
Integer txTimeoutInt = (Integer) context.get("txTimeout");
int txTimeout = txTimeoutInt != null ? txTimeoutInt.intValue() : -1;
@@ -513,7 +513,7 @@ public class WebToolsServices {
//Don't bother writing the file if there's nothing
//to put into it
- GenericValue value = (GenericValue) values.next();
+ GenericValue value = values.next();
if (value != null) {
PrintWriter writer = new PrintWriter(new BufferedWriter(new OutputStreamWriter(new FileOutputStream(new File(outdir, curEntityName +".xml")), "UTF-8")));
writer.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
@@ -526,7 +526,7 @@ public class WebToolsServices {
TransactionUtil.commit(beganTx);
beganTx = TransactionUtil.begin();
}
- } while ((value = (GenericValue) values.next()) != null);
+ } while ((value = values.next()) != null);
writer.println("</entity-engine-xml>");
writer.close();
results.add("["+fileNumber +"] [" + numberWritten + "] " + curEntityName + " wrote " + numberWritten + " records");
Modified: ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ControllerRequestArtifactInfo.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ControllerRequestArtifactInfo.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ControllerRequestArtifactInfo.java (original)
+++ ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ControllerRequestArtifactInfo.java Sun Dec 12 21:31:27 2010
@@ -68,7 +68,7 @@ public class ControllerRequestArtifactIn
// populate serviceCalledByRequestEvent, requestsThatAreResponsesToThisRequest, viewsThatAreResponsesToThisRequest and related reverse maps
if (this.requestInfoMap.event != null && this.requestInfoMap.event.type != null && (this.requestInfoMap.event.type.indexOf("service") >= 0)) {
- String serviceName = (String) this.requestInfoMap.event.invoke;
+ String serviceName = this.requestInfoMap.event.invoke;
try {
this.serviceCalledByRequestEvent = this.aif.getServiceArtifactInfo(serviceName);
if (this.serviceCalledByRequestEvent != null) {
Modified: ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java (original)
+++ ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java Sun Dec 12 21:31:27 2010
@@ -85,7 +85,7 @@ public class ServiceArtifactInfo extends
SimpleMethod simpleMethodToCall = null;
try {
Map<String, SimpleMethod> simpleMethods = SimpleMethod.getSimpleMethods(this.modelService.location, null);
- simpleMethodToCall = (SimpleMethod) simpleMethods.get(this.modelService.invoke);
+ simpleMethodToCall = simpleMethods.get(this.modelService.invoke);
} catch (MiniLangException e) {
Debug.logWarning("Error getting Simple-method [" + this.modelService.invoke + "] in [" + this.modelService.location + "] referenced in service [" + this.modelService.name + "]: " + e.toString(), module);
}
@@ -146,7 +146,7 @@ public class ServiceArtifactInfo extends
SimpleMethod simpleMethodToCall = null;
try {
Map<String, SimpleMethod> simpleMethods = SimpleMethod.getSimpleMethods(this.modelService.location, null);
- simpleMethodToCall = (SimpleMethod) simpleMethods.get(this.modelService.invoke);
+ simpleMethodToCall = simpleMethods.get(this.modelService.invoke);
} catch (MiniLangException e) {
Debug.logWarning("Error getting Simple-method [" + this.modelService.invoke + "] in [" + this.modelService.location + "] referenced in service [" + this.modelService.name + "]: " + e.toString(), module);
}
Modified: ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelInfo.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelInfo.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelInfo.java (original)
+++ ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelInfo.java Sun Dec 12 21:31:27 2010
@@ -59,7 +59,7 @@ public class LabelInfo {
}
public LabelValue getLabelValue(String localeStr) {
- return (LabelValue)labelValues.get(localeStr);
+ return labelValues.get(localeStr);
}
public int getLabelValueSize() {
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java Sun Dec 12 21:31:27 2010
@@ -239,7 +239,7 @@ public class MacroFormRenderer implement
while (fieldIterator.hasNext()) {
count++;
Entry<String, Object> field = fieldIterator.next();
- extraParameter += (String) field.getKey() + ":'" + (String) field.getValue() + "'";
+ extraParameter += field.getKey() + ":'" + (String) field.getValue() + "'";
if (count < fieldSet.size()) {
extraParameter += ',';
}
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormWrapper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormWrapper.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormWrapper.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormWrapper.java Sun Dec 12 21:31:27 2010
@@ -92,7 +92,7 @@ public class HtmlFormWrapper {
}
// if a parameter was passed saying this is an error, it is an error
- if ("true".equals((String) parameterMap.get("isError"))) {
+ if ("true".equals(parameterMap.get("isError"))) {
context.put("isError", Boolean.TRUE);
}
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuWrapper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuWrapper.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuWrapper.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuWrapper.java Sun Dec 12 21:31:27 2010
@@ -93,7 +93,7 @@ public class HtmlMenuWrapper {
}
// if a parameter was passed saying this is an error, it is an error
- if ("true".equals((String) parameterMap.get("isError"))) {
+ if ("true".equals(parameterMap.get("isError"))) {
context.put("isError", Boolean.TRUE);
}
}
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java Sun Dec 12 21:31:27 2010
@@ -287,7 +287,7 @@ public class HtmlScreenRenderer extends
if (uiLabelMap == null) {
Debug.logWarning("Could not find uiLabelMap in context", module);
} else {
- ofLabel = (String) uiLabelMap.get("CommonOf");
+ ofLabel = uiLabelMap.get("CommonOf");
ofLabel = ofLabel.toLowerCase();
}
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlTreeRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlTreeRenderer.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlTreeRenderer.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlTreeRenderer.java Sun Dec 12 21:31:27 2010
@@ -77,7 +77,7 @@ public class HtmlTreeRenderer extends Ht
String targetEntityId = null;
List<String> targetNodeTrail = UtilGenerics.toList(context.get("targetNodeTrail"));
if (depth < targetNodeTrail.size()) {
- targetEntityId = (String)targetNodeTrail.get(depth);
+ targetEntityId = targetNodeTrail.get(depth);
}
int openDepth = node.getModelTree().getOpenDepth();
@@ -102,7 +102,7 @@ public class HtmlTreeRenderer extends Ht
} else {
context.put("processChildren", Boolean.TRUE);
//expandCollapseLink.setText(" - ");
- String lastContentId = (String)currentNodeTrail.remove(currentNodeTrail.size() - 1);
+ String lastContentId = currentNodeTrail.remove(currentNodeTrail.size() - 1);
currentNodeTrailPiped = StringUtil.join(currentNodeTrail, "|");
if (currentNodeTrailPiped == null) {
currentNodeTrailPiped = "";
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java Sun Dec 12 21:31:27 2010
@@ -199,7 +199,7 @@ public class ModelMenuItem {
public ModelMenuItem addUpdateMenuItem(ModelMenuItem modelMenuItem) {
// not a conditional item, see if a named item exists in Map
- ModelMenuItem existingMenuItem = (ModelMenuItem) this.menuItemMap.get(modelMenuItem.getName());
+ ModelMenuItem existingMenuItem = this.menuItemMap.get(modelMenuItem.getName());
if (existingMenuItem != null) {
// does exist, update the item by doing a merge/override
existingMenuItem.mergeOverrideModelMenuItem(modelMenuItem);