dgraham 2003/07/08 16:59:11 Modified: src/share/org/apache/struts/tiles/definition ComponentDefinitionsFactoryWrapper.java Log: Formatted code. Revision Changes Path 1.6 +138 -115 jakarta-struts/src/share/org/apache/struts/tiles/definition/ComponentDefinitionsFactoryWrapper.java Index: ComponentDefinitionsFactoryWrapper.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/definition/ComponentDefinitionsFactoryWrapper.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ComponentDefinitionsFactoryWrapper.java 8 Mar 2003 19:23:50 -0000 1.5 +++ ComponentDefinitionsFactoryWrapper.java 8 Jul 2003 23:59:10 -0000 1.6 @@ -59,47 +59,48 @@ * */ - package org.apache.struts.tiles.definition; -import org.apache.struts.tiles.DefinitionsFactory; +import java.util.HashMap; +import java.util.Map; + +import javax.servlet.ServletContext; +import javax.servlet.ServletRequest; + import org.apache.struts.tiles.ComponentDefinition; import org.apache.struts.tiles.ComponentDefinitionsFactory; +import org.apache.struts.tiles.DefinitionsFactory; import org.apache.struts.tiles.DefinitionsFactoryConfig; import org.apache.struts.tiles.DefinitionsFactoryException; import org.apache.struts.tiles.NoSuchDefinitionException; import org.apache.struts.tiles.TilesUtil; -import javax.servlet.ServletRequest; -import javax.servlet.ServletContext; - -import java.util.Map; -import java.util.HashMap; - /** * Wrapper from new definition factory interface to old interface. * This class provides mapping from the old interface's life cycle to the new life cycle. * @author Cedric Dumoulin * @since 20020708 */ +public class ComponentDefinitionsFactoryWrapper implements DefinitionsFactory { -public class ComponentDefinitionsFactoryWrapper implements DefinitionsFactory -{ + /** + * The underlying factory. + */ + private ComponentDefinitionsFactory factory = null; - /** The underlying factory */ - private ComponentDefinitionsFactory factory; - /** Factory configuration*/ - private DefinitionsFactoryConfig config; + /** + * Factory configuration, + */ + private DefinitionsFactoryConfig config = null; /** * Constructor. * Create new wrapper for specified factory. * @param factory The factory to create a wrapper for. */ - public ComponentDefinitionsFactoryWrapper( ComponentDefinitionsFactory factory ) - { - this.factory = factory; - } + public ComponentDefinitionsFactoryWrapper(ComponentDefinitionsFactory factory) { + this.factory = factory; + } /** * Constructor. @@ -107,9 +108,9 @@ * The config object passed to init method should reference a factory implementing * [EMAIL PROTECTED] ComponentDefinitionsFactory}. */ - public ComponentDefinitionsFactoryWrapper() - { - } + public ComponentDefinitionsFactoryWrapper() { + super(); + } /** * Get requested definition. @@ -118,34 +119,39 @@ * @param servletContext Our servlet context. * @return ComponentDefition */ - public ComponentDefinition getDefinition(String name, ServletRequest request, ServletContext servletContext) - throws NoSuchDefinitionException, DefinitionsFactoryException - { - return factory.getDefinition(name, request, servletContext); - } + public ComponentDefinition getDefinition( + String name, + ServletRequest request, + ServletContext servletContext) + throws NoSuchDefinitionException, DefinitionsFactoryException { + + return factory.getDefinition(name, request, servletContext); + } /** * Call underlying factory init method. * @param config DefinitionsFactoryConfig. * @param servletContext Our servlet context. */ - public void init(DefinitionsFactoryConfig config, ServletContext servletContext) - throws DefinitionsFactoryException - { - this.config = config; - // create factory and initialize it - if( factory == null) - factory = createFactoryInstance( config.getFactoryClassname()); - factory.initFactory(servletContext, createConfigMap(config)); - } + public void init(DefinitionsFactoryConfig config, ServletContext servletContext) + throws DefinitionsFactoryException { + + this.config = config; + + // create factory and initialize it + if (factory == null) { + factory = createFactoryInstance(config.getFactoryClassname()); + } + + factory.initFactory(servletContext, createConfigMap(config)); + } /** * Do nothing because old life cycle has no equivalent. */ - public void destroy() - { - factory = null; - } + public void destroy() { + factory = null; + } /** * Set underlying factory configuration. @@ -153,79 +159,80 @@ * @param servletContext Our servlet context. * */ - public void setConfig(DefinitionsFactoryConfig config, ServletContext servletContext) - throws DefinitionsFactoryException - { - // create a new factory and initialize it - ComponentDefinitionsFactory newFactory = createFactoryInstance( config.getFactoryClassname()); - newFactory.initFactory(servletContext, createConfigMap(config)); - factory = newFactory; - } + public void setConfig( + DefinitionsFactoryConfig config, + ServletContext servletContext) + throws DefinitionsFactoryException { + + ComponentDefinitionsFactory newFactory = + createFactoryInstance(config.getFactoryClassname()); + + newFactory.initFactory(servletContext, createConfigMap(config)); + factory = newFactory; + } /** * Get underlying factory configuration. * @return DefinitionsFactoryConfig. */ - public DefinitionsFactoryConfig getConfig() - { - return config; - } - - /** - * Get internal factory. - * @return The internal ComponentDefitionsFactory. - */ - public ComponentDefinitionsFactory getInternalFactory() - { - return factory; - } - - /** - * Create Definition factory from provided classname which must implement [EMAIL PROTECTED] ComponentDefinitionsFactory}. - * Factory class must extend [EMAIL PROTECTED] DefinitionsFactory}. - * @param classname Class name of the factory to create. - * @return newly created factory. - * @throws DefinitionsFactoryException If an error occur while initializing factory - */ - protected ComponentDefinitionsFactory createFactoryInstance(String classname) - throws DefinitionsFactoryException - { - try - { - Class factoryClass = TilesUtil.applicationClass(classname); - Object factory = factoryClass.newInstance(); - return (ComponentDefinitionsFactory)factory; - } - catch( ClassCastException ex ) - { // Bad classname - throw new DefinitionsFactoryException( "Error - createDefinitionsFactory : Factory class '" - + classname +" must implement 'DefinitionsFactory'.", ex ); - } - catch( ClassNotFoundException ex ) - { // Bad classname - throw new DefinitionsFactoryException( "Error - createDefinitionsFactory : Bad class name '" - + classname +"'.", ex ); - } - catch( InstantiationException ex ) - { // Bad constructor or error - throw new DefinitionsFactoryException( ex ); - } - catch( IllegalAccessException ex ) - { // - throw new DefinitionsFactoryException( ex ); + public DefinitionsFactoryConfig getConfig() { + return config; } - } + /** + * Get internal factory. + * @return The internal ComponentDefitionsFactory. + */ + public ComponentDefinitionsFactory getInternalFactory() { + return factory; + } + + /** + * Create Definition factory from provided classname which must implement [EMAIL PROTECTED] ComponentDefinitionsFactory}. + * Factory class must extend [EMAIL PROTECTED] DefinitionsFactory}. + * @param classname Class name of the factory to create. + * @return newly created factory. + * @throws DefinitionsFactoryException If an error occur while initializing factory + */ + protected ComponentDefinitionsFactory createFactoryInstance(String classname) + throws DefinitionsFactoryException { + + try { + Class factoryClass = TilesUtil.applicationClass(classname); + Object factory = factoryClass.newInstance(); + return (ComponentDefinitionsFactory) factory; + + } catch (ClassCastException ex) { // Bad classname + throw new DefinitionsFactoryException( + "Error - createDefinitionsFactory : Factory class '" + + classname + + " must implement 'DefinitionsFactory'.", + ex); + + } catch (ClassNotFoundException ex) { // Bad classname + throw new DefinitionsFactoryException( + "Error - createDefinitionsFactory : Bad class name '" + + classname + + "'.", + ex); + + } catch (InstantiationException ex) { // Bad constructor or error + throw new DefinitionsFactoryException(ex); + + } catch (IllegalAccessException ex) { + throw new DefinitionsFactoryException(ex); + } + + } /** * Return String representation. * Calls toString() on underlying factory. * @return String representation. */ - public String toString() - { - return getInternalFactory().toString(); - } + public String toString() { + return getInternalFactory().toString(); + } /** * Create map of configuration attributes from configuration object. @@ -233,18 +240,34 @@ * @param config The DefinitionsFactoryConfig to use. * @return Map Map of name/value pairs. */ - public static Map createConfigMap( DefinitionsFactoryConfig config ) - { - Map map = new HashMap(config.getAttributes()); - // Add property attributes using old names - map.put(DefinitionsFactoryConfig.DEFINITIONS_CONFIG_PARAMETER_NAME, config.getDefinitionConfigFiles()); - map.put(DefinitionsFactoryConfig.TILES_DETAILS_PARAMETER_NAME, Integer.toString(config.getDebugLevel()) ); - map.put(DefinitionsFactoryConfig.PARSER_DETAILS_PARAMETER_NAME, Integer.toString(config.getParserDebugLevel()) ); - map.put(DefinitionsFactoryConfig.PARSER_VALIDATE_PARAMETER_NAME, new Boolean(config.getParserValidate()).toString() ); + public static Map createConfigMap(DefinitionsFactoryConfig config) { + Map map = new HashMap(config.getAttributes()); + // Add property attributes using old names + map.put( + DefinitionsFactoryConfig.DEFINITIONS_CONFIG_PARAMETER_NAME, + config.getDefinitionConfigFiles()); + + map.put( + DefinitionsFactoryConfig.TILES_DETAILS_PARAMETER_NAME, + Integer.toString(config.getDebugLevel())); + + map.put( + DefinitionsFactoryConfig.PARSER_DETAILS_PARAMETER_NAME, + Integer.toString(config.getParserDebugLevel())); + + map.put( + DefinitionsFactoryConfig.PARSER_VALIDATE_PARAMETER_NAME, + new Boolean(config.getParserValidate()).toString()); + + if (!"org.apache.struts.tiles.xmlDefinition.I18nFactorySet" + .equals(config.getFactoryClassname())) { + + map.put( + DefinitionsFactoryConfig.FACTORY_CLASSNAME_PARAMETER_NAME, + config.getFactoryClassname()); + } - if( ! "org.apache.struts.tiles.xmlDefinition.I18nFactorySet".equals(config.getFactoryClassname()) ) - map.put(DefinitionsFactoryConfig.FACTORY_CLASSNAME_PARAMETER_NAME, config.getFactoryClassname()); - - return map; - } + return map; + } + }
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]