Author: Alex.Kolonitsky Date: 2009-12-04 15:28:48 -0500 (Fri, 04 Dec 2009) New Revision: 16068 Modified: root/framework/trunk/api/src/main/java/org/ajax4jsf/Messages.java root/framework/trunk/api/src/main/java/org/ajax4jsf/context/AjaxContext.java root/framework/trunk/api/src/main/java/org/richfaces/application/ServiceTracker.java root/framework/trunk/api/src/main/java/org/richfaces/skin/SkinFactory.java Log: RFPL-195 - Code style policy Reformatting Modified: root/framework/trunk/api/src/main/java/org/ajax4jsf/Messages.java =================================================================== --- root/framework/trunk/api/src/main/java/org/ajax4jsf/Messages.java 2009-12-04 20:11:46 UTC (rev 16067) +++ root/framework/trunk/api/src/main/java/org/ajax4jsf/Messages.java 2009-12-04 20:28:48 UTC (rev 16068) @@ -19,12 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.ajax4jsf; import java.text.MessageFormat; - import java.util.Collections; import java.util.Enumeration; import java.util.HashMap; @@ -58,7 +55,6 @@ public static final String BUILD_RESOURCE_URI_INFO = "BUILD_RESOURCE_URI_INFO"; public static final String BUNDLE_MAP_NO_PUT_VALUE = "BUNDLE_MAP_NO_PUT_VALUE"; public static final String BUNDLE_MAP_NO_REMOVE_VALUE = "BUNDLE_MAP_NO_REMOVE_VALUE"; - private static final String BUNDLE_NAME = "org.ajax4jsf.messages"; public static final String CALCULATE_COMPONENT_ID_INFO = "CALCULATE_COMPONENT_ID_INFO"; public static final String CALLED_SET_PARENT = "CALLED_SET_PARENT"; public static final String CANNOT_WRITE_RASTERS = "CANNOT_WRITE_RASTERS"; @@ -299,9 +295,12 @@ public static final String VAR_MUST_BE_LITERAL = "VAR_MUST_BE_LITERAL"; public static final String VIEW_HANDLER_INSTANTIATION_ERROR = "VIEW_HANDLER_INSTANTIATION_ERROR"; public static final String WRAPPED_RULES_NULL_ERROR = "WRAPPED_RULES_NULL_ERROR"; + + private static final String BUNDLE_NAME = "org.ajax4jsf.messages"; private static Map<ClassLoader, ResourceBundle> bundles = new HashMap<ClassLoader, ResourceBundle>(); - private Messages() {} + private Messages() { + } private static synchronized ResourceBundle getBundle() { ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); @@ -313,7 +312,7 @@ } catch (MissingResourceException e) { try { bundle = ResourceBundle.getBundle(BUNDLE_NAME, Locale.getDefault(), - Messages.class.getClassLoader()); + Messages.class.getClassLoader()); } catch (MissingResourceException e2) { bundle = new EmptyResourceBundle(); } @@ -338,7 +337,7 @@ return "%" + name + "%"; } - return MessageFormat.format(pattern, new Object[] {param}); + return MessageFormat.format(pattern, new Object[]{param}); } public static String getMessage(String name, Object param1, Object param2) { @@ -348,7 +347,7 @@ return "%" + name + "%"; } - return MessageFormat.format(pattern, new Object[] {param1, param2}); + return MessageFormat.format(pattern, new Object[]{param1, param2}); } public static String getMessage(String name, Object[] params) { @@ -363,7 +362,6 @@ /** * @author asmirnov - * */ public static final class EmptyResourceBundle extends ResourceBundle { Modified: root/framework/trunk/api/src/main/java/org/ajax4jsf/context/AjaxContext.java =================================================================== --- root/framework/trunk/api/src/main/java/org/ajax4jsf/context/AjaxContext.java 2009-12-04 20:11:46 UTC (rev 16067) +++ root/framework/trunk/api/src/main/java/org/ajax4jsf/context/AjaxContext.java 2009-12-04 20:28:48 UTC (rev 16068) @@ -44,14 +44,14 @@ * Key for keep request state information in request-scope attributes. */ public static final String AJAX_CONTEXT_KEY = "ajaxContext"; - private static final String DEFAULT_CONTEXT_CLASS = "org.ajax4jsf.context.AjaxContextImpl"; public static final String RESPONSE_DATA_KEY = "_ajax:data"; static final String SERVICE_RESOURCE = "META-INF/services/" + AjaxContext.class.getName(); + private static final String DEFAULT_CONTEXT_CLASS = "org.ajax4jsf.context.AjaxContextImpl"; private static Map<ClassLoader, Class<? extends AjaxContext>> ajaxContextClasses = new HashMap<ClassLoader, Class<? extends AjaxContext>>(); private boolean limitToList; - protected AjaxContext() {} + protected AjaxContext() { } public abstract Map<String, Object> getCommonAjaxParameters(); Modified: root/framework/trunk/api/src/main/java/org/richfaces/application/ServiceTracker.java =================================================================== --- root/framework/trunk/api/src/main/java/org/richfaces/application/ServiceTracker.java 2009-12-04 20:11:46 UTC (rev 16067) +++ root/framework/trunk/api/src/main/java/org/richfaces/application/ServiceTracker.java 2009-12-04 20:28:48 UTC (rev 16068) @@ -21,101 +21,98 @@ */ package org.richfaces.application; +import javax.faces.context.FacesContext; import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.Map; -import javax.faces.context.FacesContext; - -import org.richfaces.skin.SkinFactory; - /** * <p>Tracker class to provide access to various framework implementation services. - * Examples of such services are: {@link SkinFactory}, TBD</p> - * - * <p><b>Note:</b> this class is not synchronized and presumes that all modification operations + * Examples of such services are: {@link org.richfaces.skin.SkinFactory}, TBD</p> + * <p/> + * <p><b>Note:</b> this class is not synchronized and presumes that all modification operations * should be done in a single-thread (e.g. in initialization listener)</p> - * + * * @author Nick Belaevski * @since 4.0 */ public final class ServiceTracker { - private static final String SERVICES_MAP_ATTRIBUTE = ServiceTracker.class.getName(); - - private ServiceTracker() { - //utility class private constructor - } - - public static Collection<Class<?>> getRegisteredServiceClasses(FacesContext context) { - Map<Class<?>, Object> servicesMap = getServicesMap(context, false); - if (servicesMap != null) { - return Collections.unmodifiableCollection(servicesMap.keySet()); - } else { - return Collections.emptySet(); - } - } - - @SuppressWarnings("unchecked") - public static <T> T getService(FacesContext context, Class<T> serviceInterfaceClass) { - if (context == null) { - throw new NullPointerException("context"); - } - - if (serviceInterfaceClass == null) { - throw new NullPointerException("serviceInterfaceClass"); - } + private static final String SERVICES_MAP_ATTRIBUTE = ServiceTracker.class.getName(); - T serviceImplementation = null; - - Map<Class<?>, Object> servicesMap = getServicesMap(context, false); - if (servicesMap != null) { - serviceImplementation = (T) servicesMap.get(serviceInterfaceClass); - } - - //TODO - null? - return serviceImplementation; - } + private ServiceTracker() { + //utility class private constructor + } - public static <T> void setService(FacesContext context, - Class<T> serviceInterfaceClass, - T serviceImplementation) { - - if (context == null) { - throw new NullPointerException("context"); - } - - if (serviceInterfaceClass == null) { - throw new NullPointerException("serviceInterfaceClass"); - } - - if (serviceImplementation == null) { - throw new NullPointerException("serviceImplementation"); - } - - Map<Class<?>, Object> servicesMap = getServicesMap(context, true); - servicesMap.put(serviceInterfaceClass, serviceImplementation); - } - - public static void release(FacesContext context) { - clearServicesMap(context); - } - - private static Map<Class<?>, Object> getServicesMap(FacesContext facesContext, boolean createIfNull) { - Map<String, Object> applicationMap = facesContext.getExternalContext().getApplicationMap(); - @SuppressWarnings("unchecked") - Map<Class<?>, Object> servicesMap = (Map<Class<?>, Object>) applicationMap.get(SERVICES_MAP_ATTRIBUTE); - if (servicesMap == null && createIfNull) { - servicesMap = new HashMap<Class<?>, Object>(); - applicationMap.put(SERVICES_MAP_ATTRIBUTE, servicesMap); - } - - return servicesMap; - } + public static Collection<Class<?>> getRegisteredServiceClasses(FacesContext context) { + Map<Class<?>, Object> servicesMap = getServicesMap(context, false); + if (servicesMap != null) { + return Collections.unmodifiableCollection(servicesMap.keySet()); + } else { + return Collections.emptySet(); + } + } - private static void clearServicesMap(FacesContext facesContext) { - Map<String, Object> applicationMap = facesContext.getExternalContext().getApplicationMap(); - applicationMap.remove(SERVICES_MAP_ATTRIBUTE); - } + @SuppressWarnings("unchecked") + public static <T> T getService(FacesContext context, Class<T> serviceInterfaceClass) { + if (context == null) { + throw new NullPointerException("context"); + } + + if (serviceInterfaceClass == null) { + throw new NullPointerException("serviceInterfaceClass"); + } + + T serviceImplementation = null; + + Map<Class<?>, Object> servicesMap = getServicesMap(context, false); + if (servicesMap != null) { + serviceImplementation = (T) servicesMap.get(serviceInterfaceClass); + } + + //TODO - null? + return serviceImplementation; + } + + public static <T> void setService(FacesContext context, + Class<T> serviceInterfaceClass, + T serviceImplementation) { + + if (context == null) { + throw new NullPointerException("context"); + } + + if (serviceInterfaceClass == null) { + throw new NullPointerException("serviceInterfaceClass"); + } + + if (serviceImplementation == null) { + throw new NullPointerException("serviceImplementation"); + } + + Map<Class<?>, Object> servicesMap = getServicesMap(context, true); + servicesMap.put(serviceInterfaceClass, serviceImplementation); + } + + public static void release(FacesContext context) { + clearServicesMap(context); + } + + private static Map<Class<?>, Object> getServicesMap(FacesContext facesContext, boolean createIfNull) { + Map<String, Object> applicationMap = facesContext.getExternalContext().getApplicationMap(); + @SuppressWarnings("unchecked") + Map<Class<?>, Object> servicesMap = (Map<Class<?>, Object>) applicationMap.get(SERVICES_MAP_ATTRIBUTE); + if (servicesMap == null && createIfNull) { + servicesMap = new HashMap<Class<?>, Object>(); + applicationMap.put(SERVICES_MAP_ATTRIBUTE, servicesMap); + } + + return servicesMap; + } + + private static void clearServicesMap(FacesContext facesContext) { + Map<String, Object> applicationMap = facesContext.getExternalContext().getApplicationMap(); + applicationMap.remove(SERVICES_MAP_ATTRIBUTE); + } } Modified: root/framework/trunk/api/src/main/java/org/richfaces/skin/SkinFactory.java =================================================================== --- root/framework/trunk/api/src/main/java/org/richfaces/skin/SkinFactory.java 2009-12-04 20:11:46 UTC (rev 16067) +++ root/framework/trunk/api/src/main/java/org/richfaces/skin/SkinFactory.java 2009-12-04 20:28:48 UTC (rev 16068) @@ -19,14 +19,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.skin; -import javax.faces.context.FacesContext; - import org.richfaces.application.ServiceTracker; +import javax.faces.context.FacesContext; + /** * Base factory class ( implement Singleton design pattern ). Produce self * instance to build current skin configuration. At present, realised as lazy @@ -34,11 +32,10 @@ * * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $) * @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:59:43 $ - * */ public abstract class SkinFactory { - public static final String BASE_SKIN_PARAMETER = "org.richfaces.BASE_SKIN"; + public static final String BASE_SKIN_PARAMETER = "org.richfaces.BASE_SKIN"; /** * Name of web application init parameter for current skin . Can be simple @@ -59,7 +56,7 @@ * instantiate custom factory, return default. */ public static final SkinFactory getInstance() { - return ServiceTracker.getService(FacesContext.getCurrentInstance(), SkinFactory.class); + return ServiceTracker.getService(FacesContext.getCurrentInstance(), SkinFactory.class); } /** @@ -72,6 +69,7 @@ /** * Get current {@link Skin} implementation. + * * @param context * @return */ @@ -79,6 +77,7 @@ /** * Get base {@link Skin} implementation + * * @param facesContext * @return */