Author: jonesde
Date: Sat Jan 9 07:26:58 2010
New Revision: 897387
URL: http://svn.apache.org/viewvc?rev=897387&view=rev
Log:
A few improvements to the ArtifactInfo stuff to display more complete info, especially about
services, and fix issue with controller request events that were not just plaing service
Modified:
ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelParam.java
ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ControllerRequestArtifactInfo.java
ofbiz/trunk/framework/webtools/webapp/webtools/artifactinfo/ArtifactInfo.ftl
Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelParam.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelParam.java?rev=897387&r1=897386&r2=897387&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelParam.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelParam.java Sat Jan 9 07:26:58
2010
@@ -136,6 +136,18 @@
public String getMode() {
return this.mode;
}
+
+ public String getEntityName() {
+ return this.entityName;
+ }
+
+ public String getFieldName() {
+ return this.fieldName;
+ }
+
+ public boolean getInternal() {
+ return this.internal;
+ }
public boolean isIn() {
return "IN".equals(this.mode) || "INOUT".equals(this.mode);
Modified: ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ControllerRequestArtifactInfo.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ControllerRequestArtifactInfo.java?rev=897387&r1=897386&r2=897387&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ControllerRequestArtifactInfo.java
(original)
+++ ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ControllerRequestArtifactInfo.java
Sat Jan 9 07:26:58 2010
@@ -67,7 +67,7 @@
public void populateAll() throws GeneralException {
// populate serviceCalledByRequestEvent, requestsThatAreResponsesToThisRequest, viewsThatAreResponsesToThisRequest
and related reverse maps
- if (this.requestInfoMap.event != null && "service".equals(this.requestInfoMap.event.type))
{
+ if (this.requestInfoMap.event != null && this.requestInfoMap.event.type !=
null && (this.requestInfoMap.event.type.indexOf("service") >= 0)) {
String serviceName = (String) this.requestInfoMap.event.invoke;
try {
this.serviceCalledByRequestEvent = this.aif.getServiceArtifactInfo(serviceName);
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/artifactinfo/ArtifactInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/artifactinfo/ArtifactInfo.ftl?rev=897387&r1=897386&r2=897387&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/artifactinfo/ArtifactInfo.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/artifactinfo/ArtifactInfo.ftl Sat Jan
9 07:26:58 2010
@@ -133,9 +133,10 @@
<div> Impl Location: <a href="${artifactInfo.getImplementationLocationURL()?if_exists}">${artifactInfo.getImplementationLocationURL()?if_exists}</a></div>
<h2>Service Parameters</h2>
<table>
- <tr><td>Name</td><td>Type</td><td>Optional</td><td>Mode</td></tr>
- <#list artifactInfo.modelService.getModelParamList() as modelParam>
- <tr><td>${modelParam.getName()}</td><td>${modelParam.getType()}</td><td><#if
modelParam.isOptional()>optional<#else/>required</#if></td><td>${modelParam.getMode()}</td></tr>
+ <tr><td>Name</td><td>Type</td><td>Optional</td><td>Mode</td><td>Entity.field</td></tr>
+ <#list artifactInfo.modelService.getAllParamNames() as paramName>
+ <#assign modelParam = artifactInfo.modelService.getParam(paramName)/>
+ <tr><td>${modelParam.getName()}<#if modelParam.getInternal()>
(internal)</#if></td><td>${modelParam.getType()}</td><td><#if
modelParam.isOptional()>optional<#else/>required</#if></td><td>${modelParam.getMode()}</td><td>${modelParam.getEntityName()?if_exists}.${modelParam.getFieldName()?if_exists}</td></tr>
</#list>
</table>
|