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 [4/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/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreHelper.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreHelper.java (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreHelper.java Sun Dec 12 21:31:27 2010
@@ -405,7 +405,7 @@ public class EbayStoreHelper {
public static void mappedShippingLocations(Map requestParams, ItemType item, ApiContext apiContext, HttpServletRequest request, HashMap attributeMapList) {
try {
if (UtilValidate.isNotEmpty(requestParams)) {
- EbayStoreSiteFacade sf = (EbayStoreSiteFacade) EbayEvents.getSiteFacade(apiContext, request);
+ EbayStoreSiteFacade sf = EbayEvents.getSiteFacade(apiContext, request);
Map<SiteCodeType, GeteBayDetailsResponseType> eBayDetailsMap = sf.getEBayDetailsMap();
GeteBayDetailsResponseType eBayDetails = eBayDetailsMap.get(apiContext.getSite());
ShippingLocationDetailsType[] shippingLocationDetails = eBayDetails.getShippingLocationDetails();
@@ -413,7 +413,7 @@ public class EbayStoreHelper {
int i = 0;
String[] tempShipLocation = new String[shippingLocationDetails.length];
for (ShippingLocationDetailsType shippingLocationDetail : shippingLocationDetails) {
- String shippingLocation = (String) shippingLocationDetail.getShippingLocation();
+ String shippingLocation = shippingLocationDetail.getShippingLocation();
String shipParam = (String)requestParams.get("Shipping_".concat(shippingLocation));
if ("true".equals(shipParam)) {
tempShipLocation[i] = shippingLocation;
@@ -431,7 +431,7 @@ public class EbayStoreHelper {
public static Map<String, Object> exportProductEachItem(DispatchContext dctx, Map<String, Object> context) {
Map<String,Object> result = FastMap.newInstance();
- LocalDispatcher dispatcher = (LocalDispatcher) dctx.getDispatcher();
+ LocalDispatcher dispatcher = dctx.getDispatcher();
Delegator delegator = dctx.getDelegator();
Map<String, Object> itemObject = (Map<String, Object>) context.get("itemObject");
String productListingId = itemObject.get("productListingId").toString();
@@ -658,7 +658,7 @@ public class EbayStoreHelper {
AddOrderRequestType addReq = new AddOrderRequestType();
AddOrderResponseType addResp = null;
OrderType newOrder = new OrderType();
- ShippingDetailsType shippingDetail = (ShippingDetailsType) order.getShippingDetails();
+ ShippingDetailsType shippingDetail = order.getShippingDetails();
if (trackingOrders.size() > 0) {
ShipmentTrackingDetailsType[] trackDetails = new ShipmentTrackingDetailsType[trackingOrders.size()];
for (int i = 0; i < trackDetails.length; i++) {
Modified: ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOptions.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOptions.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOptions.java (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOptions.java Sun Dec 12 21:31:27 2010
@@ -92,7 +92,7 @@ public class EbayStoreOptions {
Map<String,Object> storeColorSchemeMap = FastMap.newInstance();
while (i < storeBasicTheme.length) {
- StoreThemeType storeThemeType = (StoreThemeType)storeBasicTheme[i];
+ StoreThemeType storeThemeType = storeBasicTheme[i];
if (themeId.equals(storeThemeType.getThemeID().toString())) {
StoreColorSchemeType colorSchemeType = storeThemeType.getColorScheme();
if (colorSchemeType != null) {
Modified: ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOrder.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOrder.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOrder.java (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOrder.java Sun Dec 12 21:31:27 2010
@@ -369,7 +369,7 @@ public class EbayStoreOrder {
List<Map<String, Object>> orderItemList = UtilGenerics.checkList(context.get("orderItemList"));
Iterator<Map<String, Object>> orderItemIter = orderItemList.iterator();
while (orderItemIter.hasNext()) {
- Map<String, Object> orderItem = (Map<String, Object>) orderItemIter.next();
+ Map<String, Object> orderItem = orderItemIter.next();
addItem(cart, orderItem, dispatcher, delegator, 0);
}
@@ -424,8 +424,8 @@ public class EbayStoreOrder {
Map<String, Object> shippingAddressCtx = UtilGenerics.checkMap(context.get("shippingAddressCtx"));
if (UtilValidate.isNotEmpty(shippingAddressCtx)) {
String buyerName = (String) shippingAddressCtx.get("buyerName");
- String firstName = (String) buyerName.substring(0, buyerName.indexOf(" "));
- String lastName = (String) buyerName.substring(buyerName.indexOf(" ")+1);
+ String firstName = buyerName.substring(0, buyerName.indexOf(" "));
+ String lastName = buyerName.substring(buyerName.indexOf(" ")+1);
String country = (String) shippingAddressCtx.get("shippingAddressCountry");
String state = (String) shippingAddressCtx.get("shippingAddressStateOrProvince");
Modified: ofbiz/trunk/specialpurpose/googlebase/src/org/ofbiz/googlebase/GoogleBaseSearchEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/src/org/ofbiz/googlebase/GoogleBaseSearchEvents.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlebase/src/org/ofbiz/googlebase/GoogleBaseSearchEvents.java (original)
+++ ofbiz/trunk/specialpurpose/googlebase/src/org/ofbiz/googlebase/GoogleBaseSearchEvents.java Sun Dec 12 21:31:27 2010
@@ -55,7 +55,7 @@ public class GoogleBaseSearchEvents {
LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher");
Locale locale = UtilHttp.getLocale(request);
GenericValue userLogin = (GenericValue) request.getSession().getAttribute("userLogin");
- String selectResult = (String) request.getParameter("selectResult");
+ String selectResult = request.getParameter("selectResult");
List<String> productExportList = FastList.newInstance();
String errMsg = null;
@@ -73,7 +73,7 @@ public class GoogleBaseSearchEvents {
}
GenericValue searchResultView = null;
- while ((searchResultView = (GenericValue) eli.next()) != null) {
+ while ((searchResultView = eli.next()) != null) {
productExportList.add(searchResultView.getString("mainProductId"));
}
eli.close();
@@ -84,15 +84,15 @@ public class GoogleBaseSearchEvents {
productExportList.add(selectResult);
}
}
- String webSiteUrl = (String) request.getParameter("webSiteUrl");
- String imageUrl = (String) request.getParameter("imageUrl");
- String actionType = (String) request.getParameter("actionType");
- String statusId = (String) request.getParameter("statusId");
- String testMode = (String) request.getParameter("testMode");
- String trackingCodeId = (String) request.getParameter("trackingCodeId");
- String webSiteMountPoint = (String) request.getParameter("webSiteMountPoint");
- String countryCode = (String) request.getParameter("countryCode");
- String productStoreId = (String) request.getParameter("productStoreId");
+ String webSiteUrl = request.getParameter("webSiteUrl");
+ String imageUrl = request.getParameter("imageUrl");
+ String actionType = request.getParameter("actionType");
+ String statusId = request.getParameter("statusId");
+ String testMode = request.getParameter("testMode");
+ String trackingCodeId = request.getParameter("trackingCodeId");
+ String webSiteMountPoint = request.getParameter("webSiteMountPoint");
+ String countryCode = request.getParameter("countryCode");
+ String productStoreId = request.getParameter("productStoreId");
// Export all or selected products to Google Base
try {
Modified: ofbiz/trunk/specialpurpose/googlebase/src/org/ofbiz/googlebase/ProductsExportToGoogle.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/src/org/ofbiz/googlebase/ProductsExportToGoogle.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlebase/src/org/ofbiz/googlebase/ProductsExportToGoogle.java (original)
+++ ofbiz/trunk/specialpurpose/googlebase/src/org/ofbiz/googlebase/ProductsExportToGoogle.java Sun Dec 12 21:31:27 2010
@@ -362,7 +362,7 @@ public class ProductsExportToGoogle {
GenericValue googleProduct;
while (productsListItr.hasNext()) {
itemActionType = actionType;
- GenericValue prod = (GenericValue)productsListItr.next();
+ GenericValue prod = productsListItr.next();
String price = getProductPrice(dispatcher, prod);
if (price == null) {
Debug.logInfo("Price not found for product [" + prod.getString("productId")+ "]; product will not be exported.", module);
@@ -445,7 +445,7 @@ public class ProductsExportToGoogle {
Iterator<GenericValue> productCategoryMembersIter = productCategoryMembers.iterator();
while (productCategoryMembersIter.hasNext()) {
- GenericValue productCategoryMember = (GenericValue) productCategoryMembersIter.next();
+ GenericValue productCategoryMember = productCategoryMembersIter.next();
GenericValue productCategory = productCategoryMember.getRelatedOne("ProductCategory");
String productCategoryTypeId = productCategory.getString("productCategoryTypeId");
if (UtilValidate.isNotEmpty(productCategoryTypeId) && "GOOGLE_BASE_CATEGORY".equals(productCategoryTypeId)) {
@@ -544,10 +544,10 @@ public class ProductsExportToGoogle {
Iterator<? extends Element> atomEntryElemIter = atomEntryList.iterator();
int index = 0;
while (atomEntryElemIter.hasNext()) {
- Element atomEntryElement = (Element)atomEntryElemIter.next();
+ Element atomEntryElement = atomEntryElemIter.next();
String id = UtilXml.childElementValue(atomEntryElement, "atom:id", "");
if (UtilValidate.isNotEmpty(id) && newProductsInGoogle.get(index) != null) {
- String productId = (String)newProductsInGoogle.get(index);
+ String productId = newProductsInGoogle.get(index);
try {
GenericValue googleProductId = delegator.makeValue("GoodIdentification");
googleProductId.set("goodIdentificationTypeId", "GOOGLE_ID");
@@ -559,7 +559,7 @@ public class ProductsExportToGoogle {
}
}
if (UtilValidate.isNotEmpty(id) && productsRemovedFromGoogle.get(index) != null) {
- String productId = (String)productsRemovedFromGoogle.get(index);
+ String productId = productsRemovedFromGoogle.get(index);
try {
delegator.removeByAnd("GoodIdentification", UtilMisc.toMap("goodIdentificationTypeId", "GOOGLE_ID", "productId", productId));
} catch (GenericEntityException gee) {
@@ -570,7 +570,7 @@ public class ProductsExportToGoogle {
List<? extends Element> batchStatusList = UtilXml.childElementList(atomEntryElement, "batch:status");
Iterator<? extends Element> batchStatusEntryElemIter = batchStatusList.iterator();
while (batchStatusEntryElemIter.hasNext()) {
- Element batchStatusEntryElement = (Element)batchStatusEntryElemIter.next();
+ Element batchStatusEntryElement = batchStatusEntryElemIter.next();
if (UtilValidate.isNotEmpty(batchStatusEntryElement.getAttribute("reason"))) {
message.add(title + " " + batchStatusEntryElement.getAttribute("reason"));
}
Modified: ofbiz/trunk/specialpurpose/ldap/src/org/ofbiz/ldap/activedirectory/OFBizActiveDirectoryAuthenticationHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ldap/src/org/ofbiz/ldap/activedirectory/OFBizActiveDirectoryAuthenticationHandler.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ldap/src/org/ofbiz/ldap/activedirectory/OFBizActiveDirectoryAuthenticationHandler.java (original)
+++ ofbiz/trunk/specialpurpose/ldap/src/org/ofbiz/ldap/activedirectory/OFBizActiveDirectoryAuthenticationHandler.java Sun Dec 12 21:31:27 2010
@@ -97,7 +97,7 @@ public final class OFBizActiveDirectoryA
"(&(" + filter + ") (" + attribute +"))",
controls);
if (answer.hasMoreElements()) {
- result = (SearchResult) answer.next();
+ result = answer.next();
if (bindRequired) {
env.put(Context.SECURITY_AUTHENTICATION, authenType);
// specify the username
Modified: ofbiz/trunk/specialpurpose/ldap/src/org/ofbiz/ldap/openldap/OFBizLdapAuthenticationHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ldap/src/org/ofbiz/ldap/openldap/OFBizLdapAuthenticationHandler.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ldap/src/org/ofbiz/ldap/openldap/OFBizLdapAuthenticationHandler.java (original)
+++ ofbiz/trunk/specialpurpose/ldap/src/org/ofbiz/ldap/openldap/OFBizLdapAuthenticationHandler.java Sun Dec 12 21:31:27 2010
@@ -82,7 +82,7 @@ public final class OFBizLdapAuthenticati
"(&(" + filter + ") (" + attribute +"))",
controls);
if (answer.hasMoreElements()) {
- result = (SearchResult) answer.next();
+ result = answer.next();
if (bindRequired) {
env.put(Context.SECURITY_AUTHENTICATION, authenType);
// specify the username
Modified: ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java (original)
+++ ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java Sun Dec 12 21:31:27 2010
@@ -1023,7 +1023,7 @@ public class OagisInventoryServices {
Double returnQuantityDbl = returnItem.getDouble("returnQuantity");
if (UtilValidate.isNotEmpty(productId) && returnQuantityDbl != null) {
double newTotal = returnQuantityDbl.doubleValue();
- Double existingTotal = (Double) returnQuantityByProductIdMap.get(productId);
+ Double existingTotal = returnQuantityByProductIdMap.get(productId);
if (existingTotal != null) newTotal += existingTotal.doubleValue();
returnQuantityByProductIdMap.put(productId, new Double(newTotal));
}
Modified: ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisServices.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisServices.java (original)
+++ ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisServices.java Sun Dec 12 21:31:27 2010
@@ -450,7 +450,7 @@ public class OagisServices {
// try looking up by just the referenceId, those alone are often unique, return error if there is more than one result
List<GenericValue> oagisMessageInfoList = delegator.findByAnd("OagisMessageInfo", UtilMisc.toMap("referenceId", referenceId));
if (oagisMessageInfoList.size() == 1) {
- oagisMessageInfo = (GenericValue) oagisMessageInfoList.get(0);
+ oagisMessageInfo = oagisMessageInfoList.get(0);
} else if (oagisMessageInfoList.size() > 1) {
return ServiceUtil.returnError("Looked up by referenceId because logicalId, component, or task were not passed in but found more than one [" + oagisMessageInfoList.size() + "] record with referenceId [" + referenceId + "]");
}
Modified: ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java (original)
+++ ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java Sun Dec 12 21:31:27 2010
@@ -218,7 +218,7 @@ public class OagisShipmentServices {
String shipGroupSeqId = shipment.getString("primaryShipGroupSeqId");
String originFacilityId = shipment.getString("originFacilityId");
- Element shipUnitFirstElement = (Element)shipUnitElementList.get(0);
+ Element shipUnitFirstElement = shipUnitElementList.get(0);
String trackingNum = UtilXml.childElementValue(shipUnitFirstElement, "of:TRACKINGID"); // of
String carrierCode = UtilXml.childElementValue(shipUnitFirstElement, "of:CARRIER"); // of
if (UtilValidate.isNotEmpty(carrierCode)) {
@@ -343,7 +343,7 @@ public class OagisShipmentServices {
Debug.logError(errMsg, module);
continue;
}
- GenericValue shipmentItem = (GenericValue) shipmentItemList.get(0);
+ GenericValue shipmentItem = shipmentItemList.get(0);
String shipmentItemSeqId = shipmentItem.getString("shipmentItemSeqId");
GenericValue orderShipment = EntityUtil.getFirst(delegator.findByAnd("OrderShipment", UtilMisc.toMap("shipmentId", shipmentId, "shipmentItemSeqId", shipmentItemSeqId)));
@@ -395,7 +395,7 @@ public class OagisShipmentServices {
// because there may be more than one ShipmentItem for an OrderItem allow there to be more inventory reservations for the
//OrderItem than there is quantity on the current ShipmentItem
- if ((int) totalReserved < messageQuantity.intValue()) {
+ if (totalReserved < messageQuantity.intValue()) {
String errMsg = "Inventory reservation quantity [" + totalReserved + "] was less than the message quantity [" + messageQuantity.intValue() + "] so cannot receive against reservations for ShipmentItem with ID [" + shipmentId + ":" + shipmentItemSeqId + "], and OrderItem [" + orderShipment.getString("orderId") + ":" + orderShipment.getString("orderItemSeqId") + "]";
errorMapList.add(UtilMisc.toMap("description", errMsg, "reasonCode", "SerialNumbersMissing"));
Debug.logInfo(errMsg, module);
Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java Sun Dec 12 21:31:27 2010
@@ -367,8 +367,8 @@ public class PosTransaction implements S
//Debug.log("AuthTrans - " + authTrans, module);
if ("PaymentMethodType".equals(infValue.getEntityName())) {
- payInfo.put("description", (String) infValue.get("description", locale));
- payInfo.put("payInfo", (String) infValue.get("description", locale));
+ payInfo.put("description", infValue.get("description", locale));
+ payInfo.put("payInfo", infValue.get("description", locale));
payInfo.put("amount", UtilFormatOut.formatPrice(inf.amount));
} else {
String paymentMethodTypeId = infValue.getString("paymentMethodTypeId");
@@ -379,7 +379,7 @@ public class PosTransaction implements S
Debug.logError(e, module);
}
if (pmt != null) {
- payInfo.put("description", (String) pmt.get("description", locale));
+ payInfo.put("description", pmt.get("description", locale));
payInfo.put("amount", UtilFormatOut.formatPrice(inf.amount));
}
Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/KeyboardAdaptor.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/KeyboardAdaptor.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/KeyboardAdaptor.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/KeyboardAdaptor.java Sun Dec 12 21:31:27 2010
@@ -134,10 +134,10 @@ public class KeyboardAdaptor {
if (chars.length == 0) {
// non-character data from keyboard interface (i.e. FN keys, enter, esc, etc)
return KEYBOARD_DATA;
- } else if (((int) chars[0]) == 2 && ((int) chars[chars.length - 1]) == 10) {
+ } else if ((chars[0]) == 2 && (chars[chars.length - 1]) == 10) {
// test for scanner data
return SCANNER_DATA;
- } else if (((int) chars[0]) == 37 && ((int) chars[chars.length - 1]) == 10) {
+ } else if ((chars[0]) == 37 && (chars[chars.length - 1]) == 10) {
// test for MSR data
return MSR_DATA;
} else {
@@ -164,17 +164,17 @@ public class KeyboardAdaptor {
int[] codes = new int[keyCodeData.size()];
for (int i = 0; i < codes.length; i++) {
- Integer itg = (Integer) keyCodeData.get(i);
+ Integer itg = keyCodeData.get(i);
codes[i] = itg.intValue();
}
for (int i = 0; i < chars.length; i++) {
- Character ch = (Character) keyCharData.get(i);
+ Character ch = keyCharData.get(i);
chars[i] = ch.charValue();
}
for (KeyboardReceiver receiver : receivers.keySet()) {
- int receiverType = ((Integer) receivers.get(receiver)).intValue();
+ int receiverType = (receivers.get(receiver)).intValue();
int thisDataType = this.checkDataType(chars);
if (receiverType == ALL_DATA || receiverType == thisDataType) {
receiver.receiveData(codes, chars);
Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Input.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Input.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Input.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Input.java Sun Dec 12 21:31:27 2010
@@ -96,7 +96,7 @@ public class Input implements KeyboardRe
public String[] getLastFunction() {
String[] f = null;
try {
- f = (String[]) this.functionStack.peek();
+ f = this.functionStack.peek();
} catch (EmptyStackException e) {
}
return f;
@@ -105,7 +105,7 @@ public class Input implements KeyboardRe
public String[] clearLastFunction() {
String[] f = null;
try {
- f = (String[]) this.functionStack.pop();
+ f = this.functionStack.pop();
} catch (EmptyStackException e) {
}
return f;
@@ -123,7 +123,7 @@ public class Input implements KeyboardRe
public String[] clearFunction(String function) {
Iterator<String[]> i = functionStack.iterator();
while (i.hasNext()) {
- String[] func = (String[]) i.next();
+ String[] func = i.next();
if (func[0].equals(function)) {
i.remove();
return func;
@@ -195,7 +195,7 @@ public class Input implements KeyboardRe
boolean process = false;
int remIdx = 0;
for (int i = 0; i < chars.length; i++) {
- if (((int) chars[i]) == 10 || ((int) chars[i]) == 8 || ((int) chars[i] == 27)) {
+ if ((chars[i]) == 10 || (chars[i]) == 8 || (chars[i] == 27)) {
idxToRemove[remIdx++] = i+1;
} else {
process = true;
Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Journal.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Journal.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Journal.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Journal.java Sun Dec 12 21:31:27 2010
@@ -38,7 +38,7 @@ import org.ofbiz.pos.screen.PosScreen;
public class Journal {
public static final String module = Journal.class.getName();
- protected XProject currentProject = (XProject)XProjectManager.getCurrentProject();
+ protected XProject currentProject = XProjectManager.getCurrentProject();
private static String[] field = { "sku", "desc", "qty", "price" };
private static String[] name = { "PosSku", "PosItem", "PosQty", "PosAmt" };
Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/PosButton.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/PosButton.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/PosButton.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/PosButton.java Sun Dec 12 21:31:27 2010
@@ -92,7 +92,7 @@ public class PosButton {
}
public void setLock(String buttonName, boolean lock) {
- PosButtonWrapper button = (PosButtonWrapper) loadedXButtons.get(buttonName);
+ PosButtonWrapper button = loadedXButtons.get(buttonName);
button.setEnabled(!lock);
}
Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/PosButtonWrapper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/PosButtonWrapper.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/PosButtonWrapper.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/PosButtonWrapper.java Sun Dec 12 21:31:27 2010
@@ -203,7 +203,7 @@ public class PosButtonWrapper {
// we can only wrap if :
// 1) we have a space available
// 2) the next character is a space
- if (space == -1 && ((int)text.charAt(thisPosition)) != 32) {
+ if (space == -1 && (text.charAt(thisPosition)) != 32) {
buf.append(text);
break;
} else {
Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/DeviceLoader.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/DeviceLoader.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/DeviceLoader.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/DeviceLoader.java Sun Dec 12 21:31:27 2010
@@ -53,7 +53,7 @@ public class DeviceLoader {
public static void load(Map<String, ContainerConfig.Container.Property> devices) throws GeneralException {
// load the keyboard
if (devices.get("Keyboard") != null) {
- String keyboardDevice = ((ContainerConfig.Container.Property) devices.get("Keyboard")).value;
+ String keyboardDevice = (devices.get("Keyboard")).value;
if (UtilValidate.isNotEmpty(keyboardDevice) && !"[NOT IMPLEMENTED]".equals(keyboardDevice)) {
keyboard = new Keyboard(keyboardDevice, -1);
try {
@@ -67,7 +67,7 @@ public class DeviceLoader {
// load the scanner
if (devices.get("Scanner") != null) {
- String scannerDevice = ((ContainerConfig.Container.Property) devices.get("Scanner")).value;
+ String scannerDevice = (devices.get("Scanner")).value;
if (UtilValidate.isNotEmpty(scannerDevice) && !"[NOT IMPLEMENTED]".equals(scannerDevice)) {
scanner = new Scanner(scannerDevice, -1);
try {
@@ -81,7 +81,7 @@ public class DeviceLoader {
// load the check reader
if (devices.get("CheckScanner") != null) {
- String checkScannerDevice = ((ContainerConfig.Container.Property) devices.get("CheckScanner")).value;
+ String checkScannerDevice = (devices.get("CheckScanner")).value;
if (UtilValidate.isNotEmpty(checkScannerDevice) && !"[NOT IMPLEMENTED]".equals(checkScannerDevice)) {
check = new CheckScanner(checkScannerDevice, -1);
try {
@@ -95,7 +95,7 @@ public class DeviceLoader {
// load the msr
if (devices.get("Msr") != null) {
- String msrDevice = ((ContainerConfig.Container.Property) devices.get("Msr")).value;
+ String msrDevice = (devices.get("Msr")).value;
if (UtilValidate.isNotEmpty(msrDevice) && !"[NOT IMPLEMENTED]".equals(msrDevice)) {
msr = new Msr(msrDevice, -1);
try {
@@ -109,7 +109,7 @@ public class DeviceLoader {
// load the receipt printer
if (devices.get("Receipt") != null) {
- String receiptDevice = ((ContainerConfig.Container.Property) devices.get("Receipt")).value;
+ String receiptDevice = (devices.get("Receipt")).value;
if (UtilValidate.isNotEmpty(receiptDevice) && !"[NOT IMPLEMENTED]".equals(receiptDevice)) {
receipt = new Receipt(receiptDevice, -1);
try {
@@ -123,7 +123,7 @@ public class DeviceLoader {
// load the journal printer
if (devices.get("Journal") != null) {
- String journalDevice = ((ContainerConfig.Container.Property) devices.get("Journal")).value;
+ String journalDevice = (devices.get("Journal")).value;
if (UtilValidate.isNotEmpty(journalDevice) && !"[NOT IMPLEMENTED]".equals(journalDevice)) {
journal = new Journal(journalDevice, -1);
try {
@@ -137,7 +137,7 @@ public class DeviceLoader {
// load the line display
if (devices.get("LineDisplay") != null) {
- String lineDisplayDevice = ((ContainerConfig.Container.Property) devices.get("LineDisplay")).value;
+ String lineDisplayDevice = (devices.get("LineDisplay")).value;
if (UtilValidate.isNotEmpty(lineDisplayDevice) && !"[NOT IMPLEMENTED]".equals(lineDisplayDevice)) {
ldisplay = new LineDisplay(lineDisplayDevice, -1);
try {
@@ -153,7 +153,7 @@ public class DeviceLoader {
for (int i = 1; i < 10; i++) { // more than 10 cash drawers on a terminal??
String idName = "CashDrawer." + i;
if (devices.get(idName) != null) {
- String cashDrawerDevice = ((ContainerConfig.Container.Property) devices.get(idName)).value;
+ String cashDrawerDevice = (devices.get(idName)).value;
if (UtilValidate.isNotEmpty(cashDrawerDevice) && !"[NOT IMPLEMENTED]".equals(cashDrawerDevice)) {
if (drawer == null) {
drawer = new CashDrawer[10];
Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java Sun Dec 12 21:31:27 2010
@@ -435,7 +435,7 @@ public class ManagerEvents {
PaidInOut PaidInOut = new PaidInOut(trans, pos, type);
Map<String, String> mapInOut = PaidInOut.openDlg();
if (null != mapInOut.get("amount")) {
- String amount = (String) mapInOut.get("amount");
+ String amount = mapInOut.get("amount");
BigDecimal amt = ZERO;
try {
amt = new BigDecimal(amount);
@@ -503,7 +503,7 @@ public class ManagerEvents {
if (eli != null) {
GenericValue ohpp;
- while (((ohpp = (GenericValue) eli.next()) != null)) {
+ while (((ohpp = eli.next()) != null)) {
Timestamp orderDate = ohpp.getTimestamp("orderDate");
if (orderDate.after(dayStart) && orderDate.before(dayEnd)) {
String pmt = ohpp.getString("paymentMethodTypeId");
Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/KeyboardService.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/KeyboardService.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/KeyboardService.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/KeyboardService.java Sun Dec 12 21:31:27 2010
@@ -138,7 +138,7 @@ public class KeyboardService extends Bas
if (lastEvent != null) {
KeyEvent thisEvent = lastEvent;
PosKey thisKey = new PosKey(thisEvent);
- PosKey mappedKey = (PosKey) keyMapping.get(thisKey.hashCode());
+ PosKey mappedKey = keyMapping.get(thisKey.hashCode());
if (mappedKey != null && mappedKey.checkModifiers(thisEvent.getModifiersEx())) {
this.received = true;
this.keyData = mappedKey.getMappedCode();
Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/MsrKybService.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/MsrKybService.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/MsrKybService.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/MsrKybService.java Sun Dec 12 21:31:27 2010
@@ -284,15 +284,15 @@ public class MsrKybService extends BaseS
if (this.parseDecodeData) {
// set the sentinels
this.sentinels = new int[4];
- this.sentinels[0] = (int) tr1BegChar.charAt(0);
- this.sentinels[1] = (int) tr1EndChar.charAt(0);
- this.sentinels[2] = (int) tr2BegChar.charAt(0);
- this.sentinels[3] = (int) tr2EndChar.charAt(0);
+ this.sentinels[0] = tr1BegChar.charAt(0);
+ this.sentinels[1] = tr1EndChar.charAt(0);
+ this.sentinels[2] = tr2BegChar.charAt(0);
+ this.sentinels[3] = tr2EndChar.charAt(0);
// set the lrcs
this.lrc = new int[2];
- this.lrc[0] = (int) tr1LrcCode.charAt(0);
- this.lrc[1] = (int) tr2LrcCode.charAt(0);
+ this.lrc[0] = tr1LrcCode.charAt(0);
+ this.lrc[1] = tr2LrcCode.charAt(0);
// set the account number
this.accountNumber = new String[2];
Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/ScannerKybService.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/ScannerKybService.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/ScannerKybService.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/ScannerKybService.java Sun Dec 12 21:31:27 2010
@@ -109,7 +109,7 @@ public class ScannerKybService extends B
public int getScanDataType() throws JposException {
if (codeId != null && barcodeIdMap.containsKey(codeId)) {
- return ((Integer) barcodeIdMap.get(codeId)).intValue();
+ return (barcodeIdMap.get(codeId)).intValue();
}
return ScannerConst.SCAN_SDT_UNKNOWN;
}
Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ClientProfile.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ClientProfile.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ClientProfile.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ClientProfile.java Sun Dec 12 21:31:27 2010
@@ -276,12 +276,12 @@ public class ClientProfile extends XPage
m_clientListBidingCombo.clear();
if (UtilValidate.isNotEmpty(partyList)) {
for (Map<String, String> party : partyList) {
- name = (String) party.get("lastName");
- email = (String) party.get("infoString");
- phone = (String) party.get("contactNumber");
- String partyId = (String) party.get("partyId");
+ name = party.get("lastName");
+ email = party.get("infoString");
+ phone = party.get("contactNumber");
+ String partyId = party.get("partyId");
m_clientListBidingCombo.add(partyId);
- card = (String) party.get("cardId");
+ card = party.get("cardId");
name = name == null ? "" : name;
email = email == null ? "" : email;
phone = phone == null ? "" : phone;
Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ConfigureItem.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ConfigureItem.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ConfigureItem.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ConfigureItem.java Sun Dec 12 21:31:27 2010
@@ -412,7 +412,7 @@ public class ConfigureItem extends XPage
//for(int i: selected) {
// Debug.logInfo(""+i, module);
//}
- List<ConfigOption> options = (List<ConfigOption>)question.getOptions();
+ List<ConfigOption> options = question.getOptions();
for (ConfigOption option: options) {
option.setSelected(false);
}
Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PaidInOut.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PaidInOut.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PaidInOut.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PaidInOut.java Sun Dec 12 21:31:27 2010
@@ -123,7 +123,7 @@ public class PaidInOut extends XPage {
} else {
return UtilMisc.toMap("amount", m_amountEdit.getText(),
"reason", (String)(posPaidReasons.get(m_reasonCombo.getSelectedIndex())).get("enumId"),
- "reasonComment", (String) m_reasonCommentEdit.getText());
+ "reasonComment", m_reasonCommentEdit.getText());
}
}
Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PosScreen.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PosScreen.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PosScreen.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PosScreen.java Sun Dec 12 21:31:27 2010
@@ -58,7 +58,7 @@ public class PosScreen extends XPage imp
public static final long MAX_INACTIVITY = Long.valueOf(UtilProperties.getPropertyValue(PosTransaction.resource, "MaxInactivity", "1800000"));
public static PosScreen currentScreen;
- protected XProject currentProject = (XProject)XProjectManager.getCurrentProject();
+ protected XProject currentProject = XProjectManager.getCurrentProject();
protected static boolean monitorRunning = false;
protected static boolean firstInit = false;
protected static long lastActivity = 0;
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfApplicationServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfApplicationServices.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfApplicationServices.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfApplicationServices.java Sun Dec 12 21:31:27 2010
@@ -316,7 +316,7 @@ public class WfApplicationServices {
}
if (assigments.size() != 1)
Debug.logWarning("More than one accepted activities found for the workEffortId=" + workEffortId, module);
- return (GenericValue) assigments.iterator().next();
+ return assigments.iterator().next();
} catch (GenericEntityException ee) {
throw new GenericServiceException(ee.getMessage(), ee);
}
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfFactory.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfFactory.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfFactory.java Sun Dec 12 21:31:27 2010
@@ -144,7 +144,7 @@ public class WfFactory {
}
}
}
- return (WfProcessMgr) wfProcessMgrCache.get(key);
+ return wfProcessMgrCache.get(key);
}
/**
@@ -200,7 +200,7 @@ public class WfFactory {
wfClientCache.put(dctx, new WorkflowClient(dctx));
}
}
- return (WorkflowClient) wfClientCache.get(dctx);
+ return wfClientCache.get(dctx);
}
}
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfUtil.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfUtil.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfUtil.java Sun Dec 12 21:31:27 2010
@@ -38,7 +38,7 @@ public final class WfUtil {
*/
public static final String getJavaType(String xpdlType) {
if (typeMap.containsKey(xpdlType))
- return (String) typeMap.get(xpdlType);
+ return typeMap.get(xpdlType);
else
return "java.lang.Object";
}
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/client/WorkflowClient.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/client/WorkflowClient.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/client/WorkflowClient.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/client/WorkflowClient.java Sun Dec 12 21:31:27 2010
@@ -388,12 +388,12 @@ public class WorkflowClient {
WfExecutionObject obj = null;
try {
- obj = (WfExecutionObject) WfFactory.getWfActivity(delegator, workEffortId);
+ obj = WfFactory.getWfActivity(delegator, workEffortId);
} catch (WfException e) {// ingore
}
if (obj == null) {
try {
- obj = (WfExecutionObject) WfFactory.getWfProcess(delegator, workEffortId);
+ obj = WfFactory.getWfProcess(delegator, workEffortId);
} catch (WfException e) {// ignore
}
}
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/ServiceCondition.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/ServiceCondition.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/ServiceCondition.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/ServiceCondition.java Sun Dec 12 21:31:27 2010
@@ -43,7 +43,7 @@ public class ServiceCondition implements
*/
public Boolean evaluateCondition(Map<String, Object> context, Map<String, String> attrs, String expression, DispatchContext dctx) throws EvaluationException {
// get the service to call
- String serviceName = (String) attrs.get("serviceName");
+ String serviceName = attrs.get("serviceName");
if (UtilValidate.isEmpty(serviceName))
throw new EvaluationException("Invalid serviceName; be sure to set the serviceName ExtendedAttribute");
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityImpl.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityImpl.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityImpl.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityImpl.java Sun Dec 12 21:31:27 2010
@@ -730,7 +730,7 @@ public class WfActivityImpl extends WfEx
if (howManyAssignment() == 1) {
Debug.logVerbose("Single assignment; getting assignment info.", module);
List<WfAssignment> assignments = getAssignments();
- WfAssignment assign = (WfAssignment) assignments.iterator().next();
+ WfAssignment assign = assignments.iterator().next();
WfResource res = assign.assignee();
context.put("assignedPartyId", res.resourcePartyId());
context.put("assignedRoleTypeId", res.resourceRoleId());
@@ -764,7 +764,7 @@ public class WfActivityImpl extends WfEx
// direct assignment from context
actualContext.put(key, context.get(key));
} else if (!actualContext.containsKey(key) && !ignoreUnknown) {
- throw new WfException("Context does not contain the key: '" + (String) key + "'");
+ throw new WfException("Context does not contain the key: '" + key + "'");
}
}
}
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityToolImplementation.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityToolImplementation.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityToolImplementation.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityToolImplementation.java Sun Dec 12 21:31:27 2010
@@ -73,7 +73,7 @@ public class WfActivityToolImplementatio
Map<String, String> extendedAttr = StringUtil.strToMap(extend);
if (extendedAttr != null && extendedAttr.containsKey("serviceName")) {
- serviceName = (String) extendedAttr.get("serviceName");
+ serviceName = extendedAttr.get("serviceName");
}
serviceName = serviceName != null ? serviceName : (toolTypeEnumId.equals("WTT_APPLICATION") ? "wfActivateApplication" : toolId);
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfAssignmentImpl.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfAssignmentImpl.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfAssignmentImpl.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfAssignmentImpl.java Sun Dec 12 21:31:27 2010
@@ -125,7 +125,7 @@ public class WfAssignmentImpl implements
Iterator<WfAssignment> ai = activity.getIteratorAssignment();
while (ai.hasNext() && allDelegated) {
- WfAssignment a = (WfAssignment) ai.next();
+ WfAssignment a = ai.next();
if (!a.equals(this) && !a.status().equals("CAL_DELEGATED")) {
allDelegated = false;
}
@@ -140,7 +140,7 @@ public class WfAssignmentImpl implements
Iterator<WfAssignment> ai = activity.getIteratorAssignment();
while (ai.hasNext()) {
- WfAssignment a = (WfAssignment) ai.next();
+ WfAssignment a = ai.next();
if (!this.isEqual(a)) a.delegate();
}
}
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfProcessImpl.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfProcessImpl.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfProcessImpl.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfProcessImpl.java Sun Dec 12 21:31:27 2010
@@ -444,7 +444,7 @@ public class WfProcessImpl extends WfExe
// check for a conditionClassName attribute if exists use it
if (extendedAttr != null && extendedAttr.get("conditionClassName") != null) {
- String conditionClassName = (String) extendedAttr.get("conditionClassName");
+ String conditionClassName = extendedAttr.get("conditionClassName");
transitionOk = this.evalConditionClass(conditionClassName, conditionBody, this.processContext(), extendedAttr);
} else {
// since no condition class is supplied, evaluate the expression using bsh
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfRequesterImpl.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfRequesterImpl.java?rev=1044931&r1=1044930&r2=1044931&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfRequesterImpl.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfRequesterImpl.java Sun Dec 12 21:31:27 2010
@@ -151,7 +151,7 @@ public class WfRequesterImpl implements
GenericRequester req = null;
if (performers.containsKey(process))
- req = (GenericRequester) performers.get(process);
+ req = performers.get(process);
if (req != null)
req.receiveResult(process.result());
}