Author: deepak
Date: Sat Feb 20 12:19:15 2016
New Revision: 1731387
URL: http://svn.apache.org/viewvc?rev=1731387&view=rev
Log:
OFBIZ-6284: Merged changes done at r#1675520 in OFBIZ-6275 branch into Trunk.
Log:
===========================================================
Fix deprecated use of
SimpleMethod.getAll{Entity,Service}NamesUsed(), instead
using ArtifactInfoContext.
============================================================
Modified:
ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java
Modified:
ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java?rev=1731387&r1=1731386&r2=1731387&view=diff
==============================================================================
---
ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java
(original)
+++
ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java
Sat Feb 20 12:19:15 2016
@@ -41,6 +41,7 @@ import org.ofbiz.base.util.UtilPlist;
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.minilang.MiniLangException;
import org.ofbiz.minilang.SimpleMethod;
+import org.ofbiz.minilang.artifact.ArtifactInfoContext;
import org.ofbiz.service.ModelParam;
import org.ofbiz.service.ModelService;
import org.ofbiz.service.eca.ServiceEcaRule;
@@ -93,8 +94,10 @@ public class ServiceArtifactInfo extends
return;
}
- Set<String> allEntityNameSet =
simpleMethodToCall.getAllEntityNamesUsed();
- populateEntitiesFromNameSet(allEntityNameSet);
+ ArtifactInfoContext aic = new ArtifactInfoContext();
+ simpleMethodToCall.gatherArtifactInfo(aic);
+ populateEntitiesFromNameSet(aic.getEntityNames());
+
} else if ("java".equals(this.modelService.engineName)) {
String fullClassPathAndFile =
UtilJavaParse.findRealPathAndFileForClass(this.modelService.location);
if (fullClassPathAndFile != null) {
@@ -153,8 +156,10 @@ public class ServiceArtifactInfo extends
return;
}
- Set<String> allServiceNameSet =
simpleMethodToCall.getAllServiceNamesCalled();
- populateServicesFromNameSet(allServiceNameSet);
+ ArtifactInfoContext aic = new ArtifactInfoContext();
+ simpleMethodToCall.gatherArtifactInfo(aic);
+ populateServicesFromNameSet(aic.getServiceNames());
+
} else if ("java".equals(this.modelService.engineName)) {
String fullClassPathAndFile =
UtilJavaParse.findRealPathAndFileForClass(this.modelService.location);
if (fullClassPathAndFile != null) {
