projects
/
juplo-dialect
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
0c7b651
)
TMP
author
Kai Moritz
<kai@juplo.de>
Wed, 24 Apr 2019 14:43:01 +0000
(16:43 +0200)
committer
Kai Moritz
<kai@juplo.de>
Wed, 24 Apr 2019 14:43:01 +0000
(16:43 +0200)
pom.xml
patch
|
blob
|
history
src/main/java/de/juplo/thymeleaf/ActiveAttrProcessor.java
patch
|
blob
|
history
src/main/java/de/juplo/thymeleaf/ImportVariablesAttrProcessor.java
patch
|
blob
|
history
src/main/java/de/juplo/thymeleaf/JuploDialect.java
patch
|
blob
|
history
diff --git
a/pom.xml
b/pom.xml
index
c6158b9
..
c83d646
100644
(file)
--- a/
pom.xml
+++ b/
pom.xml
@@
-58,6
+58,12
@@
<version>${simple-mapper.version}</version>
</dependency>
<version>${simple-mapper.version}</version>
</dependency>
+ <!-- JPA -->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </dependency>
+
<!-- Testing -->
<dependency>
<groupId>junit</groupId>
<!-- Testing -->
<dependency>
<groupId>junit</groupId>
diff --git
a/src/main/java/de/juplo/thymeleaf/ActiveAttrProcessor.java
b/src/main/java/de/juplo/thymeleaf/ActiveAttrProcessor.java
index
7392bf9
..
a07241e
100644
(file)
--- a/
src/main/java/de/juplo/thymeleaf/ActiveAttrProcessor.java
+++ b/
src/main/java/de/juplo/thymeleaf/ActiveAttrProcessor.java
@@
-6,7
+6,7
@@
package de.juplo.thymeleaf;
* marked as active.
* @author Kai Moritz
*/
* marked as active.
* @author Kai Moritz
*/
-public class ActiveAttrProcessor extends AbstractSubstituteAttrrocessor
+public class ActiveAttrProcessor extends AbstractSubstituteAttr
P
rocessor
{
public ActiveAttrProcessor(final String prefix)
{
{
public ActiveAttrProcessor(final String prefix)
{
diff --git
a/src/main/java/de/juplo/thymeleaf/ImportVariablesAttrProcessor.java
b/src/main/java/de/juplo/thymeleaf/ImportVariablesAttrProcessor.java
index
aac37a6
..
e063a0c
100644
(file)
--- a/
src/main/java/de/juplo/thymeleaf/ImportVariablesAttrProcessor.java
+++ b/
src/main/java/de/juplo/thymeleaf/ImportVariablesAttrProcessor.java
@@
-15,20
+15,13
@@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.regex.Pattern;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.thymeleaf.Arguments;
-import org.thymeleaf.Configuration;
-import org.thymeleaf.TemplateProcessingParameters;
import org.thymeleaf.context.IContext;
import org.thymeleaf.context.IContext;
-import org.thymeleaf.context.VariablesMap;
-import org.thymeleaf.dom.Element;
-import org.thymeleaf.dom.Node;
import org.thymeleaf.exceptions.TemplateProcessingException;
import org.thymeleaf.exceptions.TemplateProcessingException;
-import org.thymeleaf.processor.ProcessorResult;
-import org.thymeleaf.processor.attr.AbstractAttrProcessor;
-import org.thymeleaf.resourceresolver.IResourceResolver;
+import org.thymeleaf.processor.element.AbstractAttributeModelProcessor;
import org.thymeleaf.standard.expression.IStandardExpression;
import org.thymeleaf.standard.expression.IStandardExpressionParser;
import org.thymeleaf.standard.expression.StandardExpressions;
import org.thymeleaf.standard.expression.IStandardExpression;
import org.thymeleaf.standard.expression.IStandardExpressionParser;
import org.thymeleaf.standard.expression.StandardExpressions;
+import org.thymeleaf.templatemode.TemplateMode;
import org.thymeleaf.templateresolver.ITemplateResolver;
import org.thymeleaf.templateresolver.TemplateResolution;
import org.thymeleaf.templateresolver.ITemplateResolver;
import org.thymeleaf.templateresolver.TemplateResolution;
@@
-39,7
+32,7
@@
import org.thymeleaf.templateresolver.TemplateResolution;
* variables.
* @author Kai Moritz
*/
* variables.
* @author Kai Moritz
*/
-public class ImportVariablesAttrProcessor extends AbstractAttrProcessor
+public class ImportVariablesAttrProcessor extends AbstractAttr
ibuteModel
Processor
{
private static final Logger LOG =
LoggerFactory.getLogger(ImportVariablesAttrProcessor.class);
{
private static final Logger LOG =
LoggerFactory.getLogger(ImportVariablesAttrProcessor.class);
@@
-55,9
+48,22
@@
public class ImportVariablesAttrProcessor extends AbstractAttrProcessor
public static final int ATTR_PRECEDENCE = 200;
public static final int ATTR_PRECEDENCE = 200;
- public ImportVariablesAttrProcessor()
+ public ImportVariablesAttrProcessor(
+ final String prefix,
+ final String attribute,
+ final String substitute
+ )
{
{
- super("variables");
+ super(
+ TemplateMode.HTML,
+ prefix,
+ null,
+ false,
+ attribute,
+ true,
+ ATTR_PRECEDENCE,
+ false
+ );
}
}
diff --git
a/src/main/java/de/juplo/thymeleaf/JuploDialect.java
b/src/main/java/de/juplo/thymeleaf/JuploDialect.java
index
21cf8ac
..
d97953b
100644
(file)
--- a/
src/main/java/de/juplo/thymeleaf/JuploDialect.java
+++ b/
src/main/java/de/juplo/thymeleaf/JuploDialect.java
@@
-39,8
+39,8
@@
public class JuploDialect extends AbstractProcessorDialect
public Set<IProcessor> getProcessors(String prefix)
{
final Set<IProcessor> processors = new HashSet<>();
public Set<IProcessor> getProcessors(String prefix)
{
final Set<IProcessor> processors = new HashSet<>();
- processors.add(new ActiveAttr
ibute
Processor(prefix));
- processors.add(new InactiveAttr
ibute
Processor(prefix));
+ processors.add(new ActiveAttrProcessor(prefix));
+ processors.add(new InactiveAttrProcessor(prefix));
processors.add(new ImportVariablesAttrProcessor());
return processors;
}
processors.add(new ImportVariablesAttrProcessor());
return processors;
}