svn commit: r1858295 [1/5] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/src/ma
Locked
svn commit: r1858295 [1/5] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/src/ma
 
|
Author: mthl
Date: Sat Apr 27 19:34:25 2019 New Revision: 1858295 URL: http://svn.apache.org/viewvc?rev=1858295&view=rev Log: Improved: Use the ‘@Override’ annotation (OFBIZ-10939) The ‘@Override’ annotation helps readers understand that the method at hand is overriding a super class or implementing an interface. Additionally it allows the compiler to check if the methods annotated with ‘@Override’ are actually implementing an abstract method. Using that annotation makes ‘@see foo.bar.ParentClass#myMethod’ comments useless, so those they have been removed for the newly annotated methods. Thanks Jacques Le Roux and Swapnil M Mane for acknowledging the commit. Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/BillingAccountWorker.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentMapFacade.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ftp/SimpleFtpClient.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/view/SimpleContentViewHandler.java ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderContentWrapper.java ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/content/PartyContentWrapper.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlSeoFilter.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryContentWrapper.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ControlServlet.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoContextFilter.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoControlServlet.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/CatalogAltUrlSeoTransform.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/SeoTransform.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/UrlRegexpTransform.java ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/content/WorkEffortContentWrapper.java ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalHandlerFactory.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentResourceHandler.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/concurrent/ConstantFuture.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/concurrent/ExecutionPool.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/config/MainResourceHandler.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/container/ComponentContainer.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/container/NamingServiceContainer.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/AbstractConverter.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/AbstractLocalizedConverter.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/BooleanConverters.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/CollectionConverters.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/Converters.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/DateTimeConverters.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/GenericSingletonToList.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/GenericSingletonToSet.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/JSONConverters.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/MiscConverters.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/NetConverters.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/NumberConverters.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/test/MiscTests.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/lang/ComparableRange.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/location/ClasspathLocationResolver.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/location/ComponentLocationResolver.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/location/OFBizHomeLocationResolver.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/location/StandardUrlLocationResolver.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/AliasKeyManager.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/MultiTrustManager.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/SSLUtil.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/ScriptUtil.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/URLConnector.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilDateTime.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilProperties.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilXml.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/SoftRefCacheLine.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/test/UtilCacheTests.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/FlexibleMapAccessor.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMap.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapCollection.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapEntry.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapEntrySet.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapKeySet.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapValues.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/IteratorWrapper.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MapComparator.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/ReadOnlyMapEntry.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/ResourceBundleMapWrapper.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/test/GenericMapTest.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/FlexibleStringExpander.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/test/FlexibleStringExpanderTests.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/ReferenceCleanerTests.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/StringUtilTests.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/UtilObjectTests.java ofbiz/ofbiz-framework/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/authentication/AuthHelper.java ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/authentication/AuthenticationComparator.java ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/authentication/example/TestFailAuthenticator.java ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/scripting/ScriptHelperImpl.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/DelegatorFactory.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/DelegatorFactoryImpl.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDelegator.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericEntity.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionBuilder.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityFunction.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityOperator.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/OrderByItem.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/OrderByList.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/connection/DBCPConnectionFactory.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericHelperDAO.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/ReadOnlyHelperDAO.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/EntityFinderUtil.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/CursorConnection.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/CursorResultSet.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/CursorStatement.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/DatabaseUtil.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelEntity.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelViewEntity.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/DumbTransactionFactory.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/GenericXaResource.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/GeronimoTransactionFactory.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/JNDITransactionFactory.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/TransactionUtil.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/Converters.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityListIterator.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntitySaxReader.java ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/cache/EntityCacheServices.java ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/DelegatorEcaHandler.java ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaAction.java ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/permission/EntityPermissionChecker.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CompareCondition.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CompareFieldCondition.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/EmptyCondition.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/HasPermissionCondition.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/MasterIf.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ValidateMethodCondition.java ofbiz/ofbiz-framework/trunk/framework/security/src/main/java/org/apache/ofbiz/security/SecurityFactory.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/GenericAbstractDispatcher.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/GenericResultWaiter.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ModelService.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/RunningService.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpression.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/engine/GenericAsyncEngine.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/engine/InterfaceEngine.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/jms/AbstractJmsListener.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsListenerFactory.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsQueueListener.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsServiceEngine.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsTopicListener.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/job/JobPoller.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/mail/MimeMessageWrapper.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RemoteDispatcherImpl.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RmiServiceContainer.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/rmi/socket/ssl/SSLClientSocketFactory.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/rmi/socket/ssl/SSLServerSocketFactory.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/xmlrpc/AliasSupportedTransportFactory.java ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/TestRunContainer.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ContextFilter.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlActivationEventListener.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlEventListener.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginEventListener.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/FileUploadProgressListener.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/GroovyEventHandler.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/JSONRequestBodyMapHandler.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/JavaEventHandler.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RomeEventHandler.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/SOAPEventHandler.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceEventHandler.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceMultiEventHandler.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/SimpleEventHandler.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/XmlRpcEventHandler.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/FreeMarkerViewHandler.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/LoopWriter.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizCacheStorage.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/AbstractViewHandler.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/ApacheFopWorker.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/HttpViewHandler.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/JspViewHandler.java ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ArtifactInfoBase.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/AbstractModelCondition.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelGrid.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelScreenWidget.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelSingleForm.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelWidgetCondition.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/MenuWrapTransform.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/VisualTheme.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/fo/FoFormRenderer.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlMenuRenderer.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlTreeRenderer.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroScreenRenderer.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroScreenViewHandler.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroTreeRenderer.java Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/BillingAccountWorker.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/BillingAccountWorker.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/BillingAccountWorker.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/BillingAccountWorker.java Sat Apr 27 19:34:25 2019 @@ -209,6 +209,7 @@ public class BillingAccountWorker { @SuppressWarnings("serial") protected static class BillingAccountComparator implements Comparator<Map<String, Object>>, Serializable{ + @Override public int compare(Map<String, Object> billingAccount1, Map<String, Object> billingAccount2) { return ((BigDecimal)billingAccount1.get("accountBalance")).compareTo((BigDecimal)billingAccount2.get("accountBalance")); } Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentMapFacade.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentMapFacade.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentMapFacade.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentMapFacade.java Sat Apr 27 19:34:25 2019 @@ -136,49 +136,60 @@ public class ContentMapFacade implements } // interface methods + @Override public int size() { return 1; } + @Override public boolean isEmpty() { return false; } + @Override public boolean containsKey(Object object) { return false; } + @Override public boolean containsValue(Object object) { return false; } + @Override public Object put(Object name, Object value) { Debug.logWarning("This [put()] method is not implemented in ContentMapFacade", module); return null; } + @Override public Object remove(Object object) { Debug.logWarning("This [remove()] method is not implemented in ContentMapFacade", module); return null; } + @Override public void putAll(Map<?, ?> map) { Debug.logWarning("This method [putAll()] is not implemented in ContentMapFacade", module); } + @Override public void clear() { Debug.logWarning("This method [clear()] is not implemented in ContentMapFacade", module); } + @Override public Set<Object> keySet() { return UtilGenerics.checkSet(mapKeySet); } + @Override public Collection<Object> values() { Debug.logWarning("This method [values()] is not implemented in ContentMapFacade", module); return null; } + @Override public Set<Map.Entry<Object, Object>> entrySet() { Debug.logWarning("This method [entrySet()] is not implemented in ContentMapFacade", module); return null; @@ -215,6 +226,7 @@ public class ContentMapFacade implements } // implemented get method + @Override public Object get(Object obj) { if (!(obj instanceof String)) { Debug.logWarning("Key parameters must be a string", module); @@ -354,50 +366,61 @@ public class ContentMapFacade implements } abstract class AbstractInfo implements Map<Object, Object> { + @Override public int size() { return 1; } + @Override public boolean isEmpty() { return false; } + @Override public boolean containsKey(Object object) { return false; } + @Override public boolean containsValue(Object object) { return false; } + @Override public Object put(Object name, Object value) { Debug.logWarning("This [put()] method is not implemented in ContentMapFacade.AbstractInfo", module); return null; } + @Override public Object remove(Object object) { Debug.logWarning("This [remove()] method is not implemented in ContentMapFacade.AbstractInfo", module); return null; } + @Override public void putAll(Map<?, ?> map) { Debug.logWarning("This method [putAll()] is not implemented in ContentMapFacade.AbstractInfo", module); } + @Override public void clear() { Debug.logWarning("This method [clear()] is not implemented in ContentMapFacade.AbstractInfo", module); } + @Override public Set<Object> keySet() { Debug.logWarning("This method [keySet()] is not implemented in ContentMapFacade.AbstractInfo", module); return null; } + @Override public Collection<Object> values() { Debug.logWarning("This method [values()] is not implemented in ContentMapFacade.AbstractInfo", module); return null; } + @Override public Set<Map.Entry<Object, Object>> entrySet() { Debug.logWarning("This method [entrySet()] is not implemented in ContentMapFacade.AbstractInfo", module); return null; Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ftp/SimpleFtpClient.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ftp/SimpleFtpClient.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ftp/SimpleFtpClient.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ftp/SimpleFtpClient.java Sat Apr 27 19:34:25 2019 @@ -72,6 +72,7 @@ public class SimpleFtpClient implements return fileNames; } + @Override public void setBinaryTransfer(boolean isBinary) throws IOException { if (isBinary) { client.setFileType(FTP.BINARY_FILE_TYPE); @@ -80,6 +81,7 @@ public class SimpleFtpClient implements } } + @Override public void setPassiveMode(boolean isPassive) { if (isPassive) { client.enterLocalPassiveMode(); Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/view/SimpleContentViewHandler.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/view/SimpleContentViewHandler.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/view/SimpleContentViewHandler.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/view/SimpleContentViewHandler.java Sat Apr 27 19:34:25 2019 @@ -57,6 +57,7 @@ public class SimpleContentViewHandler ex private String rootDir = null; private String https = null; + @Override public void init(ServletContext context) throws ViewHandlerException { rootDir = context.getRealPath("/"); https = (String) context.getAttribute("https"); @@ -64,6 +65,7 @@ public class SimpleContentViewHandler ex /** * @see org.apache.ofbiz.webapp.view.ViewHandler#render(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) */ + @Override public void render(String name, String page, String info, String contentType, String encoding, HttpServletRequest request, HttpServletResponse response) throws ViewHandlerException { LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher"); Modified: ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderContentWrapper.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderContentWrapper.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderContentWrapper.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderContentWrapper.java Sat Apr 27 19:34:25 2019 @@ -76,6 +76,7 @@ public class OrderContentWrapper impleme this.mimeTypeId = EntityUtilProperties.getPropertyValue("content", "defaultMimeType", "text/html; charset=utf-8", (Delegator) request.getAttribute("delegator")); } + @Override public StringUtil.StringWrapper get(String orderContentTypeId, String encoderType) { return StringUtil.makeStringWrapper(getOrderContentAsText(order, orderContentTypeId, locale, mimeTypeId, order.getDelegator(), dispatcher, encoderType)); } Modified: ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java Sat Apr 27 19:34:25 2019 @@ -322,6 +322,7 @@ public final class ProductDisplayWorker this.descending = descending; } + @Override public int compare(java.lang.Object prod1, java.lang.Object prod2) { int result = compareAsc((GenericEntity) prod1, (GenericEntity) prod2); Modified: ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/content/PartyContentWrapper.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/content/PartyContentWrapper.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/content/PartyContentWrapper.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/content/PartyContentWrapper.java Sat Apr 27 19:34:25 2019 @@ -83,6 +83,7 @@ public class PartyContentWrapper impleme return getPartyContentAsText(party, contentTypeId, locale, mimeTypeId, party.getDelegator(), dispatcher, useCache, encoderType); } + @Override public StringUtil.StringWrapper get(String contentTypeId, String encoderType) { return StringUtil.makeStringWrapper(get(contentTypeId, true, encoderType)); } Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlSeoFilter.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlSeoFilter.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlSeoFilter.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlSeoFilter.java Sat Apr 27 19:34:25 2019 @@ -40,9 +40,7 @@ public class CatalogUrlSeoFilter extends protected String defaultLocaleString = null; protected String redirectUrl = null; - /** - * @see javax.servlet.Filter#doFilter(javax.servlet.ServletRequest, javax.servlet.ServletResponse, javax.servlet.FilterChain) - */ + @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { HttpServletRequest httpRequest = (HttpServletRequest) request; HttpServletResponse httpResponse = (HttpServletResponse) response; Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryContentWrapper.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryContentWrapper.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryContentWrapper.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryContentWrapper.java Sat Apr 27 19:34:25 2019 @@ -79,6 +79,7 @@ public class CategoryContentWrapper impl this.mimeTypeId = EntityUtilProperties.getPropertyValue("content", "defaultMimeType", "text/html; charset=utf-8", (Delegator) request.getAttribute("delegator")); } + @Override public StringUtil.StringWrapper get(String prodCatContentTypeId, String encoderType) { return StringUtil.makeStringWrapper(getProductCategoryContentAsText(productCategory, prodCatContentTypeId, locale, mimeTypeId, productCategory.getDelegator(), dispatcher, encoderType)); } Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ControlServlet.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ControlServlet.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ControlServlet.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ControlServlet.java Sat Apr 27 19:34:25 2019 @@ -40,9 +40,7 @@ public class ControlServlet extends org. super(); } - /** - * @see javax.servlet.Servlet#init(javax.servlet.ServletConfig) - */ + @Override public void init(ServletConfig config) throws ServletException { super.init(config); Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoContextFilter.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoContextFilter.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoContextFilter.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoContextFilter.java Sat Apr 27 19:34:25 2019 @@ -66,6 +66,7 @@ public class SeoContextFilter implements private String errorCode = ""; private List<String> allowedPathList = new ArrayList<>(); + @Override public void init(FilterConfig config) throws ServletException { this.config = config; allowedPaths = config.getInitParameter("allowedPaths"); @@ -89,9 +90,7 @@ public class SeoContextFilter implements } } - /** - * @see javax.servlet.Filter#doFilter(javax.servlet.ServletRequest, javax.servlet.ServletResponse, javax.servlet.FilterChain) - */ + @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { HttpServletRequest httpRequest = (HttpServletRequest) request; HttpServletResponse httpResponse = (HttpServletResponse) response; Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoControlServlet.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoControlServlet.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoControlServlet.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoControlServlet.java Sat Apr 27 19:34:25 2019 @@ -50,9 +50,7 @@ public class SeoControlServlet extends C super(); } - /** - * @see javax.servlet.Servlet#init(javax.servlet.ServletConfig) - */ + @Override public void init(ServletConfig config) throws ServletException { super.init(config); @@ -72,6 +70,7 @@ public class SeoControlServlet extends C SeoConfigUtil.init(); } + @Override public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { String uri = URLEncoder.encode(request.getRequestURI(), "UTF-8"); if (request.getAttribute(REQUEST_IN_ALLOW_LIST) != null || request.getAttribute("_jsp_" + uri) != null) { Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/CatalogAltUrlSeoTransform.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/CatalogAltUrlSeoTransform.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/CatalogAltUrlSeoTransform.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/CatalogAltUrlSeoTransform.java Sat Apr 27 19:34:25 2019 @@ -88,14 +88,17 @@ public class CatalogAltUrlSeoTransform i return new Writer(out) { + @Override public void write(char[] cbuf, int off, int len) throws IOException { buf.append(cbuf, off, len); } + @Override public void flush() throws IOException { out.flush(); } + @Override public void close() throws IOException { try { Environment env = Environment.getCurrentEnvironment(); Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/SeoTransform.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/SeoTransform.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/SeoTransform.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/SeoTransform.java Sat Apr 27 19:34:25 2019 @@ -71,14 +71,17 @@ public class SeoTransform implements Tem return new Writer(out) { + @Override public void write(char cbuf[], int off, int len) { buf.append(cbuf, off, len); } + @Override public void flush() throws IOException { out.flush(); } + @Override public void close() throws IOException { try { Environment env = Environment.getCurrentEnvironment(); Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/UrlRegexpTransform.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/UrlRegexpTransform.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/UrlRegexpTransform.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/UrlRegexpTransform.java Sat Apr 27 19:34:25 2019 @@ -71,14 +71,17 @@ public class UrlRegexpTransform implemen return new Writer(out) { + @Override public void write(char cbuf[], int off, int len) { buf.append(cbuf, off, len); } + @Override public void flush() throws IOException { out.flush(); } + @Override public void close() throws IOException { try { Environment env = Environment.getCurrentEnvironment(); Modified: ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/content/WorkEffortContentWrapper.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/content/WorkEffortContentWrapper.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/content/WorkEffortContentWrapper.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/content/WorkEffortContentWrapper.java Sat Apr 27 19:34:25 2019 @@ -86,6 +86,7 @@ public class WorkEffortContentWrapper im * @param contentTypeId Type of content to return * @return String containing the content data */ + @Override public StringUtil.StringWrapper get(String contentTypeId, String encoderType) { return StringUtil.makeStringWrapper(get(contentTypeId, true, encoderType)); } Modified: ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalHandlerFactory.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalHandlerFactory.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalHandlerFactory.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalHandlerFactory.java Sat Apr 27 19:34:25 2019 @@ -59,6 +59,7 @@ public class ICalHandlerFactory implemen handlerMap.put("UNLOCK", ICalHandlerFactory::doNothing); } + @Override public RequestHandler getHandler(String method) { RequestHandler handler = handlerMap.get(method); if (handler == null) { Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentResourceHandler.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentResourceHandler.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentResourceHandler.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentResourceHandler.java Sat Apr 27 19:34:25 2019 @@ -59,14 +59,17 @@ public class ComponentResourceHandler im } } + @Override public String getLoaderName() { return this.loaderName; } + @Override public String getLocation() { return this.location; } + @Override public Document getDocument() throws GenericConfigException { try { return UtilXml.readXmlDocument(this.getStream(), this.getFullLocation(), true); @@ -75,18 +78,22 @@ public class ComponentResourceHandler im } } + @Override public InputStream getStream() throws GenericConfigException { return ComponentConfig.getStream(componentName, loaderName, location); } + @Override public URL getURL() throws GenericConfigException { return ComponentConfig.getURL(componentName, loaderName, location); } + @Override public boolean isFileResource() throws GenericConfigException { return ComponentConfig.isFileResourceLoader(componentName, loaderName); } + @Override public String getFullLocation() throws GenericConfigException { return ComponentConfig.getFullLocation(componentName, loaderName, location); } Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/concurrent/ConstantFuture.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/concurrent/ConstantFuture.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/concurrent/ConstantFuture.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/concurrent/ConstantFuture.java Sat Apr 27 19:34:25 2019 @@ -29,22 +29,27 @@ public class ConstantFuture<V> implement this.value = value; } + @Override public boolean cancel(boolean mayInterruptIfRunning) { return false; } + @Override public V get() { return value; } + @Override public V get(long timeout, TimeUnit unit) { return value; } + @Override public boolean isCancelled() { return false; } + @Override public boolean isDone() { return true; } Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/concurrent/ExecutionPool.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/concurrent/ExecutionPool.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/concurrent/ExecutionPool.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/concurrent/ExecutionPool.java Sat Apr 27 19:34:25 2019 @@ -55,6 +55,7 @@ public final class ExecutionPool { this.namePrefix = namePrefix; } + @Override public Thread newThread(Runnable r) { Thread t = new Thread(group, r); t.setDaemon(true); @@ -106,6 +107,7 @@ public final class ExecutionPool { private static final DelayQueue<Pulse> delayQueue = new DelayQueue<>(); public static class ExecutionPoolPulseWorker implements Runnable { + @Override public void run() { try { while (true) { @@ -138,10 +140,12 @@ public final class ExecutionPool { return expireTimeNanos; } + @Override public final long getDelay(TimeUnit unit) { return unit.convert(expireTimeNanos - System.nanoTime(), TimeUnit.NANOSECONDS); } + @Override public final int compareTo(Delayed other) { if (this.equals(other)) { return 0; @@ -153,6 +157,7 @@ public final class ExecutionPool { return 1; } + @Override public final boolean equals(Object other) { if(other instanceof Pulse) { return timeDiff((Pulse) other) == 0; @@ -160,6 +165,7 @@ public final class ExecutionPool { return false; } + @Override public int hashCode() { return super.hashCode(); } Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/config/MainResourceHandler.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/config/MainResourceHandler.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/config/MainResourceHandler.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/config/MainResourceHandler.java Sat Apr 27 19:34:25 2019 @@ -53,14 +53,17 @@ public final class MainResourceHandler i this.location = location; } + @Override public String getLoaderName() { return this.loaderName; } + @Override public String getLocation() { return this.location; } + @Override public Document getDocument() throws GenericConfigException { try { return UtilXml.readXmlDocument(this.getStream(), this.xmlFilename, true); @@ -69,20 +72,24 @@ public final class MainResourceHandler i } } + @Override public InputStream getStream() throws GenericConfigException { return ResourceLoader.loadResource(this.xmlFilename, this.location, this.loaderName); } + @Override public URL getURL() throws GenericConfigException { return ResourceLoader.getURL(this.xmlFilename, this.location, this.loaderName); } + @Override public boolean isFileResource() throws GenericConfigException { ResourceLoader loader = ResourceLoader.getLoader(this.xmlFilename, this.loaderName); return loader instanceof FileLoader; } + @Override public String getFullLocation() throws GenericConfigException { ResourceLoader loader = ResourceLoader.getLoader(this.xmlFilename, this.loaderName); Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/container/ComponentContainer.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/container/ComponentContainer.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/container/ComponentContainer.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/container/ComponentContainer.java Sat Apr 27 19:34:25 2019 @@ -80,9 +80,7 @@ public class ComponentContainer implemen Debug.logInfo("All components loaded", module); } - /** - * @see org.apache.ofbiz.base.container.Container#start() - */ + @Override public boolean start() { return loaded.get(); } @@ -361,12 +359,12 @@ public class ComponentContainer implemen } return classPath; } - /** - * @see org.apache.ofbiz.base.container.Container#stop() - */ + + @Override public void stop() { } + @Override public String getName() { return name; } Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/container/NamingServiceContainer.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/container/NamingServiceContainer.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/container/NamingServiceContainer.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/container/NamingServiceContainer.java Sat Apr 27 19:34:25 2019 @@ -49,6 +49,7 @@ public class NamingServiceContainer impl private String name; + @Override public void init(List<StartupCommand> ofbizCommands, String name, String configFile) throws ContainerException { this.name =name; this.configFileLocation = configFile; @@ -80,6 +81,7 @@ public class NamingServiceContainer impl } + @Override public boolean start() throws ContainerException { try { registry = LocateRegistry.createRegistry(namingPort, rmiSocketFactory, rmiSocketFactory); @@ -91,6 +93,7 @@ public class NamingServiceContainer impl return isRunning; } + @Override public void stop() throws ContainerException { if (isRunning) { try { @@ -101,6 +104,7 @@ public class NamingServiceContainer impl } } + @Override public String getName() { return name; } Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/AbstractConverter.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/AbstractConverter.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/AbstractConverter.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/AbstractConverter.java Sat Apr 27 19:34:25 2019 @@ -31,22 +31,27 @@ public abstract class AbstractConverter< this.targetClass = targetClass; } + @Override public void loadConverters() { Converters.registerConverter(this); } + @Override public T convert(Class<? extends T> targetClass, S obj) throws ConversionException { return convert(obj); } + @Override public boolean canConvert(Class<?> sourceClass, Class<?> targetClass) { return getSourceClass().isAssignableFrom(sourceClass) && getTargetClass().isAssignableFrom(targetClass); } + @Override public Class<? super S> getSourceClass() { return sourceClass; } + @Override public Class<? super T> getTargetClass() { return targetClass; } Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/AbstractLocalizedConverter.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/AbstractLocalizedConverter.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/AbstractLocalizedConverter.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/AbstractLocalizedConverter.java Sat Apr 27 19:34:25 2019 @@ -30,10 +30,12 @@ public abstract class AbstractLocalizedC super(sourceClass, targetClass); } + @Override public T convert(Class<? extends T> targetClass, S obj, Locale locale, TimeZone timeZone) throws ConversionException { return convert(obj, locale, timeZone); } + @Override public T convert(Class<? extends T> targetClass, S obj, Locale locale, TimeZone timeZone, String formatString) throws ConversionException { return convert(obj, locale, timeZone, formatString); } Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/BooleanConverters.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/BooleanConverters.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/BooleanConverters.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/BooleanConverters.java Sat Apr 27 19:34:25 2019 @@ -27,6 +27,7 @@ public class BooleanConverters implement super(Boolean.class, Integer.class); } + @Override public Integer convert(Boolean obj) throws ConversionException { return obj ? 1 : 0; } @@ -49,6 +50,7 @@ public class BooleanConverters implement super(Boolean.class, String.class); } + @Override public String convert(Boolean obj) throws ConversionException { return obj ? "true" : "false"; } @@ -59,6 +61,7 @@ public class BooleanConverters implement super(Integer.class, Boolean.class); } + @Override public Boolean convert(Integer obj) throws ConversionException { return obj == 0 ? false : true; } @@ -69,11 +72,13 @@ public class BooleanConverters implement super(String.class, Boolean.class); } + @Override public Boolean convert(String obj) throws ConversionException { return "TRUE".equals(obj.trim().toUpperCase(Locale.getDefault())); } } + @Override public void loadConverters() { Converters.loadContainedConverters(BooleanConverters.class); } Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/CollectionConverters.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/CollectionConverters.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/CollectionConverters.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/CollectionConverters.java Sat Apr 27 19:34:25 2019 @@ -32,10 +32,12 @@ import org.apache.ofbiz.base.util.UtilGe /** Collection Converter classes. */ public class CollectionConverters implements ConverterLoader { public static class ArrayCreator implements ConverterCreator, ConverterLoader { + @Override public void loadConverters() { Converters.registerCreator(this); } + @Override public <S, T> Converter<S, T> createConverter(Class<S> sourceClass, Class<T> targetClass) { if (!sourceClass.isArray()) { return null; @@ -60,6 +62,7 @@ public class CollectionConverters implem return sourceClass == this.getSourceClass() && targetClass == this.getTargetClass(); } + @Override public T convert(S obj) throws ConversionException { List<Object> list = new LinkedList<>(); int len = Array.getLength(obj); @@ -89,6 +92,7 @@ public class CollectionConverters implem return false; } + @Override public List<T> convert(T[] obj) throws ConversionException { return Arrays.asList(obj); } @@ -99,6 +103,7 @@ public class CollectionConverters implem super(List.class, String.class); } + @Override public String convert(List<T> obj) throws ConversionException { return obj.toString(); } @@ -109,6 +114,7 @@ public class CollectionConverters implem super(Map.class, List.class); } + @Override public List<Map<K, V>> convert(Map<K, V> obj) throws ConversionException { List<Map<K, V>> tempList = new LinkedList<>(); tempList.add(obj); @@ -121,6 +127,7 @@ public class CollectionConverters implem super(Map.class, Set.class); } + @Override public Set<Map<K, V>> convert(Map<K, V> obj) throws ConversionException { Set<Map<K, V>> tempSet = new HashSet<>(); tempSet.add(obj); @@ -133,6 +140,7 @@ public class CollectionConverters implem super(Map.class, String.class); } + @Override public String convert(Map<K, V> obj) throws ConversionException { return obj.toString(); } @@ -157,6 +165,7 @@ public class CollectionConverters implem super(String.class, Map.class); } + @Override public Map<String, String> convert(String obj) throws ConversionException { if (obj.startsWith("{") && obj.endsWith("}")) { return StringUtil.toMap(obj); @@ -179,6 +188,7 @@ public class CollectionConverters implem } } + @Override public void loadConverters() { Converters.loadContainedConverters(CollectionConverters.class); } Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/Converters.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/Converters.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/Converters.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/Converters.java Sat Apr 27 19:34:25 2019 @@ -201,6 +201,7 @@ OUTER: protected PassThruConverterCreator() { } + @Override public <S, T> Converter<S, T> createConverter(Class<S> sourceClass, Class<T> targetClass) { if (targetClass.isAssignableFrom(sourceClass)) { return new PassThruConverter<>(sourceClass, targetClass); @@ -223,24 +224,29 @@ OUTER: this.targetClass = targetClass; } + @Override public boolean canConvert(Class<?> sourceClass, Class<?> targetClass) { return this.sourceClass == sourceClass && this.targetClass == targetClass; } + @Override @SuppressWarnings("unchecked") public T convert(S obj) throws ConversionException { return (T) obj; } + @Override @SuppressWarnings("unchecked") public T convert(Class<? extends T> targetClass, S obj) throws ConversionException { return (T) obj; } + @Override public Class<?> getSourceClass() { return sourceClass; } + @Override public Class<?> getTargetClass() { return targetClass; } Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/DateTimeConverters.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/DateTimeConverters.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/DateTimeConverters.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/DateTimeConverters.java Sat Apr 27 19:34:25 2019 @@ -44,6 +44,7 @@ public class DateTimeConverters implemen return getSourceClass().isAssignableFrom(sourceClass) && targetClass == getTargetClass(); } + @Override public Date convert(Calendar obj) throws ConversionException { return obj.getTime(); } @@ -54,6 +55,7 @@ public class DateTimeConverters implemen super(Calendar.class, Long.class); } + @Override public Long convert(Calendar obj) throws ConversionException { return obj.getTimeInMillis(); } @@ -64,6 +66,7 @@ public class DateTimeConverters implemen super(Calendar.class, String.class); } + @Override public String convert(Calendar obj) throws ConversionException { Locale locale = obj.getLocale(com.ibm.icu.util.ULocale.VALID_LOCALE).toLocale(); TimeZone timeZone = UtilDateTime.toTimeZone(obj.getTimeZone().getID()); @@ -82,6 +85,7 @@ public class DateTimeConverters implemen return getSourceClass().isAssignableFrom(sourceClass) && targetClass == getTargetClass(); } + @Override public Timestamp convert(Calendar obj) throws ConversionException { return new Timestamp(obj.getTimeInMillis()); } @@ -92,6 +96,7 @@ public class DateTimeConverters implemen super(Date.class, Calendar.class); } + @Override public Calendar convert(Date obj, Locale locale, TimeZone timeZone, String formatString) throws ConversionException { return UtilDateTime.toCalendar(obj, timeZone, locale); } @@ -102,6 +107,7 @@ public class DateTimeConverters implemen super(java.util.Date.class, Long.class); } + @Override public Long convert(java.util.Date obj) throws ConversionException { return obj.getTime(); } @@ -117,6 +123,7 @@ public class DateTimeConverters implemen return sourceClass == this.getSourceClass() && targetClass == this.getTargetClass(); } + @Override public java.sql.Date convert(java.util.Date obj) throws ConversionException { Calendar cal = Calendar.getInstance(); cal.setTime(obj); @@ -136,6 +143,7 @@ public class DateTimeConverters implemen return sourceClass == this.getSourceClass() && targetClass == this.getTargetClass(); } + @Override public java.sql.Time convert(java.util.Date obj) throws ConversionException { return new java.sql.Time(obj.getTime()); } @@ -151,6 +159,7 @@ public class DateTimeConverters implemen return obj.toString(); } + @Override public String convert(java.util.Date obj, Locale locale, TimeZone timeZone, String formatString) throws ConversionException { DateFormat df = null; if (UtilValidate.isEmpty(formatString)) { @@ -172,6 +181,7 @@ public class DateTimeConverters implemen return getSourceClass().isAssignableFrom(sourceClass) && targetClass == getTargetClass(); } + @Override public java.sql.Timestamp convert(java.util.Date obj) throws ConversionException { return new java.sql.Timestamp(obj.getTime()); } @@ -182,6 +192,7 @@ public class DateTimeConverters implemen super(TimeDuration.class, java.math.BigDecimal.class); } + @Override public java.math.BigDecimal convert(TimeDuration obj) throws ConversionException { return new java.math.BigDecimal(TimeDuration.toLong(obj)); } @@ -192,6 +203,7 @@ public class DateTimeConverters implemen super(TimeDuration.class, Double.class); } + @Override public Double convert(TimeDuration obj) throws ConversionException { return (double) TimeDuration.toLong(obj); } @@ -202,6 +214,7 @@ public class DateTimeConverters implemen super(TimeDuration.class, Float.class); } + @Override public Float convert(TimeDuration obj) throws ConversionException { return (float) TimeDuration.toLong(obj); } @@ -218,6 +231,7 @@ public class DateTimeConverters implemen super(TimeDuration.class, Long.class); } + @Override public Long convert(TimeDuration obj) throws ConversionException { return TimeDuration.toLong(obj); } @@ -234,6 +248,7 @@ public class DateTimeConverters implemen super(TimeDuration.class, String.class); } + @Override public String convert(TimeDuration obj) throws ConversionException { return obj.toString(); } @@ -244,10 +259,12 @@ public class DateTimeConverters implemen super(sourceClass, targetClass); } + @Override public T convert(S obj) throws ConversionException { return convert(obj, Locale.getDefault(), TimeZone.getDefault(), null); } + @Override public T convert(S obj, Locale locale, TimeZone timeZone) throws ConversionException { return convert(obj, locale, timeZone, null); } @@ -258,14 +275,17 @@ public class DateTimeConverters implemen super(Long.class, Calendar.class); } + @Override public Calendar convert(Long obj) throws ConversionException { return convert(obj, Locale.getDefault(), TimeZone.getDefault()); } + @Override public Calendar convert(Long obj, Locale locale, TimeZone timeZone) throws ConversionException { return UtilDateTime.toCalendar(new java.util.Date(obj), timeZone, locale); } + @Override public Calendar convert(Long obj, Locale locale, TimeZone timeZone, String formatString) throws ConversionException { return convert(obj, Locale.getDefault(), TimeZone.getDefault()); } @@ -281,6 +301,7 @@ public class DateTimeConverters implemen return getSourceClass().isAssignableFrom(sourceClass) && targetClass == getTargetClass(); } + @Override public java.util.Date convert(Number obj) throws ConversionException { return new java.util.Date(obj.longValue()); } @@ -291,6 +312,7 @@ public class DateTimeConverters implemen super(Number.class, TimeDuration.class); } + @Override public TimeDuration convert(Number obj) throws ConversionException { return TimeDuration.fromNumber(obj); } @@ -306,6 +328,7 @@ public class DateTimeConverters implemen return getSourceClass().isAssignableFrom(sourceClass) && targetClass == getTargetClass(); } + @Override public java.sql.Date convert(Number obj) throws ConversionException { Calendar cal = Calendar.getInstance(); cal.setTimeInMillis(obj.longValue()); @@ -325,6 +348,7 @@ public class DateTimeConverters implemen return getSourceClass().isAssignableFrom(sourceClass) && targetClass == getTargetClass(); } + @Override public java.sql.Time convert(Number obj) throws ConversionException { return new java.sql.Time(obj.longValue()); } @@ -340,6 +364,7 @@ public class DateTimeConverters implemen return getSourceClass().isAssignableFrom(sourceClass) && targetClass == getTargetClass(); } + @Override public java.sql.Timestamp convert(Number obj) throws ConversionException { return new java.sql.Timestamp(obj.longValue()); } @@ -355,6 +380,7 @@ public class DateTimeConverters implemen return sourceClass == this.getSourceClass() && targetClass == this.getTargetClass(); } + @Override public java.util.Date convert(java.sql.Date obj) throws ConversionException { return new java.util.Date(obj.getTime()); } @@ -382,6 +408,7 @@ public class DateTimeConverters implemen return obj.toString(); } + @Override public String convert(java.sql.Date obj, Locale locale, TimeZone timeZone, String formatString) throws ConversionException { DateFormat df = null; if (UtilValidate.isEmpty(formatString)) { @@ -403,6 +430,7 @@ public class DateTimeConverters implemen return sourceClass == this.getSourceClass() && targetClass == this.getTargetClass(); } + @Override public java.sql.Time convert(java.sql.Date obj) throws ConversionException { throw new ConversionException("Conversion from Date to Time not supported"); } @@ -418,6 +446,7 @@ public class DateTimeConverters implemen return sourceClass == this.getSourceClass() && targetClass == this.getTargetClass(); } + @Override public java.sql.Timestamp convert(java.sql.Date obj) throws ConversionException { return new java.sql.Timestamp(obj.getTime()); } @@ -445,6 +474,7 @@ public class DateTimeConverters implemen return sourceClass == this.getSourceClass() && targetClass == this.getTargetClass(); } + @Override public java.sql.Date convert(java.sql.Time obj) throws ConversionException { throw new ConversionException("Conversion from Time to Date not supported"); } @@ -455,6 +485,7 @@ public class DateTimeConverters implemen super(java.sql.Time.class, String.class); } + @Override public String convert(java.sql.Time obj, Locale locale, TimeZone timeZone, String formatString) throws ConversionException { DateFormat df = null; if (UtilValidate.isEmpty(formatString)) { @@ -471,14 +502,17 @@ public class DateTimeConverters implemen super(String.class, Calendar.class); } + @Override public Calendar convert(String obj) throws ConversionException { return convert(obj, Locale.getDefault(), TimeZone.getDefault(), null); } + @Override public Calendar convert(String obj, Locale locale, TimeZone timeZone) throws ConversionException { return convert(obj, Locale.getDefault(), TimeZone.getDefault(), null); } + @Override public Calendar convert(String obj, Locale locale, TimeZone timeZone, String formatString) throws ConversionException { String trimStr = obj.trim(); if (trimStr.length() == 0) { @@ -504,6 +538,7 @@ public class DateTimeConverters implemen super(String.class, java.util.Date.class); } + @Override public java.util.Date convert(String obj, Locale locale, TimeZone timeZone, String formatString) throws ConversionException { String trimStr = obj.trim(); if (trimStr.length() == 0) { @@ -528,10 +563,12 @@ public class DateTimeConverters implemen super(String.class, TimeDuration.class); } + @Override public TimeDuration convert(String obj) throws ConversionException { return TimeDuration.parseDuration(obj); } + @Override public TimeDuration convert(String obj, Locale locale, TimeZone timeZone) throws ConversionException { if (!obj.contains(":")) { // Encoded duration @@ -547,6 +584,7 @@ public class DateTimeConverters implemen return convert(obj); } + @Override public TimeDuration convert(String obj, Locale locale, TimeZone timeZone, String formatString) throws ConversionException { return convert(obj, locale, timeZone); } @@ -562,6 +600,7 @@ public class DateTimeConverters implemen return getSourceClass().isAssignableFrom(sourceClass) && targetClass == getTargetClass(); } + @Override public java.sql.Date convert(String obj, Locale locale, TimeZone timeZone, String formatString) throws ConversionException { String trimStr = obj.trim(); if (trimStr.length() == 0) { @@ -595,6 +634,7 @@ public class DateTimeConverters implemen return getSourceClass().isAssignableFrom(sourceClass) && targetClass == getTargetClass(); } + @Override public java.sql.Time convert(String obj, Locale locale, TimeZone timeZone, String formatString) throws ConversionException { String trimStr = obj.trim(); if (trimStr.length() == 0) { @@ -624,6 +664,7 @@ public class DateTimeConverters implemen return getSourceClass().isAssignableFrom(sourceClass) && targetClass == getTargetClass(); } + @Override public java.sql.Timestamp convert(String obj, Locale locale, TimeZone timeZone, String formatString) throws ConversionException { String str = obj.trim(); if (str.length() == 0) { @@ -678,6 +719,7 @@ public class DateTimeConverters implemen super(String.class, TimeZone.class); } + @Override public TimeZone convert(String obj) throws ConversionException { TimeZone tz = UtilDateTime.toTimeZone(obj); if (tz != null) { @@ -697,6 +739,7 @@ public class DateTimeConverters implemen return sourceClass == this.getSourceClass() && targetClass == this.getTargetClass(); } + @Override public java.util.Date convert(java.sql.Timestamp obj) throws ConversionException { return new java.sql.Timestamp(obj.getTime()); } @@ -724,6 +767,7 @@ public class DateTimeConverters implemen return sourceClass == this.getSourceClass() && targetClass == this.getTargetClass(); } + @Override public java.sql.Date convert(java.sql.Timestamp obj) throws ConversionException { return new java.sql.Date(obj.getTime()); } @@ -739,6 +783,7 @@ public class DateTimeConverters implemen return sourceClass == this.getSourceClass() && targetClass == this.getTargetClass(); } + @Override public java.sql.Time convert(java.sql.Timestamp obj) throws ConversionException { return new java.sql.Time(obj.getTime()); } @@ -754,6 +799,7 @@ public class DateTimeConverters implemen return obj.toString(); } + @Override public String convert(java.sql.Timestamp obj, Locale locale, TimeZone timeZone, String formatString) throws ConversionException { DateFormat df = null; if (UtilValidate.isEmpty(formatString)) { @@ -770,11 +816,13 @@ public class DateTimeConverters implemen super(TimeZone.class, String.class); } + @Override public String convert(TimeZone obj) throws ConversionException { return obj.getID(); } } + @Override public void loadConverters() { Converters.loadContainedConverters(DateTimeConverters.class); } Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/GenericSingletonToList.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/GenericSingletonToList.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/GenericSingletonToList.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/GenericSingletonToList.java Sat Apr 27 19:34:25 2019 @@ -26,6 +26,7 @@ public class GenericSingletonToList<T> e super(sourceClass, List.class); } + @Override public List<T> convert(T obj) throws ConversionException { List<T> tempList = new LinkedList<>(); tempList.add(obj); Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/GenericSingletonToSet.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/GenericSingletonToSet.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/GenericSingletonToSet.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/GenericSingletonToSet.java Sat Apr 27 19:34:25 2019 @@ -26,6 +26,7 @@ public class GenericSingletonToSet<T> ex super(sourceClass, Set.class); } + @Override public Set<T> convert(T obj) throws ConversionException { Set<T> tempSet = new HashSet<>(); tempSet.add(obj); Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/JSONConverters.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/JSONConverters.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/JSONConverters.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/JSONConverters.java Sat Apr 27 19:34:25 2019 @@ -33,6 +33,7 @@ public class JSONConverters implements C super(JSON.class, List.class); } + @Override public List<Object> convert(JSON obj) throws ConversionException { try { return UtilGenerics.<List<Object>>cast(obj.toObject(List.class)); @@ -47,6 +48,7 @@ public class JSONConverters implements C super(JSON.class, Map.class); } + @Override public Map<String, Object> convert(JSON obj) throws ConversionException { try { return UtilGenerics.<Map<String, Object>>cast(obj.toObject(Map.class)); @@ -61,6 +63,7 @@ public class JSONConverters implements C super(List.class, JSON.class); } + @Override public JSON convert(List<Object> obj) throws ConversionException { try { return JSON.from(obj); @@ -75,6 +78,7 @@ public class JSONConverters implements C super(Map.class, JSON.class); } + @Override public JSON convert(Map<String, Object> obj) throws ConversionException { try { return JSON.from(obj); @@ -84,6 +88,7 @@ public class JSONConverters implements C } } + @Override public void loadConverters() { Converters.loadContainedConverters(JSONConverters.class); } |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |