This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git
The following commit(s) were added to refs/heads/trunk by this push:
new a1b2a08cf Improved: Refactor groovy folder structure and add package
declaration (OFBIZ-12813)
a1b2a08cf is described below
commit a1b2a08cff90d2af2f50fa898daada1ff0f0fbbb
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Tue Aug 1 18:09:03 2023 +0200
Improved: Refactor groovy folder structure and add package declaration
(OFBIZ-12813)
Codenarc changes, removes in *.groovy files
"Blank line precedes package declaration in file FilterOutReceipts.groovy"
"File *.groovy has consecutive blank lines"
Updates build.gradle accordingly
---
.../org/apache/ofbiz/assetmaint/assetmaint/EditMaint.groovy | 2 --
.../assetmaint/assetmaint/FixedAssetMaintServices.groovy | 2 --
.../ofbiz/assetmaint/assetmaint/PrintFixedAssetMaint.groovy | 2 --
.../apache/ofbiz/assetmaint/workeffort/EditWorkEfforts.groovy | 2 --
.../main/groovy/org/apache/ofbiz/bi/DimensionServices.groovy | 2 --
bi/src/main/groovy/org/apache/ofbiz/bi/FactServices.groovy | 11 ++---------
.../groovy/org/apache/ofbiz/bi/GetStarSchemaFields.groovy | 2 --
bi/src/main/groovy/org/apache/ofbiz/bi/GetStarSchemas.groovy | 2 --
.../main/groovy/org/apache/ofbiz/bi/RunStarSchemaQuery.groovy | 2 --
.../AcctgTransEntriesSearchResultsParameters.groovy | 2 --
.../ofbiz/birt/accounting/BalanceSheetParameters.groovy | 2 --
.../ofbiz/birt/accounting/IncomeStatementParameters.groovy | 2 --
.../birt/accounting/InvoiceAcctgTransEntryParameters.groovy | 2 --
.../birt/accounting/PaymentAcctgTransEntryParameters.groovy | 2 --
.../org/apache/ofbiz/birt/accounting/PaymentReport.groovy | 2 --
.../ofbiz/birt/accounting/TrialBalanceParameters.groovy | 2 --
.../org/apache/ofbiz/birt/facility/InventoryItemReport.groovy | 2 --
.../groovy/org/apache/ofbiz/birt/order/CheckReportBy.groovy | 2 --
.../apache/ofbiz/birt/order/NetBeforeOverheadReport.groovy | 1 -
.../groovy/org/apache/ofbiz/birt/order/OrderByChannel.groovy | 2 --
.../org/apache/ofbiz/birt/order/ProductDemandReport.groovy | 1 -
.../groovy/org/apache/ofbiz/birt/order/SalesReport.groovy | 1 -
.../org/apache/ofbiz/birt/report/PrepareBirtCall.groovy | 2 --
.../groovy/org/apache/ofbiz/ebay/EbayAdvancedSearch.groovy | 2 --
ebay/src/main/groovy/org/apache/ofbiz/ebay/EbayOrders.groovy | 2 --
.../groovy/org/apache/ofbiz/ebay/UpdatedEbayOrders.groovy | 2 --
.../ebaystore/automationPreferences/GetDisputeInfo.groovy | 2 --
.../ebaystore/automationPreferences/GetEbayJobsandbox.groovy | 2 --
.../ofbiz/ebaystore/email/GetProductStoreEmailTemplate.groovy | 2 --
.../org/apache/ofbiz/ebaystore/feedback/FeedbackList.groovy | 2 --
.../org/apache/ofbiz/ebaystore/store/CheckOrderStatus.groovy | 1 -
.../apache/ofbiz/ebaystore/store/OrderListParameters.groovy | 2 --
.../org/apache/ofbiz/ebaystore/store/OrderListPrepare.groovy | 2 --
.../apache/ofbiz/ebaystore/store/PrepareProductListing.groovy | 1 -
.../apache/ofbiz/ebaystore/store/RetrieveStoreOptions.groovy | 2 --
.../groovy/org/apache/ofbiz/ebaystore/store/SoldAction.groovy | 2 --
.../org/apache/ofbiz/ebaystore/store/StoreAccount.groovy | 2 --
.../groovy/org/apache/ofbiz/ecommerce/EcommerceSetup.groovy | 2 --
.../src/main/groovy/org/apache/ofbiz/ecommerce/Login.groovy | 2 --
.../src/main/groovy/org/apache/ofbiz/ecommerce/Main.groovy | 2 --
.../org/apache/ofbiz/ecommerce/ProcessPaymentSettings.groovy | 2 --
.../groovy/org/apache/ofbiz/ecommerce/cart/ShowCart.groovy | 2 --
.../org/apache/ofbiz/ecommerce/cart/ShowPromoText.groovy | 2 --
.../org/apache/ofbiz/ecommerce/catalog/AjaxBreadcrumbs.groovy | 1 -
.../apache/ofbiz/ecommerce/catalog/BestSellingCategory.groovy | 2 --
.../apache/ofbiz/ecommerce/catalog/LayeredNavigation.groovy | 2 --
.../apache/ofbiz/ecommerce/catalog/MiniProductSummary.groovy | 2 --
.../apache/ofbiz/ecommerce/catalog/MiniReorderProds.groovy | 2 --
.../org/apache/ofbiz/ecommerce/catalog/PopularTags.groovy | 2 --
.../apache/ofbiz/ecommerce/catalog/ProductCategories.groovy | 2 --
.../apache/ofbiz/ecommerce/content/AdvancedSearchPrep.groovy | 2 --
.../org/apache/ofbiz/ecommerce/content/ContentPrep.groovy | 2 --
.../main/groovy/org/apache/ofbiz/ecommerce/content/Mrv.groovy | 2 --
.../groovy/org/apache/ofbiz/ecommerce/content/Search.groovy | 2 --
.../org/apache/ofbiz/ecommerce/customer/ChangePassword.groovy | 2 --
.../org/apache/ofbiz/ecommerce/customer/ContactList.groovy | 3 ---
.../apache/ofbiz/ecommerce/customer/CustomerReviews.groovy | 2 --
.../org/apache/ofbiz/ecommerce/customer/CustomerSurvey.groovy | 2 --
.../apache/ofbiz/ecommerce/customer/EditBillingAddress.groovy | 2 --
.../apache/ofbiz/ecommerce/customer/EditContactMech.groovy | 3 ---
.../ofbiz/ecommerce/customer/EditEmailAndTelecomNumber.groovy | 2 --
.../apache/ofbiz/ecommerce/customer/EditPaymentMethod.groovy | 2 --
.../org/apache/ofbiz/ecommerce/customer/EditPerson.groovy | 2 --
.../ofbiz/ecommerce/customer/EditShippingAddress.groovy | 2 --
.../apache/ofbiz/ecommerce/customer/GiftCardBalance.groovy | 2 --
.../org/apache/ofbiz/ecommerce/customer/GiftCardLink.groovy | 2 --
.../org/apache/ofbiz/ecommerce/customer/NewCustomer.groovy | 2 --
.../ofbiz/ecommerce/customer/OnePageCheckoutOptions.groovy | 2 --
.../org/apache/ofbiz/ecommerce/customer/ViewProfile.groovy | 2 --
.../org/apache/ofbiz/ecommerce/forum/ContentAddPrep.groovy | 2 --
.../org/apache/ofbiz/ecommerce/forum/ContentPrep.groovy | 3 ---
.../org/apache/ofbiz/ecommerce/forum/CurrentValPrep.groovy | 2 --
.../org/apache/ofbiz/ecommerce/forum/EditAddPrep.groovy | 2 --
.../org/apache/ofbiz/ecommerce/forum/HtmlAreaPrep.groovy | 3 ---
.../org/apache/ofbiz/ecommerce/forum/NodeTrailPrep.groovy | 2 --
.../org/apache/ofbiz/ecommerce/forum/OwnerContentPrep.groovy | 2 --
.../groovy/org/apache/ofbiz/ecommerce/forum/PermPrep.groovy | 2 --
.../groovy/org/apache/ofbiz/ecommerce/forum/PubInit.groovy | 2 --
.../apache/ofbiz/ecommerce/forum/RespondPermAndPrep.groovy | 2 --
.../org/apache/ofbiz/ecommerce/forum/ResponsePrep.groovy | 3 ---
.../groovy/org/apache/ofbiz/ecommerce/forum/ShowForum.groovy | 2 --
.../groovy/org/apache/ofbiz/ecommerce/forum/ViewPrep.groovy | 2 --
.../groovy/org/apache/ofbiz/ecommerce/includes/MruAdd.groovy | 2 --
.../ofbiz/ecommerce/order/AnonymousCheckoutLinks.groovy | 2 --
.../org/apache/ofbiz/ecommerce/order/AnonymousTrail.groovy | 2 --
.../org/apache/ofbiz/ecommerce/order/BillSettings.groovy | 2 --
.../org/apache/ofbiz/ecommerce/order/CheckoutReview.groovy | 3 ---
.../ofbiz/ecommerce/order/CheckoutShippingOptions.groovy | 2 --
.../org/apache/ofbiz/ecommerce/order/CustSettings.groovy | 2 --
.../org/apache/ofbiz/ecommerce/order/OptionSettings.groovy | 3 ---
.../org/apache/ofbiz/ecommerce/order/OrderHistory.groovy | 2 --
.../org/apache/ofbiz/ecommerce/order/OrderStatus.groovy | 5 -----
.../apache/ofbiz/ecommerce/order/PaymentInformation.groovy | 2 --
.../org/apache/ofbiz/ecommerce/order/PaymentOptions.groovy | 2 --
.../ofbiz/ecommerce/order/QuickAnonCheckoutLinks.groovy | 1 -
.../apache/ofbiz/ecommerce/order/QuickAnonCustSettings.groovy | 3 ---
.../ofbiz/ecommerce/order/QuickAnonOptionSettings.groovy | 3 ---
.../ofbiz/ecommerce/order/QuickAnonPaymentInformation.groovy | 2 --
.../org/apache/ofbiz/ecommerce/order/RequestReturn.groovy | 2 --
.../org/apache/ofbiz/ecommerce/order/ShipSettings.groovy | 2 --
.../org/apache/ofbiz/ecommerce/order/ShipmentStatus.groovy | 2 --
.../ofbiz/ecommerce/shoppinglist/EditShoppingList.groovy | 3 ---
.../groovy/org/apache/ofbiz/example/ApiTokenGenerator.groovy | 2 --
.../org/apache/ofbiz/example/FindExampleFeatures.groovy | 2 --
.../main/groovy/org/apache/ofbiz/example/LoadReactApp.groovy | 1 -
.../org/apache/ofbiz/lucene/content/AdvancedSearchPrep.groovy | 2 --
.../org/apache/ofbiz/lucene/content/IndexProducts.groovy | 2 --
.../main/groovy/org/apache/ofbiz/lucene/content/Search.groovy | 2 --
.../org/apache/ofbiz/lucene/content/SearchProducts.groovy | 2 --
.../apache/ofbiz/passport/login/GetThirdPartyLogins.groovy | 1 -
.../org/apache/ofbiz/pricat/pricat/FindMyExcelImport.groovy | 1 -
.../apache/ofbiz/pricat/pricat/FindMyExcelImportLog.groovy | 1 -
.../org/apache/ofbiz/projectmgr/EditWeekTimesheet.groovy | 2 --
.../main/groovy/org/apache/ofbiz/projectmgr/GanttChart.groovy | 2 --
.../apache/ofbiz/projectmgr/GetLastRequestAssignment.groovy | 2 --
.../groovy/org/apache/ofbiz/projectmgr/GetProjectId.groovy | 2 --
.../org/apache/ofbiz/projectmgr/ListCurrentProjects.groovy | 2 --
.../apache/ofbiz/projectmgr/ListResourceBillingHours.groovy | 3 ---
.../groovy/org/apache/ofbiz/projectmgr/ProjectBilling.groovy | 2 --
.../org/apache/ofbiz/projectmgr/ProjectIsBillable.groovy | 2 --
.../org/apache/ofbiz/scrum/AddProductBacklogItem.groovy | 2 --
.../groovy/org/apache/ofbiz/scrum/AddResourceTaskParty.groovy | 2 --
.../groovy/org/apache/ofbiz/scrum/BacklogNotifications.groovy | 2 --
.../groovy/org/apache/ofbiz/scrum/EditDailyHourReport.groovy | 2 --
.../groovy/org/apache/ofbiz/scrum/EditWeekTimesheet.groovy | 2 --
.../main/groovy/org/apache/ofbiz/scrum/FindBacklogItem.groovy | 2 --
.../org/apache/ofbiz/scrum/FindProductBacklogItem.groovy | 2 --
.../main/groovy/org/apache/ofbiz/scrum/FindTaskList.groovy | 2 --
.../groovy/org/apache/ofbiz/scrum/ListCurrentProducts.groovy | 1 -
.../groovy/org/apache/ofbiz/scrum/ListCurrentSprints.groovy | 2 --
.../main/groovy/org/apache/ofbiz/scrum/ListRevision.groovy | 2 --
.../ofbiz/scrum/ListScrumPreferenceSecurityGroup.groovy | 2 --
.../groovy/org/apache/ofbiz/scrum/ListScrumResource.groovy | 3 ---
.../apache/ofbiz/scrum/ListScrumRolesPersonAndCompany.groovy | 2 --
.../main/groovy/org/apache/ofbiz/scrum/ListTimeSheets.groovy | 2 --
.../groovy/org/apache/ofbiz/scrum/ListUnplanBacklog.groovy | 2 --
.../main/groovy/org/apache/ofbiz/scrum/ProductBilling.groovy | 2 --
.../main/groovy/org/apache/ofbiz/scrum/ProductEmail.groovy | 2 --
.../main/groovy/org/apache/ofbiz/scrum/QuickAddBacklog.groovy | 2 --
.../org/apache/ofbiz/scrum/SprintBacklogListItems.groovy | 2 --
.../groovy/org/apache/ofbiz/scrum/SprintBacklogOptions.groovy | 2 --
scrum/src/main/groovy/org/apache/ofbiz/scrum/TaskList.groovy | 3 ---
webpos/src/main/groovy/org/apache/ofbiz/webpos/Login.groovy | 2 --
.../main/groovy/org/apache/ofbiz/webpos/WebPosMenus.groovy | 2 --
.../main/groovy/org/apache/ofbiz/webpos/WebPosSetup.groovy | 2 --
.../main/groovy/org/apache/ofbiz/webpos/cart/ShowCart.groovy | 1 -
.../groovy/org/apache/ofbiz/webpos/catalog/Category.groovy | 2 --
.../org/apache/ofbiz/webpos/catalog/SideDeepCategory.groovy | 1 -
.../org/apache/ofbiz/webpos/customer/EditAddress.groovy | 2 --
.../org/apache/ofbiz/webpos/manager/PaidOutAndIn.groovy | 2 --
.../org/apache/ofbiz/webpos/search/CustomerAddress.groovy | 1 -
.../org/apache/ofbiz/webpos/search/SearchSalesReps.groovy | 2 --
152 files changed, 2 insertions(+), 312 deletions(-)
diff --git
a/assetmaint/src/main/groovy/org/apache/ofbiz/assetmaint/assetmaint/EditMaint.groovy
b/assetmaint/src/main/groovy/org/apache/ofbiz/assetmaint/assetmaint/EditMaint.groovy
index a9f58c2c5..f0e541641 100644
---
a/assetmaint/src/main/groovy/org/apache/ofbiz/assetmaint/assetmaint/EditMaint.groovy
+++
b/assetmaint/src/main/groovy/org/apache/ofbiz/assetmaint/assetmaint/EditMaint.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.assetmaint.assetmaint
-
// This is a small script to set things up when the EditFixedAssetMaint
// screen is called from one of the WorkEffort calendar screens.
// The URL coming from WorkEffort does not contain the maintHistSeqId
parameter,
diff --git
a/assetmaint/src/main/groovy/org/apache/ofbiz/assetmaint/assetmaint/FixedAssetMaintServices.groovy
b/assetmaint/src/main/groovy/org/apache/ofbiz/assetmaint/assetmaint/FixedAssetMaintServices.groovy
index 2c319002e..e2222a8bf 100644
---
a/assetmaint/src/main/groovy/org/apache/ofbiz/assetmaint/assetmaint/FixedAssetMaintServices.groovy
+++
b/assetmaint/src/main/groovy/org/apache/ofbiz/assetmaint/assetmaint/FixedAssetMaintServices.groovy
@@ -16,11 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.assetmaint.assetmaint
-
import org.apache.ofbiz.entity.GenericValue
/**
diff --git
a/assetmaint/src/main/groovy/org/apache/ofbiz/assetmaint/assetmaint/PrintFixedAssetMaint.groovy
b/assetmaint/src/main/groovy/org/apache/ofbiz/assetmaint/assetmaint/PrintFixedAssetMaint.groovy
index 0f0254d81..450d0932b 100644
---
a/assetmaint/src/main/groovy/org/apache/ofbiz/assetmaint/assetmaint/PrintFixedAssetMaint.groovy
+++
b/assetmaint/src/main/groovy/org/apache/ofbiz/assetmaint/assetmaint/PrintFixedAssetMaint.groovy
@@ -16,10 +16,8 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
*/
-
package org.apache.ofbiz.assetmaint.assetmaint
-
facility = fixedAsset.getRelatedOne("LocatedAtFacility", false)
context.locatedAtFacility = facility
diff --git
a/assetmaint/src/main/groovy/org/apache/ofbiz/assetmaint/workeffort/EditWorkEfforts.groovy
b/assetmaint/src/main/groovy/org/apache/ofbiz/assetmaint/workeffort/EditWorkEfforts.groovy
index dd49b671a..7be8cca6f 100644
---
a/assetmaint/src/main/groovy/org/apache/ofbiz/assetmaint/workeffort/EditWorkEfforts.groovy
+++
b/assetmaint/src/main/groovy/org/apache/ofbiz/assetmaint/workeffort/EditWorkEfforts.groovy
@@ -16,10 +16,8 @@
specific language governing permissions and limitations
under the License.
*/
-
package org.apache.ofbiz.assetmaint.workeffort
-
maintHistSeqId = context.maintHistSeqId
fixedAssetId = context.fixedAssetId
workEffortId = context.workEffortId
diff --git a/bi/src/main/groovy/org/apache/ofbiz/bi/DimensionServices.groovy
b/bi/src/main/groovy/org/apache/ofbiz/bi/DimensionServices.groovy
index 7660c6907..66dca995e 100644
--- a/bi/src/main/groovy/org/apache/ofbiz/bi/DimensionServices.groovy
+++ b/bi/src/main/groovy/org/apache/ofbiz/bi/DimensionServices.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.bi
-
import org.apache.ofbiz.entity.condition.EntityCondition
import org.apache.ofbiz.entity.condition.EntityOperator
import org.apache.ofbiz.entity.GenericValue
diff --git a/bi/src/main/groovy/org/apache/ofbiz/bi/FactServices.groovy
b/bi/src/main/groovy/org/apache/ofbiz/bi/FactServices.groovy
index d5ae283b9..c5ae79893 100644
--- a/bi/src/main/groovy/org/apache/ofbiz/bi/FactServices.groovy
+++ b/bi/src/main/groovy/org/apache/ofbiz/bi/FactServices.groovy
@@ -15,10 +15,8 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
-*/
-
-package org.apache.ofbiz.bi
-
+*/
+package org.apache.ofbiz.bi
import java.sql.Timestamp
import java.text.SimpleDateFormat
@@ -33,7 +31,6 @@ import org.apache.ofbiz.entity.condition.EntityOperator
import org.apache.ofbiz.order.order.OrderReadHelper
import org.apache.ofbiz.service.ServiceUtil
-
def loadSalesInvoiceFact() {
GenericValue invoice = from("Invoice").where(parameters).queryOne()
if (!invoice) {
@@ -183,7 +180,6 @@ def loadSalesInvoiceItemFact() {
return success()
}
-
def loadSalesOrderFact() {
GenericValue orderHeader = from("OrderHeader").where(parameters).queryOne()
if (!orderHeader) {
@@ -220,7 +216,6 @@ def loadSalesOrderItemFact() {
List orderAdjustments
GenericValue orderStatus
-
if (!orderHeader) {
orderHeader = from("OrderHeader").where(parameters).queryOne()
}
@@ -536,7 +531,6 @@ def loadSalesOrderDataDaily() {
return success()
}
-
/**
* Import Sales Order Data
*/
@@ -593,7 +587,6 @@ def convertUomCurrency() {
return result
}
-
def loadInventoryFact() {
GenericValue inventory = from("InventoryItem").where(inventoryItemId:
parameters.inventoryItemId).queryOne()
GenericValue fact = from("InventoryItemFact").where(inventoryItemId:
parameters.inventoryItemId).queryOne()
diff --git a/bi/src/main/groovy/org/apache/ofbiz/bi/GetStarSchemaFields.groovy
b/bi/src/main/groovy/org/apache/ofbiz/bi/GetStarSchemaFields.groovy
index 693de1ae7..be2b55980 100644
--- a/bi/src/main/groovy/org/apache/ofbiz/bi/GetStarSchemaFields.groovy
+++ b/bi/src/main/groovy/org/apache/ofbiz/bi/GetStarSchemaFields.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.bi
-
starSchemaName = parameters.starSchemaName
starSchemaFields = []
diff --git a/bi/src/main/groovy/org/apache/ofbiz/bi/GetStarSchemas.groovy
b/bi/src/main/groovy/org/apache/ofbiz/bi/GetStarSchemas.groovy
index 846260e27..9f0e665c1 100644
--- a/bi/src/main/groovy/org/apache/ofbiz/bi/GetStarSchemas.groovy
+++ b/bi/src/main/groovy/org/apache/ofbiz/bi/GetStarSchemas.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.bi
-
reader = delegator.getModelReader()
ec = reader.getEntityNames()
entities = new TreeSet(ec)
diff --git a/bi/src/main/groovy/org/apache/ofbiz/bi/RunStarSchemaQuery.groovy
b/bi/src/main/groovy/org/apache/ofbiz/bi/RunStarSchemaQuery.groovy
index 380a6fde6..9ffef1e52 100644
--- a/bi/src/main/groovy/org/apache/ofbiz/bi/RunStarSchemaQuery.groovy
+++ b/bi/src/main/groovy/org/apache/ofbiz/bi/RunStarSchemaQuery.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.bi
-
import org.apache.ofbiz.base.util.UtilHttp
starSchemaName = parameters.starSchemaName
diff --git
a/birt/src/main/groovy/org/apache/ofbiz/birt/accounting/AcctgTransEntriesSearchResultsParameters.groovy
b/birt/src/main/groovy/org/apache/ofbiz/birt/accounting/AcctgTransEntriesSearchResultsParameters.groovy
index 257c0ca80..13d6d22ca 100644
---
a/birt/src/main/groovy/org/apache/ofbiz/birt/accounting/AcctgTransEntriesSearchResultsParameters.groovy
+++
b/birt/src/main/groovy/org/apache/ofbiz/birt/accounting/AcctgTransEntriesSearchResultsParameters.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.birt.accounting
-
try {
def birtParameters = [:]
birtParameters.organizationPartyId = parameters.organizationPartyId
diff --git
a/birt/src/main/groovy/org/apache/ofbiz/birt/accounting/BalanceSheetParameters.groovy
b/birt/src/main/groovy/org/apache/ofbiz/birt/accounting/BalanceSheetParameters.groovy
index 944b103bf..10833f7fa 100644
---
a/birt/src/main/groovy/org/apache/ofbiz/birt/accounting/BalanceSheetParameters.groovy
+++
b/birt/src/main/groovy/org/apache/ofbiz/birt/accounting/BalanceSheetParameters.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.birt.accounting
-
import java.sql.Timestamp
try {
diff --git
a/birt/src/main/groovy/org/apache/ofbiz/birt/accounting/IncomeStatementParameters.groovy
b/birt/src/main/groovy/org/apache/ofbiz/birt/accounting/IncomeStatementParameters.groovy
index 20bcc5f6a..6a0d43253 100644
---
a/birt/src/main/groovy/org/apache/ofbiz/birt/accounting/IncomeStatementParameters.groovy
+++
b/birt/src/main/groovy/org/apache/ofbiz/birt/accounting/IncomeStatementParameters.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.birt.accounting
-
import java.sql.Timestamp
try {
diff --git
a/birt/src/main/groovy/org/apache/ofbiz/birt/accounting/InvoiceAcctgTransEntryParameters.groovy
b/birt/src/main/groovy/org/apache/ofbiz/birt/accounting/InvoiceAcctgTransEntryParameters.groovy
index f96622f78..6ef678da6 100644
---
a/birt/src/main/groovy/org/apache/ofbiz/birt/accounting/InvoiceAcctgTransEntryParameters.groovy
+++
b/birt/src/main/groovy/org/apache/ofbiz/birt/accounting/InvoiceAcctgTransEntryParameters.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.birt.accounting
-
try {
birtParameters = [:]
birtParameters.invoiceId = parameters.invoiceId
diff --git
a/birt/src/main/groovy/org/apache/ofbiz/birt/accounting/PaymentAcctgTransEntryParameters.groovy
b/birt/src/main/groovy/org/apache/ofbiz/birt/accounting/PaymentAcctgTransEntryParameters.groovy
index 958058d69..eb721f360 100644
---
a/birt/src/main/groovy/org/apache/ofbiz/birt/accounting/PaymentAcctgTransEntryParameters.groovy
+++
b/birt/src/main/groovy/org/apache/ofbiz/birt/accounting/PaymentAcctgTransEntryParameters.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.birt.accounting
-
try {
birtParameters = [:]
birtParameters.paymentId = parameters.paymentId
diff --git
a/birt/src/main/groovy/org/apache/ofbiz/birt/accounting/PaymentReport.groovy
b/birt/src/main/groovy/org/apache/ofbiz/birt/accounting/PaymentReport.groovy
index 8e632fca9..54ae7310e 100644
--- a/birt/src/main/groovy/org/apache/ofbiz/birt/accounting/PaymentReport.groovy
+++ b/birt/src/main/groovy/org/apache/ofbiz/birt/accounting/PaymentReport.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.birt.accounting
-
birtParameters = [:]
birtParameters.partyIdTo = request.getParameter("partyIdTo")
birtParameters.paymentId = request.getParameter("paymentId")
diff --git
a/birt/src/main/groovy/org/apache/ofbiz/birt/accounting/TrialBalanceParameters.groovy
b/birt/src/main/groovy/org/apache/ofbiz/birt/accounting/TrialBalanceParameters.groovy
index 77215ffd4..68578751c 100644
---
a/birt/src/main/groovy/org/apache/ofbiz/birt/accounting/TrialBalanceParameters.groovy
+++
b/birt/src/main/groovy/org/apache/ofbiz/birt/accounting/TrialBalanceParameters.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.birt.accounting
-
try {
def birtParameters = [:]
birtParameters.organizationPartyId = parameters.organizationPartyId
diff --git
a/birt/src/main/groovy/org/apache/ofbiz/birt/facility/InventoryItemReport.groovy
b/birt/src/main/groovy/org/apache/ofbiz/birt/facility/InventoryItemReport.groovy
index 54986b45e..ac5421eab 100644
---
a/birt/src/main/groovy/org/apache/ofbiz/birt/facility/InventoryItemReport.groovy
+++
b/birt/src/main/groovy/org/apache/ofbiz/birt/facility/InventoryItemReport.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.birt.facility
-
import org.apache.ofbiz.base.util.UtilDateTime
birtParameters = [:]
diff --git
a/birt/src/main/groovy/org/apache/ofbiz/birt/order/CheckReportBy.groovy
b/birt/src/main/groovy/org/apache/ofbiz/birt/order/CheckReportBy.groovy
index c51a9dff6..ea9674ad6 100644
--- a/birt/src/main/groovy/org/apache/ofbiz/birt/order/CheckReportBy.groovy
+++ b/birt/src/main/groovy/org/apache/ofbiz/birt/order/CheckReportBy.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.birt.order
-
import org.apache.ofbiz.base.util.UtilValidate
reportBy = parameters.reportBy
diff --git
a/birt/src/main/groovy/org/apache/ofbiz/birt/order/NetBeforeOverheadReport.groovy
b/birt/src/main/groovy/org/apache/ofbiz/birt/order/NetBeforeOverheadReport.groovy
index cccc6109c..4c5d42fd7 100644
---
a/birt/src/main/groovy/org/apache/ofbiz/birt/order/NetBeforeOverheadReport.groovy
+++
b/birt/src/main/groovy/org/apache/ofbiz/birt/order/NetBeforeOverheadReport.groovy
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.birt.order
import org.apache.ofbiz.base.util.UtilDatetime
diff --git
a/birt/src/main/groovy/org/apache/ofbiz/birt/order/OrderByChannel.groovy
b/birt/src/main/groovy/org/apache/ofbiz/birt/order/OrderByChannel.groovy
index c4de591d2..c81cd959e 100644
--- a/birt/src/main/groovy/org/apache/ofbiz/birt/order/OrderByChannel.groovy
+++ b/birt/src/main/groovy/org/apache/ofbiz/birt/order/OrderByChannel.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.birt.order
-
birtParameters = [:]
if(request.getParameter("SalesChannel")){
birtParameters.saleChannel = request.getParameter("SalesChannel")
diff --git
a/birt/src/main/groovy/org/apache/ofbiz/birt/order/ProductDemandReport.groovy
b/birt/src/main/groovy/org/apache/ofbiz/birt/order/ProductDemandReport.groovy
index 4c2450df3..ab5adf68e 100644
---
a/birt/src/main/groovy/org/apache/ofbiz/birt/order/ProductDemandReport.groovy
+++
b/birt/src/main/groovy/org/apache/ofbiz/birt/order/ProductDemandReport.groovy
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.birt.order
import org.apache.ofbiz.base.util.UtilDateTime
diff --git
a/birt/src/main/groovy/org/apache/ofbiz/birt/order/SalesReport.groovy
b/birt/src/main/groovy/org/apache/ofbiz/birt/order/SalesReport.groovy
index dcf57058f..b0e7a1bdc 100644
--- a/birt/src/main/groovy/org/apache/ofbiz/birt/order/SalesReport.groovy
+++ b/birt/src/main/groovy/org/apache/ofbiz/birt/order/SalesReport.groovy
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.birt.order
import java.sql.*
diff --git
a/birt/src/main/groovy/org/apache/ofbiz/birt/report/PrepareBirtCall.groovy
b/birt/src/main/groovy/org/apache/ofbiz/birt/report/PrepareBirtCall.groovy
index 3b84cfc2f..0d72ec306 100644
--- a/birt/src/main/groovy/org/apache/ofbiz/birt/report/PrepareBirtCall.groovy
+++ b/birt/src/main/groovy/org/apache/ofbiz/birt/report/PrepareBirtCall.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.birt.report
-
import org.apache.ofbiz.base.util.UtilProperties
def birtParameters = [:]
diff --git
a/ebay/src/main/groovy/org/apache/ofbiz/ebay/EbayAdvancedSearch.groovy
b/ebay/src/main/groovy/org/apache/ofbiz/ebay/EbayAdvancedSearch.groovy
index 355e2f539..73ee18843 100644
--- a/ebay/src/main/groovy/org/apache/ofbiz/ebay/EbayAdvancedSearch.groovy
+++ b/ebay/src/main/groovy/org/apache/ofbiz/ebay/EbayAdvancedSearch.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ebay
-
import org.apache.ofbiz.entity.util.EntityUtil
import org.apache.ofbiz.product.catalog.CatalogWorker
import org.apache.ofbiz.product.category.CategoryWorker
diff --git a/ebay/src/main/groovy/org/apache/ofbiz/ebay/EbayOrders.groovy
b/ebay/src/main/groovy/org/apache/ofbiz/ebay/EbayOrders.groovy
index 07eefaa55..68703d3e7 100644
--- a/ebay/src/main/groovy/org/apache/ofbiz/ebay/EbayOrders.groovy
+++ b/ebay/src/main/groovy/org/apache/ofbiz/ebay/EbayOrders.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ebay
-
if (parameters.orderList) {
session.setAttribute("orderList", parameters.orderList)
}
diff --git
a/ebay/src/main/groovy/org/apache/ofbiz/ebay/UpdatedEbayOrders.groovy
b/ebay/src/main/groovy/org/apache/ofbiz/ebay/UpdatedEbayOrders.groovy
index 9f494e757..5a619a3ba 100644
--- a/ebay/src/main/groovy/org/apache/ofbiz/ebay/UpdatedEbayOrders.groovy
+++ b/ebay/src/main/groovy/org/apache/ofbiz/ebay/UpdatedEbayOrders.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ebay
-
if (session.getAttribute("orderList")) {
session.removeAttribute("orderList")
return "success"
diff --git
a/ebaystore/src/main/groovy/org/apache/ofbiz/ebaystore/automationPreferences/GetDisputeInfo.groovy
b/ebaystore/src/main/groovy/org/apache/ofbiz/ebaystore/automationPreferences/GetDisputeInfo.groovy
index 259f07166..fce70fcf4 100644
---
a/ebaystore/src/main/groovy/org/apache/ofbiz/ebaystore/automationPreferences/GetDisputeInfo.groovy
+++
b/ebaystore/src/main/groovy/org/apache/ofbiz/ebaystore/automationPreferences/GetDisputeInfo.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ebaystore.automationPreferences
-
import com.ebay.soap.eBLBaseComponents.DisputeReasonCodeType
import com.ebay.soap.eBLBaseComponents.DisputeExplanationCodeType
diff --git
a/ebaystore/src/main/groovy/org/apache/ofbiz/ebaystore/automationPreferences/GetEbayJobsandbox.groovy
b/ebaystore/src/main/groovy/org/apache/ofbiz/ebaystore/automationPreferences/GetEbayJobsandbox.groovy
index c571d24a3..0138bead7 100644
---
a/ebaystore/src/main/groovy/org/apache/ofbiz/ebaystore/automationPreferences/GetEbayJobsandbox.groovy
+++
b/ebaystore/src/main/groovy/org/apache/ofbiz/ebaystore/automationPreferences/GetEbayJobsandbox.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ebaystore.automationPreferences
-
jobSandboxs = from("JobSandbox").where("authUserLoginId",
userLoginId).queryList()
job = null
jobId = null
diff --git
a/ebaystore/src/main/groovy/org/apache/ofbiz/ebaystore/email/GetProductStoreEmailTemplate.groovy
b/ebaystore/src/main/groovy/org/apache/ofbiz/ebaystore/email/GetProductStoreEmailTemplate.groovy
index 9ca816b53..b820332be 100644
---
a/ebaystore/src/main/groovy/org/apache/ofbiz/ebaystore/email/GetProductStoreEmailTemplate.groovy
+++
b/ebaystore/src/main/groovy/org/apache/ofbiz/ebaystore/email/GetProductStoreEmailTemplate.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ebaystore.email
-
import org.apache.ofbiz.base.util.*
contentId = null
diff --git
a/ebaystore/src/main/groovy/org/apache/ofbiz/ebaystore/feedback/FeedbackList.groovy
b/ebaystore/src/main/groovy/org/apache/ofbiz/ebaystore/feedback/FeedbackList.groovy
index bf8bdfc5d..ccac2d493 100644
---
a/ebaystore/src/main/groovy/org/apache/ofbiz/ebaystore/feedback/FeedbackList.groovy
+++
b/ebaystore/src/main/groovy/org/apache/ofbiz/ebaystore/feedback/FeedbackList.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ebaystore.feedback
-
import org.apache.ofbiz.base.util.UtilDateTime
import org.apache.ofbiz.entity.condition.EntityCondition
import org.apache.ofbiz.entity.condition.EntityOperator
diff --git
a/ebaystore/src/main/groovy/org/apache/ofbiz/ebaystore/store/CheckOrderStatus.groovy
b/ebaystore/src/main/groovy/org/apache/ofbiz/ebaystore/store/CheckOrderStatus.groovy
index 499844b4c..5e52f7041 100644
---
a/ebaystore/src/main/groovy/org/apache/ofbiz/ebaystore/store/CheckOrderStatus.groovy
+++
b/ebaystore/src/main/groovy/org/apache/ofbiz/ebaystore/store/CheckOrderStatus.groovy
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ebaystore.store
import org.apache.ofbiz.entity.util.EntityUtil
diff --git
a/ebaystore/src/main/groovy/org/apache/ofbiz/ebaystore/store/OrderListParameters.groovy
b/ebaystore/src/main/groovy/org/apache/ofbiz/ebaystore/store/OrderListParameters.groovy
index cd7296abf..726859cdd 100644
---
a/ebaystore/src/main/groovy/org/apache/ofbiz/ebaystore/store/OrderListParameters.groovy
+++
b/ebaystore/src/main/groovy/org/apache/ofbiz/ebaystore/store/OrderListParameters.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ebaystore.store
-
session.setAttribute("shippingAddressCtx", shippingAddressCtx)
session.setAttribute("shippingServiceSelectedCtx",
shippingServiceSelectedCtx)
session.setAttribute("shippingDetailsCtx", shippingDetailsCtx)
diff --git
a/ebaystore/src/main/groovy/org/apache/ofbiz/ebaystore/store/OrderListPrepare.groovy
b/ebaystore/src/main/groovy/org/apache/ofbiz/ebaystore/store/OrderListPrepare.groovy
index 23c29ccd9..6cae6ef44 100644
---
a/ebaystore/src/main/groovy/org/apache/ofbiz/ebaystore/store/OrderListPrepare.groovy
+++
b/ebaystore/src/main/groovy/org/apache/ofbiz/ebaystore/store/OrderListPrepare.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ebaystore.store
-
import org.apache.ofbiz.entity.util.EntityUtil
orderLists = []
diff --git
a/ebaystore/src/main/groovy/org/apache/ofbiz/ebaystore/store/PrepareProductListing.groovy
b/ebaystore/src/main/groovy/org/apache/ofbiz/ebaystore/store/PrepareProductListing.groovy
index 026e620c3..d65ea7a5b 100644
---
a/ebaystore/src/main/groovy/org/apache/ofbiz/ebaystore/store/PrepareProductListing.groovy
+++
b/ebaystore/src/main/groovy/org/apache/ofbiz/ebaystore/store/PrepareProductListing.groovy
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ebaystore.store
diff --git
a/ebaystore/src/main/groovy/org/apache/ofbiz/ebaystore/store/RetrieveStoreOptions.groovy
b/ebaystore/src/main/groovy/org/apache/ofbiz/ebaystore/store/RetrieveStoreOptions.groovy
index 2634808cd..5e42b4fd2 100644
---
a/ebaystore/src/main/groovy/org/apache/ofbiz/ebaystore/store/RetrieveStoreOptions.groovy
+++
b/ebaystore/src/main/groovy/org/apache/ofbiz/ebaystore/store/RetrieveStoreOptions.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ebaystore.store
-
productStoreId = parameters.productStoreId
storeThemeId = null
if (parameters.ebayStore) {
diff --git
a/ebaystore/src/main/groovy/org/apache/ofbiz/ebaystore/store/SoldAction.groovy
b/ebaystore/src/main/groovy/org/apache/ofbiz/ebaystore/store/SoldAction.groovy
index 510ec1ab3..e3e0c68f7 100644
---
a/ebaystore/src/main/groovy/org/apache/ofbiz/ebaystore/store/SoldAction.groovy
+++
b/ebaystore/src/main/groovy/org/apache/ofbiz/ebaystore/store/SoldAction.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ebaystore.store
-
import org.apache.ofbiz.base.util.*
actionList = []
diff --git
a/ebaystore/src/main/groovy/org/apache/ofbiz/ebaystore/store/StoreAccount.groovy
b/ebaystore/src/main/groovy/org/apache/ofbiz/ebaystore/store/StoreAccount.groovy
index 32127f8a8..d34d36ac8 100644
---
a/ebaystore/src/main/groovy/org/apache/ofbiz/ebaystore/store/StoreAccount.groovy
+++
b/ebaystore/src/main/groovy/org/apache/ofbiz/ebaystore/store/StoreAccount.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ebaystore.store
-
import org.apache.ofbiz.base.util.*
results = []
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/EcommerceSetup.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/EcommerceSetup.groovy
index a5bbd1e4c..3272796b1 100644
--- a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/EcommerceSetup.groovy
+++ b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/EcommerceSetup.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce
-
import java.util.*
import org.apache.ofbiz.base.util.*
import org.apache.ofbiz.entity.*
diff --git a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/Login.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/Login.groovy
index 40ce3b385..f94db6689 100644
--- a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/Login.groovy
+++ b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/Login.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce
-
import org.apache.ofbiz.base.util.*
import org.apache.ofbiz.common.CommonWorkers
import org.apache.ofbiz.webapp.control.*
diff --git a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/Main.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/Main.groovy
index 9c8aa5e39..41be39b54 100644
--- a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/Main.groovy
+++ b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/Main.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce
-
import org.apache.ofbiz.product.catalog.*
catalogId = CatalogWorker.getCurrentCatalogId(request)
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/ProcessPaymentSettings.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/ProcessPaymentSettings.groovy
index 021766610..b7b6923af 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/ProcessPaymentSettings.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/ProcessPaymentSettings.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce
-
import java.util.ArrayList
import java.util.HashMap
import java.util.List
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/cart/ShowCart.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/cart/ShowCart.groovy
index 03f1fe739..633e02eea 100644
--- a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/cart/ShowCart.groovy
+++ b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/cart/ShowCart.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.cart
-
import org.apache.ofbiz.base.util.UtilMisc
import org.apache.ofbiz.product.catalog.CatalogWorker
import org.apache.ofbiz.order.shoppingcart.product.ProductDisplayWorker
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/cart/ShowPromoText.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/cart/ShowPromoText.groovy
index 27a43dfda..0f1f79e92 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/cart/ShowPromoText.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/cart/ShowPromoText.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.cart
-
import org.apache.ofbiz.base.util.UtilMisc
import org.apache.ofbiz.order.shoppingcart.product.ProductPromoWorker
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/catalog/AjaxBreadcrumbs.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/catalog/AjaxBreadcrumbs.groovy
index e5b5d3fa9..cf70b658a 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/catalog/AjaxBreadcrumbs.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/catalog/AjaxBreadcrumbs.groovy
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.catalog
import org.apache.ofbiz.product.product.ProductContentWrapper
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/catalog/BestSellingCategory.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/catalog/BestSellingCategory.groovy
index 26b236193..37f0743e5 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/catalog/BestSellingCategory.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/catalog/BestSellingCategory.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.catalog
-
import org.apache.ofbiz.base.util.UtilValidate
import org.apache.ofbiz.base.util.UtilMisc
import org.apache.ofbiz.product.catalog.*
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/catalog/LayeredNavigation.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/catalog/LayeredNavigation.groovy
index 2aab2d658..5810c1aa9 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/catalog/LayeredNavigation.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/catalog/LayeredNavigation.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.catalog
-
import org.apache.ofbiz.base.util.UtilHttp
import org.apache.ofbiz.entity.util.EntityUtil
import org.apache.ofbiz.product.catalog.CatalogWorker
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/catalog/MiniProductSummary.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/catalog/MiniProductSummary.groovy
index f2d02dd26..b6ac25374 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/catalog/MiniProductSummary.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/catalog/MiniProductSummary.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.catalog
-
import java.math.BigDecimal
import java.util.Map
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/catalog/MiniReorderProds.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/catalog/MiniReorderProds.groovy
index e6f5ce5f3..e6a3045cc 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/catalog/MiniReorderProds.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/catalog/MiniReorderProds.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.catalog
-
import org.apache.ofbiz.order.shoppingcart.product.ProductDisplayWorker
reorderProductResults = ProductDisplayWorker.getQuickReorderProducts(request)
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/catalog/PopularTags.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/catalog/PopularTags.groovy
index 668547493..8b1b155bc 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/catalog/PopularTags.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/catalog/PopularTags.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.catalog
-
import java.util.List
import org.apache.ofbiz.entity.*
import org.apache.ofbiz.entity.condition.*
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/catalog/ProductCategories.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/catalog/ProductCategories.groovy
index c0fd2f9a2..cb0867f0a 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/catalog/ProductCategories.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/catalog/ProductCategories.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.catalog
-
/*
* This script is also referenced by the ecommerce's screens and
* should not contain order component's specific code.
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/content/AdvancedSearchPrep.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/content/AdvancedSearchPrep.groovy
index 34124ba6a..bc0b6c41f 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/content/AdvancedSearchPrep.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/content/AdvancedSearchPrep.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.content
-
import org.apache.ofbiz.base.util.*
import org.apache.ofbiz.product.catalog.*
import org.apache.ofbiz.product.feature.*
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/content/ContentPrep.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/content/ContentPrep.groovy
index 64b948c06..73be6f221 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/content/ContentPrep.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/content/ContentPrep.groovy
@@ -16,8 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.content
-
context.contentId = parameters.cid ?: parameters.contentId
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/content/Mrv.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/content/Mrv.groovy
index 30c95e22d..240a96f9e 100644
--- a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/content/Mrv.groovy
+++ b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/content/Mrv.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.content
-
import java.util.ArrayList
import java.util.Collection
import java.util.HashMap
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/content/Search.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/content/Search.groovy
index 29267e272..0687e812b 100644
--- a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/content/Search.groovy
+++ b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/content/Search.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.content
-
import org.apache.lucene.analysis.Analyzer
import org.apache.lucene.analysis.standard.StandardAnalyzer
import org.apache.lucene.document.Document
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/ChangePassword.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/ChangePassword.groovy
index f531064f6..15cfe464f 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/ChangePassword.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/ChangePassword.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.customer
-
import java.util.HashMap
import org.apache.ofbiz.base.util.UtilHttp
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/ContactList.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/ContactList.groovy
index 74f376613..b0d0c3a0e 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/ContactList.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/ContactList.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.customer
-
import java.lang.*
import java.util.*
import org.apache.ofbiz.base.util.*
@@ -60,4 +58,3 @@ if (userLogin) {
context.partyAndContactMechList = partyAndContactMechList
}
-
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/CustomerReviews.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/CustomerReviews.groovy
index 9c50dbf95..078550e19 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/CustomerReviews.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/CustomerReviews.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.customer
-
import org.apache.ofbiz.entity.condition.EntityOperator
import org.apache.ofbiz.entity.condition.EntityCondition
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/CustomerSurvey.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/CustomerSurvey.groovy
index 8d1b1e351..ad0b9ddb5 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/CustomerSurvey.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/CustomerSurvey.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.customer
-
import org.apache.ofbiz.base.util.*
import org.apache.ofbiz.entity.Delegator
import org.apache.ofbiz.entity.GenericValue
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/EditBillingAddress.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/EditBillingAddress.groovy
index 6b451a3c6..246ce64fd 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/EditBillingAddress.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/EditBillingAddress.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.customer
-
import org.apache.ofbiz.entity.util.EntityUtil
import org.apache.ofbiz.party.contact.ContactHelper
import org.apache.ofbiz.entity.condition.EntityCondition
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/EditContactMech.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/EditContactMech.groovy
index 504eb33b1..2c020cc55 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/EditContactMech.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/EditContactMech.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.customer
-
import java.util.HashMap
import org.apache.ofbiz.party.contact.ContactMechWorker
import org.apache.ofbiz.base.util.UtilHttp
@@ -34,7 +32,6 @@ target = [:]
ContactMechWorker.getContactMechAndRelated(request, userLogin.partyId, target)
context.putAll(target)
-
if (!security.hasEntityPermission("PARTYMGR", "_VIEW", session) &&
!context.partyContactMech && context.contactMech) {
context.canNotView = true
} else {
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/EditEmailAndTelecomNumber.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/EditEmailAndTelecomNumber.groovy
index e85fb86f9..82dcc8cab 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/EditEmailAndTelecomNumber.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/EditEmailAndTelecomNumber.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.customer
-
import org.apache.ofbiz.entity.util.EntityUtil
import org.apache.ofbiz.party.contact.ContactHelper
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/EditPaymentMethod.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/EditPaymentMethod.groovy
index 5f9fae9b1..c49ebae27 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/EditPaymentMethod.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/EditPaymentMethod.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.customer
-
import java.util.HashMap
import org.apache.ofbiz.base.util.UtilHttp
import org.apache.ofbiz.accounting.payment.PaymentWorker
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/EditPerson.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/EditPerson.groovy
index eaf48d421..a5e73bf11 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/EditPerson.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/EditPerson.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.customer
-
import java.util.HashMap
import org.apache.ofbiz.base.util.UtilHttp
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/EditShippingAddress.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/EditShippingAddress.groovy
index 23f145639..37a244b2b 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/EditShippingAddress.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/EditShippingAddress.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.customer
-
import org.apache.ofbiz.entity.util.EntityUtil
import org.apache.ofbiz.party.contact.ContactHelper
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/GiftCardBalance.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/GiftCardBalance.groovy
index 6efc9065a..d59b4e824 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/GiftCardBalance.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/GiftCardBalance.groovy
@@ -16,9 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.customer
-
import org.apache.ofbiz.product.store.*
context.paymentProperties =
ProductStoreWorker.getProductStorePaymentProperties(request, "GIFT_CARD", null,
true)
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/GiftCardLink.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/GiftCardLink.groovy
index 28f775884..a05fc9a17 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/GiftCardLink.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/GiftCardLink.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.customer
-
import org.apache.ofbiz.product.store.*
processResult = parameters.processResult
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/NewCustomer.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/NewCustomer.groovy
index 7aa30c71e..2b7bc562c 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/NewCustomer.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/NewCustomer.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.customer
-
import org.apache.ofbiz.base.util.UtilProperties
import org.apache.ofbiz.base.util.UtilHttp
import org.apache.ofbiz.base.util.UtilMisc
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/OnePageCheckoutOptions.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/OnePageCheckoutOptions.groovy
index 8120a738e..f1dd2f467 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/OnePageCheckoutOptions.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/OnePageCheckoutOptions.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.customer
-
import org.apache.ofbiz.order.shoppingcart.shipping.*
shoppingCart = session.getAttribute("shoppingCart")
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/ViewProfile.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/ViewProfile.groovy
index e2c5e4bd1..011cbd606 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/ViewProfile.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/customer/ViewProfile.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.customer
-
import java.lang.*
import java.util.*
import org.apache.ofbiz.base.util.*
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/forum/ContentAddPrep.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/forum/ContentAddPrep.groovy
index 1000ca1c0..7d4f3cde6 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/forum/ContentAddPrep.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/forum/ContentAddPrep.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.forum
-
import java.util.ArrayList
import java.util.Collection
import java.util.HashMap
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/forum/ContentPrep.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/forum/ContentPrep.groovy
index 7a191cbeb..98ac919e8 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/forum/ContentPrep.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/forum/ContentPrep.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.forum
-
import org.apache.ofbiz.base.util.*
import org.apache.ofbiz.base.util.template.FreeMarkerWorker
import org.apache.ofbiz.entity.*
@@ -34,7 +32,6 @@ import java.io.StringWriter
import freemarker.template.SimpleHash
import freemarker.template.WrappingTemplateModel
-
import javax.servlet.*
import javax.servlet.http.*
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/forum/CurrentValPrep.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/forum/CurrentValPrep.groovy
index f420cc556..8b6ffc1a5 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/forum/CurrentValPrep.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/forum/CurrentValPrep.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.forum
-
import java.util.ArrayList
import java.util.Collection
import java.util.HashMap
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/forum/EditAddPrep.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/forum/EditAddPrep.groovy
index efd509065..fbe480ef4 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/forum/EditAddPrep.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/forum/EditAddPrep.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.forum
-
import java.util.ArrayList
import java.util.Collection
import java.util.HashMap
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/forum/HtmlAreaPrep.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/forum/HtmlAreaPrep.groovy
index 4f8cfd576..4e3970bd1 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/forum/HtmlAreaPrep.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/forum/HtmlAreaPrep.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.forum
-
import org.apache.ofbiz.base.util.*
import org.apache.ofbiz.entity.*
import org.apache.ofbiz.security.*
@@ -33,7 +31,6 @@ import freemarker.ext.beans.BeansWrapper
import freemarker.template.SimpleHash
import freemarker.template.WrappingTemplateModel
-
import javax.servlet.*
import javax.servlet.http.*
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/forum/NodeTrailPrep.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/forum/NodeTrailPrep.groovy
index ed66404c8..073e2cb8d 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/forum/NodeTrailPrep.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/forum/NodeTrailPrep.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.forum
-
import java.util.ArrayList
import java.util.Collection
import java.util.HashMap
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/forum/OwnerContentPrep.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/forum/OwnerContentPrep.groovy
index 5e4be24ee..8d2bfcb5c 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/forum/OwnerContentPrep.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/forum/OwnerContentPrep.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.forum
-
import org.apache.ofbiz.base.util.*
import org.apache.ofbiz.entity.*
import org.apache.ofbiz.security.*
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/forum/PermPrep.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/forum/PermPrep.groovy
index eed985966..a611f67c5 100644
--- a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/forum/PermPrep.groovy
+++ b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/forum/PermPrep.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.forum
-
import java.util.ArrayList
import java.util.Collection
import java.util.HashMap
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/forum/PubInit.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/forum/PubInit.groovy
index 5332e8363..5aafd8c19 100644
--- a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/forum/PubInit.groovy
+++ b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/forum/PubInit.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.forum
-
import java.util.ArrayList
import java.util.Collection
import java.util.HashMap
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/forum/RespondPermAndPrep.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/forum/RespondPermAndPrep.groovy
index a9742fa40..41d1f03c4 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/forum/RespondPermAndPrep.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/forum/RespondPermAndPrep.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.forum
-
import java.util.ArrayList
import java.util.Collection
import java.util.HashMap
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/forum/ResponsePrep.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/forum/ResponsePrep.groovy
index 240dbcdc9..6e442f753 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/forum/ResponsePrep.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/forum/ResponsePrep.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.forum
-
import java.util.ArrayList
import java.util.Collection
import java.util.HashMap
@@ -44,7 +42,6 @@ import javax.servlet.http.*
paramMap = UtilHttp.getParameterMap(request)
-
contentIdTo = paramMap.contentIdTo
nodeTrailCsv = paramMap.nodeTrailCsv
//logInfo("in viewprep, nodeTrailCsv:" + nodeTrailCsv)
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/forum/ShowForum.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/forum/ShowForum.groovy
index ccb888d02..5e0501f88 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/forum/ShowForum.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/forum/ShowForum.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.forum
-
import org.apache.ofbiz.ecommerce.forum.ForumEvents
import org.apache.ofbiz.service.ServiceUtil
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/forum/ViewPrep.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/forum/ViewPrep.groovy
index 0bbaa611f..86c16a8bc 100644
--- a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/forum/ViewPrep.groovy
+++ b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/forum/ViewPrep.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.forum
-
import java.util.ArrayList
import java.util.Collection
import java.util.HashMap
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/includes/MruAdd.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/includes/MruAdd.groovy
index 99a758dee..b3024041f 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/includes/MruAdd.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/includes/MruAdd.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.includes
-
import java.util.ArrayList
import java.util.Collection
import java.util.HashMap
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/AnonymousCheckoutLinks.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/AnonymousCheckoutLinks.groovy
index 96a9e6f0d..610b69356 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/AnonymousCheckoutLinks.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/AnonymousCheckoutLinks.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.order
-
import org.apache.ofbiz.order.shoppingcart.ShoppingCartEvents
shoppingCart = ShoppingCartEvents.getCartObject(request)
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/AnonymousTrail.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/AnonymousTrail.groovy
index a83fdb15b..08806f745 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/AnonymousTrail.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/AnonymousTrail.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.order
-
import org.apache.ofbiz.order.shoppingcart.*
cart = session.getAttribute("shoppingCart")
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/BillSettings.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/BillSettings.groovy
index c0dbd6170..3846f4417 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/BillSettings.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/BillSettings.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.order
-
import org.apache.ofbiz.entity.*
import org.apache.ofbiz.entity.util.*
import org.apache.ofbiz.base.util.*
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/CheckoutReview.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/CheckoutReview.groovy
index 8b96313b3..0762f9b77 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/CheckoutReview.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/CheckoutReview.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.order
-
import java.lang.*
import org.apache.ofbiz.base.util.*
import org.apache.ofbiz.entity.*
@@ -83,7 +81,6 @@ payToPartyId = productStore.payToPartyId
paymentAddress = PaymentWorker.getPaymentAddress(delegator, payToPartyId)
if (paymentAddress) context.paymentAddress = paymentAddress
-
// TODO: FIXME!
/*
billingAccount = cart.getBillingAccountId() ?
delegator.findOne("BillingAccount", [billingAccountId :
cart.getBillingAccountId()], false) : null
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/CheckoutShippingOptions.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/CheckoutShippingOptions.groovy
index 6645862b2..2f1dc3c57 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/CheckoutShippingOptions.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/CheckoutShippingOptions.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.order
-
import org.apache.ofbiz.base.util.*
import org.apache.ofbiz.entity.*
import org.apache.ofbiz.entity.util.*
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/CustSettings.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/CustSettings.groovy
index f1fd42c14..42db6fabe 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/CustSettings.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/CustSettings.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.order
-
import org.apache.ofbiz.base.util.*
import org.apache.ofbiz.entity.util.EntityUtil
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/OptionSettings.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/OptionSettings.groovy
index bb340dfe7..5f5480f95 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/OptionSettings.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/OptionSettings.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.order
-
import org.apache.ofbiz.entity.*
import org.apache.ofbiz.base.util.*
import org.apache.ofbiz.order.shoppingcart.*
@@ -47,7 +45,6 @@ if (partyId) {
context.party = party
}
-
context.emailList = ContactHelper.getContactMechByType(party,
"EMAIL_ADDRESS", false)
if (shoppingCart && shoppingCart.getShipmentMethodTypeId() &&
shoppingCart.getCarrierPartyId()) {
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/OrderHistory.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/OrderHistory.groovy
index 26516af50..aba0ab1bb 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/OrderHistory.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/OrderHistory.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.order
-
import org.apache.ofbiz.base.util.*
import org.apache.ofbiz.entity.*
import org.apache.ofbiz.entity.util.*
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/OrderStatus.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/OrderStatus.groovy
index 036c71781..14bf36ecf 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/OrderStatus.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/OrderStatus.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.order
-
import java.math.BigDecimal
import org.apache.ofbiz.base.util.*
import org.apache.ofbiz.entity.*
@@ -31,7 +29,6 @@ import org.apache.ofbiz.party.contact.*
import org.apache.ofbiz.product.catalog.*
import org.apache.ofbiz.product.store.*
-
orderId = parameters.orderId
orderHeader = null
// we have a special case here where for an anonymous order the user will
already be logged out, but the userLogin will be in the request so we can still
do a security check here
@@ -85,7 +82,6 @@ if (userLogin) {
}
}
-
// can anybody view an anonymous order? this is set in the screen widget and
should only be turned on by an email confirmation screen
allowAnonymousView = context.allowAnonymousView
@@ -150,7 +146,6 @@ if (orderHeader) {
}
}
-
payToPartyId = productStore.payToPartyId
paymentAddress = PaymentWorker.getPaymentAddress(delegator, payToPartyId)
if (paymentAddress) context.paymentAddress = paymentAddress
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/PaymentInformation.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/PaymentInformation.groovy
index c7ee559a5..a0abe19fd 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/PaymentInformation.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/PaymentInformation.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.order
-
import org.apache.ofbiz.entity.*
import org.apache.ofbiz.entity.util.*
import org.apache.ofbiz.base.util.*
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/PaymentOptions.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/PaymentOptions.groovy
index 0b4229845..4ba0da139 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/PaymentOptions.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/PaymentOptions.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.order
-
import org.apache.ofbiz.order.shoppingcart.*
//Get the Cart
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/QuickAnonCheckoutLinks.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/QuickAnonCheckoutLinks.groovy
index 7fc9fbf01..8e4a987db 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/QuickAnonCheckoutLinks.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/QuickAnonCheckoutLinks.groovy
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.order
import org.apache.ofbiz.order.shoppingcart.ShoppingCartEvents
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/QuickAnonCustSettings.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/QuickAnonCustSettings.groovy
index 37d220f18..c9216cffe 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/QuickAnonCustSettings.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/QuickAnonCustSettings.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.order
-
import org.apache.ofbiz.base.util.*
import org.apache.ofbiz.entity.util.EntityUtil
import org.apache.ofbiz.entity.*
@@ -28,7 +26,6 @@ import org.apache.ofbiz.order.shoppingcart.*
import org.apache.ofbiz.party.contact.*
import org.apache.ofbiz.product.catalog.*
-
partyId = null
userLogin = context.userLogin
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/QuickAnonOptionSettings.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/QuickAnonOptionSettings.groovy
index a53bfef80..fc50333c6 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/QuickAnonOptionSettings.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/QuickAnonOptionSettings.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.order
-
import org.apache.ofbiz.entity.*
import org.apache.ofbiz.base.util.*
import org.apache.ofbiz.order.shoppingcart.*
@@ -47,7 +45,6 @@ if (partyId) {
context.party = party
}
-
context.emailList = ContactHelper.getContactMechByType(party, "EMAIL_ADDRESS",
false)
if (shoppingCart?.getShipmentMethodTypeId() &&
shoppingCart.getCarrierPartyId()) {
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/QuickAnonPaymentInformation.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/QuickAnonPaymentInformation.groovy
index e3c11d481..e12eadf7b 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/QuickAnonPaymentInformation.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/QuickAnonPaymentInformation.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.order
-
import org.apache.ofbiz.entity.*
import org.apache.ofbiz.entity.util.*
import org.apache.ofbiz.base.util.*
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/RequestReturn.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/RequestReturn.groovy
index 7151ce434..c5da1c3fd 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/RequestReturn.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/RequestReturn.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.order
-
import org.apache.ofbiz.base.util.*
import org.apache.ofbiz.entity.*
import org.apache.ofbiz.party.contact.*
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/ShipSettings.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/ShipSettings.groovy
index d98a6b574..d9332baf0 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/ShipSettings.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/ShipSettings.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.order
-
import org.apache.ofbiz.entity.*
import org.apache.ofbiz.entity.util.*
import org.apache.ofbiz.base.util.*
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/ShipmentStatus.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/ShipmentStatus.groovy
index 2c17b7567..7b3f37834 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/ShipmentStatus.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/order/ShipmentStatus.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.order
-
import org.apache.ofbiz.base.util.UtilMisc
import org.apache.ofbiz.entity.Delegator
import org.apache.ofbiz.entity.*
diff --git
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/shoppinglist/EditShoppingList.groovy
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/shoppinglist/EditShoppingList.groovy
index 5854f62ba..9e748c8f5 100644
---
a/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/shoppinglist/EditShoppingList.groovy
+++
b/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/shoppinglist/EditShoppingList.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.ecommerce.shoppinglist
-
import java.util.*
import org.apache.ofbiz.base.util.*
import org.apache.ofbiz.entity.*
@@ -42,7 +40,6 @@ if (userLogin)
return // session ended, prevents a NPE
}
-
cart = ShoppingCartEvents.getCartObject(request)
currencyUomId = cart.getCurrency()
diff --git
a/example/src/main/groovy/org/apache/ofbiz/example/ApiTokenGenerator.groovy
b/example/src/main/groovy/org/apache/ofbiz/example/ApiTokenGenerator.groovy
index c71ada2f9..9a8523e00 100644
--- a/example/src/main/groovy/org/apache/ofbiz/example/ApiTokenGenerator.groovy
+++ b/example/src/main/groovy/org/apache/ofbiz/example/ApiTokenGenerator.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.example
-
import org.apache.ofbiz.entity.GenericValue
import org.apache.ofbiz.entity.util.EntityUtilProperties
import org.apache.ofbiz.webapp.control.JWTManager
diff --git
a/example/src/main/groovy/org/apache/ofbiz/example/FindExampleFeatures.groovy
b/example/src/main/groovy/org/apache/ofbiz/example/FindExampleFeatures.groovy
index bfa55f9fa..bf24d3726 100644
---
a/example/src/main/groovy/org/apache/ofbiz/example/FindExampleFeatures.groovy
+++
b/example/src/main/groovy/org/apache/ofbiz/example/FindExampleFeatures.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.example
-
import org.apache.ofbiz.entity.condition.EntityCondition
import org.apache.ofbiz.entity.condition.EntityFieldValue
import org.apache.ofbiz.entity.condition.EntityFunction
diff --git
a/example/src/main/groovy/org/apache/ofbiz/example/LoadReactApp.groovy
b/example/src/main/groovy/org/apache/ofbiz/example/LoadReactApp.groovy
index e6dd5fb5b..5f44cf94d 100644
--- a/example/src/main/groovy/org/apache/ofbiz/example/LoadReactApp.groovy
+++ b/example/src/main/groovy/org/apache/ofbiz/example/LoadReactApp.groovy
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.example
import groovy.json.JsonSlurper
diff --git
a/lucene/src/main/groovy/org/apache/ofbiz/lucene/content/AdvancedSearchPrep.groovy
b/lucene/src/main/groovy/org/apache/ofbiz/lucene/content/AdvancedSearchPrep.groovy
index 9abd474ab..0e6d40515 100644
---
a/lucene/src/main/groovy/org/apache/ofbiz/lucene/content/AdvancedSearchPrep.groovy
+++
b/lucene/src/main/groovy/org/apache/ofbiz/lucene/content/AdvancedSearchPrep.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.lucene.content
-
import org.apache.ofbiz.product.feature.ParametricSearch
import org.apache.ofbiz.product.product.ProductSearchSession
diff --git
a/lucene/src/main/groovy/org/apache/ofbiz/lucene/content/IndexProducts.groovy
b/lucene/src/main/groovy/org/apache/ofbiz/lucene/content/IndexProducts.groovy
index 668a6c766..3a4f60323 100644
---
a/lucene/src/main/groovy/org/apache/ofbiz/lucene/content/IndexProducts.groovy
+++
b/lucene/src/main/groovy/org/apache/ofbiz/lucene/content/IndexProducts.groovy
@@ -16,11 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.lucene.content
-
import org.apache.ofbiz.content.search.ProductDocument
import org.apache.ofbiz.content.search.DocumentIndexer
import org.apache.ofbiz.entity.transaction.TransactionUtil
diff --git
a/lucene/src/main/groovy/org/apache/ofbiz/lucene/content/Search.groovy
b/lucene/src/main/groovy/org/apache/ofbiz/lucene/content/Search.groovy
index 559568669..b8cd21763 100644
--- a/lucene/src/main/groovy/org/apache/ofbiz/lucene/content/Search.groovy
+++ b/lucene/src/main/groovy/org/apache/ofbiz/lucene/content/Search.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.lucene.content
-
import org.apache.lucene.analysis.standard.StandardAnalyzer
import org.apache.lucene.document.Document
import org.apache.lucene.index.Term
diff --git
a/lucene/src/main/groovy/org/apache/ofbiz/lucene/content/SearchProducts.groovy
b/lucene/src/main/groovy/org/apache/ofbiz/lucene/content/SearchProducts.groovy
index 171de5985..2605d79e9 100644
---
a/lucene/src/main/groovy/org/apache/ofbiz/lucene/content/SearchProducts.groovy
+++
b/lucene/src/main/groovy/org/apache/ofbiz/lucene/content/SearchProducts.groovy
@@ -16,11 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.lucene.content
-
import org.apache.lucene.analysis.core.WhitespaceAnalyzer
import org.apache.ofbiz.content.search.SearchWorker
diff --git
a/passport/src/main/groovy/org/apache/ofbiz/passport/login/GetThirdPartyLogins.groovy
b/passport/src/main/groovy/org/apache/ofbiz/passport/login/GetThirdPartyLogins.groovy
index 9a3cff40b..9624de906 100644
---
a/passport/src/main/groovy/org/apache/ofbiz/passport/login/GetThirdPartyLogins.groovy
+++
b/passport/src/main/groovy/org/apache/ofbiz/passport/login/GetThirdPartyLogins.groovy
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.passport.login
import org.apache.ofbiz.entity.util.EntityUtil
diff --git
a/pricat/src/main/groovy/org/apache/ofbiz/pricat/pricat/FindMyExcelImport.groovy
b/pricat/src/main/groovy/org/apache/ofbiz/pricat/pricat/FindMyExcelImport.groovy
index ee2f80952..007e285ec 100644
---
a/pricat/src/main/groovy/org/apache/ofbiz/pricat/pricat/FindMyExcelImport.groovy
+++
b/pricat/src/main/groovy/org/apache/ofbiz/pricat/pricat/FindMyExcelImport.groovy
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.pricat.pricat
import org.apache.ofbiz.base.util.*;
diff --git
a/pricat/src/main/groovy/org/apache/ofbiz/pricat/pricat/FindMyExcelImportLog.groovy
b/pricat/src/main/groovy/org/apache/ofbiz/pricat/pricat/FindMyExcelImportLog.groovy
index 374305135..469a3ed76 100644
---
a/pricat/src/main/groovy/org/apache/ofbiz/pricat/pricat/FindMyExcelImportLog.groovy
+++
b/pricat/src/main/groovy/org/apache/ofbiz/pricat/pricat/FindMyExcelImportLog.groovy
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.pricat.pricat
import org.apache.ofbiz.base.util.*;
diff --git
a/projectmgr/src/main/groovy/org/apache/ofbiz/projectmgr/EditWeekTimesheet.groovy
b/projectmgr/src/main/groovy/org/apache/ofbiz/projectmgr/EditWeekTimesheet.groovy
index 31809fae1..ec1f8d5fc 100644
---
a/projectmgr/src/main/groovy/org/apache/ofbiz/projectmgr/EditWeekTimesheet.groovy
+++
b/projectmgr/src/main/groovy/org/apache/ofbiz/projectmgr/EditWeekTimesheet.groovy
@@ -16,11 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.projectmgr
-
import org.apache.ofbiz.base.util.UtilDateTime
import org.apache.ofbiz.base.util.UtilProperties
import org.apache.ofbiz.entity.condition.EntityComparisonOperator
diff --git
a/projectmgr/src/main/groovy/org/apache/ofbiz/projectmgr/GanttChart.groovy
b/projectmgr/src/main/groovy/org/apache/ofbiz/projectmgr/GanttChart.groovy
index a978f3823..33e118717 100644
--- a/projectmgr/src/main/groovy/org/apache/ofbiz/projectmgr/GanttChart.groovy
+++ b/projectmgr/src/main/groovy/org/apache/ofbiz/projectmgr/GanttChart.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.projectmgr
-
import groovy.json.JsonOutput
import org.apache.ofbiz.base.util.UtilDateTime
import org.apache.ofbiz.entity.GenericValue
diff --git
a/projectmgr/src/main/groovy/org/apache/ofbiz/projectmgr/GetLastRequestAssignment.groovy
b/projectmgr/src/main/groovy/org/apache/ofbiz/projectmgr/GetLastRequestAssignment.groovy
index 7906d4333..9dbe48df8 100644
---
a/projectmgr/src/main/groovy/org/apache/ofbiz/projectmgr/GetLastRequestAssignment.groovy
+++
b/projectmgr/src/main/groovy/org/apache/ofbiz/projectmgr/GetLastRequestAssignment.groovy
@@ -17,10 +17,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.projectmgr
-
// get last request from this user and use that project/task assignment as
default on the screen
custRequestList = from("CustRequest").where("fromPartyId",
fromPartyId).orderBy("-createdDate").queryList()
diff --git
a/projectmgr/src/main/groovy/org/apache/ofbiz/projectmgr/GetProjectId.groovy
b/projectmgr/src/main/groovy/org/apache/ofbiz/projectmgr/GetProjectId.groovy
index 338847e90..67ac37c37 100644
--- a/projectmgr/src/main/groovy/org/apache/ofbiz/projectmgr/GetProjectId.groovy
+++ b/projectmgr/src/main/groovy/org/apache/ofbiz/projectmgr/GetProjectId.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.projectmgr
-
import org.apache.ofbiz.base.util.UtilValidate
if (parameters.workEffortId) {
diff --git
a/projectmgr/src/main/groovy/org/apache/ofbiz/projectmgr/ListCurrentProjects.groovy
b/projectmgr/src/main/groovy/org/apache/ofbiz/projectmgr/ListCurrentProjects.groovy
index 64119581b..69a8e36fa 100644
---
a/projectmgr/src/main/groovy/org/apache/ofbiz/projectmgr/ListCurrentProjects.groovy
+++
b/projectmgr/src/main/groovy/org/apache/ofbiz/projectmgr/ListCurrentProjects.groovy
@@ -16,11 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.projectmgr
-
import org.apache.ofbiz.entity.condition.EntityCondition
import org.apache.ofbiz.entity.condition.EntityJoinOperator
import org.apache.ofbiz.entity.condition.EntityOperator
diff --git
a/projectmgr/src/main/groovy/org/apache/ofbiz/projectmgr/ListResourceBillingHours.groovy
b/projectmgr/src/main/groovy/org/apache/ofbiz/projectmgr/ListResourceBillingHours.groovy
index d2e6b686d..978624243 100644
---
a/projectmgr/src/main/groovy/org/apache/ofbiz/projectmgr/ListResourceBillingHours.groovy
+++
b/projectmgr/src/main/groovy/org/apache/ofbiz/projectmgr/ListResourceBillingHours.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.projectmgr
-
allProjects =
select("workEffortId").from("WorkEffortAndPartyAssign").where("workEffortTypeId",
"PROJECT", "partyId",
parameters.partyId).orderBy("workEffortName").cache(true).queryList()
projects = []
@@ -31,4 +29,3 @@ if (projects) {
context.billingList = projects
}
-
diff --git
a/projectmgr/src/main/groovy/org/apache/ofbiz/projectmgr/ProjectBilling.groovy
b/projectmgr/src/main/groovy/org/apache/ofbiz/projectmgr/ProjectBilling.groovy
index 4ad1dafdb..28ccad307 100644
---
a/projectmgr/src/main/groovy/org/apache/ofbiz/projectmgr/ProjectBilling.groovy
+++
b/projectmgr/src/main/groovy/org/apache/ofbiz/projectmgr/ProjectBilling.groovy
@@ -17,11 +17,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.projectmgr
-
import org.apache.ofbiz.base.util.UtilDateTime
import org.apache.ofbiz.entity.condition.EntityCondition
import org.apache.ofbiz.entity.condition.EntityOperator
diff --git
a/projectmgr/src/main/groovy/org/apache/ofbiz/projectmgr/ProjectIsBillable.groovy
b/projectmgr/src/main/groovy/org/apache/ofbiz/projectmgr/ProjectIsBillable.groovy
index e79b84716..b388f5577 100644
---
a/projectmgr/src/main/groovy/org/apache/ofbiz/projectmgr/ProjectIsBillable.groovy
+++
b/projectmgr/src/main/groovy/org/apache/ofbiz/projectmgr/ProjectIsBillable.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.projectmgr
-
projectMembers = from("WorkEffortPartyAssignment").where("workEffortId",
context.projectId).filterByDate().queryList()
toPartyId = null
diff --git
a/scrum/src/main/groovy/org/apache/ofbiz/scrum/AddProductBacklogItem.groovy
b/scrum/src/main/groovy/org/apache/ofbiz/scrum/AddProductBacklogItem.groovy
index 19b063b3c..ee7cc8e3e 100644
--- a/scrum/src/main/groovy/org/apache/ofbiz/scrum/AddProductBacklogItem.groovy
+++ b/scrum/src/main/groovy/org/apache/ofbiz/scrum/AddProductBacklogItem.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.scrum
-
import org.apache.ofbiz.base.util.UtilMisc
import org.apache.ofbiz.entity.condition.EntityCondition
import org.apache.ofbiz.entity.condition.EntityOperator
diff --git
a/scrum/src/main/groovy/org/apache/ofbiz/scrum/AddResourceTaskParty.groovy
b/scrum/src/main/groovy/org/apache/ofbiz/scrum/AddResourceTaskParty.groovy
index ce60584a0..9a95a5d5a 100644
--- a/scrum/src/main/groovy/org/apache/ofbiz/scrum/AddResourceTaskParty.groovy
+++ b/scrum/src/main/groovy/org/apache/ofbiz/scrum/AddResourceTaskParty.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.scrum
-
partyId = parameters.partyId
// get existing task that no assign
projectSprintBacklogAndTaskList = []
diff --git
a/scrum/src/main/groovy/org/apache/ofbiz/scrum/BacklogNotifications.groovy
b/scrum/src/main/groovy/org/apache/ofbiz/scrum/BacklogNotifications.groovy
index 6ffc294ee..8386b8179 100644
--- a/scrum/src/main/groovy/org/apache/ofbiz/scrum/BacklogNotifications.groovy
+++ b/scrum/src/main/groovy/org/apache/ofbiz/scrum/BacklogNotifications.groovy
@@ -16,11 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.scrum
-
def module = "BacklogNotifications.groovy"
custRequest = from("CustRequest").where("custRequestId",
custRequestId).queryOne()
diff --git
a/scrum/src/main/groovy/org/apache/ofbiz/scrum/EditDailyHourReport.groovy
b/scrum/src/main/groovy/org/apache/ofbiz/scrum/EditDailyHourReport.groovy
index 8b5e00299..f98a7d70f 100644
--- a/scrum/src/main/groovy/org/apache/ofbiz/scrum/EditDailyHourReport.groovy
+++ b/scrum/src/main/groovy/org/apache/ofbiz/scrum/EditDailyHourReport.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.scrum
-
import java.util.*
import java.lang.*
import org.apache.ofbiz.base.util.UtilMisc
diff --git
a/scrum/src/main/groovy/org/apache/ofbiz/scrum/EditWeekTimesheet.groovy
b/scrum/src/main/groovy/org/apache/ofbiz/scrum/EditWeekTimesheet.groovy
index 69ef46d8d..4f1aab795 100644
--- a/scrum/src/main/groovy/org/apache/ofbiz/scrum/EditWeekTimesheet.groovy
+++ b/scrum/src/main/groovy/org/apache/ofbiz/scrum/EditWeekTimesheet.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.scrum
-
import java.util.*
import java.lang.*
import org.apache.ofbiz.base.util.UtilProperties
diff --git
a/scrum/src/main/groovy/org/apache/ofbiz/scrum/FindBacklogItem.groovy
b/scrum/src/main/groovy/org/apache/ofbiz/scrum/FindBacklogItem.groovy
index ccb030e25..d040d5586 100644
--- a/scrum/src/main/groovy/org/apache/ofbiz/scrum/FindBacklogItem.groovy
+++ b/scrum/src/main/groovy/org/apache/ofbiz/scrum/FindBacklogItem.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.scrum
-
import org.apache.ofbiz.base.util.UtilMisc
import org.apache.ofbiz.entity.condition.EntityCondition
import org.apache.ofbiz.entity.condition.EntityOperator
diff --git
a/scrum/src/main/groovy/org/apache/ofbiz/scrum/FindProductBacklogItem.groovy
b/scrum/src/main/groovy/org/apache/ofbiz/scrum/FindProductBacklogItem.groovy
index 0ebc81cd6..10c6fdafc 100644
--- a/scrum/src/main/groovy/org/apache/ofbiz/scrum/FindProductBacklogItem.groovy
+++ b/scrum/src/main/groovy/org/apache/ofbiz/scrum/FindProductBacklogItem.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.scrum
-
import java.sql.Timestamp
import org.apache.ofbiz.base.util.UtilMisc
import org.apache.ofbiz.base.util.UtilValidate
diff --git a/scrum/src/main/groovy/org/apache/ofbiz/scrum/FindTaskList.groovy
b/scrum/src/main/groovy/org/apache/ofbiz/scrum/FindTaskList.groovy
index a81df10fa..0e81420e9 100644
--- a/scrum/src/main/groovy/org/apache/ofbiz/scrum/FindTaskList.groovy
+++ b/scrum/src/main/groovy/org/apache/ofbiz/scrum/FindTaskList.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.scrum
-
import org.apache.ofbiz.entity.condition.EntityCondition
import org.apache.ofbiz.entity.condition.EntityOperator
diff --git
a/scrum/src/main/groovy/org/apache/ofbiz/scrum/ListCurrentProducts.groovy
b/scrum/src/main/groovy/org/apache/ofbiz/scrum/ListCurrentProducts.groovy
index 2ff3b6098..cd3b48ced 100644
--- a/scrum/src/main/groovy/org/apache/ofbiz/scrum/ListCurrentProducts.groovy
+++ b/scrum/src/main/groovy/org/apache/ofbiz/scrum/ListCurrentProducts.groovy
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.scrum
import org.apache.ofbiz.entity.condition.EntityCondition
diff --git
a/scrum/src/main/groovy/org/apache/ofbiz/scrum/ListCurrentSprints.groovy
b/scrum/src/main/groovy/org/apache/ofbiz/scrum/ListCurrentSprints.groovy
index 519082be3..1232aba7c 100644
--- a/scrum/src/main/groovy/org/apache/ofbiz/scrum/ListCurrentSprints.groovy
+++ b/scrum/src/main/groovy/org/apache/ofbiz/scrum/ListCurrentSprints.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.scrum
-
import org.apache.ofbiz.entity.condition.EntityCondition
import org.apache.ofbiz.entity.condition.EntityOperator
import org.apache.ofbiz.entity.condition.EntityJoinOperator
diff --git a/scrum/src/main/groovy/org/apache/ofbiz/scrum/ListRevision.groovy
b/scrum/src/main/groovy/org/apache/ofbiz/scrum/ListRevision.groovy
index e627294fd..71f33e785 100644
--- a/scrum/src/main/groovy/org/apache/ofbiz/scrum/ListRevision.groovy
+++ b/scrum/src/main/groovy/org/apache/ofbiz/scrum/ListRevision.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.scrum
-
import org.apache.ofbiz.entity.util.EntityUtil
import org.apache.ofbiz.entity.condition.EntityCondition
import org.apache.ofbiz.entity.condition.EntityOperator
diff --git
a/scrum/src/main/groovy/org/apache/ofbiz/scrum/ListScrumPreferenceSecurityGroup.groovy
b/scrum/src/main/groovy/org/apache/ofbiz/scrum/ListScrumPreferenceSecurityGroup.groovy
index df613dfbe..b138ce769 100644
---
a/scrum/src/main/groovy/org/apache/ofbiz/scrum/ListScrumPreferenceSecurityGroup.groovy
+++
b/scrum/src/main/groovy/org/apache/ofbiz/scrum/ListScrumPreferenceSecurityGroup.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.scrum
-
import org.apache.ofbiz.entity.condition.EntityCondition
import org.apache.ofbiz.entity.condition.EntityOperator
diff --git
a/scrum/src/main/groovy/org/apache/ofbiz/scrum/ListScrumResource.groovy
b/scrum/src/main/groovy/org/apache/ofbiz/scrum/ListScrumResource.groovy
index df5570c31..17968ec03 100644
--- a/scrum/src/main/groovy/org/apache/ofbiz/scrum/ListScrumResource.groovy
+++ b/scrum/src/main/groovy/org/apache/ofbiz/scrum/ListScrumResource.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.scrum
-
import org.apache.ofbiz.entity.GenericEntityException
performFindInMap = [:]
@@ -50,7 +48,6 @@ try {
}
}
-
resultList.each() { result ->
if (!"N".equals(result.enabled)) {
outputList.add(result)
diff --git
a/scrum/src/main/groovy/org/apache/ofbiz/scrum/ListScrumRolesPersonAndCompany.groovy
b/scrum/src/main/groovy/org/apache/ofbiz/scrum/ListScrumRolesPersonAndCompany.groovy
index 180473eaf..31e8dc878 100644
---
a/scrum/src/main/groovy/org/apache/ofbiz/scrum/ListScrumRolesPersonAndCompany.groovy
+++
b/scrum/src/main/groovy/org/apache/ofbiz/scrum/ListScrumRolesPersonAndCompany.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.scrum
-
import org.apache.ofbiz.entity.condition.EntityCondition
import org.apache.ofbiz.entity.condition.EntityOperator
import org.apache.ofbiz.entity.condition.EntityJoinOperator
diff --git a/scrum/src/main/groovy/org/apache/ofbiz/scrum/ListTimeSheets.groovy
b/scrum/src/main/groovy/org/apache/ofbiz/scrum/ListTimeSheets.groovy
index c22d2a4e2..7a39ffdba 100644
--- a/scrum/src/main/groovy/org/apache/ofbiz/scrum/ListTimeSheets.groovy
+++ b/scrum/src/main/groovy/org/apache/ofbiz/scrum/ListTimeSheets.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.scrum
-
import org.apache.ofbiz.entity.GenericEntityException
import org.apache.ofbiz.entity.condition.EntityCondition
import org.apache.ofbiz.entity.util.EntityFindOptions
diff --git
a/scrum/src/main/groovy/org/apache/ofbiz/scrum/ListUnplanBacklog.groovy
b/scrum/src/main/groovy/org/apache/ofbiz/scrum/ListUnplanBacklog.groovy
index 4c900b735..1a4a5e787 100644
--- a/scrum/src/main/groovy/org/apache/ofbiz/scrum/ListUnplanBacklog.groovy
+++ b/scrum/src/main/groovy/org/apache/ofbiz/scrum/ListUnplanBacklog.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.scrum
-
import org.apache.ofbiz.entity.condition.EntityCondition
import org.apache.ofbiz.entity.condition.EntityOperator
diff --git a/scrum/src/main/groovy/org/apache/ofbiz/scrum/ProductBilling.groovy
b/scrum/src/main/groovy/org/apache/ofbiz/scrum/ProductBilling.groovy
index 1867020e6..4158faefe 100644
--- a/scrum/src/main/groovy/org/apache/ofbiz/scrum/ProductBilling.groovy
+++ b/scrum/src/main/groovy/org/apache/ofbiz/scrum/ProductBilling.groovy
@@ -17,10 +17,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.scrum
-
import java.sql.Timestamp
import org.apache.ofbiz.base.util.UtilMisc
import org.apache.ofbiz.base.util.UtilDateTime
diff --git a/scrum/src/main/groovy/org/apache/ofbiz/scrum/ProductEmail.groovy
b/scrum/src/main/groovy/org/apache/ofbiz/scrum/ProductEmail.groovy
index 7697d1707..7506522e6 100644
--- a/scrum/src/main/groovy/org/apache/ofbiz/scrum/ProductEmail.groovy
+++ b/scrum/src/main/groovy/org/apache/ofbiz/scrum/ProductEmail.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.scrum
-
import org.apache.ofbiz.base.util.UtilDateTime
import org.apache.ofbiz.base.util.UtilValidate
import org.apache.ofbiz.entity.GenericEntityException
diff --git
a/scrum/src/main/groovy/org/apache/ofbiz/scrum/QuickAddBacklog.groovy
b/scrum/src/main/groovy/org/apache/ofbiz/scrum/QuickAddBacklog.groovy
index 134a5f943..42568d823 100644
--- a/scrum/src/main/groovy/org/apache/ofbiz/scrum/QuickAddBacklog.groovy
+++ b/scrum/src/main/groovy/org/apache/ofbiz/scrum/QuickAddBacklog.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.scrum
-
try{
// for sprint dropdown
workEffortList = []
diff --git
a/scrum/src/main/groovy/org/apache/ofbiz/scrum/SprintBacklogListItems.groovy
b/scrum/src/main/groovy/org/apache/ofbiz/scrum/SprintBacklogListItems.groovy
index 391b2c31b..c57be50c5 100644
--- a/scrum/src/main/groovy/org/apache/ofbiz/scrum/SprintBacklogListItems.groovy
+++ b/scrum/src/main/groovy/org/apache/ofbiz/scrum/SprintBacklogListItems.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.scrum
-
import org.apache.ofbiz.entity.condition.EntityCondition
import org.apache.ofbiz.entity.condition.EntityOperator
diff --git
a/scrum/src/main/groovy/org/apache/ofbiz/scrum/SprintBacklogOptions.groovy
b/scrum/src/main/groovy/org/apache/ofbiz/scrum/SprintBacklogOptions.groovy
index 75c39b589..800f2ba1f 100644
--- a/scrum/src/main/groovy/org/apache/ofbiz/scrum/SprintBacklogOptions.groovy
+++ b/scrum/src/main/groovy/org/apache/ofbiz/scrum/SprintBacklogOptions.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.scrum
-
sprintStatusId = "SPRINT_CLOSED"
sprintId = null
custRequestWorkEffortList = custRequestMap.getRelated("CustRequestWorkEffort",
null, null, false)
diff --git a/scrum/src/main/groovy/org/apache/ofbiz/scrum/TaskList.groovy
b/scrum/src/main/groovy/org/apache/ofbiz/scrum/TaskList.groovy
index a8bbb7eb1..06582d5fc 100644
--- a/scrum/src/main/groovy/org/apache/ofbiz/scrum/TaskList.groovy
+++ b/scrum/src/main/groovy/org/apache/ofbiz/scrum/TaskList.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.scrum
-
import org.apache.ofbiz.entity.condition.EntityCondition
import org.apache.ofbiz.entity.condition.EntityOperator
@@ -106,4 +104,3 @@ if (taskListDropdown){
context.taskListDropdown = taskListDropdown
}
-
diff --git a/webpos/src/main/groovy/org/apache/ofbiz/webpos/Login.groovy
b/webpos/src/main/groovy/org/apache/ofbiz/webpos/Login.groovy
index a8edc7517..e6b6d6030 100644
--- a/webpos/src/main/groovy/org/apache/ofbiz/webpos/Login.groovy
+++ b/webpos/src/main/groovy/org/apache/ofbiz/webpos/Login.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.webpos
-
import org.apache.ofbiz.product.store.ProductStoreWorker
import org.apache.ofbiz.webapp.control.LoginWorker
diff --git a/webpos/src/main/groovy/org/apache/ofbiz/webpos/WebPosMenus.groovy
b/webpos/src/main/groovy/org/apache/ofbiz/webpos/WebPosMenus.groovy
index 2c95a03e0..e52ecdb7b 100644
--- a/webpos/src/main/groovy/org/apache/ofbiz/webpos/WebPosMenus.groovy
+++ b/webpos/src/main/groovy/org/apache/ofbiz/webpos/WebPosMenus.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.webpos
-
import org.apache.ofbiz.webpos.WebPosEvents
import org.apache.ofbiz.webpos.session.WebPosSession
import org.apache.ofbiz.webpos.transaction.WebPosTransaction
diff --git a/webpos/src/main/groovy/org/apache/ofbiz/webpos/WebPosSetup.groovy
b/webpos/src/main/groovy/org/apache/ofbiz/webpos/WebPosSetup.groovy
index 4835d7644..c51686fd0 100644
--- a/webpos/src/main/groovy/org/apache/ofbiz/webpos/WebPosSetup.groovy
+++ b/webpos/src/main/groovy/org/apache/ofbiz/webpos/WebPosSetup.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.webpos
-
import org.apache.ofbiz.product.catalog.CatalogWorker
import org.apache.ofbiz.product.store.ProductStoreWorker
import org.apache.ofbiz.webapp.control.LoginWorker
diff --git
a/webpos/src/main/groovy/org/apache/ofbiz/webpos/cart/ShowCart.groovy
b/webpos/src/main/groovy/org/apache/ofbiz/webpos/cart/ShowCart.groovy
index 98635bc3f..15fcf72c0 100644
--- a/webpos/src/main/groovy/org/apache/ofbiz/webpos/cart/ShowCart.groovy
+++ b/webpos/src/main/groovy/org/apache/ofbiz/webpos/cart/ShowCart.groovy
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.webpos.cart
import org.apache.ofbiz.base.util.UtilValidate;
diff --git
a/webpos/src/main/groovy/org/apache/ofbiz/webpos/catalog/Category.groovy
b/webpos/src/main/groovy/org/apache/ofbiz/webpos/catalog/Category.groovy
index ce88f9e41..3896509fa 100644
--- a/webpos/src/main/groovy/org/apache/ofbiz/webpos/catalog/Category.groovy
+++ b/webpos/src/main/groovy/org/apache/ofbiz/webpos/catalog/Category.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.webpos.catalog
-
/*
* This script is also referenced by the ecommerce's screens and
* should not contain order component's specific code.
diff --git
a/webpos/src/main/groovy/org/apache/ofbiz/webpos/catalog/SideDeepCategory.groovy
b/webpos/src/main/groovy/org/apache/ofbiz/webpos/catalog/SideDeepCategory.groovy
index 9f44df275..42d64d92e 100644
---
a/webpos/src/main/groovy/org/apache/ofbiz/webpos/catalog/SideDeepCategory.groovy
+++
b/webpos/src/main/groovy/org/apache/ofbiz/webpos/catalog/SideDeepCategory.groovy
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.webpos.catalog
import org.apache.ofbiz.product.catalog.CatalogWorker
diff --git
a/webpos/src/main/groovy/org/apache/ofbiz/webpos/customer/EditAddress.groovy
b/webpos/src/main/groovy/org/apache/ofbiz/webpos/customer/EditAddress.groovy
index 581cda998..b65a2ea8b 100644
--- a/webpos/src/main/groovy/org/apache/ofbiz/webpos/customer/EditAddress.groovy
+++ b/webpos/src/main/groovy/org/apache/ofbiz/webpos/customer/EditAddress.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.webpos.customer
-
person = from("Person").where("partyId", parameters.partyId).queryOne()
if (person) {
request.setAttribute("lastName", person.lastName)
diff --git
a/webpos/src/main/groovy/org/apache/ofbiz/webpos/manager/PaidOutAndIn.groovy
b/webpos/src/main/groovy/org/apache/ofbiz/webpos/manager/PaidOutAndIn.groovy
index ce4c7a866..3fba08be4 100644
--- a/webpos/src/main/groovy/org/apache/ofbiz/webpos/manager/PaidOutAndIn.groovy
+++ b/webpos/src/main/groovy/org/apache/ofbiz/webpos/manager/PaidOutAndIn.groovy
@@ -16,9 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.webpos.manager
-
context.paidReasonIn = from("Enumeration").where("enumTypeId",
"POS_PAID_REASON_IN").orderBy("sequenceId").queryList()
context.paidReasonOut = from("Enumeration").where("enumTypeId",
"POS_PAID_REASON_OUT").orderBy("sequenceId").queryList()
diff --git
a/webpos/src/main/groovy/org/apache/ofbiz/webpos/search/CustomerAddress.groovy
b/webpos/src/main/groovy/org/apache/ofbiz/webpos/search/CustomerAddress.groovy
index 59311188a..414a033f2 100644
---
a/webpos/src/main/groovy/org/apache/ofbiz/webpos/search/CustomerAddress.groovy
+++
b/webpos/src/main/groovy/org/apache/ofbiz/webpos/search/CustomerAddress.groovy
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.webpos.search
import org.apache.ofbiz.base.util.UtilValidate
diff --git
a/webpos/src/main/groovy/org/apache/ofbiz/webpos/search/SearchSalesReps.groovy
b/webpos/src/main/groovy/org/apache/ofbiz/webpos/search/SearchSalesReps.groovy
index 247260e2c..47ff987f2 100644
---
a/webpos/src/main/groovy/org/apache/ofbiz/webpos/search/SearchSalesReps.groovy
+++
b/webpos/src/main/groovy/org/apache/ofbiz/webpos/search/SearchSalesReps.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ofbiz.webpos.search
-
context.salesReps = from("PartyRoleNameDetail").where("roleTypeId",
"SALES_REP").orderBy("lastName", "firstName").queryList()
shoppingCart = session.getAttribute("shoppingCart")
