svn commit: r1340143 - in /ofbiz/trunk/framework/minilan
Locked
 
|
Author: adrianc
Date: Fri May 18 15:52:11 2012 New Revision: 1340143 URL: http://svn.apache.org/viewvc?rev=1340143&view=rev Log: Refactored the artifact info code in Mini-language. Made it less dependent on implementation details and made it more flexible and efficient. Added: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/artifact/ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/artifact/ArtifactInfoContext.java (with props) Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/MiniLangElement.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/MiniLangUtil.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMethod.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallService.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallServiceAsynch.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMethod.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/SetServiceFields.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/CompareCondition.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/CompareFieldCondition.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/ElseIf.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/EmptyCondition.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/HasPermissionCondition.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/MasterIf.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/RegexpCondition.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/ValidateMethodCondition.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityAnd.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCondition.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCount.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityOne.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByAnd.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByPrimaryKey.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/GetRelated.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/GetRelatedOne.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/MakeValue.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/Iterate.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/IterateMap.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/Loop.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/While.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfInstanceOf.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfNotEmpty.java Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/MiniLangElement.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/MiniLangElement.java?rev=1340143&r1=1340142&r2=1340143&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/MiniLangElement.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/MiniLangElement.java Fri May 18 15:52:11 2012 @@ -18,6 +18,7 @@ *******************************************************************************/ package org.ofbiz.minilang; +import org.ofbiz.minilang.artifact.ArtifactInfoContext; import org.ofbiz.base.util.Debug; import org.ofbiz.minilang.method.MethodContext; import org.w3c.dom.Element; @@ -39,6 +40,9 @@ public class MiniLangElement { this.tagName = element.getTagName().intern(); } + public void gatherArtifactInfo(ArtifactInfoContext aic) { + } + public String getLineNumber() { return this.lineNumber == null ? "unknown" : this.lineNumber.toString(); } Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/MiniLangUtil.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/MiniLangUtil.java?rev=1340143&r1=1340142&r2=1340143&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/MiniLangUtil.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/MiniLangUtil.java Fri May 18 15:52:11 2012 @@ -41,7 +41,6 @@ import org.ofbiz.base.location.FlexibleL import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.ScriptUtil; import org.ofbiz.base.util.UtilProperties; -import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.UtilXml; import org.ofbiz.base.util.collections.FlexibleMapAccessor; import org.ofbiz.base.util.string.FlexibleStringExpander; @@ -49,32 +48,6 @@ import org.ofbiz.entity.GenericEntity; import org.ofbiz.minilang.method.MethodContext; import org.ofbiz.minilang.method.MethodObject; import org.ofbiz.minilang.method.MethodOperation; -import org.ofbiz.minilang.method.callops.CallService; -import org.ofbiz.minilang.method.callops.CallServiceAsynch; -import org.ofbiz.minilang.method.callops.CallSimpleMethod; -import org.ofbiz.minilang.method.callops.SetServiceFields; -import org.ofbiz.minilang.method.conditional.CompareCondition; -import org.ofbiz.minilang.method.conditional.CompareFieldCondition; -import org.ofbiz.minilang.method.conditional.EmptyCondition; -import org.ofbiz.minilang.method.conditional.HasPermissionCondition; -import org.ofbiz.minilang.method.conditional.MasterIf; -import org.ofbiz.minilang.method.conditional.RegexpCondition; -import org.ofbiz.minilang.method.conditional.ValidateMethodCondition; -import org.ofbiz.minilang.method.entityops.EntityAnd; -import org.ofbiz.minilang.method.entityops.EntityCondition; -import org.ofbiz.minilang.method.entityops.EntityCount; -import org.ofbiz.minilang.method.entityops.EntityOne; -import org.ofbiz.minilang.method.entityops.FindByAnd; -import org.ofbiz.minilang.method.entityops.FindByPrimaryKey; -import org.ofbiz.minilang.method.entityops.GetRelated; -import org.ofbiz.minilang.method.entityops.GetRelatedOne; -import org.ofbiz.minilang.method.entityops.MakeValue; -import org.ofbiz.minilang.method.envops.Iterate; -import org.ofbiz.minilang.method.envops.IterateMap; -import org.ofbiz.minilang.method.envops.Loop; -import org.ofbiz.minilang.method.envops.While; -import org.ofbiz.minilang.method.ifops.IfInstanceOf; -import org.ofbiz.minilang.method.ifops.IfNotEmpty; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; @@ -181,148 +154,6 @@ public final class MiniLangUtil { return converter.convert(obj); } - public static void findEntityNamesUsed(List<MethodOperation> methodOperations, Set<String> allEntityNames, Set<String> simpleMethodsVisited) throws MiniLangException { - for (MethodOperation methodOperation : methodOperations) { - if (methodOperation instanceof FindByPrimaryKey) { - String entName = ((FindByPrimaryKey) methodOperation).getEntityName(); - if (UtilValidate.isNotEmpty(entName)) - allEntityNames.add(entName); - } else if (methodOperation instanceof FindByAnd) { - String entName = ((FindByAnd) methodOperation).getEntityName(); - if (UtilValidate.isNotEmpty(entName)) - allEntityNames.add(entName); - } else if (methodOperation instanceof EntityOne) { - String entName = ((EntityOne) methodOperation).getEntityName(); - if (UtilValidate.isNotEmpty(entName)) - allEntityNames.add(entName); - } else if (methodOperation instanceof EntityAnd) { - String entName = ((EntityAnd) methodOperation).getEntityName(); - if (UtilValidate.isNotEmpty(entName)) - allEntityNames.add(entName); - } else if (methodOperation instanceof EntityCondition) { - String entName = ((EntityCondition) methodOperation).getEntityName(); - if (UtilValidate.isNotEmpty(entName)) - allEntityNames.add(entName); - } else if (methodOperation instanceof EntityCount) { - String entName = ((EntityCount) methodOperation).getEntityName(); - if (UtilValidate.isNotEmpty(entName)) - allEntityNames.add(entName); - } else if (methodOperation instanceof MakeValue) { - String entName = ((MakeValue) methodOperation).getEntityName(); - if (UtilValidate.isNotEmpty(entName)) - allEntityNames.add(entName); - } else if (methodOperation instanceof GetRelated) { - String relationName = ((GetRelated) methodOperation).getRelationName(); - if (UtilValidate.isNotEmpty(relationName)) - allEntityNames.add(relationName); - } else if (methodOperation instanceof GetRelatedOne) { - String relationName = ((GetRelatedOne) methodOperation).getRelationName(); - if (UtilValidate.isNotEmpty(relationName)) - allEntityNames.add(relationName); - } else if (methodOperation instanceof CallSimpleMethod) { - CallSimpleMethod csm = (CallSimpleMethod) methodOperation; - try { - SimpleMethod calledMethod = csm.getSimpleMethodToCall(null); - if (calledMethod == null) { - Debug.logWarning("Could not find simple-method [" + csm.getMethodName() + "] in [" + csm.getXmlResource() + "] from the SimpleMethod [" + csm.getSimpleMethod().getMethodName() + "] in [" + csm.getSimpleMethod().getFromLocation() + "]", module); - } else { - if (!simpleMethodsVisited.contains(calledMethod.getLocationAndName())) { - simpleMethodsVisited.add(calledMethod.getLocationAndName()); - findEntityNamesUsed(calledMethod.getMethodOperations(), allEntityNames, simpleMethodsVisited); - } - } - } catch (MiniLangException e) { - Debug.logWarning("Error getting simple-method info in the [" + csm.getSimpleMethod().getMethodName() + "] in [" + csm.getSimpleMethod().getFromLocation() + "]: " + e.toString(), module); - } - } else if (methodOperation instanceof Iterate) { - findEntityNamesUsed(((Iterate) methodOperation).getSubOps(), allEntityNames, simpleMethodsVisited); - } else if (methodOperation instanceof IterateMap) { - findEntityNamesUsed(((IterateMap) methodOperation).getSubOps(), allEntityNames, simpleMethodsVisited); - } else if (methodOperation instanceof Loop) { - findEntityNamesUsed(((Loop) methodOperation).getSubOps(), allEntityNames, simpleMethodsVisited); - } else if (methodOperation instanceof MasterIf) { - findEntityNamesUsed(((MasterIf) methodOperation).getAllSubOps(), allEntityNames, simpleMethodsVisited); - } else if (methodOperation instanceof While) { - findEntityNamesUsed(((While) methodOperation).getThenSubOps(), allEntityNames, simpleMethodsVisited); - } else if (methodOperation instanceof ValidateMethodCondition) { - findEntityNamesUsed(((ValidateMethodCondition) methodOperation).getAllSubOps(), allEntityNames, simpleMethodsVisited); - } else if (methodOperation instanceof IfInstanceOf) { - findEntityNamesUsed(((IfInstanceOf) methodOperation).getAllSubOps(), allEntityNames, simpleMethodsVisited); - } else if (methodOperation instanceof CompareCondition) { - findEntityNamesUsed(((CompareCondition) methodOperation).getAllSubOps(), allEntityNames, simpleMethodsVisited); - } else if (methodOperation instanceof CompareFieldCondition) { - findEntityNamesUsed(((CompareFieldCondition) methodOperation).getAllSubOps(), allEntityNames, simpleMethodsVisited); - } else if (methodOperation instanceof RegexpCondition) { - findEntityNamesUsed(((RegexpCondition) methodOperation).getAllSubOps(), allEntityNames, simpleMethodsVisited); - } else if (methodOperation instanceof EmptyCondition) { - findEntityNamesUsed(((EmptyCondition) methodOperation).getAllSubOps(), allEntityNames, simpleMethodsVisited); - } else if (methodOperation instanceof IfNotEmpty) { - findEntityNamesUsed(((IfNotEmpty) methodOperation).getAllSubOps(), allEntityNames, simpleMethodsVisited); - } else if (methodOperation instanceof HasPermissionCondition) { - findEntityNamesUsed(((HasPermissionCondition) methodOperation).getAllSubOps(), allEntityNames, simpleMethodsVisited); - } - } - } - - public static void findServiceNamesCalled(List<MethodOperation> methodOperations, Set<String> allServiceNames, Set<String> simpleMethodsVisited) throws MiniLangException { - for (MethodOperation methodOperation : methodOperations) { - if (methodOperation instanceof CallService) { - String svcName = ((CallService) methodOperation).getServiceName(); - if (UtilValidate.isNotEmpty(svcName)) - allServiceNames.add(svcName); - } else if (methodOperation instanceof CallServiceAsynch) { - String svcName = ((CallServiceAsynch) methodOperation).getServiceName(); - if (UtilValidate.isNotEmpty(svcName)) - allServiceNames.add(svcName); - } else if (methodOperation instanceof SetServiceFields) { - String svcName = ((SetServiceFields) methodOperation).getServiceName(); - if (UtilValidate.isNotEmpty(svcName)) - allServiceNames.add(svcName); - } else if (methodOperation instanceof CallSimpleMethod) { - CallSimpleMethod csm = (CallSimpleMethod) methodOperation; - try { - SimpleMethod calledMethod = csm.getSimpleMethodToCall(methodOperations.getClass().getClassLoader()); - if (calledMethod == null) { - Debug.logWarning("Could not find simple-method [" + csm.getMethodName() + "] in [" + csm.getXmlResource() + "] from the SimpleMethod [" + csm.getSimpleMethod().getMethodName() + "] in [" + csm.getSimpleMethod().getFromLocation() + "]", module); - } else { - if (!simpleMethodsVisited.contains(calledMethod.getLocationAndName())) { - simpleMethodsVisited.add(calledMethod.getLocationAndName()); - findServiceNamesCalled(calledMethod.getMethodOperations(), allServiceNames, simpleMethodsVisited); - } - } - } catch (MiniLangException e) { - Debug.logWarning("Error getting simple-method info in the [" + csm.getSimpleMethod().getMethodName() + "] in [" + csm.getSimpleMethod().getFromLocation() + "]: " + e.toString(), module); - } - } else if (methodOperation instanceof Iterate) { - findServiceNamesCalled(((Iterate) methodOperation).getSubOps(), allServiceNames, simpleMethodsVisited); - } else if (methodOperation instanceof IterateMap) { - findServiceNamesCalled(((IterateMap) methodOperation).getSubOps(), allServiceNames, simpleMethodsVisited); - } else if (methodOperation instanceof Loop) { - findServiceNamesCalled(((Loop) methodOperation).getSubOps(), allServiceNames, simpleMethodsVisited); - } else if (methodOperation instanceof MasterIf) { - findServiceNamesCalled(((MasterIf) methodOperation).getAllSubOps(), allServiceNames, simpleMethodsVisited); - } else if (methodOperation instanceof While) { - findServiceNamesCalled(((While) methodOperation).getThenSubOps(), allServiceNames, simpleMethodsVisited); - } else if (methodOperation instanceof ValidateMethodCondition) { - findServiceNamesCalled(((ValidateMethodCondition) methodOperation).getAllSubOps(), allServiceNames, simpleMethodsVisited); - } else if (methodOperation instanceof IfInstanceOf) { - findServiceNamesCalled(((IfInstanceOf) methodOperation).getAllSubOps(), allServiceNames, simpleMethodsVisited); - } else if (methodOperation instanceof CompareCondition) { - findServiceNamesCalled(((CompareCondition) methodOperation).getAllSubOps(), allServiceNames, simpleMethodsVisited); - } else if (methodOperation instanceof CompareFieldCondition) { - findServiceNamesCalled(((CompareFieldCondition) methodOperation).getAllSubOps(), allServiceNames, simpleMethodsVisited); - } else if (methodOperation instanceof RegexpCondition) { - findServiceNamesCalled(((RegexpCondition) methodOperation).getAllSubOps(), allServiceNames, simpleMethodsVisited); - } else if (methodOperation instanceof EmptyCondition) { - findServiceNamesCalled(((EmptyCondition) methodOperation).getAllSubOps(), allServiceNames, simpleMethodsVisited); - } else if (methodOperation instanceof IfNotEmpty) { - findServiceNamesCalled(((IfNotEmpty) methodOperation).getAllSubOps(), allServiceNames, simpleMethodsVisited); - } else if (methodOperation instanceof HasPermissionCondition) { - findServiceNamesCalled(((HasPermissionCondition) methodOperation).getAllSubOps(), allServiceNames, simpleMethodsVisited); - } - } - } - public static void flagDocumentAsCorrected(Element element) { Document doc = element.getOwnerDocument(); if (doc != null) { Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMethod.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMethod.java?rev=1340143&r1=1340142&r2=1340143&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMethod.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMethod.java Fri May 18 15:52:11 2012 @@ -35,7 +35,6 @@ import javax.servlet.http.HttpServletRes import javolution.util.FastList; import javolution.util.FastMap; -import javolution.util.FastSet; import org.ofbiz.base.location.FlexibleLocation; import org.ofbiz.base.util.Assert; @@ -50,6 +49,7 @@ import org.ofbiz.entity.GenericEntity; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.transaction.GenericTransactionException; import org.ofbiz.entity.transaction.TransactionUtil; +import org.ofbiz.minilang.artifact.ArtifactInfoContext; import org.ofbiz.minilang.method.MethodContext; import org.ofbiz.minilang.method.MethodOperation; import org.ofbiz.minilang.method.MethodOperation.DeprecatedOperation; @@ -312,6 +312,7 @@ public final class SimpleMethod extends private final String methodName; private final List<MethodOperation> methodOperations; private final String serviceErrorMessageListName; + private final String serviceErrorMessageMapName; private final String serviceErrorMessageName; private final String serviceResponseMessageName; @@ -319,7 +320,6 @@ public final class SimpleMethod extends private final String serviceSuccessMessageName; private final String shortDescription; private final boolean useTransaction; - public SimpleMethod(Element simpleMethodElement, String fromLocation) throws MiniLangException { super(simpleMethodElement, null); if (MiniLangValidate.validationOn()) { @@ -578,18 +578,25 @@ public final class SimpleMethod extends return returnValue; } + @Override + public void gatherArtifactInfo(ArtifactInfoContext aic) { + for (MethodOperation methodOp : this.methodOperations) { + methodOp.gatherArtifactInfo(aic); + } + } + + @Deprecated public Set<String> getAllEntityNamesUsed() throws MiniLangException { - Set<String> allEntityNames = FastSet.newInstance(); - Set<String> simpleMethodsVisited = FastSet.newInstance(); - MiniLangUtil.findEntityNamesUsed(this.methodOperations, allEntityNames, simpleMethodsVisited); - return allEntityNames; + ArtifactInfoContext aic = new ArtifactInfoContext(); + gatherArtifactInfo(aic); + return aic.getEntityNames(); } + @Deprecated public Set<String> getAllServiceNamesCalled() throws MiniLangException { - Set<String> allServiceNames = FastSet.newInstance(); - Set<String> simpleMethodsVisited = FastSet.newInstance(); - MiniLangUtil.findServiceNamesCalled(this.methodOperations, allServiceNames, simpleMethodsVisited); - return allServiceNames; + ArtifactInfoContext aic = new ArtifactInfoContext(); + gatherArtifactInfo(aic); + return aic.getServiceNames(); } public String getDefaultErrorCode() { Added: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/artifact/ArtifactInfoContext.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/artifact/ArtifactInfoContext.java?rev=1340143&view=auto ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/artifact/ArtifactInfoContext.java (added) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/artifact/ArtifactInfoContext.java Fri May 18 15:52:11 2012 @@ -0,0 +1,58 @@ +/******************************************************************************* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + *******************************************************************************/ +package org.ofbiz.minilang.artifact; + +import java.util.Set; + +import javolution.util.FastSet; +import org.ofbiz.minilang.SimpleMethod; + +/** + * An object used for gathering artifact information. + */ +public final class ArtifactInfoContext { + + private final Set<String> entityNameSet = FastSet.newInstance(); + private final Set<String> serviceNameSet = FastSet.newInstance(); + private final Set<String> simpleMethodNameSet = FastSet.newInstance(); + + public void addEntityName(String name) { + this.entityNameSet.add(name); + } + + public void addServiceName(String name) { + this.serviceNameSet.add(name); + } + + public void addSimpleMethod(SimpleMethod method) { + this.simpleMethodNameSet.add(method.getLocationAndName()); + } + + public Set<String> getEntityNames() { + return this.entityNameSet; + } + + public Set<String> getServiceNames() { + return this.serviceNameSet; + } + + public boolean hasVisited(SimpleMethod method) { + return simpleMethodNameSet.contains(method.getLocationAndName()); + } +} Propchange: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/artifact/ArtifactInfoContext.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/artifact/ArtifactInfoContext.java ------------------------------------------------------------------------------ svn:keywords = Author Date Id Rev URL Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallService.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallService.java?rev=1340143&r1=1340142&r2=1340143&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallService.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallService.java Fri May 18 15:52:11 2012 @@ -39,6 +39,7 @@ import org.ofbiz.entity.GenericValue; import org.ofbiz.minilang.MiniLangException; import org.ofbiz.minilang.MiniLangValidate; import org.ofbiz.minilang.SimpleMethod; +import org.ofbiz.minilang.artifact.ArtifactInfoContext; import org.ofbiz.minilang.method.MethodContext; import org.ofbiz.minilang.method.MethodOperation; import org.ofbiz.service.GenericServiceException; @@ -367,8 +368,9 @@ public final class CallService extends M return FlexibleStringExpander.expandString(toString(), methodContext.getEnvMap()); } - public String getServiceName() { - return this.serviceName; + @Override + public void gatherArtifactInfo(ArtifactInfoContext aic) { + aic.addServiceName(this.serviceName); } @Override Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallServiceAsynch.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallServiceAsynch.java?rev=1340143&r1=1340142&r2=1340143&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallServiceAsynch.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallServiceAsynch.java Fri May 18 15:52:11 2012 @@ -30,6 +30,7 @@ import org.ofbiz.entity.GenericValue; import org.ofbiz.minilang.MiniLangException; import org.ofbiz.minilang.MiniLangValidate; import org.ofbiz.minilang.SimpleMethod; +import org.ofbiz.minilang.artifact.ArtifactInfoContext; import org.ofbiz.minilang.method.MethodContext; import org.ofbiz.minilang.method.MethodOperation; import org.ofbiz.service.GenericServiceException; @@ -111,8 +112,9 @@ public final class CallServiceAsynch ext return FlexibleStringExpander.expandString(toString(), methodContext.getEnvMap()); } - public String getServiceName() { - return this.serviceNameFse.getOriginal(); + @Override + public void gatherArtifactInfo(ArtifactInfoContext aic) { + aic.addServiceName(this.serviceNameFse.toString()); } @Override Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMethod.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMethod.java?rev=1340143&r1=1340142&r2=1340143&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMethod.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMethod.java Fri May 18 15:52:11 2012 @@ -27,6 +27,7 @@ import java.util.Map; import javolution.util.FastMap; import org.ofbiz.base.location.FlexibleLocation; +import org.ofbiz.minilang.artifact.ArtifactInfoContext; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.UtilXml; @@ -153,6 +154,22 @@ public final class CallSimpleMethod exte return FlexibleStringExpander.expandString(toString(), methodContext.getEnvMap()); } + @Override + public void gatherArtifactInfo(ArtifactInfoContext aic) { + SimpleMethod simpleMethodToCall; + try { + simpleMethodToCall = SimpleMethod.getSimpleMethod(this.xmlURL, this.methodName); + if (simpleMethodToCall != null) { + if (!aic.hasVisited(simpleMethodToCall)) { + aic.addSimpleMethod(simpleMethodToCall); + simpleMethodToCall.gatherArtifactInfo(aic); + } + } + } catch (MiniLangException e) { + Debug.logWarning("Could not find <simple-method name=\"" + this.methodName + "\"> in XML document " + this.xmlResource + ": " + e.toString(), module); + } + } + public String getMethodName() { return this.methodName; } Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/SetServiceFields.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/SetServiceFields.java?rev=1340143&r1=1340142&r2=1340143&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/SetServiceFields.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/SetServiceFields.java Fri May 18 15:52:11 2012 @@ -32,6 +32,7 @@ import org.ofbiz.minilang.MiniLangRuntim import org.ofbiz.minilang.MiniLangUtil; import org.ofbiz.minilang.MiniLangValidate; import org.ofbiz.minilang.SimpleMethod; +import org.ofbiz.minilang.artifact.ArtifactInfoContext; import org.ofbiz.minilang.method.MethodContext; import org.ofbiz.minilang.method.MethodOperation; import org.ofbiz.service.GenericServiceException; @@ -115,8 +116,9 @@ public final class SetServiceFields exte return FlexibleStringExpander.expandString(toString(), methodContext.getEnvMap()); } - public String getServiceName() { - return this.serviceNameFse.getOriginal(); + @Override + public void gatherArtifactInfo(ArtifactInfoContext aic) { + aic.addServiceName(this.serviceNameFse.toString()); } @Override Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/CompareCondition.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/CompareCondition.java?rev=1340143&r1=1340142&r2=1340143&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/CompareCondition.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/CompareCondition.java Fri May 18 15:52:11 2012 @@ -21,8 +21,6 @@ package org.ofbiz.minilang.method.condit import java.util.Collections; import java.util.List; -import javolution.util.FastList; - import org.ofbiz.base.util.ObjectType; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.UtilXml; @@ -33,6 +31,7 @@ import org.ofbiz.minilang.MiniLangRuntim import org.ofbiz.minilang.MiniLangUtil; import org.ofbiz.minilang.MiniLangValidate; import org.ofbiz.minilang.SimpleMethod; +import org.ofbiz.minilang.artifact.ArtifactInfoContext; import org.ofbiz.minilang.method.MethodContext; import org.ofbiz.minilang.method.MethodOperation; import org.w3c.dom.Element; @@ -138,13 +137,18 @@ public final class CompareCondition exte return FlexibleStringExpander.expandString(toString(), methodContext.getEnvMap()); } - public List<MethodOperation> getAllSubOps() { - List<MethodOperation> allSubOps = FastList.newInstance(); - if (this.subOps != null) - allSubOps.addAll(this.subOps); - if (this.elseSubOps != null) - allSubOps.addAll(this.elseSubOps); - return allSubOps; + @Override + public void gatherArtifactInfo(ArtifactInfoContext aic) { + if (this.subOps != null) { + for (MethodOperation method : this.subOps) { + method.gatherArtifactInfo(aic); + } + } + if (this.elseSubOps != null) { + for (MethodOperation method : this.elseSubOps) { + method.gatherArtifactInfo(aic); + } + } } public void prettyPrint(StringBuilder messageBuffer, MethodContext methodContext) { Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/CompareFieldCondition.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/CompareFieldCondition.java?rev=1340143&r1=1340142&r2=1340143&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/CompareFieldCondition.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/CompareFieldCondition.java Fri May 18 15:52:11 2012 @@ -21,8 +21,6 @@ package org.ofbiz.minilang.method.condit import java.util.Collections; import java.util.List; -import javolution.util.FastList; - import org.ofbiz.base.util.ObjectType; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.UtilXml; @@ -33,6 +31,7 @@ import org.ofbiz.minilang.MiniLangRuntim import org.ofbiz.minilang.MiniLangUtil; import org.ofbiz.minilang.MiniLangValidate; import org.ofbiz.minilang.SimpleMethod; +import org.ofbiz.minilang.artifact.ArtifactInfoContext; import org.ofbiz.minilang.method.MethodContext; import org.ofbiz.minilang.method.MethodOperation; import org.w3c.dom.Element; @@ -148,13 +147,18 @@ public final class CompareFieldCondition return FlexibleStringExpander.expandString(toString(), methodContext.getEnvMap()); } - public List<MethodOperation> getAllSubOps() { - List<MethodOperation> allSubOps = FastList.newInstance(); - if (this.subOps != null) - allSubOps.addAll(this.subOps); - if (this.elseSubOps != null) - allSubOps.addAll(this.elseSubOps); - return allSubOps; + @Override + public void gatherArtifactInfo(ArtifactInfoContext aic) { + if (this.subOps != null) { + for (MethodOperation method : this.subOps) { + method.gatherArtifactInfo(aic); + } + } + if (this.elseSubOps != null) { + for (MethodOperation method : this.elseSubOps) { + method.gatherArtifactInfo(aic); + } + } } public void prettyPrint(StringBuilder messageBuffer, MethodContext methodContext) { Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/ElseIf.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/ElseIf.java?rev=1340143&r1=1340142&r2=1340143&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/ElseIf.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/ElseIf.java Fri May 18 15:52:11 2012 @@ -26,6 +26,7 @@ import org.ofbiz.minilang.MiniLangElemen import org.ofbiz.minilang.MiniLangException; import org.ofbiz.minilang.MiniLangValidate; import org.ofbiz.minilang.SimpleMethod; +import org.ofbiz.minilang.artifact.ArtifactInfoContext; import org.ofbiz.minilang.method.MethodContext; import org.ofbiz.minilang.method.MethodOperation; import org.w3c.dom.Element; @@ -55,6 +56,13 @@ public final class ElseIf extends MiniLa return condition.checkCondition(methodContext); } + @Override + public void gatherArtifactInfo(ArtifactInfoContext aic) { + for (MethodOperation method : this.thenSubOps) { + method.gatherArtifactInfo(aic); + } + } + public List<MethodOperation> getThenSubOps() { return this.thenSubOps; } Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/EmptyCondition.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/EmptyCondition.java?rev=1340143&r1=1340142&r2=1340143&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/EmptyCondition.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/EmptyCondition.java Fri May 18 15:52:11 2012 @@ -21,8 +21,6 @@ package org.ofbiz.minilang.method.condit import java.util.Collections; import java.util.List; -import javolution.util.FastList; - import org.ofbiz.base.util.ObjectType; import org.ofbiz.base.util.UtilXml; import org.ofbiz.base.util.collections.FlexibleMapAccessor; @@ -30,6 +28,7 @@ import org.ofbiz.base.util.string.Flexib import org.ofbiz.minilang.MiniLangException; import org.ofbiz.minilang.MiniLangValidate; import org.ofbiz.minilang.SimpleMethod; +import org.ofbiz.minilang.artifact.ArtifactInfoContext; import org.ofbiz.minilang.method.MethodContext; import org.ofbiz.minilang.method.MethodOperation; import org.w3c.dom.Element; @@ -92,13 +91,18 @@ public final class EmptyCondition extend return FlexibleStringExpander.expandString(toString(), methodContext.getEnvMap()); } - public List<MethodOperation> getAllSubOps() { - List<MethodOperation> allSubOps = FastList.newInstance(); - if (this.subOps != null) - allSubOps.addAll(this.subOps); - if (this.elseSubOps != null) - allSubOps.addAll(this.elseSubOps); - return allSubOps; + @Override + public void gatherArtifactInfo(ArtifactInfoContext aic) { + if (this.subOps != null) { + for (MethodOperation method : this.subOps) { + method.gatherArtifactInfo(aic); + } + } + if (this.elseSubOps != null) { + for (MethodOperation method : this.elseSubOps) { + method.gatherArtifactInfo(aic); + } + } } public void prettyPrint(StringBuilder messageBuffer, MethodContext methodContext) { Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/HasPermissionCondition.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/HasPermissionCondition.java?rev=1340143&r1=1340142&r2=1340143&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/HasPermissionCondition.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/HasPermissionCondition.java Fri May 18 15:52:11 2012 @@ -21,8 +21,6 @@ package org.ofbiz.minilang.method.condit import java.util.Collections; import java.util.List; -import javolution.util.FastList; - import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.UtilXml; import org.ofbiz.base.util.string.FlexibleStringExpander; @@ -30,6 +28,7 @@ import org.ofbiz.entity.GenericValue; import org.ofbiz.minilang.MiniLangException; import org.ofbiz.minilang.MiniLangValidate; import org.ofbiz.minilang.SimpleMethod; +import org.ofbiz.minilang.artifact.ArtifactInfoContext; import org.ofbiz.minilang.method.MethodContext; import org.ofbiz.minilang.method.MethodOperation; import org.ofbiz.security.Security; @@ -110,13 +109,18 @@ public final class HasPermissionConditio return FlexibleStringExpander.expandString(toString(), methodContext.getEnvMap()); } - public List<MethodOperation> getAllSubOps() { - List<MethodOperation> allSubOps = FastList.newInstance(); - if (this.subOps != null) - allSubOps.addAll(this.subOps); - if (this.elseSubOps != null) - allSubOps.addAll(this.elseSubOps); - return allSubOps; + @Override + public void gatherArtifactInfo(ArtifactInfoContext aic) { + if (this.subOps != null) { + for (MethodOperation method : this.subOps) { + method.gatherArtifactInfo(aic); + } + } + if (this.elseSubOps != null) { + for (MethodOperation method : this.elseSubOps) { + method.gatherArtifactInfo(aic); + } + } } public void prettyPrint(StringBuilder messageBuffer, MethodContext methodContext) { Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/MasterIf.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/MasterIf.java?rev=1340143&r1=1340142&r2=1340143&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/MasterIf.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/MasterIf.java Fri May 18 15:52:11 2012 @@ -22,12 +22,11 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import javolution.util.FastList; - import org.ofbiz.base.util.UtilXml; import org.ofbiz.minilang.MiniLangException; import org.ofbiz.minilang.MiniLangValidate; import org.ofbiz.minilang.SimpleMethod; +import org.ofbiz.minilang.artifact.ArtifactInfoContext; import org.ofbiz.minilang.method.MethodContext; import org.ofbiz.minilang.method.MethodOperation; import org.w3c.dom.Element; @@ -105,17 +104,21 @@ public final class MasterIf extends Meth return "<if><condition>" + messageBuf + "</condition></if>"; } - public List<MethodOperation> getAllSubOps() { - List<MethodOperation> allSubOps = FastList.newInstance(); - allSubOps.addAll(this.thenSubOps); - if (this.elseSubOps != null) - allSubOps.addAll(this.elseSubOps); - if (elseIfs != null) { + @Override + public void gatherArtifactInfo(ArtifactInfoContext aic) { + for (MethodOperation method : this.thenSubOps) { + method.gatherArtifactInfo(aic); + } + if (this.elseSubOps != null) { + for (MethodOperation method : this.elseSubOps) { + method.gatherArtifactInfo(aic); + } + } + if (this.elseIfs != null) { for (ElseIf elseIf : elseIfs) { - allSubOps.addAll(elseIf.getThenSubOps()); + elseIf.gatherArtifactInfo(aic); } } - return allSubOps; } @Override Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/RegexpCondition.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/RegexpCondition.java?rev=1340143&r1=1340142&r2=1340143&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/RegexpCondition.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/RegexpCondition.java Fri May 18 15:52:11 2012 @@ -21,8 +21,6 @@ package org.ofbiz.minilang.method.condit import java.util.Collections; import java.util.List; -import javolution.util.FastList; - import org.apache.oro.text.regex.MalformedPatternException; import org.ofbiz.base.util.CompilerMatcher; import org.ofbiz.base.util.UtilXml; @@ -33,6 +31,7 @@ import org.ofbiz.minilang.MiniLangRuntim import org.ofbiz.minilang.MiniLangUtil; import org.ofbiz.minilang.MiniLangValidate; import org.ofbiz.minilang.SimpleMethod; +import org.ofbiz.minilang.artifact.ArtifactInfoContext; import org.ofbiz.minilang.method.MethodContext; import org.ofbiz.minilang.method.MethodOperation; import org.w3c.dom.Element; @@ -114,13 +113,18 @@ public class RegexpCondition extends Met return FlexibleStringExpander.expandString(toString(), methodContext.getEnvMap()); } - public List<MethodOperation> getAllSubOps() { - List<MethodOperation> allSubOps = FastList.newInstance(); - if (this.subOps != null) - allSubOps.addAll(this.subOps); - if (this.elseSubOps != null) - allSubOps.addAll(this.elseSubOps); - return allSubOps; + @Override + public void gatherArtifactInfo(ArtifactInfoContext aic) { + if (this.subOps != null) { + for (MethodOperation method : this.subOps) { + method.gatherArtifactInfo(aic); + } + } + if (this.elseSubOps != null) { + for (MethodOperation method : this.elseSubOps) { + method.gatherArtifactInfo(aic); + } + } } public void prettyPrint(StringBuilder messageBuffer, MethodContext methodContext) { Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/ValidateMethodCondition.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/ValidateMethodCondition.java?rev=1340143&r1=1340142&r2=1340143&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/ValidateMethodCondition.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/ValidateMethodCondition.java Fri May 18 15:52:11 2012 @@ -22,8 +22,6 @@ import java.lang.reflect.Method; import java.util.Collections; import java.util.List; -import javolution.util.FastList; - import org.ofbiz.base.util.UtilXml; import org.ofbiz.base.util.collections.FlexibleMapAccessor; import org.ofbiz.base.util.string.FlexibleStringExpander; @@ -32,6 +30,7 @@ import org.ofbiz.minilang.MiniLangRuntim import org.ofbiz.minilang.MiniLangUtil; import org.ofbiz.minilang.MiniLangValidate; import org.ofbiz.minilang.SimpleMethod; +import org.ofbiz.minilang.artifact.ArtifactInfoContext; import org.ofbiz.minilang.method.MethodContext; import org.ofbiz.minilang.method.MethodOperation; import org.w3c.dom.Element; @@ -118,13 +117,18 @@ public final class ValidateMethodConditi return FlexibleStringExpander.expandString(toString(), methodContext.getEnvMap()); } - public List<MethodOperation> getAllSubOps() { - List<MethodOperation> allSubOps = FastList.newInstance(); - if (this.subOps != null) - allSubOps.addAll(this.subOps); - if (this.elseSubOps != null) - allSubOps.addAll(this.elseSubOps); - return allSubOps; + @Override + public void gatherArtifactInfo(ArtifactInfoContext aic) { + if (this.subOps != null) { + for (MethodOperation method : this.subOps) { + method.gatherArtifactInfo(aic); + } + } + if (this.elseSubOps != null) { + for (MethodOperation method : this.elseSubOps) { + method.gatherArtifactInfo(aic); + } + } } public void prettyPrint(StringBuilder messageBuffer, MethodContext methodContext) { Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityAnd.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityAnd.java?rev=1340143&r1=1340142&r2=1340143&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityAnd.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityAnd.java Fri May 18 15:52:11 2012 @@ -18,6 +18,7 @@ *******************************************************************************/ package org.ofbiz.minilang.method.entityops; +import org.ofbiz.minilang.artifact.ArtifactInfoContext; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; import org.ofbiz.entity.Delegator; @@ -68,8 +69,9 @@ public class EntityAnd extends MethodOpe return this.rawString(); } - public String getEntityName() { - return this.finder.getEntityName(); + @Override + public void gatherArtifactInfo(ArtifactInfoContext aic) { + aic.addEntityName(this.finder.getEntityName()); } @Override Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCondition.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCondition.java?rev=1340143&r1=1340142&r2=1340143&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCondition.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCondition.java Fri May 18 15:52:11 2012 @@ -18,6 +18,7 @@ *******************************************************************************/ package org.ofbiz.minilang.method.entityops; +import org.ofbiz.minilang.artifact.ArtifactInfoContext; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; import org.ofbiz.entity.Delegator; @@ -68,8 +69,9 @@ public class EntityCondition extends Met return this.rawString(); } - public String getEntityName() { - return this.finder.getEntityName(); + @Override + public void gatherArtifactInfo(ArtifactInfoContext aic) { + aic.addEntityName(this.finder.getEntityName()); } @Override Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCount.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCount.java?rev=1340143&r1=1340142&r2=1340143&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCount.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCount.java Fri May 18 15:52:11 2012 @@ -20,6 +20,7 @@ package org.ofbiz.minilang.method.entity import java.util.Map; +import org.ofbiz.minilang.artifact.ArtifactInfoContext; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; import org.ofbiz.base.util.UtilValidate; @@ -127,12 +128,9 @@ public class EntityCount extends MethodO return this.rawString(); } - public String getEntityName() { - String entName = this.entityNameExdr.getOriginal(); - // if there is expansion syntax - if (entName.indexOf("${") >= 0) - return null; - return entName; + @Override + public void gatherArtifactInfo(ArtifactInfoContext aic) { + aic.addEntityName(entityNameExdr.toString()); } @Override Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityOne.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityOne.java?rev=1340143&r1=1340142&r2=1340143&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityOne.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityOne.java Fri May 18 15:52:11 2012 @@ -18,6 +18,7 @@ *******************************************************************************/ package org.ofbiz.minilang.method.entityops; +import org.ofbiz.minilang.artifact.ArtifactInfoContext; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; import org.ofbiz.entity.Delegator; @@ -68,8 +69,9 @@ public class EntityOne extends MethodOpe return this.rawString(); } - public String getEntityName() { - return this.finder.getEntityName(); + @Override + public void gatherArtifactInfo(ArtifactInfoContext aic) { + aic.addEntityName(this.finder.getEntityName()); } @Override Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByAnd.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByAnd.java?rev=1340143&r1=1340142&r2=1340143&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByAnd.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByAnd.java Fri May 18 15:52:11 2012 @@ -21,6 +21,7 @@ package org.ofbiz.minilang.method.entity import java.util.List; import java.util.Map; +import org.ofbiz.minilang.artifact.ArtifactInfoContext; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.entity.Delegator; @@ -42,13 +43,13 @@ public class FindByAnd extends MethodOpe public static final String module = FindByAnd.class.getName(); String delegatorName; + String entityName; ContextAccessor<Object> listAcsr; ContextAccessor<Map<String, ? extends Object>> mapAcsr; ContextAccessor<List<String>> orderByListAcsr; String useCacheStr; String useIteratorStr; - public FindByAnd(Element element, SimpleMethod simpleMethod) throws MiniLangException { super(element, simpleMethod); listAcsr = new ContextAccessor<Object>(element.getAttribute("list"), element.getAttribute("list-name")); @@ -107,8 +108,9 @@ public class FindByAnd extends MethodOpe return this.rawString(); } - public String getEntityName() { - return this.entityName; + @Override + public void gatherArtifactInfo(ArtifactInfoContext aic) { + aic.addEntityName(entityName); } @Override Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByPrimaryKey.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByPrimaryKey.java?rev=1340143&r1=1340142&r2=1340143&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByPrimaryKey.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByPrimaryKey.java Fri May 18 15:52:11 2012 @@ -21,6 +21,7 @@ package org.ofbiz.minilang.method.entity import java.util.Collection; import java.util.Map; +import org.ofbiz.minilang.artifact.ArtifactInfoContext; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilValidate; @@ -100,8 +101,9 @@ public class FindByPrimaryKey extends Me return this.rawString(); } - public String getEntityName() { - return this.entityName; + @Override + public void gatherArtifactInfo(ArtifactInfoContext aic) { + aic.addEntityName(entityName); } @Override Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/GetRelated.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/GetRelated.java?rev=1340143&r1=1340142&r2=1340143&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/GetRelated.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/GetRelated.java Fri May 18 15:52:11 2012 @@ -21,6 +21,7 @@ package org.ofbiz.minilang.method.entity import java.util.List; import java.util.Map; +import org.ofbiz.minilang.artifact.ArtifactInfoContext; import org.ofbiz.base.util.Debug; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; @@ -94,8 +95,9 @@ public class GetRelated extends MethodOp return this.rawString(); } - public String getRelationName() { - return this.relationName; + @Override + public void gatherArtifactInfo(ArtifactInfoContext aic) { + aic.addEntityName(relationName); } @Override Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/GetRelatedOne.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/GetRelatedOne.java?rev=1340143&r1=1340142&r2=1340143&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/GetRelatedOne.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/GetRelatedOne.java Fri May 18 15:52:11 2012 @@ -18,6 +18,7 @@ *******************************************************************************/ package org.ofbiz.minilang.method.entityops; +import org.ofbiz.minilang.artifact.ArtifactInfoContext; import org.ofbiz.base.util.Debug; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; @@ -86,8 +87,9 @@ public class GetRelatedOne extends Metho return this.rawString(); } - public String getRelationName() { - return this.relationName; + @Override + public void gatherArtifactInfo(ArtifactInfoContext aic) { + aic.addEntityName(relationName); } @Override Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/MakeValue.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/MakeValue.java?rev=1340143&r1=1340142&r2=1340143&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/MakeValue.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/MakeValue.java Fri May 18 15:52:11 2012 @@ -20,6 +20,7 @@ package org.ofbiz.minilang.method.entity import java.util.Map; +import org.ofbiz.minilang.artifact.ArtifactInfoContext; import org.ofbiz.entity.GenericValue; import org.ofbiz.minilang.MiniLangException; import org.ofbiz.minilang.SimpleMethod; @@ -58,8 +59,9 @@ public class MakeValue extends MethodOpe return this.rawString(); } - public String getEntityName() { - return this.entityName; + @Override + public void gatherArtifactInfo(ArtifactInfoContext aic) { + aic.addEntityName(entityName); } @Override Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/Iterate.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/Iterate.java?rev=1340143&r1=1340142&r2=1340143&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/Iterate.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/Iterate.java Fri May 18 15:52:11 2012 @@ -34,6 +34,7 @@ import org.ofbiz.minilang.MiniLangExcept import org.ofbiz.minilang.MiniLangRuntimeException; import org.ofbiz.minilang.MiniLangValidate; import org.ofbiz.minilang.SimpleMethod; +import org.ofbiz.minilang.artifact.ArtifactInfoContext; import org.ofbiz.minilang.method.MethodContext; import org.ofbiz.minilang.method.MethodOperation; import org.ofbiz.minilang.method.envops.Break.BreakElementException; @@ -166,8 +167,11 @@ public final class Iterate extends Metho return FlexibleStringExpander.expandString(toString(), methodContext.getEnvMap()); } - public List<MethodOperation> getSubOps() { - return this.subOps; + @Override + public void gatherArtifactInfo(ArtifactInfoContext aic) { + for (MethodOperation method : this.subOps) { + method.gatherArtifactInfo(aic); + } } @Override Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/IterateMap.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/IterateMap.java?rev=1340143&r1=1340142&r2=1340143&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/IterateMap.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/IterateMap.java Fri May 18 15:52:11 2012 @@ -29,6 +29,7 @@ import org.ofbiz.minilang.MiniLangExcept import org.ofbiz.minilang.MiniLangRuntimeException; import org.ofbiz.minilang.MiniLangValidate; import org.ofbiz.minilang.SimpleMethod; +import org.ofbiz.minilang.artifact.ArtifactInfoContext; import org.ofbiz.minilang.method.MethodContext; import org.ofbiz.minilang.method.MethodOperation; import org.ofbiz.minilang.method.envops.Break.BreakElementException; @@ -113,8 +114,11 @@ public final class IterateMap extends Me return FlexibleStringExpander.expandString(toString(), methodContext.getEnvMap()); } - public List<MethodOperation> getSubOps() { - return this.subOps; + @Override + public void gatherArtifactInfo(ArtifactInfoContext aic) { + for (MethodOperation method : this.subOps) { + method.gatherArtifactInfo(aic); + } } @Override Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/Loop.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/Loop.java?rev=1340143&r1=1340142&r2=1340143&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/Loop.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/Loop.java Fri May 18 15:52:11 2012 @@ -27,6 +27,7 @@ import org.ofbiz.minilang.MiniLangExcept import org.ofbiz.minilang.MiniLangRuntimeException; import org.ofbiz.minilang.MiniLangValidate; import org.ofbiz.minilang.SimpleMethod; +import org.ofbiz.minilang.artifact.ArtifactInfoContext; import org.ofbiz.minilang.method.MethodContext; import org.ofbiz.minilang.method.MethodOperation; import org.ofbiz.minilang.method.envops.Break.BreakElementException; @@ -94,8 +95,11 @@ public final class Loop extends MethodOp return FlexibleStringExpander.expandString(toString(), methodContext.getEnvMap()); } - public List<MethodOperation> getSubOps() { - return this.subOps; + @Override + public void gatherArtifactInfo(ArtifactInfoContext aic) { + for (MethodOperation method : this.subOps) { + method.gatherArtifactInfo(aic); + } } @Override Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/While.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/While.java?rev=1340143&r1=1340142&r2=1340143&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/While.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/While.java Fri May 18 15:52:11 2012 @@ -25,6 +25,7 @@ import org.ofbiz.base.util.UtilXml; import org.ofbiz.minilang.MiniLangException; import org.ofbiz.minilang.MiniLangValidate; import org.ofbiz.minilang.SimpleMethod; +import org.ofbiz.minilang.artifact.ArtifactInfoContext; import org.ofbiz.minilang.method.MethodContext; import org.ofbiz.minilang.method.MethodOperation; import org.ofbiz.minilang.method.conditional.Conditional; @@ -84,8 +85,11 @@ public final class While extends MethodO return "<while><condition>" + messageBuf + "</condition></while>"; } - public List<MethodOperation> getThenSubOps() { - return this.thenSubOps; + @Override + public void gatherArtifactInfo(ArtifactInfoContext aic) { + for (MethodOperation method : this.thenSubOps) { + method.gatherArtifactInfo(aic); + } } @Override Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfInstanceOf.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfInstanceOf.java?rev=1340143&r1=1340142&r2=1340143&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfInstanceOf.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfInstanceOf.java Fri May 18 15:52:11 2012 @@ -21,8 +21,6 @@ package org.ofbiz.minilang.method.ifops; import java.util.Collections; import java.util.List; -import javolution.util.FastList; - import org.ofbiz.base.util.ObjectType; import org.ofbiz.base.util.UtilXml; import org.ofbiz.base.util.collections.FlexibleMapAccessor; @@ -31,6 +29,7 @@ import org.ofbiz.minilang.MiniLangExcept import org.ofbiz.minilang.MiniLangRuntimeException; import org.ofbiz.minilang.MiniLangValidate; import org.ofbiz.minilang.SimpleMethod; +import org.ofbiz.minilang.artifact.ArtifactInfoContext; import org.ofbiz.minilang.method.MethodContext; import org.ofbiz.minilang.method.MethodOperation; import org.w3c.dom.Element; @@ -100,12 +99,16 @@ public final class IfInstanceOf extends return FlexibleStringExpander.expandString(toString(), methodContext.getEnvMap()); } - public List<MethodOperation> getAllSubOps() { - List<MethodOperation> allSubOps = FastList.newInstance(); - allSubOps.addAll(this.subOps); - if (this.elseSubOps != null) - allSubOps.addAll(this.elseSubOps); - return allSubOps; + @Override + public void gatherArtifactInfo(ArtifactInfoContext aic) { + for (MethodOperation method : this.subOps) { + method.gatherArtifactInfo(aic); + } + if (this.elseSubOps != null) { + for (MethodOperation method : this.elseSubOps) { + method.gatherArtifactInfo(aic); + } + } } @Override Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfNotEmpty.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfNotEmpty.java?rev=1340143&r1=1340142&r2=1340143&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfNotEmpty.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfNotEmpty.java Fri May 18 15:52:11 2012 @@ -21,14 +21,13 @@ package org.ofbiz.minilang.method.ifops; import java.util.Collections; import java.util.List; -import javolution.util.FastList; - import org.ofbiz.base.util.ObjectType; import org.ofbiz.base.util.UtilXml; import org.ofbiz.base.util.collections.FlexibleMapAccessor; import org.ofbiz.base.util.string.FlexibleStringExpander; import org.ofbiz.minilang.MiniLangException; import org.ofbiz.minilang.SimpleMethod; +import org.ofbiz.minilang.artifact.ArtifactInfoContext; import org.ofbiz.minilang.method.MethodContext; import org.ofbiz.minilang.method.MethodOperation; import org.w3c.dom.Element; @@ -73,12 +72,16 @@ public final class IfNotEmpty extends Me return FlexibleStringExpander.expandString(toString(), methodContext.getEnvMap()); } - public List<MethodOperation> getAllSubOps() { - List<MethodOperation> allSubOps = FastList.newInstance(); - allSubOps.addAll(this.subOps); - if (this.elseSubOps != null) - allSubOps.addAll(this.elseSubOps); - return allSubOps; + @Override + public void gatherArtifactInfo(ArtifactInfoContext aic) { + for (MethodOperation method : this.subOps) { + method.gatherArtifactInfo(aic); + } + if (this.elseSubOps != null) { + for (MethodOperation method : this.elseSubOps) { + method.gatherArtifactInfo(aic); + } + } } @Override |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |