Author: jacopoc
Date: Tue Sep 2 10:20:21 2014
New Revision: 1621956
URL: http://svn.apache.org/r1621956
Log:
Misc cleanups to some groovy scripts (no functional changes).
Modified:
ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/content/GetContentLookupList.groovy
ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/actions/reports/MarketingCampaignReport.groovy
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/CountFacilityInventoryByProduct.groovy
Modified:
ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/content/GetContentLookupList.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/content/GetContentLookupList.groovy?rev=1621956&r1=1621955&r2=1621956&view=diff
==============================================================================
---
ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/content/GetContentLookupList.groovy
(original)
+++
ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/content/GetContentLookupList.groovy
Tue Sep 2 10:20:21 2014
@@ -21,14 +21,10 @@
import org.ofbiz.entity.util.*;
import org.ofbiz.entity.*;
import org.ofbiz.base.util.*;
- import javolution.util.FastList;
- import javolution.util.FastSet;
- import javolution.util.FastMap;
import org.ofbiz.entity.transaction.TransactionUtil;
import org.ofbiz.entity.util.EntityListIterator;
import org.ofbiz.entity.GenericEntity;
import org.ofbiz.entity.model.ModelField;
- import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.entity.model.ModelEntity;
import org.ofbiz.entity.model.ModelReader;
@@ -47,7 +43,7 @@ String curFindString="";
ModelReader reader = delegator.getModelReader();
ModelEntity modelEntity = reader.getModelEntity("ContentAssocViewTo");
GenericEntity findByEntity = delegator.makeValue("ContentAssocViewTo");
-List errMsgList = FastList.newInstance();
+List errMsgList = new ArrayList();
Iterator fieldIterator = modelEntity.getFieldsIterator();
while (fieldIterator.hasNext()) {
ModelField field = fieldIterator.next();
@@ -93,11 +89,8 @@ if ((highIndex - lowIndex + 1) > 0) {
try {
beganTransaction = TransactionUtil.begin();
allConditions = EntityCondition.makeCondition( conditions,
EntityOperator.AND );
- fieldsToSelect = FastSet.newInstance();
- //fieldsToSelect=["contentId", "contentName", "mimeTypeId"] as Set;
findOptions = new EntityFindOptions(true,
EntityFindOptions.TYPE_SCROLL_INSENSITIVE, EntityFindOptions.CONCUR_READ_ONLY,
true);
- EntityListIterator listIt=null;
- listIt = delegator.find("ContentAssocViewTo", allConditions, null,
null, ["contentId ASC"], findOptions);
+ EntityListIterator listIt = delegator.find("ContentAssocViewTo",
allConditions, null, null, ["contentId ASC"], findOptions);
resultPartialList = listIt.getPartialList(lowIndex, highIndex -
lowIndex + 1);
arraySize = listIt.getResultsSizeAfterPartialList();
@@ -127,5 +120,4 @@ context.resultPartialList = resultPartia
viewIndexLast = UtilMisc.getViewLastIndex(arraySize, viewSize);
context.viewIndexLast = viewIndexLast;
-contentAssoc = FastList.newInstance();
context.contentAssoc=resultPartialList;
Modified:
ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/actions/reports/MarketingCampaignReport.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/actions/reports/MarketingCampaignReport.groovy?rev=1621956&r1=1621955&r2=1621956&view=diff
==============================================================================
---
ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/actions/reports/MarketingCampaignReport.groovy
(original)
+++
ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/actions/reports/MarketingCampaignReport.groovy
Tue Sep 2 10:20:21 2014
@@ -17,12 +17,8 @@
* under the License.
*/
-import org.ofbiz.entity.transaction.TransactionUtil
-import org.ofbiz.entity.util.EntityListIterator
import org.ofbiz.entity.condition.EntityOperator
-import org.ofbiz.entity.condition.EntityExpr
import org.ofbiz.entity.condition.EntityCondition
-import org.ofbiz.entity.condition.EntityConditionList
import org.ofbiz.marketing.report.ReportHelper
//query for both number of visits and number of orders
Modified:
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/CountFacilityInventoryByProduct.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/CountFacilityInventoryByProduct.groovy?rev=1621956&r1=1621955&r2=1621956&view=diff
==============================================================================
---
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/CountFacilityInventoryByProduct.groovy
(original)
+++
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/CountFacilityInventoryByProduct.groovy
Tue Sep 2 10:20:21 2014
@@ -31,7 +31,6 @@
// need it (but it is slower than this one).
import org.ofbiz.base.util.Debug
-import org.ofbiz.base.util.ObjectType
import org.ofbiz.entity.*
import org.ofbiz.entity.condition.*
import org.ofbiz.entity.transaction.*
@@ -40,12 +39,10 @@ import org.ofbiz.entity.model.DynamicVie
import org.ofbiz.entity.model.ModelKeyMap
import org.ofbiz.entity.model.ModelViewEntity.ComplexAlias
import org.ofbiz.entity.model.ModelViewEntity.ComplexAliasField
-import org.ofbiz.entity.model.ModelViewEntity.ComplexAliasMember
import org.ofbiz.product.inventory.*
action = request.getParameter("action");
-searchParameterString = "";
searchParameterString = "action=Y&facilityId=" + facilityId;
offsetQOH = -1;
