svn commit: r1418875 [1/2] - in /ofbiz/branches/webhelp-2012-1
Locked
svn commit: r1418875 [1/2] - in /ofbiz/branches/webhelp-2012-1
 
|
Author: jleroux
Date: Sun Dec 9 10:06:52 2012 New Revision: 1418875 URL: http://svn.apache.org/viewvc?rev=1418875&view=rev Log: Merge trunk HEAD Modified: ofbiz/branches/webhelp-2012-12-07/ (props changed) ofbiz/branches/webhelp-2012-12-07/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java ofbiz/branches/webhelp-2012-12-07/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java ofbiz/branches/webhelp-2012-12-07/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java ofbiz/branches/webhelp-2012-12-07/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java ofbiz/branches/webhelp-2012-12-07/applications/accounting/src/org/ofbiz/accounting/util/UtilAccounting.java ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/ContentManagementEvents.java ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/ContentManagementWorker.java ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/blog/BlogRssServices.java ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/compdoc/CompDocEvents.java ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/compdoc/CompDocServices.java ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/content/ContentServices.java ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/content/ContentUrlFilter.java ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/content/ContentWorker.java ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/content/PermissionRecorder.java ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/content/UploadContentAndImage.java ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/layout/LayoutEvents.java ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/survey/PdfSurveyServices.java ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/survey/SurveyWrapper.java ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/webapp/ftl/OfbizContentAltUrlTransforms.java ofbiz/branches/webhelp-2012-12-07/applications/content/template/docbook/webhelp/build.ofbiz.properties ofbiz/branches/webhelp-2012-12-07/applications/content/template/docbook/webhelp/build.ofbiz.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMHelper.java ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMNode.java ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/src/org/ofbiz/manufacturing/techdata/TechDataServices.java ofbiz/branches/webhelp-2012-12-07/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java ofbiz/branches/webhelp-2012-12-07/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java ofbiz/branches/webhelp-2012-12-07/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java ofbiz/branches/webhelp-2012-12-07/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java ofbiz/branches/webhelp-2012-12-07/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java ofbiz/branches/webhelp-2012-12-07/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java ofbiz/branches/webhelp-2012-12-07/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java ofbiz/branches/webhelp-2012-12-07/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java ofbiz/branches/webhelp-2012-12-07/applications/order/src/org/ofbiz/order/thirdparty/zipsales/ZipSalesServices.java ofbiz/branches/webhelp-2012-12-07/applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java ofbiz/branches/webhelp-2012-12-07/applications/product/src/org/ofbiz/product/category/OfbizCatalogAltUrlTransform.java ofbiz/branches/webhelp-2012-12-07/applications/product/src/org/ofbiz/product/image/ScaleImage.java ofbiz/branches/webhelp-2012-12-07/applications/product/src/org/ofbiz/product/imagemanagement/CropImage.java ofbiz/branches/webhelp-2012-12-07/applications/product/src/org/ofbiz/product/imagemanagement/FrameImage.java ofbiz/branches/webhelp-2012-12-07/applications/product/src/org/ofbiz/product/imagemanagement/ImageManagementServices.java ofbiz/branches/webhelp-2012-12-07/applications/product/src/org/ofbiz/product/imagemanagement/ReplaceImage.java ofbiz/branches/webhelp-2012-12-07/applications/product/src/org/ofbiz/product/imagemanagement/RotateImage.java ofbiz/branches/webhelp-2012-12-07/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java ofbiz/branches/webhelp-2012-12-07/build.xml ofbiz/branches/webhelp-2012-12-07/framework/base/src/org/ofbiz/base/container/ContainerLoader.java ofbiz/branches/webhelp-2012-12-07/framework/base/src/org/ofbiz/base/crypto/HashCrypt.java ofbiz/branches/webhelp-2012-12-07/framework/base/src/org/ofbiz/base/util/CachedClassLoader.java ofbiz/branches/webhelp-2012-12-07/framework/base/src/org/ofbiz/base/util/CompilerMatcher.java ofbiz/branches/webhelp-2012-12-07/framework/base/src/org/ofbiz/base/util/GroovyUtil.java ofbiz/branches/webhelp-2012-12-07/framework/base/src/org/ofbiz/base/util/ScriptUtil.java ofbiz/branches/webhelp-2012-12-07/framework/catalina/src/org/ofbiz/catalina/container/OfbizStore.java ofbiz/branches/webhelp-2012-12-07/framework/common/src/org/ofbiz/common/authentication/example/TestPassAuthenticator.java ofbiz/branches/webhelp-2012-12-07/framework/common/src/org/ofbiz/common/preferences/PreferenceServices.java ofbiz/branches/webhelp-2012-12-07/framework/entity/src/org/ofbiz/entity/GenericValue.java ofbiz/branches/webhelp-2012-12-07/framework/entity/src/org/ofbiz/entity/cache/AbstractEntityConditionCache.java ofbiz/branches/webhelp-2012-12-07/framework/entity/src/org/ofbiz/entity/cache/EntityListCache.java ofbiz/branches/webhelp-2012-12-07/framework/entity/src/org/ofbiz/entity/model/ModelReader.java ofbiz/branches/webhelp-2012-12-07/framework/entity/src/org/ofbiz/entity/util/EntityCrypto.java ofbiz/branches/webhelp-2012-12-07/framework/minilang/src/org/ofbiz/minilang/method/MethodOperation.java ofbiz/branches/webhelp-2012-12-07/framework/service/src/org/ofbiz/service/engine/BeanShellEngine.java ofbiz/branches/webhelp-2012-12-07/framework/service/src/org/ofbiz/service/engine/GroovyEngine.java ofbiz/branches/webhelp-2012-12-07/framework/service/src/org/ofbiz/service/engine/ScriptEngine.java ofbiz/branches/webhelp-2012-12-07/framework/start/src/org/ofbiz/base/start/Start.java ofbiz/branches/webhelp-2012-12-07/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java ofbiz/branches/webhelp-2012-12-07/framework/webapp/src/org/ofbiz/webapp/event/GroovyEventHandler.java ofbiz/branches/webhelp-2012-12-07/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizUrlTransform.java ofbiz/branches/webhelp-2012-12-07/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java ofbiz/branches/webhelp-2012-12-07/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ControllerViewArtifactInfo.java ofbiz/branches/webhelp-2012-12-07/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelInfo.java ofbiz/branches/webhelp-2012-12-07/specialpurpose/ecommerce/src/org/ofbiz/ecommerce/janrain/JanrainHelper.java ofbiz/branches/webhelp-2012-12-07/specialpurpose/googlebase/src/org/ofbiz/googlebase/GoogleBaseSearchEvents.java ofbiz/branches/webhelp-2012-12-07/specialpurpose/pos/src/org/ofbiz/pos/screen/PosDialog.java ofbiz/branches/webhelp-2012-12-07/specialpurpose/webpos/src/org/ofbiz/webpos/WebPosEvents.java ofbiz/branches/webhelp-2012-12-07/specialpurpose/webpos/src/org/ofbiz/webpos/transaction/WebPosTransaction.java Propchange: ofbiz/branches/webhelp-2012-12-07/ ------------------------------------------------------------------------------ Merged /ofbiz/trunk:r1418541-1418870 Modified: ofbiz/branches/webhelp-2012-12-07/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java Sun Dec 9 10:06:52 2012 @@ -20,7 +20,6 @@ package org.ofbiz.accounting.payment; import java.math.BigDecimal; import java.sql.Timestamp; -import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Map; Modified: ofbiz/branches/webhelp-2012-12-07/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java Sun Dec 9 10:06:52 2012 @@ -20,7 +20,6 @@ package org.ofbiz.accounting.tax; import java.math.BigDecimal; import java.sql.Timestamp; -import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Map; Modified: ofbiz/branches/webhelp-2012-12-07/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java Sun Dec 9 10:06:52 2012 @@ -27,13 +27,11 @@ import java.net.URL; import java.net.URLConnection; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Iterator; import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; -import java.util.Set; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; Modified: ofbiz/branches/webhelp-2012-12-07/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java Sun Dec 9 10:06:52 2012 @@ -19,7 +19,6 @@ package org.ofbiz.accounting.thirdparty.valuelink; import java.math.BigDecimal; -import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Map; Modified: ofbiz/branches/webhelp-2012-12-07/applications/accounting/src/org/ofbiz/accounting/util/UtilAccounting.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/accounting/src/org/ofbiz/accounting/util/UtilAccounting.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/accounting/src/org/ofbiz/accounting/util/UtilAccounting.java (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/accounting/src/org/ofbiz/accounting/util/UtilAccounting.java Sun Dec 9 10:06:52 2012 @@ -20,9 +20,10 @@ package org.ofbiz.accounting.util; import java.math.BigDecimal; -import java.util.Iterator; import java.util.List; +import javolution.util.FastList; + import org.ofbiz.accounting.AccountingException; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilMisc; @@ -30,8 +31,6 @@ import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; -import javolution.util.FastList; - public class UtilAccounting { Modified: ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/ContentManagementEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/ContentManagementEvents.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/ContentManagementEvents.java (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/ContentManagementEvents.java Sun Dec 9 10:06:52 2012 @@ -19,10 +19,8 @@ package org.ofbiz.content; import java.sql.Timestamp; -import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Set; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; Modified: ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/ContentManagementWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/ContentManagementWorker.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/ContentManagementWorker.java (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/ContentManagementWorker.java Sun Dec 9 10:06:52 2012 @@ -24,7 +24,6 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Set; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; Modified: ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/blog/BlogRssServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/blog/BlogRssServices.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/blog/BlogRssServices.java (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/blog/BlogRssServices.java Sun Dec 9 10:06:52 2012 @@ -20,7 +20,6 @@ package org.ofbiz.content.blog; import java.io.IOException; -import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Map; Modified: ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/compdoc/CompDocEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/compdoc/CompDocEvents.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/compdoc/CompDocEvents.java (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/compdoc/CompDocEvents.java Sun Dec 9 10:06:52 2012 @@ -21,10 +21,8 @@ package org.ofbiz.content.compdoc; import java.io.ByteArrayInputStream; import java.io.IOException; import java.nio.ByteBuffer; -import java.util.Iterator; import java.util.Locale; import java.util.Map; -import java.util.Set; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; Modified: ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/compdoc/CompDocServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/compdoc/CompDocServices.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/compdoc/CompDocServices.java (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/compdoc/CompDocServices.java Sun Dec 9 10:06:52 2012 @@ -22,7 +22,6 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.nio.ByteBuffer; import java.sql.Timestamp; -import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Map; Modified: ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/content/ContentServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/content/ContentServices.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/content/ContentServices.java (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/content/ContentServices.java Sun Dec 9 10:06:52 2012 @@ -22,7 +22,6 @@ import java.io.IOException; import java.io.StringWriter; import java.io.Writer; import java.sql.Timestamp; -import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Map; Modified: ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java Sun Dec 9 10:06:52 2012 @@ -19,7 +19,6 @@ package org.ofbiz.content.content; import java.sql.Timestamp; -import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Map; Modified: ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/content/ContentUrlFilter.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/content/ContentUrlFilter.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/content/ContentUrlFilter.java (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/content/ContentUrlFilter.java Sun Dec 9 10:06:52 2012 @@ -56,6 +56,7 @@ public class ContentUrlFilter extends Co protected static String redirectUrl = null; public static String defaultViewRequest = "contentViewInfo"; + @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { HttpServletRequest httpRequest = (HttpServletRequest) request; HttpServletResponse httpResponse = (HttpServletResponse) response; Modified: ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/content/ContentWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/content/ContentWorker.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/content/ContentWorker.java (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/content/ContentWorker.java Sun Dec 9 10:06:52 2012 @@ -23,11 +23,9 @@ import java.io.StringReader; import java.io.StringWriter; import java.io.Writer; import java.sql.Timestamp; -import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Map; -import java.util.Set; import javax.xml.parsers.ParserConfigurationException; Modified: ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/content/PermissionRecorder.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/content/PermissionRecorder.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/content/PermissionRecorder.java (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/content/PermissionRecorder.java Sun Dec 9 10:06:52 2012 @@ -18,7 +18,6 @@ *******************************************************************************/ package org.ofbiz.content.content; -import java.util.Iterator; import java.util.List; import java.util.Map; Modified: ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/content/UploadContentAndImage.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/content/UploadContentAndImage.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/content/UploadContentAndImage.java (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/content/UploadContentAndImage.java Sun Dec 9 10:06:52 2012 @@ -18,7 +18,6 @@ *******************************************************************************/ package org.ofbiz.content.content; -import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Map; Modified: ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/layout/LayoutEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/layout/LayoutEvents.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/layout/LayoutEvents.java (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/layout/LayoutEvents.java Sun Dec 9 10:06:52 2012 @@ -21,10 +21,10 @@ package org.ofbiz.content.layout; import java.nio.ByteBuffer; import java.sql.Timestamp; import java.util.Collection; -import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Map; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; Modified: ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/survey/PdfSurveyServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/survey/PdfSurveyServices.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/survey/PdfSurveyServices.java (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/survey/PdfSurveyServices.java Sun Dec 9 10:06:52 2012 @@ -26,7 +26,6 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.sql.Timestamp; import java.util.Date; -import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Map; Modified: ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/survey/SurveyWrapper.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/survey/SurveyWrapper.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/survey/SurveyWrapper.java (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/survey/SurveyWrapper.java Sun Dec 9 10:06:52 2012 @@ -25,7 +25,6 @@ import java.io.StringWriter; import java.io.Writer; import java.net.MalformedURLException; import java.net.URL; -import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Map; Modified: ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java Sun Dec 9 10:06:52 2012 @@ -20,11 +20,9 @@ package org.ofbiz.content.webapp.ftl; import java.io.IOException; import java.io.Writer; -import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Map; -import java.util.Set; import javax.servlet.http.HttpServletRequest; Modified: ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/webapp/ftl/OfbizContentAltUrlTransforms.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/webapp/ftl/OfbizContentAltUrlTransforms.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/webapp/ftl/OfbizContentAltUrlTransforms.java (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/content/src/org/ofbiz/content/webapp/ftl/OfbizContentAltUrlTransforms.java Sun Dec 9 10:06:52 2012 @@ -62,14 +62,17 @@ public class OfbizContentAltUrlTransform final StringBuilder buf = new StringBuilder(); 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/branches/webhelp-2012-12-07/applications/content/template/docbook/webhelp/build.ofbiz.properties URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/content/template/docbook/webhelp/build.ofbiz.properties?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/content/template/docbook/webhelp/build.ofbiz.properties (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/content/template/docbook/webhelp/build.ofbiz.properties Sun Dec 9 10:06:52 2012 @@ -34,6 +34,7 @@ input-xml-catalog=../../../data/helpdata # This directory is created if it does not exist. # output-dir=docs # output-dir=test-output +output-dir=../../../webapp/ofbizhelp/ output-root=../../../webapp/ofbizhelp/web-inf/ output-dir-accounting=../../../webapp/ofbizhelp/accounting_en output-dir-humanres=../../../webapp/ofbizhelp/humanres_en Modified: ofbiz/branches/webhelp-2012-12-07/applications/content/template/docbook/webhelp/build.ofbiz.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/content/template/docbook/webhelp/build.ofbiz.xml?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/content/template/docbook/webhelp/build.ofbiz.xml (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/content/template/docbook/webhelp/build.ofbiz.xml Sun Dec 9 10:06:52 2012 @@ -27,7 +27,7 @@ under the License. <property name="ofbiz.dir" value="../../framework/base/lib"/> <!-- <property name="lib.dir" value="lib"/> --> - <path id="classpath"> + <path id="classpath"> <pathelement location="${extensions.dir}/webhelpindexer.jar"/> <pathelement location="${extensions.dir}/lucene-analyzers-3.0.0.jar"/> <pathelement location="${extensions.dir}/lucene-core-3.0.0.jar"/> @@ -1082,8 +1082,10 @@ under the License. <target name="help"> <echo> Usage: - Run help for this message. - Run webhelp.componentname target to generate webhelp format and indexes for the OFBiz Component. + help for this message. + webhelp.all Generates webhelp for all OFBiz Components with webhelp present. + webhelp.componentname Generates webhelp for the OFBiz Component. + clean Remove all webhelp for all OFBiz Components. </echo> </target> Modified: ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMHelper.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMHelper.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMHelper.java (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMHelper.java Sun Dec 9 10:06:52 2012 @@ -20,7 +20,6 @@ package org.ofbiz.manufacturing.bom; import java.util.Date; -import java.util.Iterator; import java.util.List; import org.ofbiz.base.util.Debug; @@ -112,7 +111,6 @@ public class BOMHelper { UtilMisc.toMap("productIdTo", productId, "productAssocTypeId", bomType), null, true); productNodesList = EntityUtil.filterByDate(productNodesList, inDate); GenericValue duplicatedNode = null; - Iterator<GenericValue> nodesIterator = productNodesList.iterator(); for(GenericValue oneNode : productNodesList) { for (int i = 0; i < productIdKeys.size(); i++) { if (oneNode.getString("productId").equals(productIdKeys.get(i))) { Modified: ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMNode.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMNode.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMNode.java (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMNode.java Sun Dec 9 10:06:52 2012 @@ -22,7 +22,6 @@ package org.ofbiz.manufacturing.bom; import java.math.BigDecimal; import java.sql.Timestamp; import java.util.Date; -import java.util.Iterator; import java.util.List; import java.util.Map; @@ -161,7 +160,7 @@ public class BOMNode { if (productFeatures != null) { for (int j = 0; j < productFeatures.size(); j++) { feature = productFeatures.get(j); - if (ruleCondition.equals((String)feature.get("productFeatureId"))) { + if (ruleCondition.equals(feature.get("productFeatureId"))) { ruleSatisfied = true; break; } Modified: ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java Sun Dec 9 10:06:52 2012 @@ -22,7 +22,6 @@ package org.ofbiz.manufacturing.bom; import java.math.BigDecimal; import java.sql.Timestamp; import java.util.Date; -import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Map; Modified: ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java Sun Dec 9 10:06:52 2012 @@ -942,7 +942,7 @@ public class ProductionRunServices { Map<String, Object> inMap = UtilMisc.<String, Object>toMap("userLogin", userLogin, "workEffortId", productionRunId); inMap.put("costComponentCalcId", costComponentCalc.getString("costComponentCalcId")); inMap.put("costComponentTypeId", "ACTUAL_" + productCostComponentCalc.getString("costComponentTypeId")); - inMap.put("costUomId", (String)partyAccountingPreference.get("baseCurrencyUomId")); + inMap.put("costUomId", partyAccountingPreference.get("baseCurrencyUomId")); inMap.put("cost", productCostAdjustment); dispatcher.runSync("createCostComponent", inMap); } @@ -2101,9 +2101,9 @@ public class ProductionRunServices { "fromDate", component.getTimestamp("fromDate")); serviceContext.put("quantity", requiredQuantity); if (componentsLocation != null) { - serviceContext.put("locationSeqId", (String)componentsLocation.get("locationSeqId")); - serviceContext.put("secondaryLocationSeqId", (String)componentsLocation.get("secondaryLocationSeqId")); - serviceContext.put("failIfItemsAreNotAvailable", (String)componentsLocation.get("failIfItemsAreNotAvailable")); + serviceContext.put("locationSeqId", componentsLocation.get("locationSeqId")); + serviceContext.put("secondaryLocationSeqId", componentsLocation.get("secondaryLocationSeqId")); + serviceContext.put("failIfItemsAreNotAvailable", componentsLocation.get("failIfItemsAreNotAvailable")); } serviceContext.put("userLogin", userLogin); Map<String, Object> resultService = dispatcher.runSync("issueProductionRunTaskComponent", Modified: ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java Sun Dec 9 10:06:52 2012 @@ -21,7 +21,6 @@ package org.ofbiz.manufacturing.mrp; import java.math.BigDecimal; import java.sql.Timestamp; -import java.util.Iterator; import java.util.List; import java.util.ListIterator; import java.util.Locale; Modified: ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/src/org/ofbiz/manufacturing/techdata/TechDataServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/src/org/ofbiz/manufacturing/techdata/TechDataServices.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/src/org/ofbiz/manufacturing/techdata/TechDataServices.java (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/src/org/ofbiz/manufacturing/techdata/TechDataServices.java Sun Dec 9 10:06:52 2012 @@ -20,7 +20,6 @@ package org.ofbiz.manufacturing.techdata import java.sql.Time; import java.sql.Timestamp; -import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Map; Modified: ofbiz/branches/webhelp-2012-12-07/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java Sun Dec 9 10:06:52 2012 @@ -57,7 +57,6 @@ import org.ofbiz.product.store.ProductSt import org.ofbiz.service.DispatchContext; import org.ofbiz.service.GenericServiceException; import org.ofbiz.service.LocalDispatcher; -import org.ofbiz.service.ModelParam; import org.ofbiz.service.ModelService; import org.ofbiz.service.ServiceUtil; @@ -1842,7 +1841,7 @@ public class OrderReturnServices { if (ServiceUtil.isError(invReqResult)) { Debug.logError("Error calling isStoreInventoryAvailable service, result is: " + invReqResult, module); } else { - inventoryAvailable = "Y".equals((String) invReqResult.get("available")); + inventoryAvailable = "Y".equals(invReqResult.get("available")); } } catch (GenericServiceException e) { Debug.logError(e, "Fatal error calling inventory checking services: " + e.toString(), module); @@ -1962,7 +1961,7 @@ public class OrderReturnServices { } if (priceResult.get("listPrice") != null) { - newItem.set("unitListPrice", (BigDecimal)priceResult.get("listPrice")); + newItem.set("unitListPrice", priceResult.get("listPrice")); } BigDecimal repairUnitPrice = null; Modified: ofbiz/branches/webhelp-2012-12-07/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java Sun Dec 9 10:06:52 2012 @@ -47,7 +47,6 @@ import org.ofbiz.entity.util.EntityUtil; import org.ofbiz.marketing.tracking.TrackingCodeEvents; import org.ofbiz.order.order.OrderReadHelper; import org.ofbiz.party.party.PartyWorker; -import org.ofbiz.product.catalog.CatalogWorker; import org.ofbiz.product.store.ProductStoreWorker; import org.ofbiz.service.GenericServiceException; import org.ofbiz.service.LocalDispatcher; Modified: ofbiz/branches/webhelp-2012-12-07/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java Sun Dec 9 10:06:52 2012 @@ -27,7 +27,6 @@ import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; -import java.util.Set; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; Modified: ofbiz/branches/webhelp-2012-12-07/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java Sun Dec 9 10:06:52 2012 @@ -236,7 +236,7 @@ public class ShoppingCart implements Ite // clone the additionalPartyRoleMap this.additionalPartyRole = new HashMap<String, List<String>>(); for (Map.Entry<String, List<String>> me : cart.additionalPartyRole.entrySet()) { - this.additionalPartyRole.put(me.getKey(), new LinkedList<String>((Collection<String>) me.getValue())); + this.additionalPartyRole.put(me.getKey(), new LinkedList<String>(me.getValue())); } // clone the groups @@ -4287,6 +4287,7 @@ public class ShoppingCart implements Ite } } + @Override public boolean equals(java.lang.Object obj) { if (obj instanceof BasePriceOrderComparator) { return this.ascending == ((BasePriceOrderComparator) obj).ascending; @@ -4358,6 +4359,7 @@ public class ShoppingCart implements Ite } } + @Override public boolean equals(Object obj) { if (obj == null) return false; ShoppingCartItemGroup that = (ShoppingCartItemGroup) obj; @@ -4963,11 +4965,13 @@ public class ShoppingCart implements Ite } } + @Override public String toString() { return "Pm: " + paymentMethodId + " / PmType: " + paymentMethodTypeId + " / Amt: " + amount + " / Ref: " + refNum[0] + "!" + refNum[1]; } } + @Override protected void finalize() throws Throwable { // DEJ20050518 we should not call clear because it kills the auto-save shopping list and is unnecessary given that when this object is GC'ed it will cause everything it points to that isn't referenced anywhere else to be GC'ed too: this.clear(); super.finalize(); Modified: ofbiz/branches/webhelp-2012-12-07/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java Sun Dec 9 10:06:52 2012 @@ -1990,7 +1990,7 @@ public class ShoppingCartEvents { appendOrderItemMap.put("shipGroupSeqId", shipGroupSeqId); try { Map<String, Object> result = dispatcher.runSync("appendOrderItem", appendOrderItemMap); - request.setAttribute("shoppingCart", (ShoppingCart) result.get("shoppingCart")); + request.setAttribute("shoppingCart", result.get("shoppingCart")); ShoppingCartEvents.destroyCart(request, response); } catch (GenericServiceException e) { Debug.logError(e, "Failed to execute service appendOrderItem", module); Modified: ofbiz/branches/webhelp-2012-12-07/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java Sun Dec 9 10:06:52 2012 @@ -30,7 +30,6 @@ import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Map.Entry; -import java.util.Set; import javolution.util.FastMap; Modified: ofbiz/branches/webhelp-2012-12-07/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java Sun Dec 9 10:06:52 2012 @@ -272,7 +272,7 @@ public class ProductDisplayWorker { Integer quantity = entry.getValue(); BigDecimal occs = productQuantities.get(prodId); //For quantity we should test if we allow to add decimal quantity for this product an productStore : if not then round to 0 - if(! ProductWorker.isDecimalQuantityOrderAllowed(delegator, (String)prodId, cart.getProductStoreId())){ + if(! ProductWorker.isDecimalQuantityOrderAllowed(delegator, prodId, cart.getProductStoreId())){ occs = occs.setScale(0, UtilNumber.getBigDecimalRoundingMode("order.rounding")); } else { Modified: ofbiz/branches/webhelp-2012-12-07/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java Sun Dec 9 10:06:52 2012 @@ -1446,7 +1446,7 @@ public class ProductPromoWorker { if (ServiceUtil.isError(invReqResult)) { Debug.logError("Error calling isStoreInventoryAvailable service, result is: " + invReqResult, module); throw new CartItemModifyException((String) invReqResult.get(ModelService.ERROR_MESSAGE)); - } else if (!"Y".equals((String) invReqResult.get("available"))) { + } else if (!"Y".equals(invReqResult.get("available"))) { Debug.logWarning(UtilProperties.getMessage(resource_error,"OrderNotApplyingGwpBecauseProductIdIsOutOfStockForProductPromoAction", UtilMisc.toMap("productId", productId, "productPromoAction", productPromoAction), cart.getLocale()), module); productId = null; product = null; @@ -1483,7 +1483,7 @@ public class ProductPromoWorker { if (ServiceUtil.isError(invReqResult)) { Debug.logError("Error calling isStoreInventoryAvailable service, result is: " + invReqResult, module); throw new CartItemModifyException((String) invReqResult.get(ModelService.ERROR_MESSAGE)); - } else if (!"Y".equals((String) invReqResult.get("available"))) { + } else if (!"Y".equals(invReqResult.get("available"))) { optionProductIdIter.remove(); } } catch (GenericServiceException e) { Modified: ofbiz/branches/webhelp-2012-12-07/applications/order/src/org/ofbiz/order/thirdparty/zipsales/ZipSalesServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/order/src/org/ofbiz/order/thirdparty/zipsales/ZipSalesServices.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/order/src/org/ofbiz/order/thirdparty/zipsales/ZipSalesServices.java (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/order/src/org/ofbiz/order/thirdparty/zipsales/ZipSalesServices.java Sun Dec 9 10:06:52 2012 @@ -23,7 +23,6 @@ import java.net.URL; import java.sql.Timestamp; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Map; Modified: ofbiz/branches/webhelp-2012-12-07/applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java Sun Dec 9 10:06:52 2012 @@ -34,7 +34,6 @@ import javolution.util.FastMap; import org.ofbiz.base.util.Assert; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilMisc; -import org.ofbiz.base.util.UtilProperties; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; Modified: ofbiz/branches/webhelp-2012-12-07/applications/product/src/org/ofbiz/product/category/OfbizCatalogAltUrlTransform.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/product/src/org/ofbiz/product/category/OfbizCatalogAltUrlTransform.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/product/src/org/ofbiz/product/category/OfbizCatalogAltUrlTransform.java (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/product/src/org/ofbiz/product/category/OfbizCatalogAltUrlTransform.java Sun Dec 9 10:06:52 2012 @@ -86,14 +86,17 @@ public class OfbizCatalogAltUrlTransform 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/branches/webhelp-2012-12-07/applications/product/src/org/ofbiz/product/image/ScaleImage.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/product/src/org/ofbiz/product/image/ScaleImage.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/product/src/org/ofbiz/product/image/ScaleImage.java (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/product/src/org/ofbiz/product/image/ScaleImage.java Sun Dec 9 10:06:52 2012 @@ -20,11 +20,8 @@ package org.ofbiz.product.image; import java.awt.image.BufferedImage; import java.awt.image.ImagingOpException; -import java.awt.image.RenderedImage; import java.io.File; import java.io.IOException; -import java.lang.NullPointerException; -import java.lang.SecurityException; import java.util.List; import java.util.Locale; import java.util.Map; @@ -40,8 +37,8 @@ import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilProperties; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.string.FlexibleStringExpander; -import org.ofbiz.service.ServiceUtil; import org.ofbiz.common.image.ImageTransform; +import org.ofbiz.service.ServiceUtil; /** * ScaleImage Class @@ -317,8 +314,8 @@ public class ScaleImage { bufImg = (BufferedImage) resultBufImgMap.get("bufferedImage"); // get Dimensions - imgHeight = (double) bufImg.getHeight(); - imgWidth = (double) bufImg.getWidth(); + imgHeight = bufImg.getHeight(); + imgWidth = bufImg.getWidth(); if (imgHeight == 0.0 || imgWidth == 0.0) { String errMsg = UtilProperties.getMessage(resource, "ScaleImage.one_current_image_dimension_is_null", locale) + " : imgHeight = " + imgHeight + " ; imgWidth = " + imgWidth; Debug.logError(errMsg, module); @@ -365,7 +362,7 @@ public class ScaleImage { // write new image try { - ImageIO.write((RenderedImage) bufNewImg, imgExtension, new File(imageServerPath + "/" + newFilePathPrefix + filenameToUse)); + ImageIO.write(bufNewImg, imgExtension, new File(imageServerPath + "/" + newFilePathPrefix + filenameToUse)); } catch (IllegalArgumentException e) { String errMsg = UtilProperties.getMessage(resource, "ScaleImage.one_parameter_is_null", locale) + e.toString(); Debug.logError(errMsg, module); Modified: ofbiz/branches/webhelp-2012-12-07/applications/product/src/org/ofbiz/product/imagemanagement/CropImage.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/product/src/org/ofbiz/product/imagemanagement/CropImage.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/product/src/org/ofbiz/product/imagemanagement/CropImage.java (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/product/src/org/ofbiz/product/imagemanagement/CropImage.java Sun Dec 9 10:06:52 2012 @@ -98,7 +98,7 @@ public class CropImage { BufferedImage bufNewImg = bufImg.getSubimage(x, y, w, h); String mimeType = imageName.substring(imageName.lastIndexOf(".") + 1); - ImageIO.write((RenderedImage) bufNewImg, mimeType, new File(imageServerPath + "/" + productId + "/" + filenameToUse)); + ImageIO.write(bufNewImg, mimeType, new File(imageServerPath + "/" + productId + "/" + filenameToUse)); double imgHeight = bufNewImg.getHeight(); double imgWidth = bufNewImg.getWidth(); Modified: ofbiz/branches/webhelp-2012-12-07/applications/product/src/org/ofbiz/product/imagemanagement/FrameImage.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/product/src/org/ofbiz/product/imagemanagement/FrameImage.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/product/src/org/ofbiz/product/imagemanagement/FrameImage.java (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/product/src/org/ofbiz/product/imagemanagement/FrameImage.java Sun Dec 9 10:06:52 2012 @@ -154,7 +154,7 @@ public class FrameImage { Image newImg2 = bufImg2.getScaledInstance(width , height , Image.SCALE_SMOOTH); BufferedImage bufNewImg = combineBufferedImage(newImg1, newImg2, bufImgType); String mimeType = imageName.substring(imageName.lastIndexOf(".") + 1); - ImageIO.write((RenderedImage) bufNewImg, mimeType, new File(imageServerPath + "/" + productId + "/" + filenameToUse)); + ImageIO.write(bufNewImg, mimeType, new File(imageServerPath + "/" + productId + "/" + filenameToUse)); double imgHeight = bufNewImg.getHeight(); double imgWidth = bufNewImg.getWidth(); @@ -384,7 +384,7 @@ public class FrameImage { Image newImg2 = bufImg2.getScaledInstance(width , height , Image.SCALE_SMOOTH); BufferedImage bufNewImg = combineBufferedImage(newImg1, newImg2, bufImgType); String mimeType = imageName.substring(imageName.lastIndexOf(".") + 1); - ImageIO.write((RenderedImage) bufNewImg, mimeType, new File(imageServerPath + "/preview/" + "/previewImage.jpg")); + ImageIO.write(bufNewImg, mimeType, new File(imageServerPath + "/preview/" + "/previewImage.jpg")); } else{ Modified: ofbiz/branches/webhelp-2012-12-07/applications/product/src/org/ofbiz/product/imagemanagement/ImageManagementServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/product/src/org/ofbiz/product/imagemanagement/ImageManagementServices.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/product/src/org/ofbiz/product/imagemanagement/ImageManagementServices.java (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/product/src/org/ofbiz/product/imagemanagement/ImageManagementServices.java Sun Dec 9 10:06:52 2012 @@ -359,8 +359,8 @@ public class ImageManagementServices { bufImg = (BufferedImage) resultBufImgMap.get("bufferedImage"); // get Dimensions - imgHeight = (double) bufImg.getHeight(); - imgWidth = (double) bufImg.getWidth(); + imgHeight = bufImg.getHeight(); + imgWidth = bufImg.getWidth(); if (imgHeight == 0.0 || imgWidth == 0.0) { String errMsg = UtilProperties.getMessage(resource, "ScaleImage.one_current_image_dimension_is_null", locale) + " : imgHeight = " + imgHeight + " ; imgWidth = " + imgWidth; Debug.logError(errMsg, module); @@ -390,7 +390,7 @@ public class ImageManagementServices { // write new image try { - ImageIO.write((RenderedImage) bufNewImg, imgExtension, new File(imageServerPath + "/" + productId + "/" + filenameToUse)); + ImageIO.write(bufNewImg, imgExtension, new File(imageServerPath + "/" + productId + "/" + filenameToUse)); File deleteFile = new File(imageServerPath + "/" + filenameToUse); deleteFile.delete(); //FIXME can be removed ? @@ -941,7 +941,7 @@ public class ImageManagementServices { if (imageType.equals(mimeType)) { BufferedImage bufImg = ImageIO.read(new File(imageServerPath + "/" + productId + "/" + dataResourceName)); - ImageIO.write((RenderedImage) bufImg, imgExtension, new File(imageServerPath + "/" + productId + "/" + filenameToUse)); + ImageIO.write(bufImg, imgExtension, new File(imageServerPath + "/" + productId + "/" + filenameToUse)); File file = new File(imageServerPath + "/" + productId + "/" + dataResourceName); file.delete(); @@ -1000,7 +1000,7 @@ public class ImageManagementServices { String imageUrlAssoc = imageServerUrl + "/" + productId + "/" + filenameToUseAssoc; BufferedImage bufImgAssoc = ImageIO.read(new File(imageServerPath + "/" + productId + "/" + drDataResourceNameAssoc)); - ImageIO.write((RenderedImage) bufImgAssoc, imgExtension, new File(imageServerPath + "/" + productId + "/" + filenameToUseAssoc)); + ImageIO.write(bufImgAssoc, imgExtension, new File(imageServerPath + "/" + productId + "/" + filenameToUseAssoc)); File fileAssoc = new File(imageServerPath + "/" + productId + "/" + drDataResourceNameAssoc); fileAssoc.delete(); Modified: ofbiz/branches/webhelp-2012-12-07/applications/product/src/org/ofbiz/product/imagemanagement/ReplaceImage.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/product/src/org/ofbiz/product/imagemanagement/ReplaceImage.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/product/src/org/ofbiz/product/imagemanagement/ReplaceImage.java (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/product/src/org/ofbiz/product/imagemanagement/ReplaceImage.java Sun Dec 9 10:06:52 2012 @@ -19,7 +19,6 @@ package org.ofbiz.product.imagemanagement; import java.awt.image.BufferedImage; -import java.awt.image.RenderedImage; import java.io.File; import java.util.List; import java.util.Map; @@ -78,7 +77,7 @@ public class ReplaceImage{ try { BufferedImage bufImg = ImageIO.read(new File(imageServerPath + "/" + productId + "/" + dataResourceNameReplace)); - ImageIO.write((RenderedImage) bufImg, "jpg", new File(imageServerPath + "/" + productId + "/" + dataResourceNameExist)); + ImageIO.write(bufImg, "jpg", new File(imageServerPath + "/" + productId + "/" + dataResourceNameExist)); List<GenericValue> contentAssocReplaceList = delegator.findByAnd("ContentAssoc", UtilMisc.toMap("contentId", contentIdReplace, "contentAssocTypeId", "IMAGE_THUMBNAIL"), null, false); if (contentAssocReplaceList.size() > 0) { @@ -96,11 +95,11 @@ public class ReplaceImage{ if (UtilValidate.isNotEmpty(dataResourceAssocExist)) { BufferedImage bufImgAssocReplace = ImageIO.read(new File(imageServerPath + "/" + productId + "/" + dataResourceAssocReplace.get("drDataResourceName"))); - ImageIO.write((RenderedImage) bufImgAssocReplace, "jpg", new File(imageServerPath + "/" + productId + "/" + dataResourceAssocExist.get("drDataResourceName"))); + ImageIO.write(bufImgAssocReplace, "jpg", new File(imageServerPath + "/" + productId + "/" + dataResourceAssocExist.get("drDataResourceName"))); } else{ BufferedImage bufImgAssocReplace = ImageIO.read(new File(imageServerPath + "/" + productId + "/" + dataResourceAssocReplace.get("drDataResourceName"))); - ImageIO.write((RenderedImage) bufImgAssocReplace, "jpg", new File(imageServerPath + "/" + productId + "/" + dataResourceNameExist.substring(0, dataResourceNameExist.length() - 4) + "-" + contentAssocReplace.get("mapKey") + ".jpg")); + ImageIO.write(bufImgAssocReplace, "jpg", new File(imageServerPath + "/" + productId + "/" + dataResourceNameExist.substring(0, dataResourceNameExist.length() - 4) + "-" + contentAssocReplace.get("mapKey") + ".jpg")); } } } Modified: ofbiz/branches/webhelp-2012-12-07/applications/product/src/org/ofbiz/product/imagemanagement/RotateImage.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/product/src/org/ofbiz/product/imagemanagement/RotateImage.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/product/src/org/ofbiz/product/imagemanagement/RotateImage.java (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/product/src/org/ofbiz/product/imagemanagement/RotateImage.java Sun Dec 9 10:06:52 2012 @@ -105,7 +105,7 @@ public class RotateImage { g.dispose(); String mimeType = imageName.substring(imageName.lastIndexOf(".") + 1); - ImageIO.write((RenderedImage) bufNewImg, mimeType, new File(imageServerPath + "/" + productId + "/" + filenameToUse)); + ImageIO.write(bufNewImg, mimeType, new File(imageServerPath + "/" + productId + "/" + filenameToUse)); double imgHeight = bufNewImg.getHeight(); double imgWidth = bufNewImg.getWidth(); Modified: ofbiz/branches/webhelp-2012-12-07/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java Sun Dec 9 10:06:52 2012 @@ -41,7 +41,6 @@ import org.ofbiz.entity.GenericEntityExc import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.util.EntityUtil; import org.ofbiz.party.contact.ContactMechWorker; -import org.ofbiz.product.catalog.CatalogWorker; import org.ofbiz.product.config.ProductConfigWrapper; import org.ofbiz.product.product.ProductWorker; import org.ofbiz.service.GenericServiceException; Modified: ofbiz/branches/webhelp-2012-12-07/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/build.xml?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/build.xml (original) +++ ofbiz/branches/webhelp-2012-12-07/build.xml Sun Dec 9 10:06:52 2012 @@ -1265,6 +1265,24 @@ under the License. </classpath> </java> </target> + + <!-- ================================================================== --> + <!-- webhelp helpers --> + <!-- ================================================================== --> + + <target name="webhelp" + description="Create all webhelp"> + <subant target="webhelp.all"> + <filelist dir="." files=" applications/content/template/docbook/webhelp/build.ofbiz.xml"/> + </subant> + </target> + + <target name="clean-webhelp" + description="Clean all webhelp"> + <subant target="clean"> + <filelist dir="." files=" applications/content/template/docbook/webhelp/build.ofbiz.xml"/> + </subant> + </target> <!-- ================================================================== --> <!-- Old tasks. --> Modified: ofbiz/branches/webhelp-2012-12-07/framework/base/src/org/ofbiz/base/container/ContainerLoader.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/framework/base/src/org/ofbiz/base/container/ContainerLoader.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/framework/base/src/org/ofbiz/base/container/ContainerLoader.java (original) +++ ofbiz/branches/webhelp-2012-12-07/framework/base/src/org/ofbiz/base/container/ContainerLoader.java Sun Dec 9 10:06:52 2012 @@ -26,7 +26,6 @@ import java.util.Enumeration; import java.util.LinkedList; import java.util.List; import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; import org.ofbiz.base.component.ComponentConfig; import org.ofbiz.base.start.Config; @@ -35,7 +34,6 @@ import org.ofbiz.base.start.StartupLoade import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.StringUtil; import org.ofbiz.base.util.UtilValidate; -import org.ofbiz.base.util.UtilXml; /** * An object that loads containers (background processes). @@ -67,7 +65,7 @@ public class ContainerLoader implements List<String> loaders = null; for (Map loaderMap: config.loaders) { - if (module.equals((String)loaderMap.get("class"))) { + if (module.equals(loaderMap.get("class"))) { loaders = StringUtil.split((String)loaderMap.get("profiles"), ","); } } Modified: ofbiz/branches/webhelp-2012-12-07/framework/base/src/org/ofbiz/base/crypto/HashCrypt.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/framework/base/src/org/ofbiz/base/crypto/HashCrypt.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/framework/base/src/org/ofbiz/base/crypto/HashCrypt.java (original) +++ ofbiz/branches/webhelp-2012-12-07/framework/base/src/org/ofbiz/base/crypto/HashCrypt.java Sun Dec 9 10:06:52 2012 @@ -18,19 +18,19 @@ *******************************************************************************/ package org.ofbiz.base.crypto; +import static org.ofbiz.base.util.UtilIO.UTF8; + import java.io.UnsupportedEncodingException; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.Random; -import org.apache.commons.codec.EncoderException; import org.apache.commons.codec.binary.Base64; import org.apache.commons.codec.binary.Hex; import org.apache.commons.lang.RandomStringUtils; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralRuntimeException; import org.ofbiz.base.util.StringUtil; -import static org.ofbiz.base.util.UtilIO.UTF8; import org.ofbiz.base.util.UtilValidate; /** Modified: ofbiz/branches/webhelp-2012-12-07/framework/base/src/org/ofbiz/base/util/CachedClassLoader.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/framework/base/src/org/ofbiz/base/util/CachedClassLoader.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/framework/base/src/org/ofbiz/base/util/CachedClassLoader.java (original) +++ ofbiz/branches/webhelp-2012-12-07/framework/base/src/org/ofbiz/base/util/CachedClassLoader.java Sun Dec 9 10:06:52 2012 @@ -20,7 +20,6 @@ package org.ofbiz.base.util; import java.net.URL; import java.net.URLClassLoader; -import java.util.Iterator; import java.util.Map; import java.util.ServiceLoader; import java.util.Set; Modified: ofbiz/branches/webhelp-2012-12-07/framework/base/src/org/ofbiz/base/util/CompilerMatcher.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/framework/base/src/org/ofbiz/base/util/CompilerMatcher.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/framework/base/src/org/ofbiz/base/util/CompilerMatcher.java (original) +++ ofbiz/branches/webhelp-2012-12-07/framework/base/src/org/ofbiz/base/util/CompilerMatcher.java Sun Dec 9 10:06:52 2012 @@ -50,6 +50,7 @@ public class CompilerMatcher { public static ThreadLocal<CompilerMatcher> getThreadLocal() { return new ThreadLocal<CompilerMatcher>() { + @Override protected CompilerMatcher initialValue() { return new CompilerMatcher(); } Modified: ofbiz/branches/webhelp-2012-12-07/framework/base/src/org/ofbiz/base/util/GroovyUtil.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/framework/base/src/org/ofbiz/base/util/GroovyUtil.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/framework/base/src/org/ofbiz/base/util/GroovyUtil.java (original) +++ ofbiz/branches/webhelp-2012-12-07/framework/base/src/org/ofbiz/base/util/GroovyUtil.java Sun Dec 9 10:06:52 2012 @@ -18,26 +18,25 @@ */ package org.ofbiz.base.util; +import groovy.lang.Binding; +import groovy.lang.GroovyClassLoader; +import groovy.lang.GroovyShell; +import groovy.lang.Script; + import java.io.IOException; import java.io.InputStream; import java.net.URL; import java.util.Map; -import groovy.lang.Binding; -import groovy.lang.GroovyClassLoader; -import groovy.lang.Script; -import groovy.lang.GroovyShell; +import javax.script.ScriptContext; import javolution.util.FastMap; import org.codehaus.groovy.control.CompilationFailedException; -import org.codehaus.groovy.control.CompilerConfiguration; import org.codehaus.groovy.runtime.InvokerHelper; import org.ofbiz.base.location.FlexibleLocation; import org.ofbiz.base.util.cache.UtilCache; -import javax.script.ScriptContext; - /** * Groovy Utilities. * Modified: ofbiz/branches/webhelp-2012-12-07/framework/base/src/org/ofbiz/base/util/ScriptUtil.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/framework/base/src/org/ofbiz/base/util/ScriptUtil.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/framework/base/src/org/ofbiz/base/util/ScriptUtil.java (original) +++ ofbiz/branches/webhelp-2012-12-07/framework/base/src/org/ofbiz/base/util/ScriptUtil.java Sun Dec 9 10:06:52 2012 @@ -438,12 +438,14 @@ public final class ScriptUtil { public Set<java.util.Map.Entry<String, Object>> entrySet() { return bindings.entrySet(); } + @Override public boolean equals(Object o) { return bindings.equals(o); } public Object get(Object key) { return bindings.get(key); } + @Override public int hashCode() { return bindings.hashCode(); } Modified: ofbiz/branches/webhelp-2012-12-07/framework/catalina/src/org/ofbiz/catalina/container/OfbizStore.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/framework/catalina/src/org/ofbiz/catalina/container/OfbizStore.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/framework/catalina/src/org/ofbiz/catalina/container/OfbizStore.java (original) +++ ofbiz/branches/webhelp-2012-12-07/framework/catalina/src/org/ofbiz/catalina/container/OfbizStore.java Sun Dec 9 10:06:52 2012 @@ -30,7 +30,6 @@ import java.util.List; import org.apache.catalina.Container; import org.apache.catalina.Loader; import org.apache.catalina.Session; -import org.apache.catalina.Store; import org.apache.catalina.session.StandardSession; import org.apache.catalina.session.StoreBase; import org.apache.catalina.util.CustomObjectInputStream; @@ -39,7 +38,7 @@ import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; -public class OfbizStore extends StoreBase implements Store { +public class OfbizStore extends StoreBase { public static final String module = OfbizStore.class.getName(); public static final String entityName = "CatalinaSession"; Modified: ofbiz/branches/webhelp-2012-12-07/framework/common/src/org/ofbiz/common/authentication/example/TestPassAuthenticator.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/framework/common/src/org/ofbiz/common/authentication/example/TestPassAuthenticator.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/framework/common/src/org/ofbiz/common/authentication/example/TestPassAuthenticator.java (original) +++ ofbiz/branches/webhelp-2012-12-07/framework/common/src/org/ofbiz/common/authentication/example/TestPassAuthenticator.java Sun Dec 9 10:06:52 2012 @@ -19,14 +19,13 @@ package org.ofbiz.common.authentication.example; -import org.ofbiz.common.authentication.api.AuthenticatorException; -import org.ofbiz.common.authentication.api.Authenticator; import org.ofbiz.base.util.Debug; +import org.ofbiz.common.authentication.api.AuthenticatorException; /** * TestPassAuthenticator */ -public class TestPassAuthenticator extends TestFailAuthenticator implements Authenticator { +public class TestPassAuthenticator extends TestFailAuthenticator { private static final String module = TestPassAuthenticator.class.getName(); Modified: ofbiz/branches/webhelp-2012-12-07/framework/common/src/org/ofbiz/common/preferences/PreferenceServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/framework/common/src/org/ofbiz/common/preferences/PreferenceServices.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/framework/common/src/org/ofbiz/common/preferences/PreferenceServices.java (original) +++ ofbiz/branches/webhelp-2012-12-07/framework/common/src/org/ofbiz/common/preferences/PreferenceServices.java Sun Dec 9 10:06:52 2012 @@ -242,7 +242,7 @@ public class PreferenceServices { try { for (Map.Entry<String, Object> mapEntry: userPrefMap.entrySet()) { - GenericValue rec = delegator.makeValidValue("UserPreference", PreferenceWorker.toFieldMap(userLoginId, mapEntry.getKey(), userPrefGroupTypeId, (String) mapEntry.getValue())); + GenericValue rec = delegator.makeValidValue("UserPreference", PreferenceWorker.toFieldMap(userLoginId, mapEntry.getKey(), userPrefGroupTypeId, mapEntry.getValue())); delegator.createOrStore(rec); } } catch (GenericEntityException e) { Modified: ofbiz/branches/webhelp-2012-12-07/framework/entity/src/org/ofbiz/entity/GenericValue.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/framework/entity/src/org/ofbiz/entity/GenericValue.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/framework/entity/src/org/ofbiz/entity/GenericValue.java (original) +++ ofbiz/branches/webhelp-2012-12-07/framework/entity/src/org/ofbiz/entity/GenericValue.java Sun Dec 9 10:06:52 2012 @@ -25,7 +25,6 @@ import java.util.List; import java.util.Map; import javolution.context.ObjectFactory; -import javolution.lang.Reusable; import javolution.util.FastMap; import org.ofbiz.base.util.Debug; @@ -44,7 +43,7 @@ import org.ofbiz.entity.util.EntityUtil; * */ @SuppressWarnings("serial") -public class GenericValue extends GenericEntity implements Reusable { +public class GenericValue extends GenericEntity { public static final GenericValue NULL_VALUE = new NullGenericValue(); Modified: ofbiz/branches/webhelp-2012-12-07/framework/entity/src/org/ofbiz/entity/cache/AbstractEntityConditionCache.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/framework/entity/src/org/ofbiz/entity/cache/AbstractEntityConditionCache.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/framework/entity/src/org/ofbiz/entity/cache/AbstractEntityConditionCache.java (original) +++ ofbiz/branches/webhelp-2012-12-07/framework/entity/src/org/ofbiz/entity/cache/AbstractEntityConditionCache.java Sun Dec 9 10:06:52 2012 @@ -24,8 +24,6 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import javolution.util.FastMap; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilValidate; Modified: ofbiz/branches/webhelp-2012-12-07/framework/entity/src/org/ofbiz/entity/cache/EntityListCache.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/framework/entity/src/org/ofbiz/entity/cache/EntityListCache.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/framework/entity/src/org/ofbiz/entity/cache/EntityListCache.java (original) +++ ofbiz/branches/webhelp-2012-12-07/framework/entity/src/org/ofbiz/entity/cache/EntityListCache.java Sun Dec 9 10:06:52 2012 @@ -20,7 +20,6 @@ package org.ofbiz.entity.cache; import java.util.Iterator; import java.util.List; -import java.util.Map; import java.util.concurrent.ConcurrentMap; import org.ofbiz.entity.GenericValue; Modified: ofbiz/branches/webhelp-2012-12-07/framework/entity/src/org/ofbiz/entity/model/ModelReader.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/framework/entity/src/org/ofbiz/entity/model/ModelReader.java?rev=1418875&r1=1418874&r2=1418875&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/framework/entity/src/org/ofbiz/entity/model/ModelReader.java (original) +++ ofbiz/branches/webhelp-2012-12-07/framework/entity/src/org/ofbiz/entity/model/ModelReader.java Sun Dec 9 10:06:52 2012 @@ -278,7 +278,7 @@ TEMP_VIEW_LOOP: mveIt.remove(); curViewEntity.populateFields(this); for (ModelViewEntity.ModelMemberEntity mve: curViewEntity.getAllModelMemberEntities()) { - ModelEntity me = (ModelEntity) entityCache.get(mve.getEntityName()); + ModelEntity me = entityCache.get(mve.getEntityName()); me.addViewEntity(curViewEntity); } entityCache.put(curViewEntity.getEntityName(), curViewEntity); |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |