svn commit: r1774154 [1/2] - in /ofbiz/trunk: applications/accounting/src/ma
Locked
svn commit: r1774154 [1/2] - in /ofbiz/trunk: applications/accounting/src/ma
 
|
Author: taher
Date: Wed Dec 14 09:22:32 2016 New Revision: 1774154 URL: http://svn.apache.org/viewvc?rev=1774154&view=rev Log: Improved: refactor javadocs in OFBiz to be standards compliant (OFBIZ-9144) This is the first commit to the above mentioned issue which fixes many javadoc errors dispersed through the different components. The fixes are not necessarily improvements to the javadocs but rather making them valid javadocs to prevent reporting errors from gradle Modified: ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java ofbiz/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/mrp/MrpServices.java ofbiz/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/mrp/ProposedOrder.java ofbiz/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoConfigUtil.java ofbiz/trunk/applications/product/src/main/java/org/apache/ofbiz/product/feature/ParametricSearch.java ofbiz/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingServices.java ofbiz/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingSession.java ofbiz/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortServices.java ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/metrics/Metrics.java ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/metrics/MetricsFactory.java ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/Observable.java ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/ScriptHelper.java ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilFormatOut.java ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilProperties.java ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilValidate.java ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilXml.java ofbiz/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/SslAcceleratorValve.java ofbiz/trunk/framework/common/src/main/java/org/apache/ofbiz/common/authentication/AuthenticationComparator.java ofbiz/trunk/framework/common/src/main/java/org/apache/ofbiz/common/email/NotificationServices.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleMethod.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/FieldObject.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MessageElement.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallClassMethod.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallObjectMethod.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallScript.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallService.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallServiceAsynch.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMethod.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/Return.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/SetServiceFields.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CombinedCondition.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CompareCondition.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CompareFieldCondition.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ElseIf.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/EmptyCondition.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/HasPermissionCondition.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/RegexpCondition.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ValidateMethodCondition.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/ClearCacheLine.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/ClearEntityCaches.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/CloneValue.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/CreateValue.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityAnd.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityCondition.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityCount.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityData.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityOne.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FilterListByAnd.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FilterListByDate.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FindByAnd.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FindByPrimaryKey.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/GetRelated.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/GetRelatedOne.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/MakeNextSeqId.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/MakeValue.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/OrderValueList.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RefreshValue.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveByAnd.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveList.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveRelated.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveValue.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/SequencedIdToEnv.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/SetCurrentUserLogin.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/SetNonpkFields.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/SetPkFields.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/StoreList.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/StoreValue.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionBegin.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionCommit.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionRollback.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/AddError.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Assert.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Break.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CheckErrors.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CheckId.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/ClearField.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Continue.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CreateObject.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/FieldToList.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/FirstFromList.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Iterate.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/IterateMap.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/ListToList.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Loop.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/MapToMap.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Now.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/OrderMapList.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/SetCalendar.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/SetOperation.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/StringAppend.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/StringToList.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/ToString.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/While.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/FieldToRequest.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/FieldToSession.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/RequestParametersToList.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/RequestToField.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/SessionToField.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/WebappPropertyToField.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/ifops/CheckPermission.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/ifops/IfInstanceOf.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/ifops/IfNotEmpty.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Calculate.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Log.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/PropertyToField.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Trace.java ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/serviceops/FieldToResult.java ofbiz/trunk/framework/service/src/main/java/org/apache/ofbiz/service/mail/JavaMailContainer.java ofbiz/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/RequestHandler.java ofbiz/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/RequestHandlerFactory.java ofbiz/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/MenuWrapTransform.java ofbiz/trunk/specialpurpose/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractHtmlReport.java ofbiz/trunk/specialpurpose/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractReportThread.java ofbiz/trunk/specialpurpose/pricat/src/main/java/org/apache/ofbiz/htmlreport/InterfaceReport.java ofbiz/trunk/specialpurpose/pricat/src/main/java/org/apache/ofbiz/htmlreport/sample/SampleHtmlReport.java Modified: ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java?rev=1774154&r1=1774153&r2=1774154&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java (original) +++ ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java Wed Dec 14 09:22:32 2016 @@ -68,7 +68,7 @@ import org.apache.ofbiz.entity.GenericVa import org.apache.ofbiz.entity.util.EntityQuery; /** - * ValueLinkApi - Implementation of ValueLink Encryption & Transport + * ValueLinkApi - Implementation of ValueLink Encryption and Transport */ public class ValueLinkApi { Modified: ofbiz/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/mrp/MrpServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/mrp/MrpServices.java?rev=1774154&r1=1774153&r2=1774154&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/mrp/MrpServices.java (original) +++ ofbiz/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/mrp/MrpServices.java Wed Dec 14 09:22:32 2016 @@ -499,8 +499,10 @@ public class MrpServices { /** * Find the quantity on hand of products for MRP. + * <ul> * <li>PreConditions : none</li> * <li>Result : We get the quantity of product available in the stocks.</li> + * </ul> * * @param product the product for which the Quantity Available is required * @return the sum of all the totalAvailableToPromise of the inventoryItem related to the product, if the related facility is Mrp available (not yet implemented!!) @@ -583,14 +585,13 @@ public class MrpServices { /** * Launch the MRP. + * <ul> * <li>PreConditions : none</li> - * <li>Result : The date when we must order or begin to build the products and subproducts we need are calclated</li> + * <li>Result : The date when we must order or begin to build the products and subproducts we need are calculated</li> + * <li>INPUT : parameters to get from the context: <ul><li>String mrpName</li></ul></li> + * <li>OUTPUT : Result to put in the map : <ul><li>none</li></ul></li> + * </ul> * - * <li>INPUT : parameters to get from the context :</li><ul> - * <li>String mrpName</li></ul> - * - * <li>OUTPUT : Result to put in the map :</li><ul> - * <li>none</li></ul> * @param ctx The DispatchContext that this service is operating in. * @param context Map containing the input parameters, productId routingId, quantity, startDate. * @return Map with the result of the service, the output parameters. Modified: ofbiz/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/mrp/ProposedOrder.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/mrp/ProposedOrder.java?rev=1774154&r1=1774153&r2=1774154&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/mrp/ProposedOrder.java (original) +++ ofbiz/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/mrp/ProposedOrder.java Wed Dec 14 09:22:32 2016 @@ -88,14 +88,21 @@ public class ProposedOrder { } /** * calculate the ProposedOrder requirementStartDate and update the requirementStartDate property. - * <li>For the build product, <ul> - * <li>read the routing associated to the product, - * <li>read the routingTask associated to the routing - * <li> step by step calculate from the endDate the startDate</ul> - * <li>For the bought product, the first ProductFacility.daysToShip is used to calculated the startDate - * @return <ul> - * <li>if ProposedOrder.isBuild a Map with all the routingTaskId as keys and estimatedStartDate as value. - * <li>else null. + * <ul> + * <li>For the build product, + * <ul> + * <li>read the routing associated to the product,</li> + * <li>read the routingTask associated to the routing</li> + * <li> step by step calculate from the endDate the startDate</li> + * </ul> + * </li> + * <li>For the bought product, the first ProductFacility.daysToShip is used to calculated the startDate</li> + * </ul> + * @return + * <ul> + * <li>if ProposedOrder.isBuild a Map with all the routingTaskId as keys and estimatedStartDate as value.</li> + * <li>else null.</li> + * </ul> **/ public Map<String, Object> calculateStartDate(int daysToShip, GenericValue routing, Delegator delegator, LocalDispatcher dispatcher, GenericValue userLogin) { Map<String, Object> result = null; @@ -191,7 +198,7 @@ public class ProposedOrder { /** * calculate the ProposedOrder quantity and update the quantity property. - * Read the first ProductFacility.reorderQuantity and calculate the quantity : if (quantity < reorderQuantity) quantity = reorderQuantity; + * Read the first ProductFacility.reorderQuantity and calculate the quantity : if (quantity < reorderQuantity) quantity = reorderQuantity; **/ // FIXME: facilityId public void calculateQuantityToSupply(BigDecimal reorderQuantity, BigDecimal minimumStock, ListIterator<GenericValue> listIterIEP) { Modified: ofbiz/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoConfigUtil.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoConfigUtil.java?rev=1774154&r1=1774153&r2=1774154&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoConfigUtil.java (original) +++ ofbiz/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoConfigUtil.java Wed Dec 14 09:22:32 2016 @@ -100,8 +100,6 @@ public final class SeoConfigUtil { /** * Initialize url regular express configuration. - * - * @return result to indicate the status of initialization. */ public static void init() { FileInputStream configFileIS = null; @@ -440,7 +438,7 @@ public final class SeoConfigUtil { /** * Get user exception url pattern configures. * - * @return user exception url pattern configures (java.util.List<Pattern>) + * @return user exception url pattern configures (java.util.List<Pattern>) */ public static List<Pattern> getUserExceptionPatterns() { return userExceptionPatterns; @@ -449,7 +447,7 @@ public final class SeoConfigUtil { /** * Get char filters. * - * @return char filters (java.util.Map<String, String>) + * @return char filters (java.util.Map<String, String>) */ public static Map<String, String> getCharFilters() { return charFilters; @@ -458,7 +456,7 @@ public final class SeoConfigUtil { /** * Get seo url pattern configures. * - * @return seo url pattern configures (java.util.Map<String, Pattern>) + * @return seo url pattern configures (java.util.Map<String, Pattern>) */ public static Map<String, Pattern> getSeoPatterns() { return seoPatterns; @@ -467,7 +465,7 @@ public final class SeoConfigUtil { /** * Get seo replacement configures. * - * @return seo replacement configures (java.util.Map<String, String>) + * @return seo replacement configures (java.util.Map<String, String>) */ public static Map<String, String> getSeoReplacements() { return seoReplacements; @@ -476,7 +474,7 @@ public final class SeoConfigUtil { /** * Get forward replacement configures. * - * @return forward replacement configures (java.util.Map<String, String>) + * @return forward replacement configures (java.util.Map<String, String>) */ public static Map<String, String> getForwardReplacements() { return forwardReplacements; @@ -485,7 +483,7 @@ public final class SeoConfigUtil { /** * Get forward response codes. * - * @return forward response code configures (java.util.Map<String, Integer>) + * @return forward response code configures (java.util.Map<String, Integer>) */ public static Map<String, Integer> getForwardResponseCodes() { return forwardResponseCodes; Modified: ofbiz/trunk/applications/product/src/main/java/org/apache/ofbiz/product/feature/ParametricSearch.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/main/java/org/apache/ofbiz/product/feature/ParametricSearch.java?rev=1774154&r1=1774153&r2=1774154&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/main/java/org/apache/ofbiz/product/feature/ParametricSearch.java (original) +++ ofbiz/trunk/applications/product/src/main/java/org/apache/ofbiz/product/feature/ParametricSearch.java Wed Dec 14 09:22:32 2016 @@ -48,9 +48,11 @@ public class ParametricSearch { public static final int DEFAULT_PER_TYPE_MAX_SIZE = 1000; - /** Gets all features associated with the specified category through: - * ProductCategory -> ProductFeatureCategoryAppl -> ProductFeatureCategory -> ProductFeature. - * Returns a Map of Lists of ProductFeature GenericValue objects organized by productFeatureTypeId. + /** + * Gets all features associated with the specified category through:<br> + * ProductCategory -> ProductFeatureCategoryAppl -> ProductFeatureCategory -> ProductFeature. + * + * @return a Map of Lists of ProductFeature GenericValue objects organized by productFeatureTypeId. */ public static Map<String, List<GenericValue>> makeCategoryFeatureLists(String productCategoryId, Delegator delegator) { return makeCategoryFeatureLists(productCategoryId, delegator, DEFAULT_PER_TYPE_MAX_SIZE); Modified: ofbiz/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingServices.java?rev=1774154&r1=1774153&r2=1774154&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingServices.java (original) +++ ofbiz/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingServices.java Wed Dec 14 09:22:32 2016 @@ -76,17 +76,16 @@ public class PackingServices { /** * <p>Create or update package lines.</p> - * <p>Context parameters: + * Context parameters: * <ul> * <li>selInfo - selected rows</li> * <li>iteInfo - orderItemIds</li> * <li>prdInfo - productIds</li> * <li>pkgInfo - package numbers</li> * <li>wgtInfo - weights to pack</li> - * <li>numPackagesInfo - number of packages to pack per line (>= 1, default: 1)<br/> + * <li>numPackagesInfo - number of packages to pack per line (>= 1, default: 1)<br> * Packs the same items n times in consecutive packages, starting from the package number retrieved from pkgInfo.</li> * </ul> - * </p> * @param dctx the dispatch context * @param context the context * @return returns the result of the service execution Modified: ofbiz/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingSession.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingSession.java?rev=1774154&r1=1774153&r2=1774154&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingSession.java (original) +++ ofbiz/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingSession.java Wed Dec 14 09:22:32 2016 @@ -332,13 +332,14 @@ public class PackingSession implements j /** * <p>Delivers all the packing lines grouped by package.</p> - * <p>Output map: + * Output map: * <ul> - * <li>packageMap - a Map of type Map<Integer, List<PackingSessionLine>> + * <li>packageMap - a Map of type {@code Map<Integer, List<PackingSessionLine>>} * that maps package sequence ids to the lines that belong in * that package</li> - * <li>sortedKeys - a List of type List<Integer> with the sorted package + * <li>sortedKeys - a List of type List<Integer> with the sorted package * sequence numbers to index the packageMap</li> + * </ul> * @return result Map with packageMap and sortedKeys */ public Map<Object, Object> getPackingSessionLinesByPackage() { Modified: ofbiz/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortServices.java?rev=1774154&r1=1774153&r2=1774154&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortServices.java (original) +++ ofbiz/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortServices.java Wed Dec 14 09:22:32 2016 @@ -434,16 +434,16 @@ public class WorkEffortServices { * This method takes the following parameters: * </p> * <ul> - * <li>start - TimeStamp (Period start date/time)</li> - * <li>numPeriods - Integer</li> - * <li>periodType - Integer (see java.util.Calendar)</li> - * <li>eventStatus - String</li> - * <li>partyId - String</li> - * <li>partyIds - List</li> - * <li>facilityId - String</li> - * <li>fixedAssetId - String</li> - * <li>filterOutCanceledEvents - Boolean</li> - * <li>entityExprList - List</li> + * <li>start - TimeStamp (Period start date/time)</li> + * <li>numPeriods - Integer</li> + * <li>periodType - Integer (see java.util.Calendar)</li> + * <li>eventStatus - String</li> + * <li>partyId - String</li> + * <li>partyIds - List</li> + * <li>facilityId - String</li> + * <li>fixedAssetId - String</li> + * <li>filterOutCanceledEvents - Boolean</li> + * <li>entityExprList - List</li> * </ul> * <p> * The method will find all matching Work Effort events and return them as a List called @@ -456,15 +456,14 @@ public class WorkEffortServices { * key/value pairs: * </p> * <ul> - * <li>start - TimeStamp (Period start date/time)</li> - * <li>end - TimeStamp (Period end date/time)</li> - * <li>calendarEntries - List of Maps. Each Map contains the following - * key/value pairs:</li> - * <ul> - * <li>workEffort - GenericValue</li> - * <li>periodSpan - Integer (Number of periods this Work Effort spans)</li> - * <li>startOfPeriod - Boolean (true if this is the first occurrence in the period range)</li> - * </ul> + * <li>start - TimeStamp (Period start date/time)</li> + * <li>end - TimeStamp (Period end date/time)</li> + * <li>calendarEntries - List of Maps. Each Map contains the following key/value pairs</li> + * <li><ul> + * <li>workEffort - GenericValue</li> + * <li>periodSpan - Integer (Number of periods this Work Effort spans)</li> + * <li>startOfPeriod - Boolean (true if this is the first occurrence in the period range)</li> + * </ul></li> * </ul> */ Modified: ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/metrics/Metrics.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/metrics/Metrics.java?rev=1774154&r1=1774153&r2=1774154&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/metrics/Metrics.java (original) +++ ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/metrics/Metrics.java Wed Dec 14 09:22:32 2016 @@ -33,7 +33,7 @@ package org.apache.ofbiz.base.metrics; * An object that tracks service metrics. * <p>This interface and its default implementation are based on the * <code>seda.sandstorm.internal.StageStats</code> class written by - * Matt Welsh.</code> + * Matt Welsh. * @see <a href="http://www.eecs.harvard.edu/~mdw/proj/seda/">SEDA</a> */ public interface Metrics { Modified: ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/metrics/MetricsFactory.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/metrics/MetricsFactory.java?rev=1774154&r1=1774153&r2=1774154&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/metrics/MetricsFactory.java (original) +++ ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/metrics/MetricsFactory.java Wed Dec 14 09:22:32 2016 @@ -51,15 +51,38 @@ public final class MetricsFactory { /** * Creates a <code>Metrics</code> instance based on <code>element</code> attributes. * If an instance with the same name already exists, it will be returned. - * <p><strong>Element Attributes</strong> * <table border="1"> - * <tr><th>Attribute Name</th><th>Requirements</th><th>Description</th><th>Notes</th></tr> - * <tr><td>name</td><td>Required</td><td>The metric name.</td><td> </td></tr> - * <tr><td>estimation-size</td><td>Optional</td><td>Positive integer number of events to include in the metrics calculation.</td><td>Defaults to "100".</td></tr> - * <tr><td>estimation-time</td><td>Optional</td><td>Positive integer number of milliseconds to include in the metrics calculation.</td><td>Defaults to "1000".</td></tr> - * <tr><td>smoothing</td><td>Optional</td><td>Smoothing factor - used to smooth the differences between calculations.</td><td>A value of "1" disables smoothing. Defaults to "0.7".</td></tr> - * <tr><td>threshold</td><td>Optional</td><td>The metric threshold. The meaning of the threshold is determined by client code.</td><td>Defaults to "0.0".</td></tr> - * </table></p> + * <caption><strong>Element Attributes</strong></caption> + * <tr><th>Attribute Name</th><th>Requirements</th><th>Description</th><th>Notes</th></tr> + * <tr> + * <td>name</td> + * <td>Required</td> + * <td>The metric name.</td> + * <td> </td> + * <tr> + * <td>estimation-size</td> + * <td>Optional</td> + * <td>Positive integer number of events to include in the metrics calculation.</td> + * <td>Defaults to "100".</td> + * </tr> + * <tr> + * <td>estimation-time</td> + * <td>Optional</td> + * <td>Positive integer number of milliseconds to include in the metrics calculation.</td> + * <td>Defaults to "1000".</td> + * </tr> + * <tr> + * <td>smoothing</td> + * <td>Optional</td> + * <td>Smoothing factor - used to smooth the differences between calculations.</td> + * <td>A value of "1" disables smoothing. Defaults to "0.7".</td> + * </tr> + * <tr> + * <td>threshold</td> + * <td>Optional</td> + * <td>The metric threshold. The meaning of the threshold is determined by client code.</td> + * <td>Defaults to "0.0".</td></tr> + * </table> * * @param element The element whose attributes will be used to create the <code>Metrics</code> instance * @return A <code>Metrics</code> instance based on <code>element</code> attributes Modified: ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/Observable.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/Observable.java?rev=1774154&r1=1774153&r2=1774154&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/Observable.java (original) +++ ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/Observable.java Wed Dec 14 09:22:32 2016 @@ -23,13 +23,13 @@ import java.util.concurrent.atomic.Atomi /** * An observable object. - * <p>This class is similar to <code>java.util.Observable</code> but it has some differences: + * <p>This class is similar to <code>java.util.Observable</code> but it has some differences:</p> * <ul> - * <li>It has improved concurrency</li> - * <li>It cannot be subclassed</li> - * <li>The <code>notifyObservers</code> method does not clear the changed flag</li> - * <li>Protected methods have been made public</li> - * </ul></p> + * <li>It has improved concurrency</li> + * <li>It cannot be subclassed</li> + * <li>The <code>notifyObservers</code> method does not clear the changed flag</li> + * <li>Protected methods have been made public</li> + * </ul> * */ public final class Observable { @@ -92,8 +92,10 @@ public final class Observable { * <p>Each <code>Observer</code> has its <code>update</code> method called with two * arguments: this observable object and <code>null</code>. In other * words, this method is equivalent to: - * <blockquote><tt> - * notifyObservers(null)</tt></blockquote></p> + * </p> + * <blockquote> + * <tt>notifyObservers(null)</tt> + * </blockquote> * */ public void notifyObservers() { Modified: ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/ScriptHelper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/ScriptHelper.java?rev=1774154&r1=1774153&r2=1774154&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/ScriptHelper.java (original) +++ ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/ScriptHelper.java Wed Dec 14 09:22:32 2016 @@ -24,11 +24,14 @@ import java.util.Map; import javax.script.ScriptException; /** - * A script helper object. The OFBiz scripting framework will include an instance of this class in the script's bindings. - * <p>The scripting language will determine how the helper is used. Most languages will access it as a variable:<br /> - * <code>partyValue = ofbiz.findOne("Party");</code><br /> - * while other languages might access it as a native method or function:<br /> - * <code>partyValue = findOne("Party");</code></p> + * A script helper object. The OFBiz scripting framework will include an + * instance of this class in the script's bindings. + * <p>The scripting language will determine how the helper is used. Most + * languages will access it as a variable:<br> + * <code>partyValue = ofbiz.findOne("Party");</code><br> + * while other languages might access it as a native method or function:<br> + * <code>partyValue = findOne("Party");</code> + * </p> */ public interface ScriptHelper { Modified: ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java?rev=1774154&r1=1774153&r2=1774154&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java (original) +++ ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java Wed Dec 14 09:22:32 2016 @@ -509,15 +509,17 @@ public class StringUtil { /** Converts operator substitutions (@and, @or, etc) back to their original form. * <p>OFBiz script syntax provides special forms of common operators to make - * it easier to embed logical expressions in XML: + * it easier to embed logical expressions in XML</p> * <table border="1" cellpadding="2"> - * <tr><td><strong>@and</strong></td><td>&&</td></tr> - * <tr><td><strong>@or</strong></td><td>||</td></tr> - * <tr><td><strong>@gt</strong></td><td>></td></tr> - * <tr><td><strong>@gteq</strong></td><td>>=</td></tr> - * <tr><td><strong>@lt</strong></td><td><</td></tr> - * <tr><td><strong>@lteq</strong></td><td><=</td></tr> - * </table></p> + * <caption>OFBiz XML operators</caption> + * <tr><th>OFBiz operator</th><th>Substitution</th></tr> + * <tr><td><strong>@and</strong></td><td>&&</td></tr> + * <tr><td><strong>@or</strong></td><td>||</td></tr> + * <tr><td><strong>@gt</strong></td><td>></td></tr> + * <tr><td><strong>@gteq</strong></td><td>>=</td></tr> + * <tr><td><strong>@lt</strong></td><td><</td></tr> + * <tr><td><strong>@lteq</strong></td><td><=</td></tr> + * </table> * @param expression The <code>String</code> to convert * @return The converted <code>String</code> */ Modified: ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java?rev=1774154&r1=1774153&r2=1774154&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java (original) +++ ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java Wed Dec 14 09:22:32 2016 @@ -237,7 +237,10 @@ public class UtilCodec { /** * Uses a black-list approach for necessary characters for HTML. - * Does not allow various characters (after canonicalization), including "<", ">", "&" (if not followed by a space), and "%" (if not followed by a space). + * <p> + * Does not allow various characters (after canonicalization), including + * "<", ">", "&" (if not followed by a space), and "%" (if not + * followed by a space). * * @param value * @param errorMessageList Modified: ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilFormatOut.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilFormatOut.java?rev=1774154&r1=1774153&r2=1774154&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilFormatOut.java (original) +++ ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilFormatOut.java Wed Dec 14 09:22:32 2016 @@ -474,7 +474,10 @@ public final class UtilFormatOut { } // ------------------- web encode handlers ------------------- - /** Encodes an HTTP URL query String, replacing characters used for other things in HTTP URL query strings, but not touching the separator characters '?', '=', and '&' + /** + * Encodes an HTTP URL query String, replacing characters used for other + * things in HTTP URL query strings, but not touching the separator + * characters '?', '=', and '&' * @param query The plain query String * @return The encoded String */ @@ -527,7 +530,8 @@ public final class UtilFormatOut { } // ------------------- web encode handlers ------------------- - /** Encodes an XML string replacing the characters '<', '>', '"', ''', '&' + /** + * Encodes an XML string replacing the characters '<', '>', '"', ''', '&' * @param inString The plain value String * @return The encoded String */ Modified: ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java?rev=1774154&r1=1774153&r2=1774154&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java (original) +++ ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java Wed Dec 14 09:22:32 2016 @@ -1216,9 +1216,13 @@ public final class UtilHttp { * the composite according to compositeType. For example, consider the following * form widget field, * - * <field name="meetingDate"> + * <pre> + * {@code + * <field name="meetingDate"> * <date-time type="timestamp" input-method="time-dropdown"> - * </field> + * </field> + * } + * </pre> * * The result in HTML is three input boxes to input the date, hour and minutes separately. * The parameter names are named meetingDate_c_date, meetingDate_c_hour, meetingDate_c_minutes. Modified: ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilProperties.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilProperties.java?rev=1774154&r1=1774153&r2=1774154&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilProperties.java (original) +++ ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilProperties.java Wed Dec 14 09:22:32 2016 @@ -871,23 +871,26 @@ public final class UtilProperties implem return propertiesNotFound.contains(createResourceName(resource, locale, removeExtension)); } - /** Resolve a properties file URL. - * <p>This method uses the following strategy:<br /> + /** + * Resolve a properties file URL. + * <p>This method uses the following strategy:</p> * <ul> - * <li>Locate the XML file specified in <code>resource (MyProps.xml)</code></li> - * <li>Locate the file that starts with the name specified in - * <code>resource</code> and ends with the locale's string and - * <code>.xml (MyProps_en.xml)</code></li> - * <li>Locate the file that starts with the name specified in - * <code>resource</code> and ends with the locale's string and - * <code>.properties (MyProps_en.properties)</code></li> - * <li>Locate the file that starts with the name specified in - * <code>resource and ends with the locale's string (MyProps_en)</code></li> + * <li>Locate the XML file specified in <code>resource (MyProps.xml)</code></li> + * <li>Locate the file that starts with the name specified in + * <code>resource</code> and ends with the locale's string and + * <code>.xml (MyProps_en.xml)</code> + * </li> + * <li>Locate the file that starts with the name specified in + * <code>resource</code> and ends with the locale's string and + * <code>.properties (MyProps_en.properties)</code> + * </li> + * <li>Locate the file that starts with the name specified in + * <code>resource and ends with the locale's string (MyProps_en)</code> + * </li> * </ul> - * <br /> + * * The <code>component://</code> protocol is supported in the * <code>resource</code> parameter. - * </p> * * @param resource The resource to resolve * @param locale The desired locale @@ -961,22 +964,25 @@ public final class UtilProperties implem return null; } - /** Convert XML property file to Properties instance. This method will convert + /** + * Convert XML property file to Properties instance. This method will convert * both the Java XML properties file format and the OFBiz custom XML * properties file format. - * <p> - * The format of the custom XML properties file is:<br /> - * <br /> - * <code> - * <resource><br /> - * <property key="key"><br /> - * <value xml:lang="locale 1">Some value</value><br /> - * <value xml:lang="locale 2">Some value</value><br /> - * ...<br /> - * </property><br /> - * ...<br /> - * </resource><br /><br /></code> where <em>"locale 1", "locale 2"</em> are valid xml:lang values.. - * </p> + * + * <p>The format of the custom XML properties file is:</p> + * <pre> + * {@code + * <resource> + * <property key="key"> + * <value xml:lang="locale 1">Some value</value> + * <value xml:lang="locale 2">Some value</value> + * ... + * </property> + * ... + * </resource> + * } + * </pre> + * where <em>"locale 1", "locale 2"</em> are valid xml:lang values.. * * @param in XML file InputStream * @param locale The desired locale Modified: ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilValidate.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilValidate.java?rev=1774154&r1=1774153&r2=1774154&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilValidate.java (original) +++ ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilValidate.java Wed Dec 14 09:22:32 2016 @@ -32,33 +32,33 @@ import com.ibm.icu.util.Calendar; * Utility methods for validating data, especially input. * See detailed description below. * - * <br/> SUMMARY - * <br/> - * <br/> This is a set of meethods for validating input. Functions are provided to validate: - * <br/> - U.S. and international phone/fax numbers - * <br/> - U.S. ZIP codes(5 or 9 digit postal codes) - * <br/> - U.S. Postal Codes(2 letter abbreviations for names of states) - * <br/> - U.S. Social Security Numbers(abbreviated as SSNs) - * <br/> - email addresses - * <br/> - dates(entry of year, month, and day and validity of combined date) - * <br/> - credit card numbers - * <br/> - * <br/> Supporting utility functions validate that: - * <br/> - characters are Letter, Digit, or LetterOrDigit - * <br/> - strings are a Signed, Positive, Negative, Nonpositive, or Nonnegative integer - * <br/> - strings are a Float or a SignedFloat - * <br/> - strings are Alphabetic, Alphanumeric, or Whitespace - * <br/> - strings contain an integer within a specified range - * <br/> - * <br/> Other utility functions are provided to: - * <br/> - remove from a string characters which are/are not in a "bag" of selected characters - * <br/> - strip whitespace/leading whitespace from a string - * <br/> - * <br/> ============================================================================== - * <br/> NOTE: This code was adapted from the Netscape JavaScript form validation code, - * <br/> usually found in "FormChek.js". Credit card verification functions Originally - * <br/> included as Starter Application 1.0.0 in LivePayment. - * <br/> ============================================================================== + * <br> SUMMARY + * <br> + * <br> This is a set of meethods for validating input. Functions are provided to validate: + * <br> - U.S. and international phone/fax numbers + * <br> - U.S. ZIP codes(5 or 9 digit postal codes) + * <br> - U.S. Postal Codes(2 letter abbreviations for names of states) + * <br> - U.S. Social Security Numbers(abbreviated as SSNs) + * <br> - email addresses + * <br> - dates(entry of year, month, and day and validity of combined date) + * <br> - credit card numbers + * <br> + * <br> Supporting utility functions validate that: + * <br> - characters are Letter, Digit, or LetterOrDigit + * <br> - strings are a Signed, Positive, Negative, Nonpositive, or Nonnegative integer + * <br> - strings are a Float or a SignedFloat + * <br> - strings are Alphabetic, Alphanumeric, or Whitespace + * <br> - strings contain an integer within a specified range + * <br> + * <br> Other utility functions are provided to: + * <br> - remove from a string characters which are/are not in a "bag" of selected characters + * <br> - strip whitespace/leading whitespace from a string + * <br> + * <br> ============================================================================== + * <br> NOTE: This code was adapted from the Netscape JavaScript form validation code, + * <br> usually found in "FormChek.js". Credit card verification functions Originally + * <br> included as Starter Application 1.0.0 in LivePayment. + * <br> ============================================================================== */ public final class UtilValidate { @@ -389,7 +389,10 @@ public final class UtilValidate { } } - /** Returns true if string s is an integer > 0. NOTE: using the Java Long object for greatest precision */ + /** + * Returns true if string s is an integer > 0. + * NOTE: using the Java Long object for greatest precision + */ public static boolean isPositiveInteger(String s) { if (isEmpty(s)) return defaultEmptyOK; @@ -403,7 +406,9 @@ public final class UtilValidate { } } - /** Returns true if string s is an integer >= 0. */ + /** + * Returns true if string s is an integer >= 0 + */ public static boolean isNonnegativeInteger(String s) { if (isEmpty(s)) return defaultEmptyOK; @@ -417,7 +422,9 @@ public final class UtilValidate { } } - /** Returns true if string s is an integer < 0. */ + /** + * Returns true if string s is an integer < 0 + */ public static boolean isNegativeInteger(String s) { if (isEmpty(s)) return defaultEmptyOK; @@ -431,7 +438,9 @@ public final class UtilValidate { } } - /** Returns true if string s is an integer <= 0. */ + /** + * Returns true if string s is an integer <= 0 + */ public static boolean isNonpositiveInteger(String s) { if (isEmpty(s)) return defaultEmptyOK; Modified: ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilXml.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilXml.java?rev=1774154&r1=1774153&r2=1774154&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilXml.java (original) +++ ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilXml.java Wed Dec 14 09:22:32 2016 @@ -80,7 +80,7 @@ import com.thoughtworks.xstream.io.Hiera import com.thoughtworks.xstream.io.HierarchicalStreamWriter; /** - * Utilities methods to simplify dealing with JAXP & DOM XML parsing + * Utilities methods to simplify dealing with JAXP and DOM XML parsing * */ public final class UtilXml { Modified: ofbiz/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/SslAcceleratorValve.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/SslAcceleratorValve.java?rev=1774154&r1=1774153&r2=1774154&view=diff ============================================================================== --- ofbiz/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/SslAcceleratorValve.java (original) +++ ofbiz/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/SslAcceleratorValve.java Wed Dec 14 09:22:32 2016 @@ -27,8 +27,11 @@ import org.apache.catalina.connector.Res import org.apache.catalina.valves.ValveBase; /** - * To use add (or uncomment) the following line to the Tomcat/Catalina configuarion (ie in ofbiz-containers.xml under the <property name="default-server" value="engine"> element) - * <property name="ssl-accelerator-port" value="8443"/> + * To use add (or uncomment) the following line to the Tomcat/Catalina configuarion + * (ie in ofbiz-containers.xml under the <property name="default-server" value="engine"> element): + * <p> + * <property name="ssl-accelerator-port" value="8443"/> + * <p> * * Once that is done just setup a connector just like the example http-connector and have it listen on the port you set in the ssl-accelerator-port value. */ Modified: ofbiz/trunk/framework/common/src/main/java/org/apache/ofbiz/common/authentication/AuthenticationComparator.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/main/java/org/apache/ofbiz/common/authentication/AuthenticationComparator.java?rev=1774154&r1=1774153&r2=1774154&view=diff ============================================================================== --- ofbiz/trunk/framework/common/src/main/java/org/apache/ofbiz/common/authentication/AuthenticationComparator.java (original) +++ ofbiz/trunk/framework/common/src/main/java/org/apache/ofbiz/common/authentication/AuthenticationComparator.java Wed Dec 14 09:22:32 2016 @@ -34,20 +34,22 @@ public class AuthenticationComparator im * Compares its two arguments for order. Returns a negative integer, * zero, or a positive integer as the first argument is less than, equal * to, or greater than the second.<p> - * <p/> + * <p> * The implementor must ensure that <tt>sgn(compare(x, y)) == * -sgn(compare(y, x))</tt> for all <tt>x</tt> and <tt>y</tt>. (This * implies that <tt>compare(x, y)</tt> must throw an exception if and only * if <tt>compare(y, x)</tt> throws an exception.)<p> - * <p/> + * </p> + * <p> * The implementor must also ensure that the relation is transitive: * <tt>((compare(x, y)>0) && (compare(y, z)>0))</tt> implies * <tt>compare(x, z)>0</tt>.<p> - * <p/> + * </p> + * <p> * Finally, the implementer must ensure that <tt>compare(x, y)==0</tt> * implies that <tt>sgn(compare(x, z))==sgn(compare(y, z))</tt> for all - * <tt>z</tt>.<p> - * <p/> + * <tt>z</tt>. + * </p> * It is generally the case, but <i>not</i> strictly required that * <tt>(compare(x, y)==0) == (x.equals(y))</tt>. Generally speaking, * any comparator that violates this condition should clearly indicate Modified: ofbiz/trunk/framework/common/src/main/java/org/apache/ofbiz/common/email/NotificationServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/main/java/org/apache/ofbiz/common/email/NotificationServices.java?rev=1774154&r1=1774153&r2=1774154&view=diff ============================================================================== --- ofbiz/trunk/framework/common/src/main/java/org/apache/ofbiz/common/email/NotificationServices.java (original) +++ ofbiz/trunk/framework/common/src/main/java/org/apache/ofbiz/common/email/NotificationServices.java Wed Dec 14 09:22:32 2016 @@ -44,40 +44,43 @@ import org.apache.ofbiz.webapp.WebAppUti import freemarker.template.TemplateException; /** - * Provides generic services related to preparing and - * delivering notifications via email. + * Provides generic services related to preparing and delivering notifications + * via email. * <p> * To use the NotificationService, a message specific service should be - * defined for a particular <a href="http://freemarker.sourceforge.net/docs/dgui_quickstart_template.html"> - * Freemarker Template</a> mapping the required fields of the - * template to the required attributes of the service. + * defined for a particular + * <a href="http://freemarker.sourceforge.net/docs/dgui_quickstart_template.html"> + * Freemarker Template</a> mapping the required fields of the template to the + * required attributes of the service. + * </p> * <p> - * This service definition should extend the <code>sendNotificationInterface<code> + * This service definition should extend the <code>sendNotificationInterface</code> * or the <code>prepareNotificationInterface</code> service interface * and simply invoke the associated method defined in this class. - * <p> - * <blockquote> + * </p> * <pre> - * <service name="sendPoPickupNotification" engine="java" - * location="org.apache.ofbiz.content.email.NotificationServices" invoke="sendNotification"> - * <description>Sends notification based on a message template</description> - * <implements service="sendNotificationInterface"/> - * <attribute name="orderId" type="String" mode="IN" optional="false"/> - * </service> + * {@code + * <service name="sendPoPickupNotification" engine="java" + * location="org.apache.ofbiz.content.email.NotificationServices" + * invoke="sendNotification"> + * <description>Sends notification based on a message template</description> + * <implements service="sendNotificationInterface"/> + * <attribute name="orderId" type="String" mode="IN" optional="false"/> + * </service> + * } * </pre> - * </blockquote> - * <p> - * An optional parameter available to all message templates is <code>baseUrl</code> - * which can either be specified when the service is invoked or let the - * <code>NotificationService</code> attempt to resolve it as best it can, - * see {@link #setBaseUrl(Delegator, String, Map) setBaseUrl(Map)} for details on how this is achieved. * <p> + * An optional parameter available to all message templates is + * <code>baseUrl</code> which can either be specified when the service is + * invoked or let the <code>NotificationService</code> attempt to resolve it + * as best it can, see {@link #setBaseUrl(Delegator, String, Map) setBaseUrl(Map)} + * for details on how this is achieved. + * </p> * The following example shows what a simple notification message template, * associated with the above service, might contain: * <blockquote> * <pre> * Please use the following link to schedule a delivery date: - * <p> * ${baseUrl}/ordermgr/control/schedulepo?orderId=${orderId}" * </pre> * </blockquote> @@ -85,6 +88,7 @@ import freemarker.template.TemplateExcep * The template file must be found on the classpath at runtime and * match the "templateName" field passed to the service when it * is invoked. + * </p> * <p> * For complex messages with a large number of dynamic fields, it may be wise * to implement a custom service that takes one or two parameters that can @@ -92,7 +96,7 @@ import freemarker.template.TemplateExcep * the {@link #prepareNotification(DispatchContext, Map) prepareNotification(DispatchContext, Map)} * or {@link #sendNotification(DispatchContext, Map) sendNotification(DispatchContext, Map)} * methods directly to generate or generate and send the notification respectively. - * + * </p> */ public class NotificationServices { Modified: ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleMethod.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleMethod.java?rev=1774154&r1=1774153&r2=1774154&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleMethod.java (original) +++ ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleMethod.java Wed Dec 14 09:22:32 2016 @@ -76,7 +76,7 @@ import org.w3c.dom.Element; * </li> * </ul> * </p> - * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-The{{%3Csimplemethod%3E}}element">Mini-language Reference</a> + * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class SimpleMethod extends MiniLangElement { Modified: ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/FieldObject.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/FieldObject.java?rev=1774154&r1=1774153&r2=1774154&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/FieldObject.java (original) +++ ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/FieldObject.java Wed Dec 14 09:22:32 2016 @@ -27,7 +27,7 @@ import org.w3c.dom.Element; /** * Implements the <field> element. * - * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cfield%3E}}">Mini-language Reference</a> + * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class FieldObject<T> extends MethodObject<T> { Modified: ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MessageElement.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MessageElement.java?rev=1774154&r1=1774153&r2=1774154&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MessageElement.java (original) +++ ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MessageElement.java Wed Dec 14 09:22:32 2016 @@ -30,7 +30,7 @@ import org.w3c.dom.Element; /** * Implements the <fail-message> and <fail-property> elements. * - * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{<failmessage>}}">Mini-language Reference</a> + * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class MessageElement extends MiniLangElement { Modified: ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallClassMethod.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallClassMethod.java?rev=1774154&r1=1774153&r2=1774154&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallClassMethod.java (original) +++ ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallClassMethod.java Wed Dec 14 09:22:32 2016 @@ -40,7 +40,7 @@ import org.w3c.dom.Element; /** * Implements the <call-class-method> element. * - * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Ccallclassmethod%3E}}">Mini-language Reference</a> + * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class CallClassMethod extends MethodOperation { Modified: ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallObjectMethod.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallObjectMethod.java?rev=1774154&r1=1774153&r2=1774154&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallObjectMethod.java (original) +++ ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallObjectMethod.java Wed Dec 14 09:22:32 2016 @@ -39,7 +39,7 @@ import org.w3c.dom.Element; /** * Implements the <call-object-method> element. * - * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Ccallobjectmethod%3E}}">Mini-language Reference</a> + * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class CallObjectMethod extends MethodOperation { Modified: ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallScript.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallScript.java?rev=1774154&r1=1774153&r2=1774154&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallScript.java (original) +++ ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallScript.java Wed Dec 14 09:22:32 2016 @@ -34,7 +34,7 @@ import org.w3c.dom.Element; /** * Implements the <script> element. * - * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cscript%3E}}">Mini-language Reference</a> + * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class CallScript extends MethodOperation { Modified: ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallService.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallService.java?rev=1774154&r1=1774153&r2=1774154&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallService.java (original) +++ ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallService.java Wed Dec 14 09:22:32 2016 @@ -49,7 +49,7 @@ import org.w3c.dom.Element; /** * Implements the <call-service> element. * - * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Ccallservice%3E}}">Mini-language Reference</a> + * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class CallService extends MethodOperation { Modified: ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallServiceAsynch.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallServiceAsynch.java?rev=1774154&r1=1774153&r2=1774154&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallServiceAsynch.java (original) +++ ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallServiceAsynch.java Wed Dec 14 09:22:32 2016 @@ -38,7 +38,7 @@ import org.w3c.dom.Element; /** * Implements the <call-service-asynch> element. * - * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Ccallserviceasynch%3E}}">Mini-language Reference</a> + * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class CallServiceAsynch extends MethodOperation { Modified: ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java?rev=1774154&r1=1774153&r2=1774154&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java (original) +++ ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java Wed Dec 14 09:22:32 2016 @@ -37,7 +37,7 @@ import org.w3c.dom.Element; /** * Implements the <call-map-processor> element. * - * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Ccallmapprocessor%3E}}">Mini-language Reference</a> + * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class CallSimpleMapProcessor extends MethodOperation { Modified: ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMethod.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMethod.java?rev=1774154&r1=1774153&r2=1774154&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMethod.java (original) +++ ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMethod.java Wed Dec 14 09:22:32 2016 @@ -43,7 +43,7 @@ import org.w3c.dom.Element; /** * Implements the <call-simple-method> element. * - * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Ccallsimplemethod%3E}}">Mini-language Reference</a> + * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class CallSimpleMethod extends MethodOperation { Modified: ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/Return.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/Return.java?rev=1774154&r1=1774153&r2=1774154&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/Return.java (original) +++ ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/Return.java Wed Dec 14 09:22:32 2016 @@ -29,7 +29,7 @@ import org.w3c.dom.Element; /** * Implements the <return> element. * - * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Creturn%3E}}">Mini-language Reference</a> + * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class Return extends MethodOperation { Modified: ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/SetServiceFields.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/SetServiceFields.java?rev=1774154&r1=1774153&r2=1774154&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/SetServiceFields.java (original) +++ ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/SetServiceFields.java Wed Dec 14 09:22:32 2016 @@ -41,7 +41,7 @@ import org.w3c.dom.Element; /** * Implements the <set-service-fields> element. * - * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Csetservicefields%3E}}">Mini-language Reference</a> + * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class SetServiceFields extends MethodOperation { Modified: ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CombinedCondition.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CombinedCondition.java?rev=1774154&r1=1774153&r2=1774154&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CombinedCondition.java (original) +++ ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CombinedCondition.java Wed Dec 14 09:22:32 2016 @@ -33,7 +33,7 @@ import org.w3c.dom.Element; /** * Implements the <and>, <or>, <not>, and <xor> elements. * - * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-Conditional%2FLoopingStatements">Mini-language Reference</a> + * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public abstract class CombinedCondition extends MiniLangElement implements Conditional { Modified: ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CompareCondition.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CompareCondition.java?rev=1774154&r1=1774153&r2=1774154&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CompareCondition.java (original) +++ ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CompareCondition.java Wed Dec 14 09:22:32 2016 @@ -40,7 +40,7 @@ import org.w3c.dom.Element; /** * Implements the <if-compare> element. * - * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cifcompare%3E}}">Mini-language Reference</a> + * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class CompareCondition extends MethodOperation implements Conditional { Modified: ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CompareFieldCondition.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CompareFieldCondition.java?rev=1774154&r1=1774153&r2=1774154&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CompareFieldCondition.java (original) +++ ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CompareFieldCondition.java Wed Dec 14 09:22:32 2016 @@ -39,7 +39,7 @@ import org.w3c.dom.Element; /** * Implements the <if-compare-field> element. * - * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cifcomparefield%3E}}">Mini-language Reference</a> + * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class CompareFieldCondition extends MethodOperation implements Conditional { Modified: ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ElseIf.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ElseIf.java?rev=1774154&r1=1774153&r2=1774154&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ElseIf.java (original) +++ ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ElseIf.java Wed Dec 14 09:22:32 2016 @@ -34,7 +34,7 @@ import org.w3c.dom.Element; /** * Implements the <else-if> element. * - * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Celseif%3E}}">Mini-language Reference</a> + * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class ElseIf extends MiniLangElement { Modified: ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/EmptyCondition.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/EmptyCondition.java?rev=1774154&r1=1774153&r2=1774154&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/EmptyCondition.java (original) +++ ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/EmptyCondition.java Wed Dec 14 09:22:32 2016 @@ -35,7 +35,7 @@ import org.w3c.dom.Element; /** * Implements the <if-empty> element. * - * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cifempty%3E}}">Mini-language Reference</a> + * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class EmptyCondition extends MethodOperation implements Conditional { Modified: ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/HasPermissionCondition.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/HasPermissionCondition.java?rev=1774154&r1=1774153&r2=1774154&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/HasPermissionCondition.java (original) +++ ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/HasPermissionCondition.java Wed Dec 14 09:22:32 2016 @@ -37,7 +37,7 @@ import org.w3c.dom.Element; /** * Implements the <if-has-permission> element. * - * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cifhaspermission%3E}}">Mini-language Reference</a> + * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class HasPermissionCondition extends MethodOperation implements Conditional { Modified: ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/RegexpCondition.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/RegexpCondition.java?rev=1774154&r1=1774153&r2=1774154&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/RegexpCondition.java (original) +++ ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/RegexpCondition.java Wed Dec 14 09:22:32 2016 @@ -43,7 +43,7 @@ import org.w3c.dom.Element; /** * Implements the <if-regexp> element. * - * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{<ifregexp>}}">Mini-language Reference</a> + * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public class RegexpCondition extends MethodOperation implements Conditional { Modified: ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ValidateMethodCondition.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ValidateMethodCondition.java?rev=1774154&r1=1774153&r2=1774154&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ValidateMethodCondition.java (original) +++ ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ValidateMethodCondition.java Wed Dec 14 09:22:32 2016 @@ -37,7 +37,7 @@ import org.w3c.dom.Element; /** * Implements the <if-validate-method> element. * - * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cifvalidatemethod%3E}}">Mini-language Reference</a> + * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class ValidateMethodCondition extends MethodOperation implements Conditional { Modified: ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/ClearCacheLine.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/ClearCacheLine.java?rev=1774154&r1=1774153&r2=1774154&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/ClearCacheLine.java (original) +++ ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/ClearCacheLine.java Wed Dec 14 09:22:32 2016 @@ -32,7 +32,7 @@ import org.w3c.dom.Element; /** * Implements the <clear-cache-line> element. * - * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cclearcacheline%3E}}">Mini-language Reference</a> + * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class ClearCacheLine extends EntityOperation { Modified: ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/ClearEntityCaches.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/ClearEntityCaches.java?rev=1774154&r1=1774153&r2=1774154&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/ClearEntityCaches.java (original) +++ ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/ClearEntityCaches.java Wed Dec 14 09:22:32 2016 @@ -28,7 +28,7 @@ import org.w3c.dom.Element; /** * Implements the <clear-entity-caches> element. * - * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cclearentitycaches%3E}}">Mini-language Reference</a> + * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class ClearEntityCaches extends EntityOperation { Modified: ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/CloneValue.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/CloneValue.java?rev=1774154&r1=1774153&r2=1774154&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/CloneValue.java (original) +++ ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/CloneValue.java Wed Dec 14 09:22:32 2016 @@ -30,7 +30,7 @@ import org.w3c.dom.Element; /** * Implements the <clone-value> element. * - * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cclonevalue%3E}}">Mini-language Reference</a> + * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class CloneValue extends MethodOperation { Modified: ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/CreateValue.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/CreateValue.java?rev=1774154&r1=1774153&r2=1774154&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/CreateValue.java (original) +++ ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/CreateValue.java Wed Dec 14 09:22:32 2016 @@ -32,7 +32,7 @@ import org.w3c.dom.Element; /** * Implements the <create-value> element. * - * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Ccreatevalue%3E}}">Mini-language Reference</a> + * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class CreateValue extends MethodOperation { Modified: ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityAnd.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityAnd.java?rev=1774154&r1=1774153&r2=1774154&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityAnd.java (original) +++ ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityAnd.java Wed Dec 14 09:22:32 2016 @@ -32,7 +32,7 @@ import org.w3c.dom.Element; /** * Implements the <entity-and> element. * - * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Centityand%3E}}">Mini-language Reference</a> + * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class EntityAnd extends EntityOperation { |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |