Author: jleroux
Date: Fri Mar 6 17:49:18 2009
New Revision: 751002
URL: http://svn.apache.org/viewvc?rev=751002&view=rev
Log:
try{ => try {
Modified:
ofbiz/trunk/applications/content/src/org/ofbiz/content/ConvertTree.java
ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java
ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/ProposedOrder.java
ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/techdata/TechDataServices.java
ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/tracking/TrackingCodeEvents.java
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java
ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java
ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java
ofbiz/trunk/framework/common/src/org/ofbiz/common/FindServices.java
ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ConfigureItem.java
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/NumericKeypad.java
ofbiz/trunk/specialpurpose/shark/src/org/enhydra/shark/ThreadedToolAgentManager.java
ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/repository/EntityRepositoryMgr.java
Modified:
ofbiz/trunk/applications/content/src/org/ofbiz/content/ConvertTree.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/ConvertTree.java?rev=751002&r1=751001&r2=751002&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/ConvertTree.java
(original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/ConvertTree.java Fri
Mar 6 17:49:18 2009
@@ -72,7 +72,7 @@
GenericValue Entity = null;
try {
BufferedReader input = null;
- try{
+ try {
if (!UtilValidate.isEmpty(file)) {
input = new BufferedReader( new FileReader(file));
String line = null;
@@ -271,7 +271,7 @@
subContents = line.substring(index+1, line.length());
subContents = subContents.replace(oldChar, newChar);
int size = subContents.length();
- try{
+ try {
for(index = 0; index < size; index++) {//start character in line
boolean contentNameMatch = false;
if (subContents.charAt(index) == check.charAt(0)) {//store data
Modified:
ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java?rev=751002&r1=751001&r2=751002&view=diff
==============================================================================
---
ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java
(original)
+++
ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java
Fri Mar 6 17:49:18 2009
@@ -83,7 +83,7 @@
return ServiceUtil.returnError("Problem, we can not find all the
items of MrpEvent, for more detail look at the log");
}
if (listResult != null) {
- try{
+ try {
delegator.removeAll(listResult);
} catch(GenericEntityException e) {
Debug.logError(e,"Error : removeAll(listResult), listResult
="+listResult, module);
@@ -94,13 +94,13 @@
// Proposed requirements are deleted
listResult = null;
List listResultRoles = new ArrayList();
- try{
+ try {
listResult = delegator.findByAnd("Requirement",
UtilMisc.toMap("requirementTypeId", "PRODUCT_REQUIREMENT", "statusId",
"REQ_PROPOSED"));
} catch(GenericEntityException e) {
return ServiceUtil.returnError("Problem, we can not find all the
items of MrpEvent, for more detail look at the log");
}
if (listResult != null) {
- try{
+ try {
Iterator listResultIt = listResult.iterator();
while (listResultIt.hasNext()) {
GenericValue tmpRequirement =
(GenericValue)listResultIt.next();
@@ -120,7 +120,7 @@
return ServiceUtil.returnError("Problem, we can not find all the
items of MrpEvent, for more detail look at the log");
}
if (listResult != null) {
- try{
+ try {
delegator.removeAll(listResult);
} catch(GenericEntityException e) {
return ServiceUtil.returnError("Problem, we can not remove the
MrpEvent items, for more detail look at the log");
@@ -211,7 +211,7 @@
resultList = null;
iteratorResult = null;
parameters = UtilMisc.toMap("requirementTypeId",
"PRODUCT_REQUIREMENT", "statusId", "REQ_APPROVED", "facilityId", facilityId);
- try{
+ try {
resultList = delegator.findByAnd("Requirement", parameters);
} catch(GenericEntityException e) {
return ServiceUtil.returnError("Problem, we can not find all the
items of MrpEvent, for more detail look at the log");
@@ -508,7 +508,7 @@
}
public static BigDecimal findProductMrpQoh(String mrpId, String productId,
String facilityId, LocalDispatcher dispatcher, GenericDelegator delegator) {
Map resultMap = null;
- try{
+ try {
if (facilityId == null) {
resultMap = dispatcher.runSync("getProductInventoryAvailable",
UtilMisc.toMap("productId", productId));
} else {
@@ -689,7 +689,7 @@
} else {
filterByConditions =
EntityCondition.makeCondition("billOfMaterialLevel", EntityOperator.EQUALS, new
Long(bomLevel));
}
- try{
+ try {
listInventoryEventForMRP = delegator.findList("MrpEventView",
filterByConditions, null, UtilMisc.toList("productId", "eventDate"), null,
false);
} catch(GenericEntityException e) {
return ServiceUtil.returnError("MRP Error retieving MRP event
for the bom level: " + bomLevel + ". Error: " + e.getMessage());
Modified:
ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/ProposedOrder.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/ProposedOrder.java?rev=751002&r1=751001&r2=751002&view=diff
==============================================================================
---
ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/ProposedOrder.java
(original)
+++
ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/ProposedOrder.java
Fri Mar 6 17:49:18 2009
@@ -251,7 +251,7 @@
} else {
parameters.put("description", "Automatically generated by MRP");
}
- try{
+ try {
Map result = dispatcher.runSync("createRequirement", parameters);
return (String) result.get("requirementId");
} catch (GenericServiceException e) {
Modified:
ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/techdata/TechDataServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/techdata/TechDataServices.java?rev=751002&r1=751001&r2=751002&view=diff
==============================================================================
---
ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/techdata/TechDataServices.java
(original)
+++
ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/techdata/TechDataServices.java
Fri Mar 6 17:49:18 2009
@@ -160,20 +160,20 @@
*/
public static GenericValue getTechDataCalendar(GenericValue routingTask) {
GenericValue machineGroup = null, techDataCalendar = null;
- try{
+ try {
machineGroup = routingTask.getRelatedOneCache("FixedAsset");
} catch (GenericEntityException e) {
Debug.logError("Pb reading FixedAsset associated with
routingTask"+e.getMessage(), module);
}
if (machineGroup != null) {
if (machineGroup.getString("calendarId") != null) {
- try{
+ try {
techDataCalendar =
machineGroup.getRelatedOneCache("TechDataCalendar");
} catch (GenericEntityException e) {
Debug.logError("Pb reading TechDataCalendar associated
with machineGroup"+e.getMessage(), module);
}
}else {
- try{
+ try {
List machines =
machineGroup.getRelatedCache("ChildFixedAsset");
if (machines != null && machines.size()>0) {
GenericValue machine = EntityUtil.getFirst(machines);
@@ -258,7 +258,7 @@
public static long capacityRemaining(GenericValue techDataCalendar,
Timestamp dateFrom) {
GenericValue techDataCalendarWeek = null;
// TODO read TechDataCalendarExcWeek to manage execption week (maybe
it's needed to refactor the entity definition
- try{
+ try {
techDataCalendarWeek =
techDataCalendar.getRelatedOneCache("TechDataCalendarWeek");
} catch (GenericEntityException e) {
Debug.logError("Pb reading Calendar Week associated with
calendar"+e.getMessage(), module);
@@ -290,7 +290,7 @@
Timestamp dateTo = null;
GenericValue techDataCalendarWeek = null;
// TODO read TechDataCalendarExcWeek to manage execption week (maybe
it's needed to refactor the entity definition
- try{
+ try {
techDataCalendarWeek =
techDataCalendar.getRelatedOneCache("TechDataCalendarWeek");
} catch (GenericEntityException e) {
Debug.logError("Pb reading Calendar Week associated with
calendar"+e.getMessage(), module);
@@ -412,7 +412,7 @@
public static long capacityRemainingBackward(GenericValue
techDataCalendar, Timestamp dateFrom) {
GenericValue techDataCalendarWeek = null;
// TODO read TechDataCalendarExcWeek to manage exception week (maybe
it's needed to refactor the entity definition
- try{
+ try {
techDataCalendarWeek =
techDataCalendar.getRelatedOneCache("TechDataCalendarWeek");
} catch (GenericEntityException e) {
Debug.logError("Pb reading Calendar Week associated with
calendar"+e.getMessage(), module);
@@ -444,7 +444,7 @@
Timestamp dateTo = null;
GenericValue techDataCalendarWeek = null;
// TODO read TechDataCalendarExcWeek to manage exception week (maybe
it's needed to refactor the entity definition
- try{
+ try {
techDataCalendarWeek =
techDataCalendar.getRelatedOneCache("TechDataCalendarWeek");
} catch (GenericEntityException e) {
Debug.logError("Pb reading Calendar Week associated with
calendar"+e.getMessage(), module);
Modified:
ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/tracking/TrackingCodeEvents.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/tracking/TrackingCodeEvents.java?rev=751002&r1=751001&r2=751002&view=diff
==============================================================================
---
ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/tracking/TrackingCodeEvents.java
(original)
+++
ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/tracking/TrackingCodeEvents.java
Fri Mar 6 17:49:18 2009
@@ -460,7 +460,7 @@
if ("Ofbiz.TKCD.UpdatedTimeStamp".equals(cookieName)) {
String affiliateReferredTime = cookies[i].getValue();
if (affiliateReferredTime !=null &&
!affiliateReferredTime.equals("")) {
- try{
+ try {
affiliateReferredTimeStamp =
Timestamp.valueOf(affiliateReferredTime);
}catch (IllegalArgumentException e) {
Debug.logError(e, "Error parsing
affiliateReferredTimeStamp value from cookie", module);
Modified:
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java?rev=751002&r1=751001&r2=751002&view=diff
==============================================================================
---
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java
(original)
+++
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java
Fri Mar 6 17:49:18 2009
@@ -160,7 +160,7 @@
productId = (String) paramMap.remove("ADD_PRODUCT_ID");
} else if (paramMap.containsKey("add_product_id")) {
Object object = paramMap.remove("add_product_id");
- try{
+ try {
productId = (String) object;
}catch(ClassCastException e) {
productId = (String)((List)object).get(0);
@@ -1468,7 +1468,7 @@
}
if (partyId != null && partyId.length() > 0) {
GenericValue thisParty = null;
- try{
+ try {
thisParty = delegator.findByPrimaryKey("Party",
UtilMisc.toMap("partyId", partyId));
} catch(GenericEntityException gee) {
//
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=751002&r1=751001&r2=751002&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
Fri Mar 6 17:49:18 2009
@@ -962,7 +962,7 @@
String viewNumber =
String.valueOf(productContentTypeId.charAt(productContentTypeId.length() - 1));
ScaleImage imageTransform = new ScaleImage();
Map<String, Object> resultResize = FastMap.newInstance();
- try{
+ try {
resultResize.putAll(imageTransform.scaleImageInAllSize(context, filenameToUse,
"additional", viewNumber));
}catch(IOException e) {
String errMsg = "Scale additional image in all different sizes
is impossible : " + e.toString();
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=751002&r1=751001&r2=751002&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
Fri Mar 6 17:49:18 2009
@@ -1560,7 +1560,7 @@
cxt.put("shippableWeight", context.get("shippableWeight"));
cxt.put("isResidentialAddress", context.get("isResidentialAddress"));
cxt.put("shipFromAddress", shipFromAddress);
- try{
+ try {
return dctx.getDispatcher().runSync("upsRateEstimateByPostalCode",
cxt);
}catch(GenericServiceException e) {
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=751002&r1=751001&r2=751002&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/src/org/ofbiz/common/FindServices.java
(original)
+++ ofbiz/trunk/framework/common/src/org/ofbiz/common/FindServices.java Fri Mar
6 17:49:18 2009
@@ -378,7 +378,7 @@
int start = viewIndex.intValue() * viewSize.intValue();
List<GenericValue> list = null;
Integer listSize = null;
- try{
+ try {
EntityListIterator it = (EntityListIterator) result.get("listIt");
list = it.getPartialList(start+1, viewSize.intValue()); // list
starts at '1'
it.last();
@@ -660,7 +660,7 @@
List<GenericValue> list = null;
GenericValue item= null;
- try{
+ try {
EntityListIterator it = (EntityListIterator) result.get("listIt");
list = it.getPartialList(1, 1); // list starts at '1'
if (list != null && list.size() > 0 ) {
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=751002&r1=751001&r2=751002&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java
(original)
+++ ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java
Fri Mar 6 17:49:18 2009
@@ -184,7 +184,7 @@
// The parsing takes place
// #############################
if (s != null || fulltext != null || url != null) {
- try{
+ try {
Map<String, Object> inputMap = UtilMisc.toMap("mostlyInserts",
mostlyInserts,
"createDummyFks", createDummyFks,
"checkDataOnly", checkDataOnly,
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=751002&r1=751001&r2=751002&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
Fri Mar 6 17:49:18 2009
@@ -408,7 +408,7 @@
}
public void valueChanged(ListSelectionEvent event) {
- try{
+ try {
JList jlist = (JList)event.getSource();
boolean isAdjusting = event.getValueIsAdjusting();
if (!isAdjusting) {
Modified:
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/NumericKeypad.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/NumericKeypad.java?rev=751002&r1=751001&r2=751002&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/NumericKeypad.java
(original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/NumericKeypad.java
Fri Mar 6 17:49:18 2009
@@ -190,7 +190,7 @@
private synchronized void prependUnique(char c) {
if (wasMouseClicked()) {
String text = "";
- try{
+ try {
text = m_edit.getText();
}catch (NullPointerException e) {
// getText throws exception if no text
@@ -248,7 +248,7 @@
private synchronized void append(char c) {
if (wasMouseClicked()) {
String text = "";
- try{
+ try {
text = m_edit.getText();
}catch (NullPointerException e) {
// getText throws exception if no text
@@ -265,7 +265,7 @@
private synchronized void append(String c) {
if (wasMouseClicked()) {
String text = "";
- try{
+ try {
text = m_edit.getText();
}catch (NullPointerException e) {
// getText throws exception if no text
Modified:
ofbiz/trunk/specialpurpose/shark/src/org/enhydra/shark/ThreadedToolAgentManager.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/src/org/enhydra/shark/ThreadedToolAgentManager.java?rev=751002&r1=751001&r2=751002&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/shark/src/org/enhydra/shark/ThreadedToolAgentManager.java
(original)
+++
ofbiz/trunk/specialpurpose/shark/src/org/enhydra/shark/ThreadedToolAgentManager.java
Fri Mar 6 17:49:18 2009
@@ -105,7 +105,7 @@
public void run () throws BaseException, ToolAgentGeneralException {
Iterator tools = null;
- try{
+ try {
ActivityTypes acTypes = actDef.getActivityTypes();
org.enhydra.shark.xpdl.elements.Implementation impl =
acTypes.getImplementation();
ImplementationTypes implt = impl.getImplementationTypes();
Modified:
ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/repository/EntityRepositoryMgr.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/repository/EntityRepositoryMgr.java?rev=751002&r1=751001&r2=751002&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/repository/EntityRepositoryMgr.java
(original)
+++
ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/repository/EntityRepositoryMgr.java
Fri Mar 6 17:49:18 2009
@@ -324,7 +324,7 @@
long xpdlClassVer) throws RepositoryException
{
Debug.log("XPDL Upload : " + xpdlId, module);
- //try{throw new Exception ("XPDL Upload");}catch(Exception e)
{e.printStackTrace();};
+ //try {throw new Exception ("XPDL Upload");}catch(Exception e)
{e.printStackTrace();};
String newVersion = null;
try {
newVersion = nextVersions.updateNextVersion(xpdlId);
