You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2016/01/18 15:57:08 UTC
[26/30] struts git commit: Extracts constants representing expression
languages
Extracts constants representing expression languages
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/f645c91e
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/f645c91e
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/f645c91e
Branch: refs/heads/master
Commit: f645c91ee66416e964b5823f8c9cdc48ba8ef53c
Parents: 0e85da6
Author: Lukasz Lenart <lu...@gmail.com>
Authored: Fri Jan 15 08:45:54 2016 +0100
Committer: Lukasz Lenart <lu...@gmail.com>
Committed: Fri Jan 15 08:45:54 2016 +0100
----------------------------------------------------------------------
.../apache/struts2/tiles/StrutsTilesContainerFactory.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/f645c91e/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
----------------------------------------------------------------------
diff --git a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
index 57594af..8403610 100644
--- a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
+++ b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
@@ -97,6 +97,12 @@ public class StrutsTilesContainerFactory extends BasicTilesContainerFactory {
*/
public static final String TILES_DEFAULT_PATTERN = "tiles*.xml";
+ /**
+ * Supported expression languages
+ */
+ public static final String OGNL = "OGNL";
+ public static final String EL = "EL";
+
@Override
public TilesContainer createDecoratedContainer(TilesContainer originalContainer, ApplicationContext applicationContext) {
return new CachingTilesContainer(originalContainer);
@@ -137,8 +143,8 @@ public class StrutsTilesContainerFactory extends BasicTilesContainerFactory {
LocaleResolver resolver) {
BasicAttributeEvaluatorFactory attributeEvaluatorFactory = new BasicAttributeEvaluatorFactory(new DirectAttributeEvaluator());
- attributeEvaluatorFactory.registerAttributeEvaluator("OGNL", createOGNLEvaluator());
- attributeEvaluatorFactory.registerAttributeEvaluator("EL", createELEvaluator(applicationContext));
+ attributeEvaluatorFactory.registerAttributeEvaluator(OGNL, createOGNLEvaluator());
+ attributeEvaluatorFactory.registerAttributeEvaluator(EL, createELEvaluator(applicationContext));
return attributeEvaluatorFactory;
}