svn commit: r1675520 - /ofbiz/branches/OFBIZ-6275/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java

[doogie-3]

Author: doogie
Date: Wed Apr 22 23:35:37 2015
New Revision: 1675520

URL: http://svn.apache.org/r1675520
Log:
OFBIZ-6284: Fix deprecated use of
SimpleMethod.getAll{Entity,Service}NamesUsed(), instead using ArtifactInfoContext.

Modified:
    ofbiz/branches/OFBIZ-6275/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java

Modified: ofbiz/branches/OFBIZ-6275/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-6275/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java?rev=1675520&r1=1675519&r2=1675520&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-6275/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java (original)
+++ ofbiz/branches/OFBIZ-6275/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java Wed Apr 22 23:35:37 2015
@@ -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,9 @@ 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 +155,9 @@ 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) {