Author: adrianc
Date: Sat Nov 1 14:28:41 2014
New Revision: 1635957
URL: http://svn.apache.org/r1635957
Log:
Continue working on making widget models thread safe.
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/fo/FoScreenRenderer.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/IterateSectionWidget.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/fo/FoScreenRenderer.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/fo/FoScreenRenderer.java?rev=1635957&r1=1635956&r2=1635957&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/fo/FoScreenRenderer.java
(original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/fo/FoScreenRenderer.java
Sat Nov 1 14:28:41 2014
@@ -62,13 +62,13 @@ public class FoScreenRenderer extends Ht
}
public void renderSectionBegin(Appendable writer, Map<String, Object>
context, ModelScreenWidget.Section section) throws IOException {
- if (section.isMainSection) {
+ if (section.isMainSection()) {
this.widgetCommentsEnabled =
ModelWidget.widgetBoundaryCommentsEnabled(context);
}
- renderBeginningBoundaryComment(writer,
section.isMainSection?"Screen":"Section Widget", section);
+ renderBeginningBoundaryComment(writer,
section.isMainSection()?"Screen":"Section Widget", section);
}
public void renderSectionEnd(Appendable writer, Map<String, Object>
context, ModelScreenWidget.Section section) throws IOException {
- renderEndingBoundaryComment(writer,
section.isMainSection?"Screen":"Section Widget", section);
+ renderEndingBoundaryComment(writer,
section.isMainSection()?"Screen":"Section Widget", section);
}
public void renderContainerBegin(Appendable writer, Map<String, Object>
context, ModelScreenWidget.Container container) throws IOException {
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java?rev=1635957&r1=1635956&r2=1635957&view=diff
==============================================================================
---
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java
(original)
+++
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java
Sat Nov 1 14:28:41 2014
@@ -82,14 +82,14 @@ public class HtmlScreenRenderer extends
}
public void renderSectionBegin(Appendable writer, Map<String, Object>
context, ModelScreenWidget.Section section) throws IOException {
- if (section.isMainSection) {
+ if (section.isMainSection()) {
this.widgetCommentsEnabled =
ModelWidget.widgetBoundaryCommentsEnabled(context);
}
- renderBeginningBoundaryComment(writer,
section.isMainSection?"Screen":"Section Widget", section);
+ renderBeginningBoundaryComment(writer,
section.isMainSection()?"Screen":"Section Widget", section);
}
public void renderSectionEnd(Appendable writer, Map<String, Object>
context, ModelScreenWidget.Section section) throws IOException {
- renderEndingBoundaryComment(writer,
section.isMainSection?"Screen":"Section Widget", section);
+ renderEndingBoundaryComment(writer,
section.isMainSection()?"Screen":"Section Widget", section);
}
public void renderContainerBegin(Appendable writer, Map<String, Object>
context, ModelScreenWidget.Container container) throws IOException {
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java?rev=1635957&r1=1635956&r2=1635957&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java
(original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java
Sat Nov 1 14:28:41 2014
@@ -271,7 +271,7 @@ public class HtmlWidget extends ModelScr
this.name =
htmlTemplateDecoratorSectionElement.getAttribute("name");
// read sub-widgets
List<? extends Element> subElementList =
UtilXml.childElementList(htmlTemplateDecoratorSectionElement);
- this.subWidgets =
ModelScreenWidget.readSubWidgets(this.modelScreen, subElementList);
+ this.subWidgets =
ModelScreenWidget.readSubWidgets(getModelScreen(), subElementList);
}
@Override
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/IterateSectionWidget.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/IterateSectionWidget.java?rev=1635957&r1=1635956&r2=1635957&view=diff
==============================================================================
---
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/IterateSectionWidget.java
(original)
+++
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/IterateSectionWidget.java
Sat Nov 1 14:28:41 2014
@@ -95,7 +95,7 @@ public class IterateSectionWidget extend
sectionList = new ArrayList<ModelScreenWidget.Section>();
List<? extends Element> childElementList =
UtilXml.childElementList(iterateSectionElement);
for (Element sectionElement: childElementList) {
- ModelScreenWidget.Section section = new
ModelScreenWidget.Section(modelScreen, sectionElement);
+ ModelScreenWidget.Section section = new
ModelScreenWidget.Section(modelScreen, sectionElement, false);
sectionList.add(section);
}
}
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java?rev=1635957&r1=1635956&r2=1635957&view=diff
==============================================================================
---
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java
(original)
+++
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java
Sat Nov 1 14:28:41 2014
@@ -151,13 +151,13 @@ public class MacroScreenRenderer impleme
}
public void renderSectionBegin(Appendable writer, Map<String, Object>
context, ModelScreenWidget.Section section) throws IOException {
- if (section.isMainSection) {
+ if (section.isMainSection()) {
this.widgetCommentsEnabled =
ModelWidget.widgetBoundaryCommentsEnabled(context);
}
if (this.widgetCommentsEnabled) {
Map<String, Object> parameters = new HashMap<String, Object>();
StringBuilder sb = new StringBuilder("Begin ");
- sb.append(section.isMainSection ? "Screen " : "Section Widget ");
+ sb.append(section.isMainSection() ? "Screen " : "Section Widget ");
sb.append(section.getBoundaryCommentName());
parameters.put("boundaryComment", sb.toString());
executeMacro(writer, "renderSectionBegin", parameters);
@@ -168,7 +168,7 @@ public class MacroScreenRenderer impleme
Map<String, Object> parameters = new HashMap<String, Object>();
StringBuilder sb = new StringBuilder();
sb.append("End ");
- sb.append(section.isMainSection ? "Screen " : "Section Widget ");
+ sb.append(section.isMainSection() ? "Screen " : "Section Widget ");
sb.append(section.getBoundaryCommentName());
parameters.put("boundaryComment", sb.toString());
executeMacro(writer, "renderSectionEnd", parameters);
@@ -801,8 +801,8 @@ public class MacroScreenRenderer impleme
}
public void renderPortalPageBegin(Appendable writer, Map<String, Object>
context, ModelScreenWidget.PortalPage portalPage) throws GeneralException,
IOException {
- String portalPageId = portalPage.getActualPortalPageId();
- String originalPortalPageId = portalPage.getOriginalPortalPageId();
+ String portalPageId = portalPage.getActualPortalPageId(context);
+ String originalPortalPageId =
portalPage.getOriginalPortalPageId(context);
String confMode = portalPage.getConfMode(context);
Map<String, String> uiLabelMap =
UtilGenerics.cast(context.get("uiLabelMap"));
@@ -838,8 +838,8 @@ public class MacroScreenRenderer impleme
}
public void renderPortalPageColumnBegin(Appendable writer, Map<String,
Object> context, ModelScreenWidget.PortalPage portalPage, GenericValue
portalPageColumn) throws GeneralException, IOException {
- String portalPageId = portalPage.getActualPortalPageId();
- String originalPortalPageId = portalPage.getOriginalPortalPageId();
+ String portalPageId = portalPage.getActualPortalPageId(context);
+ String originalPortalPageId =
portalPage.getOriginalPortalPageId(context);
String columnSeqId = portalPageColumn.getString("columnSeqId");
String columnWidthPercentage =
portalPageColumn.getString("columnWidthPercentage");
String columnWidthPixels =
portalPageColumn.getString("columnWidthPixels");
@@ -908,8 +908,8 @@ public class MacroScreenRenderer impleme
}
public void renderPortalPagePortletBegin(Appendable writer, Map<String,
Object> context, ModelScreenWidget.PortalPage portalPage, GenericValue
portalPortlet) throws GeneralException, IOException {
- String portalPageId = portalPage.getActualPortalPageId();
- String originalPortalPageId = portalPage.getOriginalPortalPageId();
+ String portalPageId = portalPage.getActualPortalPageId(context);
+ String originalPortalPageId =
portalPage.getOriginalPortalPageId(context);
String portalPortletId = portalPortlet.getString("portalPortletId");
String portletSeqId = portalPortlet.getString("portletSeqId");
String columnSeqId = portalPortlet.getString("columnSeqId");
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java?rev=1635957&r1=1635956&r2=1635957&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java
(original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java
Sat Nov 1 14:28:41 2014
@@ -72,8 +72,7 @@ public class ModelScreen extends ModelWi
if (sectionElement == null) {
throw new IllegalArgumentException("No section found for the
screen definition with name: " + getName());
}
- this.section = new ModelScreenWidget.Section(this, sectionElement);
- this.section.isMainSection = true;
+ this.section = new ModelScreenWidget.Section(this, sectionElement,
true);
}
public String getSourceLocation() {
@@ -88,9 +87,9 @@ public class ModelScreen extends ModelWi
protected static void findServiceNamesUsedInWidget(ModelScreenWidget
currentWidget, Set<String> allServiceNamesUsed) {
if (currentWidget instanceof ModelScreenWidget.Section) {
- List<ModelWidgetAction> actions =
((ModelScreenWidget.Section)currentWidget).actions;
- List<ModelScreenWidget> subWidgets =
((ModelScreenWidget.Section)currentWidget).subWidgets;
- List<ModelScreenWidget> failWidgets =
((ModelScreenWidget.Section)currentWidget).failWidgets;
+ List<ModelWidgetAction> actions =
((ModelScreenWidget.Section)currentWidget).getActions();
+ List<ModelScreenWidget> subWidgets =
((ModelScreenWidget.Section)currentWidget).getSubWidgets();
+ List<ModelScreenWidget> failWidgets =
((ModelScreenWidget.Section)currentWidget).getFailWidgets();
if (actions != null) {
for (ModelWidgetAction screenOperation: actions) {
if (screenOperation instanceof ModelWidgetAction.Service) {
@@ -110,33 +109,25 @@ public class ModelScreen extends ModelWi
}
}
} else if (currentWidget instanceof
ModelScreenWidget.DecoratorSection) {
- ModelScreenWidget.DecoratorSection decoratorSection =
(ModelScreenWidget.DecoratorSection)currentWidget;
- if (decoratorSection.subWidgets != null) {
- for (ModelScreenWidget widget: decoratorSection.subWidgets) {
- findServiceNamesUsedInWidget(widget, allServiceNamesUsed);
- }
+ ModelScreenWidget.DecoratorSection decoratorSection =
(ModelScreenWidget.DecoratorSection) currentWidget;
+ for (ModelScreenWidget widget : decoratorSection.getSubWidgets()) {
+ findServiceNamesUsedInWidget(widget, allServiceNamesUsed);
}
} else if (currentWidget instanceof ModelScreenWidget.DecoratorScreen)
{
- ModelScreenWidget.DecoratorScreen decoratorScreen =
(ModelScreenWidget.DecoratorScreen)currentWidget;
- if (decoratorScreen.sectionMap != null) {
- Collection<ModelScreenWidget.DecoratorSection> sections =
decoratorScreen.sectionMap.values();
- for (ModelScreenWidget section: sections) {
- findServiceNamesUsedInWidget(section, allServiceNamesUsed);
- }
+ ModelScreenWidget.DecoratorScreen decoratorScreen =
(ModelScreenWidget.DecoratorScreen) currentWidget;
+ Collection<ModelScreenWidget.DecoratorSection> sections =
decoratorScreen.getSectionMap().values();
+ for (ModelScreenWidget section : sections) {
+ findServiceNamesUsedInWidget(section, allServiceNamesUsed);
}
} else if (currentWidget instanceof ModelScreenWidget.Container) {
- ModelScreenWidget.Container container =
(ModelScreenWidget.Container)currentWidget;
- if (container.subWidgets != null) {
- for (ModelScreenWidget widget: container.subWidgets) {
- findServiceNamesUsedInWidget(widget, allServiceNamesUsed);
- }
+ ModelScreenWidget.Container container =
(ModelScreenWidget.Container) currentWidget;
+ for (ModelScreenWidget widget : container.getSubWidgets()) {
+ findServiceNamesUsedInWidget(widget, allServiceNamesUsed);
}
} else if (currentWidget instanceof ModelScreenWidget.Screenlet) {
- ModelScreenWidget.Screenlet screenlet =
(ModelScreenWidget.Screenlet)currentWidget;
- if (screenlet.subWidgets != null) {
- for (ModelScreenWidget widget: screenlet.subWidgets) {
- findServiceNamesUsedInWidget(widget, allServiceNamesUsed);
- }
+ ModelScreenWidget.Screenlet screenlet =
(ModelScreenWidget.Screenlet) currentWidget;
+ for (ModelScreenWidget widget : screenlet.getSubWidgets()) {
+ findServiceNamesUsedInWidget(widget, allServiceNamesUsed);
}
}
}
@@ -147,9 +138,9 @@ public class ModelScreen extends ModelWi
}
protected static void findEntityNamesUsedInWidget(ModelScreenWidget
currentWidget, Set<String> allEntityNamesUsed) {
if (currentWidget instanceof ModelScreenWidget.Section) {
- List<ModelWidgetAction> actions =
((ModelScreenWidget.Section)currentWidget).actions;
- List<ModelScreenWidget> subWidgets =
((ModelScreenWidget.Section)currentWidget).subWidgets;
- List<ModelScreenWidget> failWidgets =
((ModelScreenWidget.Section)currentWidget).failWidgets;
+ List<ModelWidgetAction> actions =
((ModelScreenWidget.Section)currentWidget).getActions();
+ List<ModelScreenWidget> subWidgets =
((ModelScreenWidget.Section)currentWidget).getSubWidgets();
+ List<ModelScreenWidget> failWidgets =
((ModelScreenWidget.Section)currentWidget).getFailWidgets();
if (actions != null) {
for (ModelWidgetAction screenOperation: actions) {
if (screenOperation instanceof
ModelWidgetAction.EntityOne) {
@@ -181,85 +172,67 @@ public class ModelScreen extends ModelWi
}
}
} else if (currentWidget instanceof
ModelScreenWidget.DecoratorSection) {
- ModelScreenWidget.DecoratorSection decoratorSection =
(ModelScreenWidget.DecoratorSection)currentWidget;
- if (decoratorSection.subWidgets != null) {
- for (ModelScreenWidget widget: decoratorSection.subWidgets) {
- findEntityNamesUsedInWidget(widget, allEntityNamesUsed);
- }
+ ModelScreenWidget.DecoratorSection decoratorSection =
(ModelScreenWidget.DecoratorSection) currentWidget;
+ for (ModelScreenWidget widget : decoratorSection.getSubWidgets()) {
+ findEntityNamesUsedInWidget(widget, allEntityNamesUsed);
}
} else if (currentWidget instanceof ModelScreenWidget.DecoratorScreen)
{
- ModelScreenWidget.DecoratorScreen decoratorScreen =
(ModelScreenWidget.DecoratorScreen)currentWidget;
- if (decoratorScreen.sectionMap != null) {
- Collection<ModelScreenWidget.DecoratorSection> sections =
decoratorScreen.sectionMap.values();
- for (ModelScreenWidget section: sections) {
- findEntityNamesUsedInWidget(section, allEntityNamesUsed);
- }
+ ModelScreenWidget.DecoratorScreen decoratorScreen =
(ModelScreenWidget.DecoratorScreen) currentWidget;
+ Collection<ModelScreenWidget.DecoratorSection> sections =
decoratorScreen.getSectionMap().values();
+ for (ModelScreenWidget section : sections) {
+ findEntityNamesUsedInWidget(section, allEntityNamesUsed);
}
} else if (currentWidget instanceof ModelScreenWidget.Container) {
- ModelScreenWidget.Container container =
(ModelScreenWidget.Container)currentWidget;
- if (container.subWidgets != null) {
- for (ModelScreenWidget widget: container.subWidgets) {
- findEntityNamesUsedInWidget(widget, allEntityNamesUsed);
- }
+ ModelScreenWidget.Container container =
(ModelScreenWidget.Container) currentWidget;
+ for (ModelScreenWidget widget : container.getSubWidgets()) {
+ findEntityNamesUsedInWidget(widget, allEntityNamesUsed);
}
} else if (currentWidget instanceof ModelScreenWidget.Screenlet) {
- ModelScreenWidget.Screenlet screenlet =
(ModelScreenWidget.Screenlet)currentWidget;
- if (screenlet.subWidgets != null) {
- for (ModelScreenWidget widget: screenlet.subWidgets) {
- findEntityNamesUsedInWidget(widget, allEntityNamesUsed);
- }
+ ModelScreenWidget.Screenlet screenlet =
(ModelScreenWidget.Screenlet) currentWidget;
+ for (ModelScreenWidget widget : screenlet.getSubWidgets()) {
+ findEntityNamesUsedInWidget(widget, allEntityNamesUsed);
}
}
}
+
public Set<String> getAllFormNamesIncluded() {
Set<String> allFormNamesIncluded = new HashSet<String>();
findFormNamesIncludedInWidget(this.section, allFormNamesIncluded);
return allFormNamesIncluded;
}
+
protected static void findFormNamesIncludedInWidget(ModelScreenWidget
currentWidget, Set<String> allFormNamesIncluded) {
if (currentWidget instanceof ModelScreenWidget.Form) {
ModelScreenWidget.Form form = (ModelScreenWidget.Form)
currentWidget;
- allFormNamesIncluded.add(form.locationExdr.getOriginal() + "#" +
form.nameExdr.getOriginal());
+ allFormNamesIncluded.add(form.getLocation() + "#" +
form.getName());
} else if (currentWidget instanceof ModelScreenWidget.Section) {
ModelScreenWidget.Section section = (ModelScreenWidget.Section)
currentWidget;
- if (section.subWidgets != null) {
- for (ModelScreenWidget widget: section.subWidgets) {
- findFormNamesIncludedInWidget(widget,
allFormNamesIncluded);
- }
+ for (ModelScreenWidget widget : section.getSubWidgets()) {
+ findFormNamesIncludedInWidget(widget, allFormNamesIncluded);
}
- if (section.failWidgets != null) {
- for (ModelScreenWidget widget: section.failWidgets) {
- findFormNamesIncludedInWidget(widget,
allFormNamesIncluded);
- }
+ for (ModelScreenWidget widget : section.getFailWidgets()) {
+ findFormNamesIncludedInWidget(widget, allFormNamesIncluded);
}
} else if (currentWidget instanceof
ModelScreenWidget.DecoratorSection) {
ModelScreenWidget.DecoratorSection decoratorSection =
(ModelScreenWidget.DecoratorSection) currentWidget;
- if (decoratorSection.subWidgets != null) {
- for (ModelScreenWidget widget: decoratorSection.subWidgets) {
- findFormNamesIncludedInWidget(widget,
allFormNamesIncluded);
- }
+ for (ModelScreenWidget widget : decoratorSection.getSubWidgets()) {
+ findFormNamesIncludedInWidget(widget, allFormNamesIncluded);
}
} else if (currentWidget instanceof ModelScreenWidget.DecoratorScreen)
{
ModelScreenWidget.DecoratorScreen decoratorScreen =
(ModelScreenWidget.DecoratorScreen) currentWidget;
- if (decoratorScreen.sectionMap != null) {
- Collection<ModelScreenWidget.DecoratorSection> sections =
decoratorScreen.sectionMap.values();
- for (ModelScreenWidget section: sections) {
- findFormNamesIncludedInWidget(section,
allFormNamesIncluded);
- }
+ Collection<ModelScreenWidget.DecoratorSection> sections =
decoratorScreen.getSectionMap().values();
+ for (ModelScreenWidget section : sections) {
+ findFormNamesIncludedInWidget(section, allFormNamesIncluded);
}
} else if (currentWidget instanceof ModelScreenWidget.Container) {
ModelScreenWidget.Container container =
(ModelScreenWidget.Container) currentWidget;
- if (container.subWidgets != null) {
- for (ModelScreenWidget widget: container.subWidgets) {
- findFormNamesIncludedInWidget(widget,
allFormNamesIncluded);
- }
+ for (ModelScreenWidget widget : container.getSubWidgets()) {
+ findFormNamesIncludedInWidget(widget, allFormNamesIncluded);
}
} else if (currentWidget instanceof ModelScreenWidget.Screenlet) {
ModelScreenWidget.Screenlet screenlet =
(ModelScreenWidget.Screenlet) currentWidget;
- if (screenlet.subWidgets != null) {
- for (ModelScreenWidget widget: screenlet.subWidgets) {
- findFormNamesIncludedInWidget(widget,
allFormNamesIncluded);
- }
+ for (ModelScreenWidget widget : screenlet.getSubWidgets()) {
+ findFormNamesIncludedInWidget(widget, allFormNamesIncluded);
}
}
}
@@ -281,44 +254,32 @@ public class ModelScreen extends ModelWi
allRequestNamesIncluded.addAll(controllerLocAndRequestSet);
} else if (currentWidget instanceof ModelScreenWidget.Section) {
ModelScreenWidget.Section section = (ModelScreenWidget.Section)
currentWidget;
- if (section.subWidgets != null) {
- for (ModelScreenWidget widget: section.subWidgets) {
- findRequestNamesLinkedtoInWidget(widget,
allRequestNamesIncluded);
- }
+ for (ModelScreenWidget widget : section.getSubWidgets()) {
+ findRequestNamesLinkedtoInWidget(widget,
allRequestNamesIncluded);
}
- if (section.failWidgets != null) {
- for (ModelScreenWidget widget: section.failWidgets) {
- findRequestNamesLinkedtoInWidget(widget,
allRequestNamesIncluded);
- }
+ for (ModelScreenWidget widget : section.getFailWidgets()) {
+ findRequestNamesLinkedtoInWidget(widget,
allRequestNamesIncluded);
}
} else if (currentWidget instanceof
ModelScreenWidget.DecoratorSection) {
ModelScreenWidget.DecoratorSection decoratorSection =
(ModelScreenWidget.DecoratorSection) currentWidget;
- if (decoratorSection.subWidgets != null) {
- for (ModelScreenWidget widget: decoratorSection.subWidgets) {
- findRequestNamesLinkedtoInWidget(widget,
allRequestNamesIncluded);
- }
+ for (ModelScreenWidget widget : decoratorSection.getSubWidgets()) {
+ findRequestNamesLinkedtoInWidget(widget,
allRequestNamesIncluded);
}
} else if (currentWidget instanceof ModelScreenWidget.DecoratorScreen)
{
ModelScreenWidget.DecoratorScreen decoratorScreen =
(ModelScreenWidget.DecoratorScreen) currentWidget;
- if (decoratorScreen.sectionMap != null) {
- Collection<ModelScreenWidget.DecoratorSection> sections =
decoratorScreen.sectionMap.values();
- for (ModelScreenWidget section: sections) {
- findRequestNamesLinkedtoInWidget(section,
allRequestNamesIncluded);
- }
+ Collection<ModelScreenWidget.DecoratorSection> sections =
decoratorScreen.getSectionMap().values();
+ for (ModelScreenWidget section : sections) {
+ findRequestNamesLinkedtoInWidget(section,
allRequestNamesIncluded);
}
} else if (currentWidget instanceof ModelScreenWidget.Container) {
ModelScreenWidget.Container container =
(ModelScreenWidget.Container) currentWidget;
- if (container.subWidgets != null) {
- for (ModelScreenWidget widget: container.subWidgets) {
- findRequestNamesLinkedtoInWidget(widget,
allRequestNamesIncluded);
- }
+ for (ModelScreenWidget widget : container.getSubWidgets()) {
+ findRequestNamesLinkedtoInWidget(widget,
allRequestNamesIncluded);
}
} else if (currentWidget instanceof ModelScreenWidget.Screenlet) {
ModelScreenWidget.Screenlet screenlet =
(ModelScreenWidget.Screenlet) currentWidget;
- if (screenlet.subWidgets != null) {
- for (ModelScreenWidget widget: screenlet.subWidgets) {
- findRequestNamesLinkedtoInWidget(widget,
allRequestNamesIncluded);
- }
+ for (ModelScreenWidget widget : screenlet.getSubWidgets()) {
+ findRequestNamesLinkedtoInWidget(widget,
allRequestNamesIncluded);
}
}
}
