svn commit: r1744047 - /sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/processor/SlingIncludeAttributeTagProcessor.java

[olli]

Author: olli
Date: Mon May 16 13:40:58 2016
New Revision: 1744047

URL: http://svn.apache.org/viewvc?rev=1744047&view=rev
Log:
SLING-5075 Upgrade Thymeleaf to 3.0

use getDialectPrefix():String

Modified:
    
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/processor/SlingIncludeAttributeTagProcessor.java

Modified: 
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/processor/SlingIncludeAttributeTagProcessor.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/processor/SlingIncludeAttributeTagProcessor.java?rev=1744047&r1=1744046&r2=1744047&view=diff
==============================================================================
--- 
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/processor/SlingIncludeAttributeTagProcessor.java
 (original)
+++ 
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/processor/SlingIncludeAttributeTagProcessor.java
 Mon May 16 13:40:58 2016
@@ -46,8 +46,6 @@ import org.thymeleaf.templatemode.Templa
 
 public class SlingIncludeAttributeTagProcessor extends 
AbstractAttributeTagProcessor {
 
-    private final String dialectPrefix; // TODO remove (use dialectPrefix from 
extended AbstractElementTagProcessor)
-
     public static final int ATTRIBUTE_PRECEDENCE = 100;
 
     public static final String ATTRIBUTE_NAME = "include";
@@ -66,7 +64,6 @@ public class SlingIncludeAttributeTagPro
 
     public SlingIncludeAttributeTagProcessor(final String dialectPrefix) {
         super(TemplateMode.HTML, dialectPrefix, null, true, ATTRIBUTE_NAME, 
true, ATTRIBUTE_PRECEDENCE, true);
-        this.dialectPrefix = dialectPrefix;
     }
 
     @Override
@@ -105,13 +102,13 @@ public class SlingIncludeAttributeTagPro
     }
 
     protected Object parseAttribute(final IStandardExpressionParser 
expressionParser, final ITemplateContext templateContext, final 
IProcessableElementTag processableElementTag, final IElementTagStructureHandler 
elementTagStructureHandler, final String name) {
-        final String value = 
processableElementTag.getAttributeValue(dialectPrefix, name);
+        final String value = 
processableElementTag.getAttributeValue(getDialectPrefix(), name);
         Object result = null;
         if (value != null) {
             final IStandardExpression expression = 
expressionParser.parseExpression(templateContext, value);
             result = expression.execute(templateContext);
         }
-        elementTagStructureHandler.removeAttribute(dialectPrefix, name);
+        elementTagStructureHandler.removeAttribute(getDialectPrefix(), name);
         return result;
     }