This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.scripting.thymeleaf-1.0.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-thymeleaf.git
commit 512cba0b2b3cf82d75fc4ead0974e91a0387dbf8 Author: Oliver Lietz <[email protected]> AuthorDate: Mon May 16 13:40:58 2016 +0000 SLING-5075 Upgrade Thymeleaf to 3.0 use getDialectPrefix():String git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf@1744047 13f79535-47bb-0310-9956-ffa450edef68 --- .../internal/processor/SlingIncludeAttributeTagProcessor.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/apache/sling/scripting/thymeleaf/internal/processor/SlingIncludeAttributeTagProcessor.java b/src/main/java/org/apache/sling/scripting/thymeleaf/internal/processor/SlingIncludeAttributeTagProcessor.java index 295d7c1..802b865 100644 --- a/src/main/java/org/apache/sling/scripting/thymeleaf/internal/processor/SlingIncludeAttributeTagProcessor.java +++ b/src/main/java/org/apache/sling/scripting/thymeleaf/internal/processor/SlingIncludeAttributeTagProcessor.java @@ -46,8 +46,6 @@ import org.thymeleaf.templatemode.TemplateMode; 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 SlingIncludeAttributeTagProcessor extends AbstractAttributeTagProce 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 SlingIncludeAttributeTagProcessor extends AbstractAttributeTagProce } 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; } -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
