Thymeleaf BETA03 fixes

jpenren · Apr 21, 2016 · caf03d2 · caf03d2
1 parent 9265b61
commit caf03d2
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>io.github.jpenren</groupId>
 	<artifactId>thymeleaf-spring-data-dialect</artifactId>
-	<version>3.0.0.BETA02</version>
+	<version>3.0.0.BETA03</version>
 
 	<name>Thymeleaf Spring Data Dialect</name>
 	<description>Data pagination made easy with Thymeleaf and Spring Data</description>
@@ -102,7 +102,7 @@
 		<dependency>
 			<groupId>org.thymeleaf</groupId>
 			<artifactId>thymeleaf</artifactId>
-			<version>3.0.0.BETA02</version>
+			<version>3.0.0.BETA03</version>
 		</dependency>
 	</dependencies>
 

diff --git a/src/main/java/org/thymeleaf/dialect/springdata/PaginationAttrProcessor.java b/src/main/java/org/thymeleaf/dialect/springdata/PaginationAttrProcessor.java
@@ -26,8 +26,8 @@ protected void doProcess(ITemplateContext context,
 		String attrValue = String.valueOf(attributeValue).trim();
 		PaginationDecorator decorator = PaginationDecoratorRegistry.getInstance().getDecorator(attrValue);
 		String html = decorator.decorate(tag, context);
-
-		boolean isUlNode = Strings.UL.equalsIgnoreCase(tag.getElementName());
+		
+		boolean isUlNode = Strings.UL.equalsIgnoreCase(tag.getElementCompleteName());
 		if (isUlNode) {
 			structureHandler.replaceWith(html, false);
 		} else {

diff --git a/src/main/java/org/thymeleaf/dialect/springdata/PaginationSortAttrProcessor.java b/src/main/java/org/thymeleaf/dialect/springdata/PaginationSortAttrProcessor.java
@@ -34,10 +34,10 @@ protected void doProcess(ITemplateContext context,
 		Sort sort = page.getSort();
 		boolean isSorted = sort != null && sort.getOrderFor(attributeValue) != null;
 		String clas = isSorted ? SORTED_PREFIX.concat(sort.getOrderFor(attributeValue).getDirection().toString().toLowerCase()) : EMPTY;
-
-		tag.getAttributes().setAttribute(HREF, url);
-		String currentClass = tag.getAttributes().getValue(CLASS);
-		tag.getAttributes().setAttribute(CLASS, Strings.concat(currentClass, BLANK, clas));
+		
+		structureHandler.setAttribute(HREF, url);
+		String currentClass = tag.getAttributeValue(CLASS);
+		structureHandler.setAttribute(CLASS, Strings.concat(currentClass, BLANK, clas));
 	}
 
 }
diff --git a/src/main/java/org/thymeleaf/dialect/springdata/decorator/FullPaginationDecorator.java b/src/main/java/org/thymeleaf/dialect/springdata/decorator/FullPaginationDecorator.java
@@ -43,8 +43,8 @@ public String decorate(final IProcessableElementTag tag, final ITemplateContext
 	    String lastPage = PageUtils.createPageUrl(context, page.getTotalPages()-1);
     	String raquo = isLastPage ? getRaquo(locale) : getRaquo(lastPage, locale);
 
-    	boolean isUl = Strings.UL.equalsIgnoreCase(tag.getElementName());
-    	String currentClass = tag.getAttributes().getValue(Strings.CLASS);
+    	boolean isUl = Strings.UL.equalsIgnoreCase(tag.getElementCompleteName());
+    	String currentClass = tag.getAttributeValue(Strings.CLASS);
     	String clas = (isUl && !Strings.isEmpty(currentClass)) ? currentClass : DEFAULT_CLASS;
 
     	return Messages.getMessage(BUNDLE_NAME, "pagination", locale, clas, laquo, previous, pageLinks, next, raquo);