Author: jleroux
Date: Fri Apr 29 17:36:31 2016
New Revision: 1741674
URL: http://svn.apache.org/viewvc?rev=1741674&view=rev
Log:
No functional changes, removes duplicate ";"
Modified:
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/Observable.java
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/test/EntityQueryTestSuite.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelFormAction.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelFormFieldBuilder.java
Modified:
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java?rev=1741674&r1=1741673&r2=1741674&view=diff
==============================================================================
---
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java
(original)
+++
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java
Fri Apr 29 17:36:31 2016
@@ -1765,7 +1765,7 @@ public class OrderReadHelper {
if ((returnedItem.get("returnPrice") != null) &&
(returnedItem.get("returnQuantity") != null)) {
returnedAmount =
returnedAmount.add(returnedItem.getBigDecimal("returnPrice").multiply(returnedItem.getBigDecimal("returnQuantity")).setScale(scale,
rounding));
}
- Map<String, Object> itemAdjustmentCondition =
UtilMisc.toMap("returnId", returnedItem.get("returnId"), "returnItemSeqId",
returnedItem.get("returnItemSeqId"));;
+ Map<String, Object> itemAdjustmentCondition =
UtilMisc.toMap("returnId", returnedItem.get("returnId"), "returnItemSeqId",
returnedItem.get("returnItemSeqId"));
if (UtilValidate.isNotEmpty(returnTypeId)) {
itemAdjustmentCondition.put("returnTypeId", returnTypeId);
}
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/Observable.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/Observable.java?rev=1741674&r1=1741673&r2=1741674&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/Observable.java
(original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/Observable.java Fri Apr
29 17:36:31 2016
@@ -34,7 +34,7 @@ import java.util.concurrent.atomic.Atomi
*/
public final class Observable {
- private final AtomicBoolean changed = new AtomicBoolean();;
+ private final AtomicBoolean changed = new AtomicBoolean();
private final CopyOnWriteArrayList<Observer> observers = new
CopyOnWriteArrayList<Observer>();
public Observable() {}
Modified:
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/test/EntityQueryTestSuite.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/test/EntityQueryTestSuite.java?rev=1741674&r1=1741673&r2=1741674&view=diff
==============================================================================
---
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/test/EntityQueryTestSuite.java
(original)
+++
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/test/EntityQueryTestSuite.java
Fri Apr 29 17:36:31 2016
@@ -255,7 +255,7 @@ public class EntityQueryTestSuite extend
delegator.storeAll(testingTypes);
EntityFindOptions findOptions = new EntityFindOptions();
- findOptions.setFetchSize(2);;
+ findOptions.setFetchSize(2);
List<GenericValue> fetchSizeByEntityEngine =
delegator.findList("TestingType", null, null, UtilMisc.toList("description"),
findOptions, false);
List<GenericValue> fetchSizeByEntityQuery =
EntityQuery.use(delegator).from("TestingType").fetchSize(2).orderBy("description").queryList();
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelFormAction.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelFormAction.java?rev=1741674&r1=1741673&r2=1741674&view=diff
==============================================================================
---
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelFormAction.java
(original)
+++
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelFormAction.java
Fri Apr 29 17:36:31 2016
@@ -77,7 +77,7 @@ public abstract class ModelFormAction {
*/
@SuppressWarnings("serial")
public static class CallParentActions extends AbstractModelAction {
- private final ActionsKind kind;;
+ private final ActionsKind kind;
private final ModelForm modelForm;
public CallParentActions(ModelForm modelForm, Element
callParentActionsElement) {
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelFormFieldBuilder.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelFormFieldBuilder.java?rev=1741674&r1=1741673&r2=1741674&view=diff
==============================================================================
---
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelFormFieldBuilder.java
(original)
+++
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelFormFieldBuilder.java
Fri Apr 29 17:36:31 2016
@@ -71,7 +71,7 @@ public class ModelFormFieldBuilder {
public static final String module = ModelFormFieldBuilder.class.getName();
- private FlexibleStringExpander action =
FlexibleStringExpander.getInstance("");;
+ private FlexibleStringExpander action =
FlexibleStringExpander.getInstance("");
private String attributeName = "";
private boolean encodeOutput = true;
private String entityName = "";
@@ -100,12 +100,12 @@ public class ModelFormFieldBuilder {
private String sortFieldDescStyle = "";
private String sortFieldHelpText = "";
private String sortFieldStyle = "";
- private FlexibleStringExpander title =
FlexibleStringExpander.getInstance("");;
+ private FlexibleStringExpander title =
FlexibleStringExpander.getInstance("");
private String titleAreaStyle = "";
private String titleStyle = "";
- private FlexibleStringExpander tooltip =
FlexibleStringExpander.getInstance("");;
+ private FlexibleStringExpander tooltip =
FlexibleStringExpander.getInstance("");
private String tooltipStyle = "";
- private FlexibleStringExpander useWhen =
FlexibleStringExpander.getInstance("");;
+ private FlexibleStringExpander useWhen =
FlexibleStringExpander.getInstance("");
private FlexibleStringExpander ignoreWhen =
FlexibleStringExpander.getInstance("");
private String widgetAreaStyle = "";
private String widgetStyle = "";