Author: jbalunas(a)redhat.com Date: 2010-08-16 18:07:55 -0400 (Mon, 16 Aug 2010) New Revision: 18679 Modified: branches/RF-9023/core/impl/src/main/java/org/ajax4jsf/cache/OSCacheCacheFactory.java branches/RF-9023/core/impl/src/main/java/org/ajax4jsf/context/ContextInitParameters.java branches/RF-9023/core/impl/src/main/java/org/richfaces/VersionBean.java branches/RF-9023/core/impl/src/main/java/org/richfaces/application/InitializationListener.java branches/RF-9023/core/impl/src/main/java/org/richfaces/application/ServicesFactoryImpl.java branches/RF-9023/core/impl/src/main/java/org/richfaces/renderkit/SequenceRendererHelper.java branches/RF-9023/core/impl/src/main/java/org/richfaces/resource/DefaultResourceCodecData.java branches/RF-9023/core/impl/src/main/java/org/richfaces/skin/SkinImpl.java Log: Fixed 33 checkstyle errors after re-initializing checkstyle check in impl Modified: branches/RF-9023/core/impl/src/main/java/org/ajax4jsf/cache/OSCacheCacheFactory.java =================================================================== --- branches/RF-9023/core/impl/src/main/java/org/ajax4jsf/cache/OSCacheCacheFactory.java 2010-08-16 19:35:17 UTC (rev 18678) +++ branches/RF-9023/core/impl/src/main/java/org/ajax4jsf/cache/OSCacheCacheFactory.java 2010-08-16 22:07:55 UTC (rev 18679) @@ -50,6 +50,16 @@ private List<GeneralCacheAdministrator> cacheAdministrators = new ArrayList<GeneralCacheAdministrator>(1); + public OSCacheCacheFactory() throws ClassNotFoundException { + ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); + if (classLoader == null) { + classLoader = OSCacheCacheFactory.class.getClassLoader(); + } + + //try load cache class to check its presence in classpath + Class.forName(GeneralCacheAdministrator.class.getName(), false, classLoader); + } + private static Properties loadProperties() throws IOException { Properties properties = new Properties(); URL resource = OSCacheCache.class.getResource("oscache.properties"); @@ -71,16 +81,6 @@ return properties; } - - public OSCacheCacheFactory() throws ClassNotFoundException { - ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); - if (classLoader == null) { - classLoader = OSCacheCacheFactory.class.getClassLoader(); - } - - //try load cache class to check its presence in classpath - Class.forName(GeneralCacheAdministrator.class.getName(), false, classLoader); - } public Cache createCache(FacesContext facesContext, String cacheName, Map<?, ?> env) { //TODO - handle cache name Modified: branches/RF-9023/core/impl/src/main/java/org/ajax4jsf/context/ContextInitParameters.java =================================================================== --- branches/RF-9023/core/impl/src/main/java/org/ajax4jsf/context/ContextInitParameters.java 2010-08-16 19:35:17 UTC (rev 18678) +++ branches/RF-9023/core/impl/src/main/java/org/ajax4jsf/context/ContextInitParameters.java 2010-08-16 22:07:55 UTC (rev 18679) @@ -30,7 +30,6 @@ import org.ajax4jsf.util.ELUtils; import org.richfaces.application.ServiceTracker; -import org.richfaces.skin.Skin; /** * This class hold all methods for get application init parameters. Created for @@ -39,11 +38,7 @@ * @author asmirnov */ public final class ContextInitParameters { - /** - * - */ - private static final int DEFAULT_TTL = 60 * 60 * 24; - + public static final String[] DATATABLE_USES_VIEW_LOCALE = {"org.richfaces.datatableUsesViewLocale"}; /** @@ -75,6 +70,7 @@ public static final String EXECUTE_AWT_INITIALIZER = "org.richfaces.executeAWTInitializer"; + private static final int DEFAULT_TTL = 60 * 60 * 24; private static final String[] RESOURCES_TTL_ARRAY = { RESOURCES_TTL }; private static final String[] RESOURCES_CACHE_SIZE_ARRAY = { RESOURCES_CACHE_SIZE }; Modified: branches/RF-9023/core/impl/src/main/java/org/richfaces/VersionBean.java =================================================================== --- branches/RF-9023/core/impl/src/main/java/org/richfaces/VersionBean.java 2010-08-16 19:35:17 UTC (rev 18678) +++ branches/RF-9023/core/impl/src/main/java/org/richfaces/VersionBean.java 2010-08-16 22:07:55 UTC (rev 18679) @@ -42,8 +42,11 @@ */ public final class VersionBean { + public static final Version VERSION = new Version(); + private static final org.slf4j.Logger LOGGER = RichfacesLogger.APPLICATION.getLogger(); + /** * Class for incapsulate version info. * @@ -197,8 +200,6 @@ } } - public static final Version VERSION = new Version(); - public String getVendor() { return VERSION.getImplementationVendor(); } Modified: branches/RF-9023/core/impl/src/main/java/org/richfaces/application/InitializationListener.java =================================================================== --- branches/RF-9023/core/impl/src/main/java/org/richfaces/application/InitializationListener.java 2010-08-16 19:35:17 UTC (rev 18678) +++ branches/RF-9023/core/impl/src/main/java/org/richfaces/application/InitializationListener.java 2010-08-16 22:07:55 UTC (rev 18679) @@ -51,7 +51,8 @@ private static final Logger LOGGER = RichfacesLogger.APPLICATION.getLogger(); private static final class AWTInitializer { - + private AWTInitializer() { } + private static boolean checkGetSystemClassLoaderAccess() { try { ClassLoader.getSystemClassLoader(); @@ -130,8 +131,8 @@ ArrayList<Module> modules = new ArrayList<Module>(); modules.add(new DefaultModule()); try { - modules.addAll(ServiceLoader.loadServices(Module.class)); - injector.init(modules); + modules.addAll(ServiceLoader.loadServices(Module.class)); + injector.init(modules); } catch (ServiceException e) { throw new FacesException(e); } Modified: branches/RF-9023/core/impl/src/main/java/org/richfaces/application/ServicesFactoryImpl.java =================================================================== --- branches/RF-9023/core/impl/src/main/java/org/richfaces/application/ServicesFactoryImpl.java 2010-08-16 19:35:17 UTC (rev 18678) +++ branches/RF-9023/core/impl/src/main/java/org/richfaces/application/ServicesFactoryImpl.java 2010-08-16 22:07:55 UTC (rev 18679) @@ -1,7 +1,5 @@ package org.richfaces.application; -import java.util.List; - import com.google.common.collect.ClassToInstanceMap; import com.google.common.collect.ImmutableClassToInstanceMap; import com.google.common.collect.MutableClassToInstanceMap; Modified: branches/RF-9023/core/impl/src/main/java/org/richfaces/renderkit/SequenceRendererHelper.java =================================================================== --- branches/RF-9023/core/impl/src/main/java/org/richfaces/renderkit/SequenceRendererHelper.java 2010-08-16 19:35:17 UTC (rev 18678) +++ branches/RF-9023/core/impl/src/main/java/org/richfaces/renderkit/SequenceRendererHelper.java 2010-08-16 22:07:55 UTC (rev 18679) @@ -40,6 +40,14 @@ private String[] columnClasses = null; + public SequenceRendererHelper(UISequence sequence) { + super(); + this.sequence = sequence; + + this.rowClasses = splitClassesString((String) sequence.getAttributes().get("rowClasses")); + this.columnClasses = splitClassesString((String) sequence.getAttributes().get("columnClasses")); + } + private static String[] splitClassesString(String s) { if (s != null) { return s.split(","); @@ -56,14 +64,6 @@ return null; } - public SequenceRendererHelper(UISequence sequence) { - super(); - this.sequence = sequence; - - this.rowClasses = splitClassesString((String) sequence.getAttributes().get("rowClasses")); - this.columnClasses = splitClassesString((String) sequence.getAttributes().get("columnClasses")); - } - public UISequence getSequence() { return sequence; } Modified: branches/RF-9023/core/impl/src/main/java/org/richfaces/resource/DefaultResourceCodecData.java =================================================================== --- branches/RF-9023/core/impl/src/main/java/org/richfaces/resource/DefaultResourceCodecData.java 2010-08-16 19:35:17 UTC (rev 18678) +++ branches/RF-9023/core/impl/src/main/java/org/richfaces/resource/DefaultResourceCodecData.java 2010-08-16 22:07:55 UTC (rev 18679) @@ -31,11 +31,6 @@ private DefaultResourceCodec defaultResourceCodec; - public DefaultResourceCodecData(DefaultResourceCodec defaultResourceCodec) { - super(); - this.defaultResourceCodec = defaultResourceCodec; - } - private String resourceName; private String libraryName; @@ -52,6 +47,11 @@ //lazy evaluated private Object data = null; + public DefaultResourceCodecData(DefaultResourceCodec defaultResourceCodec) { + super(); + this.defaultResourceCodec = defaultResourceCodec; + } + protected void setResourceName(String resourceName) { this.resourceName = resourceName; } Modified: branches/RF-9023/core/impl/src/main/java/org/richfaces/skin/SkinImpl.java =================================================================== --- branches/RF-9023/core/impl/src/main/java/org/richfaces/skin/SkinImpl.java 2010-08-16 19:35:17 UTC (rev 18678) +++ branches/RF-9023/core/impl/src/main/java/org/richfaces/skin/SkinImpl.java 2010-08-16 22:07:55 UTC (rev 18679) @@ -38,40 +38,6 @@ */ final class SkinImpl extends AbstractSkin { - private static class MutableInteger { - private int value; - - public int getAndIncrement() { - return value++; - } - - public int getAndDecrement() { - return value--; - } - } - - private String name; - - private MutableInteger getCounter(FacesContext context) { - Map<Object, Object> attr = context.getAttributes(); - - MutableInteger counter = (MutableInteger) attr.get(MutableInteger.class); - if (counter == null) { - counter = new MutableInteger(); - attr.put(MutableInteger.class, counter); - } - - return counter; - } - - private abstract static class Operation { - - public abstract Object executeLocal(FacesContext facesContext, SkinImpl skin, String name); - - public abstract Object executeBase(FacesContext facesContext, Skin skin, String name); - - } - private static final Operation RESOLVE = new Operation() { public Object executeLocal(FacesContext facesContext, SkinImpl skin, String name) { @@ -114,9 +80,23 @@ } }; - + private final Map<Object, Object> skinParams; - + + private static class MutableInteger { + private int value; + + public int getAndIncrement() { + return value++; + } + + public int getAndDecrement() { + return value--; + } + } + + private String name; + /** * Skin can instantiate only by factory method. * @@ -126,7 +106,27 @@ this.skinParams = properties; this.name = name; } + + private MutableInteger getCounter(FacesContext context) { + Map<Object, Object> attr = context.getAttributes(); + + MutableInteger counter = (MutableInteger) attr.get(MutableInteger.class); + if (counter == null) { + counter = new MutableInteger(); + attr.put(MutableInteger.class, counter); + } + + return counter; + } + + private abstract static class Operation { + + public abstract Object executeLocal(FacesContext facesContext, SkinImpl skin, String name); + public abstract Object executeBase(FacesContext facesContext, Skin skin, String name); + + } + protected Map<Object, Object> getSkinParams() { return skinParams; }