You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2015/03/05 10:12:11 UTC
svn commit: r1664288 - in /sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal: NonCachingTemplateResolver.java ThymeleafScriptEngineFactory.java

Author: olli
Date: Thu Mar  5 09:12:11 2015
New Revision: 1664288

URL: http://svn.apache.org/r1664288
Log:
style

Modified:
    sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/NonCachingTemplateResolver.java
    sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ThymeleafScriptEngineFactory.java

Modified: sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/NonCachingTemplateResolver.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/NonCachingTemplateResolver.java?rev=1664288&r1=1664287&r2=1664288&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/NonCachingTemplateResolver.java (original)
+++ sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/NonCachingTemplateResolver.java Thu Mar  5 09:12:11 2015
@@ -62,7 +62,7 @@ public class NonCachingTemplateResolver
     private IResourceResolver resourceResolver;
 
     @Reference(referenceInterface = SlingTemplateModeHandler.class, cardinality = ReferenceCardinality.MANDATORY_MULTIPLE, policy = ReferencePolicy.DYNAMIC)
-    final private Set<SlingTemplateModeHandler> templateModeHandlers = new LinkedHashSet<SlingTemplateModeHandler>();
+    private final Set<SlingTemplateModeHandler> templateModeHandlers = new LinkedHashSet<SlingTemplateModeHandler>();
 
     private Integer order;
 
@@ -110,7 +110,7 @@ public class NonCachingTemplateResolver
         templateModeHandlers.remove(templateModeHandler);
     }
 
-    private synchronized void configure(final ComponentContext componentContext) {
+    private void configure(final ComponentContext componentContext) {
         final Dictionary properties = componentContext.getProperties();
         order = PropertiesUtil.toInteger(properties.get(ORDER_PARAMETER), DEFAULT_ORDER);
         encoding = PropertiesUtil.toString(properties.get(ENCODING_PARAMETER), DEFAULT_ENCODING);

Modified: sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ThymeleafScriptEngineFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ThymeleafScriptEngineFactory.java?rev=1664288&r1=1664287&r2=1664288&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ThymeleafScriptEngineFactory.java (original)
+++ sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ThymeleafScriptEngineFactory.java Thu Mar  5 09:12:11 2015
@@ -59,16 +59,16 @@ import org.thymeleaf.templateresolver.IT
     @Property(name = Constants.SERVICE_DESCRIPTION, value = "scripting engine for Thymeleaf templates"),
     @Property(name = Constants.SERVICE_RANKING, intValue = 0, propertyPrivate = false)
 })
-public class ThymeleafScriptEngineFactory extends AbstractScriptEngineFactory {
+public final class ThymeleafScriptEngineFactory extends AbstractScriptEngineFactory {
 
     @Reference(referenceInterface = ITemplateResolver.class, cardinality = ReferenceCardinality.MANDATORY_MULTIPLE, policy = ReferencePolicy.DYNAMIC)
-    final private Set<ITemplateResolver> templateResolvers = new LinkedHashSet<ITemplateResolver>();
+    private final Set<ITemplateResolver> templateResolvers = new LinkedHashSet<ITemplateResolver>();
 
     @Reference(referenceInterface = IMessageResolver.class, cardinality = ReferenceCardinality.MANDATORY_MULTIPLE, policy = ReferencePolicy.DYNAMIC)
-    final private Set<IMessageResolver> messageResolvers = new LinkedHashSet<IMessageResolver>();
+    private final Set<IMessageResolver> messageResolvers = new LinkedHashSet<IMessageResolver>();
 
     @Reference(referenceInterface = IDialect.class, cardinality = ReferenceCardinality.MANDATORY_MULTIPLE, policy = ReferencePolicy.DYNAMIC)
-    final private Set<IDialect> dialects = new LinkedHashSet<IDialect>();
+    private final Set<IDialect> dialects = new LinkedHashSet<IDialect>();
 
     private TemplateEngine templateEngine;