You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jo...@apache.org on 2008/03/25 16:29:32 UTC
svn commit: r640861 - in /ofbiz/trunk/framework/webtools:
src/org/ofbiz/webtools/artifactinfo/ webapp/webtools/artifactinfo/
Author: jonesde
Date: Tue Mar 25 08:29:30 2008
New Revision: 640861
URL: http://svn.apache.org/viewvc?rev=640861&view=rev
Log:
Added data structures for forward and reverse request references in screens and forms; no code to populate yet
Modified:
ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java
ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ControllerRequestArtifactInfo.java
ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/FormWidgetArtifactInfo.java
ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ScreenWidgetArtifactInfo.java
ofbiz/trunk/framework/webtools/webapp/webtools/artifactinfo/ArtifactInfo.ftl
Modified: ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java?rev=640861&r1=640860&r2=640861&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java (original)
+++ ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java Tue Mar 25 08:29:30 2008
@@ -113,6 +113,9 @@
public Map<String, Set<ControllerRequestArtifactInfo>> allRequestInfosReferringToView = FastMap.newInstance();
+ public Map<String, Set<FormWidgetArtifactInfo>> allFormInfosTargetingRequest = FastMap.newInstance();
+ public Map<String, Set<FormWidgetArtifactInfo>> allFormInfosReferringToRequest = FastMap.newInstance();
+ public Map<String, Set<ScreenWidgetArtifactInfo>> allScreenInfosReferringToRequest = FastMap.newInstance();
public Map<String, Set<ControllerRequestArtifactInfo>> allRequestInfosReferringToRequest = FastMap.newInstance();
public static ArtifactInfoFactory getArtifactInfoFactory(String delegatorName) throws GeneralException {
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=640861&r1=640860&r2=640861&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 Tue Mar 25 08:29:30 2008
@@ -162,6 +162,18 @@
return serviceCalledByRequestEvent;
}
+ public Set<FormWidgetArtifactInfo> getFormInfosReferringToRequest() {
+ return this.aif.allFormInfosReferringToRequest.get(this.getUniqueId());
+ }
+
+ public Set<FormWidgetArtifactInfo> getFormInfosTargetingRequest() {
+ return this.aif.allFormInfosTargetingRequest.get(this.getUniqueId());
+ }
+
+ public Set<ScreenWidgetArtifactInfo> getScreenInfosReferringToRequest() {
+ return this.aif.allScreenInfosReferringToRequest.get(this.getUniqueId());
+ }
+
public Set<ControllerRequestArtifactInfo> getRequestsThatAreResponsesToThisRequest() {
return this.requestsThatAreResponsesToThisRequest;
}
Modified: ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/FormWidgetArtifactInfo.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/FormWidgetArtifactInfo.java?rev=640861&r1=640860&r2=640861&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/FormWidgetArtifactInfo.java (original)
+++ ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/FormWidgetArtifactInfo.java Tue Mar 25 08:29:30 2008
@@ -46,6 +46,8 @@
protected Set<EntityArtifactInfo> entitiesUsedInThisForm = FastSet.newInstance();
protected Set<ServiceArtifactInfo> servicesUsedInThisForm = FastSet.newInstance();
protected FormWidgetArtifactInfo formThisFormExtends = null;
+ protected Set<ControllerRequestArtifactInfo> requestsLinkedToInForm = FastSet.newInstance();
+ protected Set<ControllerRequestArtifactInfo> requestsTargetedByInForm = FastSet.newInstance();
public FormWidgetArtifactInfo(String formName, String formLocation, ArtifactInfoFactory aif) throws GeneralException {
super(aif);
@@ -179,5 +181,13 @@
public Set<ScreenWidgetArtifactInfo> getScreensIncludingThisForm() {
return this.aif.allScreenInfosReferringToForm.get(this.getUniqueId());
+ }
+
+ public Set<ControllerRequestArtifactInfo> getRequestsLinkedToInForm() {
+ return this.requestsLinkedToInForm;
+ }
+
+ public Set<ControllerRequestArtifactInfo> getRequestsTargetedByForm() {
+ return this.requestsTargetedByInForm;
}
}
Modified: ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ScreenWidgetArtifactInfo.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ScreenWidgetArtifactInfo.java?rev=640861&r1=640860&r2=640861&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ScreenWidgetArtifactInfo.java (original)
+++ ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ScreenWidgetArtifactInfo.java Tue Mar 25 08:29:30 2008
@@ -47,6 +47,7 @@
protected Set<EntityArtifactInfo> entitiesUsedInThisScreen = FastSet.newInstance();
protected Set<ServiceArtifactInfo> servicesUsedInThisScreen = FastSet.newInstance();
protected Set<FormWidgetArtifactInfo> formsIncludedInThisScreen = FastSet.newInstance();
+ protected Set<ControllerRequestArtifactInfo> requestsLinkedToInScreen = FastSet.newInstance();
public ScreenWidgetArtifactInfo(String screenName, String screenLocation, ArtifactInfoFactory aif) throws GeneralException {
super(aif);
@@ -191,5 +192,9 @@
public Set<ScreenWidgetArtifactInfo> getScreensIncludingThisScreen() {
return this.aif.allScreenInfosReferringToScreen.get(this.getUniqueId());
+ }
+
+ public Set<ControllerRequestArtifactInfo> getRequestsLinkedToInScreen() {
+ return this.requestsLinkedToInScreen;
}
}
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=640861&r1=640860&r2=640861&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/artifactinfo/ArtifactInfo.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/artifactinfo/ArtifactInfo.ftl Tue Mar 25 08:29:30 2008
@@ -175,14 +175,23 @@
<@displayServiceArtifactInfo serviceArtifactInfo=serviceArtifactInfo/>
</#list>
+ <h2>Forms Extending This Form</h2>
+ <#list artifactInfo.getFormsExtendingThisForm()?if_exists as formWidgetArtifactInfo>
+ <@displayFormWidgetArtifactInfo formWidgetArtifactInfo=formWidgetArtifactInfo/>
+ </#list>
+
<h2>Screens Including This Form</h2>
<#list artifactInfo.getScreensIncludingThisForm()?if_exists as screenWidgetArtifactInfo>
<@displayScreenWidgetArtifactInfo screenWidgetArtifactInfo=screenWidgetArtifactInfo/>
</#list>
- <h2>Forms Extending This Form</h2>
- <#list artifactInfo.getFormsExtendingThisForm()?if_exists as formWidgetArtifactInfo>
- <@displayFormWidgetArtifactInfo formWidgetArtifactInfo=formWidgetArtifactInfo/>
+ <h2>Controller Requests That Are Linked to in This Form</h2>
+ <#list artifactInfo.getRequestsLinkedToInForm()?if_exists as controllerRequestArtifactInfo>
+ <@displayControllerRequestArtifactInfo controllerRequestArtifactInfo=controllerRequestArtifactInfo/>
+ </#list>
+ <h2>Controller Requests That Are Targeted By This Form</h2>
+ <#list artifactInfo.getRequestsTargetedByForm()?if_exists as controllerRequestArtifactInfo>
+ <@displayControllerRequestArtifactInfo controllerRequestArtifactInfo=controllerRequestArtifactInfo/>
</#list>
<#elseif artifactInfo.getType() == "screen"/>
@@ -211,6 +220,11 @@
<@displayScreenWidgetArtifactInfo screenWidgetArtifactInfo=screenWidgetArtifactInfo/>
</#list>
+ <h2>Controller Requests That Are Linked to in This Screen</h2>
+ <#list artifactInfo.getRequestsLinkedToInScreen()?if_exists as controllerRequestArtifactInfo>
+ <@displayControllerRequestArtifactInfo controllerRequestArtifactInfo=controllerRequestArtifactInfo/>
+ </#list>
+
<h2>Controller Views Referring to This Screen</h2>
<#list artifactInfo.getViewsReferringToScreen()?if_exists as controllerViewArtifactInfo>
<@displayControllerViewArtifactInfo controllerViewArtifactInfo=controllerViewArtifactInfo/>
@@ -222,6 +236,20 @@
<@displayServiceArtifactInfo serviceArtifactInfo=artifactInfo.getServiceCalledByRequestEvent()/>
</#if>
+ <h2>Forms Referring to This Request</h2>
+ <#list artifactInfo.getFormInfosReferringToRequest()?if_exists as formWidgetArtifactInfo>
+ <@displayFormWidgetArtifactInfo formWidgetArtifactInfo=formWidgetArtifactInfo/>
+ </#list>
+ <h2>Forms Targeting This Request</h2>
+ <#list artifactInfo.getFormInfosTargetingRequest()?if_exists as formWidgetArtifactInfo>
+ <@displayFormWidgetArtifactInfo formWidgetArtifactInfo=formWidgetArtifactInfo/>
+ </#list>
+
+ <h2>Screens Referring to This Request</h2>
+ <#list artifactInfo.getScreenInfosReferringToRequest()?if_exists as screenWidgetArtifactInfo>
+ <@displayScreenWidgetArtifactInfo screenWidgetArtifactInfo=screenWidgetArtifactInfo/>
+ </#list>
+
<h2>Requests That Are Responses to This Request</h2>
<#list artifactInfo.getRequestsThatAreResponsesToThisRequest()?if_exists as controllerRequestArtifactInfo>
<@displayControllerRequestArtifactInfo controllerRequestArtifactInfo=controllerRequestArtifactInfo/>