cziegeler 2002/07/15 07:42:50 Modified: src/java/org/apache/cocoon/acting Tag: cocoon_2_0_3_branch LangSelect.java src/java/org/apache/cocoon/components Tag: cocoon_2_0_3_branch ExtendedComponentSelector.java src/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements Tag: cocoon_2_0_3_branch EPStyleRegion.java EPStyles.java src/java/org/apache/cocoon/components/language/markup Tag: cocoon_2_0_3_branch AbstractMarkupLanguage.java src/java/org/apache/cocoon/components/treeprocessor Tag: cocoon_2_0_3_branch AbstractParentProcessingNode.java DefaultTreeBuilder.java ProcessingNodeBuilder.java src/java/org/apache/cocoon/environment Tag: cocoon_2_0_3_branch AbstractEnvironment.java Environment.java src/java/org/apache/cocoon/environment/http Tag: cocoon_2_0_3_branch HttpEnvironment.java HttpRequest.java HttpSession.java src/java/org/apache/cocoon/matching Tag: cocoon_2_0_3_branch AbstractRegexpMatcher.java HeaderMatcher.java RequestParameterMatcher.java src/java/org/apache/cocoon/matching/helpers Tag: cocoon_2_0_3_branch WildcardHelper.java src/java/org/apache/cocoon/transformation Tag: cocoon_2_0_3_branch AbstractDOMTransformer.java Log: Fixing javadocs Revision Changes Path No revision No revision 1.7.2.1 +3 -3 xml-cocoon2/src/java/org/apache/cocoon/acting/Attic/LangSelect.java Index: LangSelect.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/Attic/LangSelect.java,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -r1.7 -r1.7.2.1 --- LangSelect.java 22 Feb 2002 06:59:26 -0000 1.7 +++ LangSelect.java 15 Jul 2002 14:42:48 -0000 1.7.2.1 @@ -85,8 +85,8 @@ * * Creation date: (3.11.2000 14:32:19) * Modification date: (29.05.2001 0:30:01) - * @author: <a href="mailto:[EMAIL PROTECTED]">Konstantin Piroumian</a> - * @author: <a href="mailto:[EMAIL PROTECTED]">Lassi Immonen</a> + * @author <a href="mailto:[EMAIL PROTECTED]">Konstantin Piroumian</a> + * @author <a href="mailto:[EMAIL PROTECTED]">Lassi Immonen</a> * @version CVS $Id$ * @deprecated Use LocaleAction instead. */ No revision No revision 1.1.2.1 +11 -2 xml-cocoon2/src/java/org/apache/cocoon/components/ExtendedComponentSelector.java Index: ExtendedComponentSelector.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/ExtendedComponentSelector.java,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 --- ExtendedComponentSelector.java 4 Mar 2002 18:16:45 -0000 1.1 +++ ExtendedComponentSelector.java 15 Jul 2002 14:42:48 -0000 1.1.2.1 @@ -191,7 +191,7 @@ * <ul> * <li>if {@link #getComponentInstanceName()} returns <code>null</code>, * any child configurations having a attribute named as the result of - * {@link "getClassAttributeName()}, is considered as a component instance. + * {@link #getClassAttributeName()}, is considered as a component instance. * </li> * <li>if {@link #getComponentInstanceName()} returns a non-null value, * only child configurations having this name are considered as a @@ -316,4 +316,13 @@ super.release(component); } } + + public boolean hasComponent(Object hint) { + boolean exists = super.hasComponent( hint ); + if ( !exists && this.parentSelector != null ) { + exists = this.parentSelector.hasComponent( hint ); + } + return exists; + } + } No revision No revision 1.1.2.1 +1 -1 xml-cocoon2/src/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPStyleRegion.java Index: EPStyleRegion.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPStyleRegion.java,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 --- EPStyleRegion.java 6 Mar 2002 16:58:02 -0000 1.1 +++ EPStyleRegion.java 15 Jul 2002 14:42:48 -0000 1.1.2.1 @@ -226,7 +226,7 @@ } /** - * @returns HSSFCellStyle associated with this style region. + * @return HSSFCellStyle associated with this style region. */ public HSSFCellStyle getStyle() { return _style; 1.1.2.1 +1 -1 xml-cocoon2/src/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPStyles.java Index: EPStyles.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPStyles.java,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 --- EPStyles.java 6 Mar 2002 16:58:02 -0000 1.1 +++ EPStyles.java 15 Jul 2002 14:42:48 -0000 1.1.2.1 @@ -82,7 +82,7 @@ } /** - * @returns an instance of Hashtable created by HSSFColor.getTripletHash() + * @return an instance of Hashtable created by HSSFColor.getTripletHash() * @see org.apache.poi.hssf.util.HSSFColor#getTripletHash() */ public Hashtable getColorHash() { No revision No revision 1.15.2.1 +2 -2 xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/AbstractMarkupLanguage.java Index: AbstractMarkupLanguage.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/AbstractMarkupLanguage.java,v retrieving revision 1.15 retrieving revision 1.15.2.1 diff -u -r1.15 -r1.15.2.1 --- AbstractMarkupLanguage.java 22 Feb 2002 07:00:07 -0000 1.15 +++ AbstractMarkupLanguage.java 15 Jul 2002 14:42:48 -0000 1.15.2.1 @@ -584,7 +584,7 @@ /** * This method should be called prior to receiving any SAX event. * Indeed the language information is needed to get the core stylesheet. - * @language the language in used + * @param language the language in used */ protected void setLanguageDescriptor(LanguageDescriptor language) { this.language = language; No revision No revision 1.2.2.1 +2 -2 xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/AbstractParentProcessingNode.java Index: AbstractParentProcessingNode.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/AbstractParentProcessingNode.java,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -r1.2 -r1.2.2.1 --- AbstractParentProcessingNode.java 12 Mar 2002 22:19:30 -0000 1.2 +++ AbstractParentProcessingNode.java 15 Jul 2002 14:42:48 -0000 1.2.2.1 @@ -68,7 +68,7 @@ /** * Invoke all nodes of a node array in order, until one succeeds. * - * @parameter currentMap the <code>Map<code> of parameters produced by this node, + * @param currentMap the <code>Map<code> of parameters produced by this node, * which is added to <code>listOfMap</code>. */ protected final boolean invokeNodes( 1.3.2.4 +2 -2 xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/DefaultTreeBuilder.java Index: DefaultTreeBuilder.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/DefaultTreeBuilder.java,v retrieving revision 1.3.2.3 retrieving revision 1.3.2.4 diff -u -r1.3.2.3 -r1.3.2.4 --- DefaultTreeBuilder.java 7 Jun 2002 10:22:43 -0000 1.3.2.3 +++ DefaultTreeBuilder.java 15 Jul 2002 14:42:48 -0000 1.3.2.4 @@ -125,7 +125,7 @@ // ------------------------------------- /** - * Component manager created by {@link #createComponentManager()}. + * Component manager created by {@link #createComponentManager(Configuration)}. */ protected ComponentManager manager; 1.2.2.1 +2 -2 xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/ProcessingNodeBuilder.java Index: ProcessingNodeBuilder.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/ProcessingNodeBuilder.java,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -r1.2 -r1.2.2.1 --- ProcessingNodeBuilder.java 17 Mar 2002 21:55:22 -0000 1.2 +++ ProcessingNodeBuilder.java 15 Jul 2002 14:42:48 -0000 1.2.2.1 @@ -84,7 +84,7 @@ /** * Build the {@link ProcessingNode} and its children from the given - * <code>Configuration</code>, and optionnaly register it in the {@link Builder} + * <code>Configuration</code>, and optionnaly register it in the tree builder * for lookup by other <code>LinkedProcessingNodeBuilder</code>s. */ ProcessingNode buildNode(Configuration config) throws Exception; No revision No revision 1.12.2.4 +2 -2 xml-cocoon2/src/java/org/apache/cocoon/environment/AbstractEnvironment.java Index: AbstractEnvironment.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/environment/AbstractEnvironment.java,v retrieving revision 1.12.2.3 retrieving revision 1.12.2.4 diff -u -r1.12.2.3 -r1.12.2.4 --- AbstractEnvironment.java 15 Jul 2002 11:31:12 -0000 1.12.2.3 +++ AbstractEnvironment.java 15 Jul 2002 14:42:49 -0000 1.12.2.4 @@ -364,7 +364,7 @@ * "resource" was requested. * The caller has to test if it is really the same "resource" * which is requested. - * @result true if the response is modified or if the + * @return true if the response is modified or if the * environment is not able to test it */ public boolean isResponseModified(long lastModified) { 1.6.2.2 +2 -2 xml-cocoon2/src/java/org/apache/cocoon/environment/Environment.java Index: Environment.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/environment/Environment.java,v retrieving revision 1.6.2.1 retrieving revision 1.6.2.2 diff -u -r1.6.2.1 -r1.6.2.2 --- Environment.java 7 Jun 2002 09:34:24 -0000 1.6.2.1 +++ Environment.java 15 Jul 2002 14:42:49 -0000 1.6.2.2 @@ -159,7 +159,7 @@ * "resource" was requested. * The caller has to test if it is really the same "resource" * which is requested. - * @result true if the response is modified or if the + * @return true if the response is modified or if the * environment is not able to test it */ boolean isResponseModified(long lastModified); No revision No revision 1.12.2.1 +2 -2 xml-cocoon2/src/java/org/apache/cocoon/environment/http/HttpEnvironment.java Index: HttpEnvironment.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/environment/http/HttpEnvironment.java,v retrieving revision 1.12 retrieving revision 1.12.2.1 diff -u -r1.12 -r1.12.2.1 --- HttpEnvironment.java 27 Mar 2002 15:13:40 -0000 1.12 +++ HttpEnvironment.java 15 Jul 2002 14:42:49 -0000 1.12.2.1 @@ -243,7 +243,7 @@ * "resource" was requested. * The caller has to test if it is really the same "resource" * which is requested. - * @result true if the response is modified or if the + * @return true if the response is modified or if the * environment is not able to test it */ public boolean isResponseModified(long lastModified) { 1.6.2.2 +2 -2 xml-cocoon2/src/java/org/apache/cocoon/environment/http/HttpRequest.java Index: HttpRequest.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/environment/http/HttpRequest.java,v retrieving revision 1.6.2.1 retrieving revision 1.6.2.2 diff -u -r1.6.2.1 -r1.6.2.2 --- HttpRequest.java 24 May 2002 09:06:54 -0000 1.6.2.1 +++ HttpRequest.java 15 Jul 2002 14:42:49 -0000 1.6.2.2 @@ -66,7 +66,7 @@ * Implements the {@link javax.servlet.http.HttpServletRequest} interface * to provide request information for HTTP servlets. * - * @author <a href="mailto:giacomo@apache,org">Giacomo Pati</a> + * @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a> * @version CVS $Id$ */ 1.4.2.1 +3 -3 xml-cocoon2/src/java/org/apache/cocoon/environment/http/HttpSession.java Index: HttpSession.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/environment/http/HttpSession.java,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -r1.4 -r1.4.2.1 --- HttpSession.java 22 Feb 2002 07:03:50 -0000 1.4 +++ HttpSession.java 15 Jul 2002 14:42:49 -0000 1.4.2.1 @@ -122,7 +122,7 @@ * @return a string specifying the identifier * assigned to this session * - * @exeption IllegalStateException if this method is called on an + * @exception IllegalStateException if this method is called on an * invalidated session * */ @@ -146,7 +146,7 @@ * with this session, expressed in * milliseconds since 1/1/1970 GMT * - * @exeption IllegalStateException if this method is called on an + * @exception IllegalStateException if this method is called on an * invalidated session * */ No revision No revision 1.5.2.3 +2 -2 xml-cocoon2/src/java/org/apache/cocoon/matching/AbstractRegexpMatcher.java Index: AbstractRegexpMatcher.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/matching/AbstractRegexpMatcher.java,v retrieving revision 1.5.2.2 retrieving revision 1.5.2.3 diff -u -r1.5.2.2 -r1.5.2.3 --- AbstractRegexpMatcher.java 1 May 2002 10:54:31 -0000 1.5.2.2 +++ AbstractRegexpMatcher.java 15 Jul 2002 14:42:49 -0000 1.5.2.3 @@ -69,7 +69,7 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a> * @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a> - * @authos <a href="mailto:[EMAIL PROTECTED]">Sylvain Wallez</a> + * @author <a href="mailto:[EMAIL PROTECTED]">Sylvain Wallez</a> * @version CVS $Id$ */ 1.1.2.1 +2 -2 xml-cocoon2/src/java/org/apache/cocoon/matching/HeaderMatcher.java Index: HeaderMatcher.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/matching/HeaderMatcher.java,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 --- HeaderMatcher.java 3 Mar 2002 01:03:48 -0000 1.1 +++ HeaderMatcher.java 15 Jul 2002 14:42:49 -0000 1.1.2.1 @@ -82,7 +82,7 @@ * * @param pattern name of request header to find * @param objectModel environment passed through via cocoon - * @returns null or map containing value of request header 'pattern' + * @return null or map containing value of request header 'pattern' */ public Map match(String pattern, Map objectModel, Parameters parameters) { Request request = ObjectModelHelper.getRequest(objectModel); 1.5.2.1 +2 -2 xml-cocoon2/src/java/org/apache/cocoon/matching/RequestParameterMatcher.java Index: RequestParameterMatcher.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/matching/RequestParameterMatcher.java,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -r1.5 -r1.5.2.1 --- RequestParameterMatcher.java 22 Feb 2002 07:03:52 -0000 1.5 +++ RequestParameterMatcher.java 15 Jul 2002 14:42:50 -0000 1.5.2.1 @@ -83,7 +83,7 @@ * * @param pattern name of request parameter to find * @param objectModel environment passed through via cocoon - * @returns null or map containing value of request parameter 'pattern' + * @return null or map containing value of request parameter 'pattern' */ public Map match(String pattern, Map objectModel, Parameters parameters) { Request request = ObjectModelHelper.getRequest(objectModel); No revision No revision 1.4.2.1 +2 -2 xml-cocoon2/src/java/org/apache/cocoon/matching/helpers/WildcardHelper.java Index: WildcardHelper.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/matching/helpers/WildcardHelper.java,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -r1.4 -r1.4.2.1 --- WildcardHelper.java 22 Feb 2002 07:03:53 -0000 1.4 +++ WildcardHelper.java 15 Jul 2002 14:42:50 -0000 1.4.2.1 @@ -105,7 +105,7 @@ * All MATCH* values are less than zero, while normal characters are equal * or greater. * - * @parameter data The string to translate. + * @param data The string to translate. * @return The encoded string as an int array, terminated by the MATCH_END * value (don't consider the array length). * @exception NullPointerException If data is null. No revision No revision 1.6.2.1 +2 -2 xml-cocoon2/src/java/org/apache/cocoon/transformation/AbstractDOMTransformer.java Index: AbstractDOMTransformer.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/AbstractDOMTransformer.java,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -r1.6 -r1.6.2.1 --- AbstractDOMTransformer.java 8 Mar 2002 04:28:13 -0000 1.6 +++ AbstractDOMTransformer.java 15 Jul 2002 14:42:50 -0000 1.6.2.1 @@ -182,7 +182,7 @@ /** * Transform the specified DOM, returning a new DOM to stream down the pipeline. * @param doc The DOM Document representing the SAX stream - * @returns A DOM Document to stream down the pipeline + * @return A DOM Document to stream down the pipeline */ protected abstract Document transform(Document doc);
---------------------------------------------------------------------- In case of troubles, e-mail: [EMAIL PROTECTED] To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]