struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lukaszlen...@apache.org
Subject [42/50] [abbrv] struts git commit: Extracts constants representing expression languages
Date Fri, 15 Jul 2016 13:19:09 GMT
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/4771dfa6
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/4771dfa6
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/4771dfa6

Branch: refs/heads/master
Commit: 4771dfa63da7c4c1329319201050f4abc1aa0df2
Parents: 6274820
Author: Lukasz Lenart <lukasz.lenart@gmail.com>
Authored: Fri Jan 15 08:45:54 2016 +0100
Committer: Lukasz Lenart <lukasz.lenart@gmail.com>
Committed: Tue Jan 19 16:19:20 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/4771dfa6/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;
     }


Mime
View raw message