Author: adrianc
Date: Sat Nov 1 14:56:07 2014
New Revision: 1635961
URL: http://svn.apache.org/r1635961
Log:
Continue working on making widget models thread safe.
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenFactory.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java
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=1635961&r1=1635960&r2=1635961&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:56:07 2014
@@ -48,13 +48,13 @@ public class ModelScreen extends ModelWi
public static final String module = ModelScreen.class.getName();
- protected String sourceLocation;
- protected FlexibleStringExpander transactionTimeoutExdr;
- protected Map<String, ModelScreen> modelScreenMap;
- protected boolean useTransaction;
- protected boolean useCache;
+ private final String sourceLocation;
+ private final FlexibleStringExpander transactionTimeoutExdr;
+ private final Map<String, ModelScreen> modelScreenMap;
+ private final boolean useTransaction;
+ private final boolean useCache;
- protected ModelScreenWidget.Section section;
+ private final ModelScreenWidget.Section section;
// ===== CONSTRUCTORS =====
@@ -75,6 +75,26 @@ public class ModelScreen extends ModelWi
this.section = new ModelScreenWidget.Section(this, sectionElement,
true);
}
+ public String getTransactionTimeout() {
+ return transactionTimeoutExdr.getOriginal();
+ }
+
+ public Map<String, ModelScreen> getModelScreenMap() {
+ return modelScreenMap;
+ }
+
+ public boolean getUseTransaction() {
+ return useTransaction;
+ }
+
+ public boolean getUseCache() {
+ return useCache;
+ }
+
+ public ModelScreenWidget.Section getSection() {
+ return section;
+ }
+
public String getSourceLocation() {
return sourceLocation;
}
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenFactory.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenFactory.java?rev=1635961&r1=1635960&r2=1635961&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenFactory.java
(original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenFactory.java
Sat Nov 1 14:56:07 2014
@@ -201,7 +201,7 @@ public class ScreenFactory {
throw new RuntimeException(errMsg);
}
} else {
- modelScreen =
parentWidget.getModelScreen().modelScreenMap.get(name);
+ modelScreen =
parentWidget.getModelScreen().getModelScreenMap().get(name);
if (modelScreen == null) {
throw new IllegalArgumentException("Could not find screen with
name [" + name + "] in the same file as the screen with name [" +
parentWidget.getModelScreen().getName() + "]");
}
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java?rev=1635961&r1=1635960&r2=1635961&view=diff
==============================================================================
---
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java
(original)
+++
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java
Sat Nov 1 14:56:07 2014
@@ -107,7 +107,7 @@ public class ScreenRenderer {
*/
public String render(String resourceName, String screenName) throws
GeneralException, IOException, SAXException, ParserConfigurationException {
ModelScreen modelScreen =
ScreenFactory.getScreenFromLocation(resourceName, screenName);
- if (modelScreen.useCache) {
+ if (modelScreen.getUseCache()) {
// if in the screen definition use-cache is set to true
// then try to get an already built screen output from the cache:
// 1) if we find it then we get it and attach it to the passed in
writer
