This is an automated email from the ASF dual-hosted git repository.
surajk pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git.
from 99b7f96 Merge branch 'trunk' of
https://gitbox.apache.org/repos/asf/ofbiz-framework into trunk
new dd4da77 Improved: Corrected checkstyle formatting issues, 'is
preceded/not preceded with whitespace' for framework component. (OFBIZ-11874)
This fixes following checkstyle issues: '{' is not preceded with whitespace.
'{' is not followed by whitespace. '}' is not followed by whitespace. '}' is
not preceded with whitespace. 'typecast' is not followed by whitespace. 'try'
is not followed by whitespace. ';' is preceded with whitespace.
new 6695698 Merge branch 'trunk' of
https://gitbox.apache.org/repos/asf/ofbiz-framework into trunk
The 2 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:
.../ofbiz/base/component/ComponentConfig.java | 4 +-
.../apache/ofbiz/base/config/JNDIConfigUtil.java | 2 +-
.../apache/ofbiz/base/config/ResourceLoader.java | 2 +-
.../base/container/NamingServiceContainer.java | 2 +-
.../apache/ofbiz/base/conversion/Converters.java | 4 +-
.../org/apache/ofbiz/base/crypto/HashCrypt.java | 4 +-
.../java/org/apache/ofbiz/base/crypto/Main.java | 1 -
.../ofbiz/base/location/FlexibleLocation.java | 2 +-
.../apache/ofbiz/base/metrics/MetricsFactory.java | 2 +-
.../apache/ofbiz/base/util/AliasKeyManager.java | 2 +-
.../java/org/apache/ofbiz/base/util/Assert.java | 2 +-
.../java/org/apache/ofbiz/base/util/FileUtil.java | 2 +-
.../org/apache/ofbiz/base/util/GroovyUtil.java | 2 +-
.../org/apache/ofbiz/base/util/HttpClient.java | 2 +-
.../org/apache/ofbiz/base/util/KeyStoreUtil.java | 2 +-
.../org/apache/ofbiz/base/util/Observable.java | 2 +-
.../java/org/apache/ofbiz/base/util/SSLUtil.java | 2 +-
.../org/apache/ofbiz/base/util/ScriptUtil.java | 2 +-
.../org/apache/ofbiz/base/util/URLConnector.java | 2 +-
.../org/apache/ofbiz/base/util/UtilDateTime.java | 2 +-
.../org/apache/ofbiz/base/util/UtilFormatOut.java | 4 +-
.../org/apache/ofbiz/base/util/UtilGenerics.java | 2 +-
.../java/org/apache/ofbiz/base/util/UtilHttp.java | 12 ++----
.../java/org/apache/ofbiz/base/util/UtilIO.java | 2 +-
.../org/apache/ofbiz/base/util/UtilJavaParse.java | 2 +-
.../java/org/apache/ofbiz/base/util/UtilMisc.java | 8 ++--
.../org/apache/ofbiz/base/util/UtilNumber.java | 40 ++++++++---------
.../java/org/apache/ofbiz/base/util/UtilPlist.java | 2 +-
.../org/apache/ofbiz/base/util/UtilProperties.java | 4 +-
.../java/org/apache/ofbiz/base/util/UtilURL.java | 2 +-
.../org/apache/ofbiz/base/util/UtilValidate.java | 2 +-
.../java/org/apache/ofbiz/base/util/UtilXml.java | 23 +++++-----
.../ofbiz/base/util/collections/LifoSet.java | 2 +-
.../org/apache/ofbiz/base/util/string/UelUtil.java | 2 +-
.../string/test/FlexibleStringExpanderTests.java | 2 +-
.../ofbiz/base/util/template/XslTransform.java | 10 ++---
.../org/apache/ofbiz/base/util/UtilCodecTests.java | 2 +-
.../catalina/container/CatalinaContainer.java | 4 +-
.../ofbiz/catalina/container/OFBizRealm.java | 2 +-
.../org/apache/ofbiz/common/CommonWorkers.java | 4 +-
.../java/org/apache/ofbiz/common/FindServices.java | 4 +-
.../org/apache/ofbiz/common/KeywordSearchUtil.java | 2 +-
.../org/apache/ofbiz/common/UrlServletHelper.java | 18 ++++----
.../apache/ofbiz/common/email/EmailServices.java | 18 ++++----
.../org/apache/ofbiz/common/geo/GeoWorker.java | 2 +-
.../apache/ofbiz/common/image/ImageTransform.java | 6 +--
.../apache/ofbiz/common/period/PeriodWorker.java | 2 +-
.../ofbiz/common/preferences/PreferenceWorker.java | 2 +-
.../apache/ofbiz/common/qrcode/QRCodeServices.java | 2 -
.../apache/ofbiz/common/status/StatusWorker.java | 2 +-
.../ofbiz/common/telecom/TelecomServices.java | 2 -
.../org/apache/ofbiz/common/uom/UomWorker.java | 2 +-
.../org/apache/ofbiz/datafile/ModelDataFile.java | 2 -
.../org/apache/ofbiz/entity/GenericDelegator.java | 2 +-
.../org/apache/ofbiz/entity/GenericEntity.java | 4 +-
.../ofbiz/entity/condition/EntityClause.java | 2 +-
.../entity/condition/EntityConditionParam.java | 2 +-
.../apache/ofbiz/entity/condition/EntityExpr.java | 2 +-
.../ofbiz/entity/finder/EntityFinderUtil.java | 2 +-
.../org/apache/ofbiz/entity/jdbc/SqlJdbcUtil.java | 2 +-
.../ofbiz/entity/model/ModelEntityChecker.java | 2 +-
.../apache/ofbiz/entity/model/ModelRelation.java | 4 +-
.../org/apache/ofbiz/entity/model/ModelUtil.java | 4 +-
.../apache/ofbiz/entity/model/ModelViewEntity.java | 2 +-
.../entity/transaction/DumbTransactionFactory.java | 2 +-
.../entity/transaction/JNDITransactionFactory.java | 2 +-
.../ofbiz/entity/transaction/TransactionUtil.java | 4 +-
.../org/apache/ofbiz/entity/util/ByteWrapper.java | 2 +-
.../ofbiz/entity/util/EntityFindOptions.java | 2 +-
.../apache/ofbiz/entity/util/EntitySaxReader.java | 4 +-
.../apache/ofbiz/entity/util/EntityTypeUtil.java | 2 +-
.../org/apache/ofbiz/entity/util/EntityUtil.java | 2 +-
.../ofbiz/entity/util/EntityUtilProperties.java | 2 +-
.../apache/ofbiz/entityext/EntityGroupUtil.java | 2 +-
.../ofbiz/entityext/cache/EntityCacheServices.java | 2 +-
.../entityext/data/EntityDataLoadContainer.java | 4 +-
.../ofbiz/entityext/data/EntityDataServices.java | 8 ++--
.../apache/ofbiz/entityext/eca/EntityEcaRule.java | 4 +-
.../apache/ofbiz/entityext/eca/EntityEcaUtil.java | 2 +-
.../permission/EntityPermissionChecker.java | 32 ++++++--------
.../synchronization/EntitySyncContext.java | 4 --
.../org/apache/ofbiz/minilang/MiniLangUtil.java | 4 +-
.../apache/ofbiz/minilang/MiniLangValidate.java | 2 +-
.../org/apache/ofbiz/minilang/SimpleMethod.java | 1 -
.../ofbiz/minilang/method/callops/CallScript.java | 1 -
.../org/apache/ofbiz/security/SecurityFactory.java | 4 +-
.../ofbiz/service/GenericAbstractDispatcher.java | 2 +-
.../java/org/apache/ofbiz/service/ModelParam.java | 2 +-
.../org/apache/ofbiz/service/ModelService.java | 4 +-
.../java/org/apache/ofbiz/service/ServiceUtil.java | 2 +-
.../org/apache/ofbiz/service/ServiceXaWrapper.java | 2 +-
.../ofbiz/service/calendar/ExpressionUiHelper.java | 6 +--
.../ofbiz/service/calendar/RecurrenceInfo.java | 3 +-
.../ofbiz/service/calendar/RecurrenceUtil.java | 2 +-
.../ofbiz/service/calendar/TemporalExpression.java | 2 +-
.../service/calendar/TemporalExpressionWorker.java | 2 +-
.../ofbiz/service/config/ServiceConfigUtil.java | 2 +-
.../apache/ofbiz/service/eca/ServiceEcaAction.java | 2 +-
.../ofbiz/service/eca/ServiceEcaCondition.java | 2 +-
.../apache/ofbiz/service/eca/ServiceEcaUtil.java | 2 +-
.../ofbiz/service/engine/EntityAutoEngine.java | 6 +--
.../ofbiz/service/jms/JmsListenerFactory.java | 2 +-
.../java/org/apache/ofbiz/service/job/Job.java | 2 +-
.../ofbiz/service/mail/MimeMessageWrapper.java | 2 +-
.../apache/ofbiz/service/mail/ServiceMcaUtil.java | 2 +-
.../test/ServiceEngineTestPermissionServices.java | 2 +-
.../ofbiz/service/test/ServiceEntityAutoTests.java | 4 +-
.../ofbiz/service/test/ServicePermissionTests.java | 6 +--
.../java/org/apache/ofbiz/base/start/Config.java | 2 +-
.../ofbiz/base/start/StartupControlPanel.java | 11 +++--
.../apache/ofbiz/testtools/SimpleMethodTest.java | 2 -
.../apache/ofbiz/testtools/TestRunContainer.java | 2 +-
.../java/org/apache/ofbiz/webapp/WebAppUtil.java | 2 +-
.../apache/ofbiz/webapp/control/ContextFilter.java | 4 +-
.../control/ControlActivationEventListener.java | 3 +-
.../ofbiz/webapp/control/ControlEventListener.java | 2 +-
.../webapp/control/ExternalLoginKeysManager.java | 3 +-
.../ofbiz/webapp/control/LoginEventListener.java | 2 +-
.../apache/ofbiz/webapp/control/LoginWorker.java | 18 +-------
.../ofbiz/webapp/control/ProtectViewWorker.java | 2 +-
.../ofbiz/webapp/control/RequestHandler.java | 3 +-
.../org/apache/ofbiz/webapp/event/CoreEvents.java | 10 ++---
.../ofbiz/webapp/ftl/OfbizContentTransform.java | 8 ++--
.../apache/ofbiz/webapp/stats/VisitHandler.java | 8 +---
.../apache/ofbiz/webapp/view/ApacheFopWorker.java | 4 +-
.../apache/ofbiz/webapp/webdav/WebDavServlet.java | 2 +-
.../org/apache/ofbiz/webapp/webdav/WebDavUtil.java | 2 +-
.../ofbiz/webapp/website/WebSiteProperties.java | 2 -
.../apache/ofbiz/webapp/website/WebSiteWorker.java | 2 +-
.../org/apache/ofbiz/webtools/UtilCacheEvents.java | 3 +-
.../apache/ofbiz/webtools/WebToolsServices.java | 18 ++++----
.../webtools/artifactinfo/ArtifactInfoFactory.java | 2 +-
.../artifactinfo/FormWidgetArtifactInfo.java | 4 +-
.../artifactinfo/ScreenWidgetArtifactInfo.java | 2 +-
.../ofbiz/webtools/print/FoPrintServerEvents.java | 3 +-
.../org/apache/ofbiz/widget/WidgetFactory.java | 2 +-
.../java/org/apache/ofbiz/widget/WidgetWorker.java | 8 ++--
.../ofbiz/widget/cache/WidgetContextCacheKey.java | 2 +-
.../ofbiz/widget/content/WidgetContentWorker.java | 2 +-
.../widget/content/WidgetDataResourceWorker.java | 2 +-
.../ofbiz/widget/model/AbstractModelAction.java | 4 +-
.../org/apache/ofbiz/widget/model/MenuFactory.java | 2 +-
.../ofbiz/widget/model/ModelActionVisitor.java | 2 +-
.../ofbiz/widget/model/ModelFieldVisitor.java | 50 +++++++++++-----------
.../apache/ofbiz/widget/model/ModelFormField.java | 4 +-
.../apache/ofbiz/widget/model/ModelMenuAction.java | 14 +++---
.../ofbiz/widget/portal/PortalPageWorker.java | 3 +-
.../apache/ofbiz/widget/renderer/FormRenderer.java | 6 +--
.../ofbiz/widget/renderer/MenuStringRenderer.java | 18 ++++----
.../apache/ofbiz/widget/renderer/Paginator.java | 6 +--
.../apache/ofbiz/widget/renderer/UtilHelpText.java | 2 +-
.../ofbiz/widget/renderer/fo/FoFormRenderer.java | 4 +-
.../widget/renderer/fo/ScreenFopViewHandler.java | 6 +--
.../widget/renderer/html/HtmlMenuRenderer.java | 2 +-
.../renderer/html/HtmlMenuRendererImage.java | 2 +-
.../widget/renderer/html/HtmlMenuWrapper.java | 2 +-
.../widget/renderer/html/HtmlMenuWrapperImage.java | 2 +-
.../widget/renderer/html/HtmlTreeRenderer.java | 2 +-
.../widget/renderer/macro/MacroMenuRenderer.java | 4 +-
.../widget/renderer/macro/MacroScreenRenderer.java | 14 +++---
.../ofbiz/widget/test/WidgetMacroLibraryTests.java | 2 +-
161 files changed, 325 insertions(+), 389 deletions(-)
