You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by su...@apache.org on 2020/09/26 08:49:16 UTC
[ofbiz-framework] branch trunk updated: Improved: Corrected some
spacing issues in code, where there are extra white spaces,
this will fix some checkstyle issues in applications component.
(OFBIZ-12022)
This is an automated email from the ASF dual-hosted git repository.
surajk pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new 1ff8957 Improved: Corrected some spacing issues in code, where there are extra white spaces, this will fix some checkstyle issues in applications component. (OFBIZ-12022)
1ff8957 is described below
commit 1ff89570320263e92514ffad637252ba3473cf3e
Author: Suraj Khurana <su...@hotwax.co>
AuthorDate: Sat Sep 26 14:18:28 2020 +0530
Improved: Corrected some spacing issues in code, where there are extra white spaces, this will fix some checkstyle issues in applications component.
(OFBIZ-12022)
---
.../main/java/org/apache/ofbiz/content/content/ContentUrlFilter.java | 2 +-
.../main/java/org/apache/ofbiz/content/data/DataResourceWorker.java | 2 +-
.../src/main/java/org/apache/ofbiz/content/layout/LayoutWorker.java | 2 +-
.../main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java | 2 +-
.../main/java/org/apache/ofbiz/party/contact/ContactMechWorker.java | 2 +-
.../java/org/apache/ofbiz/party/party/PartyRelationshipHelper.java | 2 +-
.../party/src/main/java/org/apache/ofbiz/party/party/PartyWorker.java | 4 ++--
7 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentUrlFilter.java b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentUrlFilter.java
index 42e27b2..197e00c 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentUrlFilter.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentUrlFilter.java
@@ -51,7 +51,7 @@ public class ContentUrlFilter implements Filter {
}
@Override
- public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+ public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
HttpServletRequest httpRequest = (HttpServletRequest) request;
HttpServletResponse httpResponse = (HttpServletResponse) response;
Delegator delegator = (Delegator) httpRequest.getSession().getServletContext().getAttribute("delegator");
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java b/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java
index 8f3bc61..7eef4c3 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java
@@ -103,7 +103,7 @@ import freemarker.template.TemplateException;
/**
* DataResourceWorker Class
*/
-public class DataResourceWorker implements org.apache.ofbiz.widget.content.DataResourceWorkerInterface {
+public class DataResourceWorker implements org.apache.ofbiz.widget.content.DataResourceWorkerInterface {
private static final String MODULE = DataResourceWorker.class.getName();
private static final String ERR_RESOURCE = "ContentErrorUiLabels";
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/layout/LayoutWorker.java b/applications/content/src/main/java/org/apache/ofbiz/content/layout/LayoutWorker.java
index 8140565..741902e 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/layout/LayoutWorker.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/layout/LayoutWorker.java
@@ -72,7 +72,7 @@ public final class LayoutWorker {
List<FileItem> lst = null;
try {
- lst = UtilGenerics.cast(upload.parseRequest(request));
+ lst = UtilGenerics.cast(upload.parseRequest(request));
} catch (FileUploadException e4) {
return ServiceUtil.returnError(e4.getMessage());
}
diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java
index 2aa519a..d0fad01 100644
--- a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java
+++ b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java
@@ -5993,7 +5993,7 @@ public class ShoppingCart implements Iterable<ShoppingCartItem>, Serializable {
if ("Y".equals(splitPayPrefPerShpGrp) && cart.paymentInfo.size() > 1) {
throw new GeneralRuntimeException("Split Payment Preference per Ship Group does not yet support multiple Payment Methods");
}
- if ("Y".equals(splitPayPrefPerShpGrp) && cart.paymentInfo.size() == 1) {
+ if ("Y".equals(splitPayPrefPerShpGrp) && cart.paymentInfo.size() == 1) {
for (CartShipInfo csi : cart.getShipGroups()) {
maxAmount = csi.getTotal().add(cart.getOrderOtherAdjustmentTotal().add(cart.getOrderGlobalAdjustments()).divide(
new BigDecimal(cart.getShipGroupSize()), GEN_ROUNDING)).add(csi.getShipEstimate().add(csi.getTotalTax(cart)));
diff --git a/applications/party/src/main/java/org/apache/ofbiz/party/contact/ContactMechWorker.java b/applications/party/src/main/java/org/apache/ofbiz/party/contact/ContactMechWorker.java
index cff44f5..ae399cc 100644
--- a/applications/party/src/main/java/org/apache/ofbiz/party/contact/ContactMechWorker.java
+++ b/applications/party/src/main/java/org/apache/ofbiz/party/contact/ContactMechWorker.java
@@ -157,7 +157,7 @@ public class ContactMechWorker {
}
public static List<Map<String, Object>> getFacilityContactMechValueMaps(Delegator delegator, String facilityId, boolean showOld) {
- return getFacilityContactMechValueMaps(delegator, facilityId, showOld, null);
+ return getFacilityContactMechValueMaps(delegator, facilityId, showOld, null);
}
public static List<Map<String, Object>> getFacilityContactMechValueMaps(Delegator delegator, String facilityId, boolean showOld,
String contactMechTypeId) {
diff --git a/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyRelationshipHelper.java b/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyRelationshipHelper.java
index 029bfcd..3e96bb0 100644
--- a/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyRelationshipHelper.java
+++ b/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyRelationshipHelper.java
@@ -78,7 +78,7 @@ public final class PartyRelationshipHelper {
return null;
}
if (UtilValidate.isNotEmpty(partyRelationships)) {
- return partyRelationships;
+ return partyRelationships;
}
return null;
}
diff --git a/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyWorker.java b/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyWorker.java
index 75e52b1..486fde3 100644
--- a/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyWorker.java
+++ b/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyWorker.java
@@ -140,10 +140,10 @@ public class PartyWorker {
public static GenericValue findPartyLatestPostalAddressGeoPoint(String partyId, Delegator delegator) {
GenericValue latestPostalAddress = findPartyLatestPostalAddress(partyId, delegator);
- if (latestPostalAddress != null) {
+ if (latestPostalAddress != null) {
try {
GenericValue latestGeoPoint = latestPostalAddress.getRelatedOne("GeoPoint", false);
- if (latestGeoPoint != null) {
+ if (latestGeoPoint != null) {
return latestGeoPoint;
}
return null;