[ofbiz-framework] branch trunk updated (3517a54 -> 69c62f5)

[mbrohl]

This is an automated email from the ASF dual-hosted git repository.

mbrohl pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git.


    from 3517a54  Fixed: webapp position does not really work (OFBIZ-12176)
     add 0dc7e56  Improved: Remove unused imports (OFBIZ-12169)
     add 2fe5e15  Improved: Adds newline at the end of file (OFBIZ-12169)
     add bae3628  Declare classes final as suggested by checkstyle (OFBIZ-12169)
     add badc590  Improved: Updates the max checkstyle error count according to the latest changes (OFBIZ-12169)
     add 95d37d2  Removes and adds whitespaces as suggested by checkstyle (OFBIZ-12169)
     add b65be41  Improved: if else construct must use parentheses (OFBIZ-12169)
     add c1c0813  Improved: Removes illegal character as shown by checkstyle (OFBIZ-12169)
     add 5d52bcf  Improved: Replaced tab character (OFBIZ-12169)
     add 0396005  Improved: Replaced '.*' import form (OFBIZ-12169)
     add 8f323d4  Improved: Each variable declaration in an own statement (OFBIZ-12169)
     add 2e6399c  Improved: Simplified expression (OFBIZ-12169)
     add 636c5e3  Improved: max line length is 150 characters (OFBIZ-12169)
     add 3845724  Improved: Fixed indentation level (OFBIZ-12169)
     add 74f224f  Improved: Removed trailing spaces (OFBIZ-12169)
     add 51e82c6  Improved: Removes nested blocks and closed OutputStream in finally statment (OFBIZ-12169)
     add 783a987  Improved: Multiblock indentations as shown by checkstyle (OFBIZ-12169)
     add 3cd7cf1  Improved: Changed modifier order (OFBIZ-12169)
     add 780e008  Improved: Changed line break so line doesnt't start with ( (OFBIZ-12169)
     add 82a15c7  Improved: Removed inner assignments (OFBIZ-12169)
     add 39458d2  Improved: Removed Conditional logic as shown by checkstyle (OFBIZ-12169)
     add fab0783  Improved: Used uppercase 'L' as suggested by checkstyle (OFBIZ-12169)
     add 29bf0a0  Merge branch 'trunk' into OFBIZ-12169_Handle_remaining_checkstyle_errors
     new 69c62f5  Merge changes for PR #267 due to conflicting changes in trunk (OFBIZ-12169)

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../accounting/agreement/AgreementServices.java    |  6 +++--
 .../ofbiz/accounting/invoice/InvoiceServices.java  |  7 +++---
 .../authorizedotnet/AIMPaymentServices.java        | 14 +++++-------
 .../accounting/thirdparty/eway/EwayServices.java   |  2 +-
 .../thirdparty/eway/GatewayConnector.java          |  4 ++--
 .../ofbiz/content/ContentManagementServices.java   |  6 +++--
 .../ofbiz/content/cms/ContentJsonEvents.java       |  2 +-
 .../org/apache/ofbiz/content/ftp/SshFtpClient.java |  4 ++--
 .../apache/ofbiz/content/survey/SurveyEvents.java  |  6 ++++-
 .../webapp/ftl/TraverseSubContentTransform.java    | 12 ++++++----
 .../mrp/InventoryEventPlannedServices.java         |  4 ++--
 .../ofbiz/order/order/OrderContentWrapper.java     |  2 +-
 .../apache/ofbiz/order/order/OrderReadHelper.java  |  3 ++-
 .../ofbiz/order/order/OrderReturnServices.java     |  1 -
 .../apache/ofbiz/order/order/OrderServices.java    |  4 ++--
 .../order/requirement/RequirementServices.java     | 11 ++++++---
 .../ofbiz/order/shoppingcart/ShoppingCartItem.java |  2 +-
 .../ofbiz/party/contact/ContactMechWorker.java     |  4 ++--
 .../category/ftl/OfbizCatalogUrlTransform.java     |  2 +-
 .../ofbiz/product/config/ProductConfigWrapper.java |  2 +-
 .../shipment/thirdparty/fedex/FedexServices.java   |  2 +-
 .../shipment/thirdparty/usps/UspsServices.java     |  2 +-
 .../workeffort/workeffort/WorkEffortServices.java  |  2 +-
 build.gradle                                       |  2 +-
 .../base/component/ComponentLoaderConfig.java      |  2 +-
 .../apache/ofbiz/base/conversion/Converters.java   |  2 +-
 .../org/apache/ofbiz/base/crypto/DesCrypt.java     |  2 +-
 .../org/apache/ofbiz/base/metrics/Metrics.java     |  2 +-
 .../apache/ofbiz/base/metrics/MetricsFactory.java  |  7 ++++--
 .../java/org/apache/ofbiz/base/util/Assert.java    |  2 +-
 .../org/apache/ofbiz/base/util/UtilDateTime.java   |  2 +-
 .../java/org/apache/ofbiz/base/util/UtilTimer.java |  4 +++-
 .../apache/ofbiz/base/util/cache/UtilCache.java    |  2 +-
 .../org/apache/ofbiz/base/util/string/UelUtil.java | 16 ++++++-------
 .../apache/ofbiz/common/login/LoginServices.java   |  3 ++-
 .../apache/ofbiz/common/status/StatusWorker.java   | 15 ++++++++-----
 .../ofbiz/entity/condition/EntityFunction.java     |  8 +++----
 .../org/apache/ofbiz/entity/jdbc/DatabaseUtil.java |  4 ++--
 .../ofbiz/entity/model/ModelEntityChecker.java     |  2 +-
 .../ofbiz/entity/model/ModelGroupReader.java       |  3 ++-
 .../org/apache/ofbiz/entity/model/ModelIndex.java  |  2 +-
 .../org/apache/ofbiz/entity/model/ModelInfo.java   |  2 +-
 .../org/apache/ofbiz/entity/model/ModelReader.java |  5 +++--
 .../ofbiz/entity/serialize/XmlSerializer.java      |  2 +-
 .../apache/ofbiz/entity/test/EntityTestSuite.java  |  7 +++++-
 .../org/apache/ofbiz/entity/util/SequenceUtil.java |  2 +-
 .../method/conditional/RegexpCondition.java        |  5 ++---
 .../apache/ofbiz/minilang/operation/Convert.java   |  3 ++-
 .../org/apache/ofbiz/security/SecuredUpload.java   |  1 +
 .../ofbiz/service/GenericDispatcherFactory.java    |  2 +-
 .../apache/ofbiz/service/ModelServiceReader.java   |  2 +-
 .../apache/ofbiz/service/jms/JmsQueueListener.java |  6 ++++-
 .../apache/ofbiz/service/jms/JmsTopicListener.java | 12 +++++++---
 .../test/ServiceEngineTestPermissionServices.java  |  2 +-
 .../service/test/ServiceEngineTestServices.java    |  4 ++--
 .../ofbiz/service/test/ServicePermissionTests.java |  2 +-
 .../control/ControlActivationEventListener.java    |  2 +-
 .../webapp/control/ExternalLoginKeysManager.java   |  2 +-
 .../ftl/JsLanguageFilesMappingTransform.java       |  1 -
 .../apache/ofbiz/webapp/stats/ServerHitBin.java    |  2 +-
 .../apache/ofbiz/webapp/view/ApacheFopWorker.java  |  2 +-
 .../apache/ofbiz/webtools/WebToolsServices.java    |  3 ++-
 .../ofbiz/webtools/artifactinfo/RunTestEvents.java |  2 +-
 .../webtools/labelmanager/LabelManagerFactory.java |  2 +-
 .../org/apache/ofbiz/widget/WidgetFactory.java     |  2 +-
 .../java/org/apache/ofbiz/widget/WidgetWorker.java |  2 +-
 .../ofbiz/widget/model/AbstractModelCondition.java | 24 ++++++++++----------
 .../ofbiz/widget/model/IterateSectionWidget.java   |  2 +-
 .../apache/ofbiz/widget/model/ModelFormField.java  |  2 +-
 .../apache/ofbiz/widget/model/ModelMenuAction.java |  2 +-
 .../ofbiz/widget/model/ModelScreenCondition.java   |  4 ++--
 .../ofbiz/widget/model/ModelWidgetCondition.java   | 26 +++++++++++-----------
 .../ofbiz/widget/renderer/ScreenRenderer.java      |  2 +-
 73 files changed, 184 insertions(+), 139 deletions(-)

[mbrohl]

This is an automated email from the ASF dual-hosted git repository.

mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git

commit 69c62f5f00995468b06e94f59071d48a343f157a
Merge: 3517a54 29bf0a0
Author: Michael Brohl <[hidden email]>
AuthorDate: Mon Feb 15 17:15:18 2021 +0100

    Merge changes for PR #267 due to conflicting changes in trunk (OFBIZ-12169)

 .../accounting/agreement/AgreementServices.java    |  6 +++--
 .../ofbiz/accounting/invoice/InvoiceServices.java  |  7 +++---
 .../authorizedotnet/AIMPaymentServices.java        | 14 +++++-------
 .../accounting/thirdparty/eway/EwayServices.java   |  2 +-
 .../thirdparty/eway/GatewayConnector.java          |  4 ++--
 .../ofbiz/content/ContentManagementServices.java   |  6 +++--
 .../ofbiz/content/cms/ContentJsonEvents.java       |  2 +-
 .../org/apache/ofbiz/content/ftp/SshFtpClient.java |  4 ++--
 .../apache/ofbiz/content/survey/SurveyEvents.java  |  6 ++++-
 .../webapp/ftl/TraverseSubContentTransform.java    | 12 ++++++----
 .../mrp/InventoryEventPlannedServices.java         |  4 ++--
 .../ofbiz/order/order/OrderContentWrapper.java     |  2 +-
 .../apache/ofbiz/order/order/OrderReadHelper.java  |  3 ++-
 .../ofbiz/order/order/OrderReturnServices.java     |  1 -
 .../apache/ofbiz/order/order/OrderServices.java    |  4 ++--
 .../order/requirement/RequirementServices.java     | 11 ++++++---
 .../ofbiz/order/shoppingcart/ShoppingCartItem.java |  2 +-
 .../ofbiz/party/contact/ContactMechWorker.java     |  4 ++--
 .../category/ftl/OfbizCatalogUrlTransform.java     |  2 +-
 .../ofbiz/product/config/ProductConfigWrapper.java |  2 +-
 .../shipment/thirdparty/fedex/FedexServices.java   |  2 +-
 .../shipment/thirdparty/usps/UspsServices.java     |  2 +-
 .../workeffort/workeffort/WorkEffortServices.java  |  2 +-
 build.gradle                                       |  2 +-
 .../base/component/ComponentLoaderConfig.java      |  2 +-
 .../apache/ofbiz/base/conversion/Converters.java   |  2 +-
 .../org/apache/ofbiz/base/crypto/DesCrypt.java     |  2 +-
 .../org/apache/ofbiz/base/metrics/Metrics.java     |  2 +-
 .../apache/ofbiz/base/metrics/MetricsFactory.java  |  7 ++++--
 .../java/org/apache/ofbiz/base/util/Assert.java    |  2 +-
 .../org/apache/ofbiz/base/util/UtilDateTime.java   |  2 +-
 .../java/org/apache/ofbiz/base/util/UtilTimer.java |  4 +++-
 .../apache/ofbiz/base/util/cache/UtilCache.java    |  2 +-
 .../org/apache/ofbiz/base/util/string/UelUtil.java | 16 ++++++-------
 .../apache/ofbiz/common/login/LoginServices.java   |  3 ++-
 .../apache/ofbiz/common/status/StatusWorker.java   | 15 ++++++++-----
 .../ofbiz/entity/condition/EntityFunction.java     |  8 +++----
 .../org/apache/ofbiz/entity/jdbc/DatabaseUtil.java |  4 ++--
 .../ofbiz/entity/model/ModelEntityChecker.java     |  2 +-
 .../ofbiz/entity/model/ModelGroupReader.java       |  3 ++-
 .../org/apache/ofbiz/entity/model/ModelIndex.java  |  2 +-
 .../org/apache/ofbiz/entity/model/ModelInfo.java   |  2 +-
 .../org/apache/ofbiz/entity/model/ModelReader.java |  5 +++--
 .../ofbiz/entity/serialize/XmlSerializer.java      |  2 +-
 .../apache/ofbiz/entity/test/EntityTestSuite.java  |  7 +++++-
 .../org/apache/ofbiz/entity/util/SequenceUtil.java |  2 +-
 .../method/conditional/RegexpCondition.java        |  5 ++---
 .../apache/ofbiz/minilang/operation/Convert.java   |  3 ++-
 .../org/apache/ofbiz/security/SecuredUpload.java   |  1 +
 .../ofbiz/service/GenericDispatcherFactory.java    |  2 +-
 .../apache/ofbiz/service/ModelServiceReader.java   |  2 +-
 .../apache/ofbiz/service/jms/JmsQueueListener.java |  6 ++++-
 .../apache/ofbiz/service/jms/JmsTopicListener.java | 12 +++++++---
 .../test/ServiceEngineTestPermissionServices.java  |  2 +-
 .../service/test/ServiceEngineTestServices.java    |  4 ++--
 .../ofbiz/service/test/ServicePermissionTests.java |  2 +-
 .../control/ControlActivationEventListener.java    |  2 +-
 .../webapp/control/ExternalLoginKeysManager.java   |  2 +-
 .../ftl/JsLanguageFilesMappingTransform.java       |  1 -
 .../apache/ofbiz/webapp/stats/ServerHitBin.java    |  2 +-
 .../apache/ofbiz/webapp/view/ApacheFopWorker.java  |  2 +-
 .../apache/ofbiz/webtools/WebToolsServices.java    |  3 ++-
 .../ofbiz/webtools/artifactinfo/RunTestEvents.java |  2 +-
 .../webtools/labelmanager/LabelManagerFactory.java |  2 +-
 .../org/apache/ofbiz/widget/WidgetFactory.java     |  2 +-
 .../java/org/apache/ofbiz/widget/WidgetWorker.java |  2 +-
 .../ofbiz/widget/model/AbstractModelCondition.java | 24 ++++++++++----------
 .../ofbiz/widget/model/IterateSectionWidget.java   |  2 +-
 .../apache/ofbiz/widget/model/ModelFormField.java  |  2 +-
 .../apache/ofbiz/widget/model/ModelMenuAction.java |  2 +-
 .../ofbiz/widget/model/ModelScreenCondition.java   |  4 ++--
 .../ofbiz/widget/model/ModelWidgetCondition.java   | 26 +++++++++++-----------
 .../ofbiz/widget/renderer/ScreenRenderer.java      |  2 +-
 73 files changed, 184 insertions(+), 139 deletions(-)