Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/ImportAttributeTag.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/ImportAttributeTag.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/ImportAttributeTag.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/ImportAttributeTag.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 The Apache Software Foundation. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -53,7 +53,8 @@ */ private int scope = PageContext.PAGE_SCOPE; /** - * Are errors ignored. This is the property for attribute <code>ignore</code>. + * Are errors ignored. This is the property for attribute + * <code>ignore</code>. * Default value is <code>false</code>, which throws an exception. * Only "attribute not found" - errors are ignored. */ @@ -111,7 +112,8 @@ /** * Set ignore flag. - * @param ignore default: <code>false</code>: Exception is thrown when attribute is not found, set to <code> + * @param ignore default: <code>false</code>: Exception is thrown when + * attribute is not found, set to <code> * true</code> to ignore missing attributes silently */ public void setIgnore(boolean ignore) @@ -121,7 +123,8 @@ /** * Get ignore flag. - * @return default: <code>false</code>: Exception is thrown when attribute is not found, set to <code> + * @return default: <code>false</code>: Exception is thrown when attribute + * is not found, set to <code> * true</code> to ignore missing attributes silently */ public boolean getIgnore() @@ -140,9 +143,12 @@ public int doStartTag() throws JspException { // retrieve component context - ComponentContext compContext = (ComponentContext)pageContext.getAttribute(ComponentConstants.COMPONENT_CONTEXT, PageContext.REQUEST_SCOPE); + ComponentContext compContext = + (ComponentContext)pageContext.getAttribute( + ComponentConstants.COMPONENT_CONTEXT, PageContext.REQUEST_SCOPE); if( compContext == null ) - throw new JspException ( "Error - tag importAttribute : no tiles context found." ); + throw new JspException ( "Error - tag importAttribute : " + + "no tiles context found." ); // set scope scope = TagUtils.getScope( scopeName, PageContext.PAGE_SCOPE ); @@ -154,8 +160,9 @@ // Check if value exist and if we must send a runtime exception if( value == null ) if(!isErrorIgnored) { - throw new JspException ( "Error - tag importAttribute : property '"+ name + "' not found in context. Check tag syntax" ); - } + throw new JspException ( "Error - tag importAttribute : property '"+ + name + "' not found in context. Check tag syntax" ); + } pageContext.setAttribute(name, value, scope); } @@ -167,7 +174,8 @@ String name = (String)names.next(); if(name == null ) { if(!isErrorIgnored) - throw new JspException ( "Error - tag importAttribute : encountered an attribute with key 'null'" ); + throw new JspException ( "Error - tag importAttribute : " + + "encountered an attribute with key 'null'" ); else return SKIP_BODY; } @@ -176,8 +184,9 @@ // Check if value exist and if we must send a runtime exception if( value == null ) { if(!isErrorIgnored) { - throw new JspException ( "Error - tag importAttribute : property '"+ name + "' has a value of 'null'" ); - } + throw new JspException ( "Error - tag importAttribute : property '" + + name + "' has a value of 'null'" ); + } } pageContext.setAttribute(name, value, scope); } // end loop
Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/InitDefinitionsTag.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/InitDefinitionsTag.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/InitDefinitionsTag.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/InitDefinitionsTag.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 The Apache Software Foundation. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -30,7 +30,8 @@ /** * Init definitions factory. */ -public class InitDefinitionsTag extends TagSupport implements ComponentConstants { +public class InitDefinitionsTag extends TagSupport + implements ComponentConstants { private String filename = null; @@ -71,7 +72,9 @@ */ public int doStartTag() throws JspException { - DefinitionsFactory factory = TilesUtil.getDefinitionsFactory(pageContext.getRequest(),pageContext.getServletContext()); + DefinitionsFactory factory = + TilesUtil.getDefinitionsFactory(pageContext.getRequest(), + pageContext.getServletContext()); if(factory != null ) return SKIP_BODY; @@ -81,7 +84,8 @@ try { - factory = TilesUtil.createDefinitionsFactory(pageContext.getServletContext(), factoryConfig); + factory = TilesUtil.createDefinitionsFactory( + pageContext.getServletContext(), factoryConfig); } catch( DefinitionsFactoryException ex ) { Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/PutListTag.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/PutListTag.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/PutListTag.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/PutListTag.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 The Apache Software Foundation. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -34,18 +34,18 @@ extends TagSupport implements ComponentConstants, AddTagParent, PutListTagParent { - /** - * Name of this attribute. + /** + * Name of this attribute. */ private String attributeName = null; - - /** - * The list itself. + + /** + * The list itself. */ private List list = null; - - /** - * Role attribute. + + /** + * Role attribute. */ private String role = null; @@ -115,7 +115,7 @@ if (list == null) { list = new ArrayList(); } - + list.add(value); } @@ -137,7 +137,7 @@ def.setRole(nestedTag.getRole()); attributeValue = def; } - + // now add attribute to enclosing parent (i.e. : this object) addElement(attributeValue); } @@ -165,7 +165,7 @@ def.setRole(nestedTag.getRole()); attributeValue = def; } - + // now add attribute to enclosing parent (i.e. : this object) addElement(attributeValue); } @@ -197,13 +197,13 @@ PutListTagParent parent = (PutListTagParent) findAncestorWithClass(this, PutListTagParent.class); - + if (parent == null) { throw new JspException("Error - tag putList : enclosing tag doesn't accept 'putList' tag."); } - + return parent; - + } catch (ClassCastException ex) { throw new JspException("Error - tag putList : enclosing tag doesn't accept 'putList' tag.", ex); } Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/PutListTagParent.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/PutListTagParent.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/PutListTagParent.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/PutListTagParent.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 The Apache Software Foundation. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/PutTag.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/PutTag.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/PutTag.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/PutTag.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 The Apache Software Foundation. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -64,50 +64,50 @@ /* JSP Tag attributes */ - /** - * Name of attribute to put in component context. + /** + * Name of attribute to put in component context. */ protected String attributeName = null; - /** - * Associated attribute value. + /** + * Associated attribute value. */ private Object value = null; - /** - * JSP Template compatibility. + /** + * JSP Template compatibility. */ private String direct = null; - /** - * Requested type for the value. + /** + * Requested type for the value. */ private String valueType = null; - /** - * Bean name attribute. + /** + * Bean name attribute. */ private String beanName = null; - /** - * Bean property attribute. + /** + * Bean property attribute. */ private String beanProperty = null; - /** - * Bean scope attribute. + /** + * Bean scope attribute. */ private String beanScope = null; - /** - * Role attribute. + /** + * Role attribute. */ private String role = null; /* Internal properties */ - /** - * Cached real value computed from tag attributes. + /** + * Cached real value computed from tag attributes. */ protected Object realValue = null; @@ -386,7 +386,7 @@ } else { realValue = bean; // value can be null } - + } catch (NoSuchMethodException ex) { throw new JspException( "Error - component.PutAttributeTag : Error while retrieving value from bean '" Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/PutTagParent.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/PutTagParent.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/PutTagParent.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/PutTagParent.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 The Apache Software Foundation. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/UseAttributeTag.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/UseAttributeTag.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/UseAttributeTag.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/UseAttributeTag.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 The Apache Software Foundation. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/UseAttributeTei.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/UseAttributeTei.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/UseAttributeTei.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/UseAttributeTei.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 The Apache Software Foundation. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/util/TagUtils.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/util/TagUtils.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/util/TagUtils.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/util/TagUtils.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 The Apache Software Foundation. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -40,13 +40,13 @@ * This class also serves as an interface between Components and Struts. If * you want to rip away Struts, simply reimplement some methods in this class. * You can copy them from Struts. - * + * */ public class TagUtils { /** Debug flag */ public static final boolean debug = true; - + /** * Maps lowercase JSP scope names to their PageContext integer constant * values. @@ -76,16 +76,16 @@ if (scopeName == null) { return defaultValue; } - + if (scopeName.equalsIgnoreCase("component")) { return ComponentConstants.COMPONENT_SCOPE; - + } else if (scopeName.equalsIgnoreCase("template")) { return ComponentConstants.COMPONENT_SCOPE; - + } else if (scopeName.equalsIgnoreCase("tile")) { return ComponentConstants.COMPONENT_SCOPE; - + } else { return getScope(scopeName); } @@ -123,14 +123,14 @@ */ public static Object retrieveBean(String beanName, String scopeName, PageContext pageContext) throws JspException { - + if (scopeName == null) { return findAttribute(beanName, pageContext); } // Default value doesn't matter because we have already check it int scope = getScope(scopeName, PageContext.PAGE_SCOPE); - + //return pageContext.getAttribute( beanName, scope ); return getAttribute(beanName, scope, pageContext); } @@ -144,7 +144,7 @@ */ public static Object findAttribute(String beanName, PageContext pageContext) { ComponentContext compContext = ComponentContext.getContext(pageContext.getRequest()); - + if (compContext != null) { Object attribute = compContext.findAttribute(beanName, pageContext); if (attribute != null) { @@ -195,7 +195,7 @@ String beanScope, PageContext pageContext) throws JspException { - + try { Object realValue; Object bean = retrieveBean(beanName, beanScope, pageContext); @@ -205,7 +205,7 @@ realValue = bean; // value can be null } return realValue; - + } catch (NoSuchMethodException ex) { throw new JspException( "Error - component.PutAttributeTag : Error while retrieving value from bean '" @@ -216,7 +216,7 @@ + beanScope + "'. (exception : " + ex.getMessage(), ex); - + } catch (InvocationTargetException ex) { throw new JspException( "Error - component.PutAttributeTag : Error while retrieving value from bean '" @@ -227,7 +227,7 @@ + beanScope + "'. (exception : " + ex.getMessage(), ex); - + } catch (IllegalAccessException ex) { throw new JspException( "Error - component.PutAttributeTag : Error while retrieving value from bean '" @@ -259,7 +259,7 @@ Object value, String scope) throws JspException { - + if (scope == null) pageContext.setAttribute(name, value, PageContext.REQUEST_SCOPE); else if (scope.equalsIgnoreCase("page")) @@ -307,13 +307,13 @@ */ public static ComponentDefinition getComponentDefinition(String name, PageContext pageContext) throws JspException { - + try { return TilesUtil.getDefinition( name, pageContext.getRequest(), pageContext.getServletContext()); - + } catch (NoSuchDefinitionException ex) { throw new JspException( "Error : Can't get component definition for '" @@ -321,7 +321,7 @@ + "'. Check if this name exist in component definitions.",ex); } catch (FactoryNotFoundException ex) { // factory not found. throw new JspException(ex); - + } catch (DefinitionsFactoryException ex) { if (debug) ex.printStackTrace(); Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/xmlDefinition/DefinitionsFactory.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/xmlDefinition/DefinitionsFactory.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/xmlDefinition/DefinitionsFactory.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/xmlDefinition/DefinitionsFactory.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 The Apache Software Foundation. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -98,4 +98,3 @@ } } - Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/xmlDefinition/FactorySet.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/xmlDefinition/FactorySet.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/xmlDefinition/FactorySet.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/xmlDefinition/FactorySet.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 The Apache Software Foundation. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/xmlDefinition/I18nFactorySet.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/xmlDefinition/I18nFactorySet.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/xmlDefinition/I18nFactorySet.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/xmlDefinition/I18nFactorySet.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2005 The Apache Software Foundation. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -55,31 +55,31 @@ */ public class I18nFactorySet extends FactorySet { - /** - * Commons Logging instance. + /** + * Commons Logging instance. */ protected static Log log = LogFactory.getLog(I18nFactorySet.class); - /** - * Config file parameter name. + /** + * Config file parameter name. */ public static final String DEFINITIONS_CONFIG_PARAMETER_NAME = "definitions-config"; - /** - * Config file parameter name. + /** + * Config file parameter name. */ public static final String PARSER_DETAILS_PARAMETER_NAME = "definitions-parser-details"; - /** - * Config file parameter name. + /** + * Config file parameter name. */ public static final String PARSER_VALIDATE_PARAMETER_NAME = "definitions-parser-validate"; - /** - * Possible definition filenames. + /** + * Possible definition filenames. */ public static final String DEFAULT_DEFINITION_FILENAMES[] = { @@ -87,42 +87,42 @@ "/WEB-INF/componentDefinitions.xml", "/WEB-INF/instanceDefinitions.xml" }; - /** - * Default filenames extension. + /** + * Default filenames extension. */ public static final String FILENAME_EXTENSION = ".xml"; - /** - * Default factory. + /** + * Default factory. */ protected DefinitionsFactory defaultFactory = null; - /** + /** * XML parser used. * Attribute is transient to allow serialization. In this implementaiton, * xmlParser is created each time we need it ;-(. */ protected transient XmlParser xmlParser; - /** + /** * Do we want validating parser. Default is <code>false</code>. * Can be set from servlet config file. */ protected boolean isValidatingParser = false; - /** + /** * Parser detail level. Default is 0. * Can be set from servlet config file. */ protected int parserDetailLevel = 0; - /** - * Names of files containing instances descriptions. + /** + * Names of files containing instances descriptions. */ private List filenames = null; - /** - * Collection of already loaded definitions set, referenced by their suffix. + /** + * Collection of already loaded definitions set, referenced by their suffix. */ private Map loaded = null; @@ -480,7 +480,7 @@ } catch (Exception e) { } } - + // If the config isn't in the servlet context, try the class loader // which allows the config files to be stored in a jar if (input == null) { Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/xmlDefinition/XmlAttribute.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/xmlDefinition/XmlAttribute.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/xmlDefinition/XmlAttribute.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/xmlDefinition/XmlAttribute.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 The Apache Software Foundation. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -131,7 +131,7 @@ } /** - * Access method for the value property. Return the value or a + * Access method for the value property. Return the value or a * QualifiedAttribute containing the value if 'direct' is set. * * @return The current value of the value property. @@ -173,7 +173,7 @@ if (body.length() == 0) { return; } - + setValue(body); } @@ -230,7 +230,8 @@ } } - // Create attribute wrapper to hold role if role is set and no type specified + // Create attribute wrapper to hold role if role is set and no type + // specified if (role != null && value != null && valueType == null) { realValue = new UntypedAttribute(value.toString(), role); } Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/xmlDefinition/XmlDefinition.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/xmlDefinition/XmlDefinition.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/xmlDefinition/XmlDefinition.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/xmlDefinition/XmlDefinition.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 The Apache Software Foundation. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -130,7 +130,8 @@ { // error String msg = "Error while resolving definition inheritance: child '" + getName() + "' can't find its ancestor '" - + getExtends() + "'. Please check your description file."; + + getExtends() + + "'. Please check your description file."; log.error( msg ); // to do : find better exception throw new NoSuchDefinitionException( msg ); @@ -160,9 +161,10 @@ /** * Overload this definition with passed child. - * All attributes from child are copied to this definition. Previous attributes with - * same name are disguarded. - * Special attribute 'path','role' and 'extends' are overloaded if defined in child. + * All attributes from child are copied to this definition. Previous + * attributes with same name are disguarded. + * Special attribute 'path','role' and 'extends' are overloaded if defined + * in child. * @param child Child used to overload this definition. */ public void overload( XmlDefinition child ) Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/xmlDefinition/XmlDefinitionsSet.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/xmlDefinition/XmlDefinitionsSet.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/xmlDefinition/XmlDefinitionsSet.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/xmlDefinition/XmlDefinitionsSet.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 The Apache Software Foundation. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/xmlDefinition/XmlListAttribute.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/xmlDefinition/XmlListAttribute.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/xmlDefinition/XmlListAttribute.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/xmlDefinition/XmlListAttribute.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 The Apache Software Foundation. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. Modified: struts/struts1/trunk/tiles/src/test/java/org/apache/struts/tiles/CustomI18nFactorySet.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/test/java/org/apache/struts/tiles/CustomI18nFactorySet.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/test/java/org/apache/struts/tiles/CustomI18nFactorySet.java (original) +++ struts/struts1/trunk/tiles/src/test/java/org/apache/struts/tiles/CustomI18nFactorySet.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 2005 The Apache Software Foundation. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
