This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jelly.git
The following commit(s) were added to refs/heads/master by this push:
new 44066567 No need for blank Javadoc lines between Javadoc @ tags
44066567 is described below
commit 4406656791b541b4a70bc6e83efb9842901cd0cf
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Thu Nov 28 12:43:58 2024 -0500
No need for blank Javadoc lines between Javadoc @ tags
---
core/src/main/java/org/apache/commons/jelly/TagSupport.java | 1 -
.../java/org/apache/commons/jelly/parser/XMLParser.java | 13 -------------
.../java/org/apache/commons/jelly/tags/core/CaseTag.java | 1 -
.../java/org/apache/commons/jelly/tags/core/DefaultTag.java | 1 -
.../java/org/apache/commons/jelly/tags/core/SwitchTag.java | 1 -
.../java/org/apache/commons/digester/rss/RSSDigester.java | 4 ----
.../java/org/apache/commons/jelly/tags/fmt/BundleTag.java | 2 --
.../main/java/org/apache/commons/jelly/tags/fmt/Config.java | 3 ---
.../org/apache/commons/jelly/tags/fmt/FormatDateTag.java | 1 -
.../apache/commons/jelly/tags/fmt/LocalizationContext.java | 1 -
.../org/apache/commons/jelly/tags/fmt/SetLocaleTag.java | 3 ---
.../org/apache/commons/jelly/tags/http/HttpTagLibrary.java | 1 -
.../apache/commons/jelly/tags/http/MultipartPostTag.java | 1 -
.../commons/jelly/tags/jetty/JellyResourceHttpHandler.java | 1 -
.../apache/commons/jelly/tags/jetty/JettyTagLibrary.java | 1 -
.../apache/commons/jelly/tags/soap/StringInputStream.java | 1 -
.../main/java/javax/servlet/jsp/jstl/sql/ResultSupport.java | 2 --
17 files changed, 38 deletions(-)
diff --git a/core/src/main/java/org/apache/commons/jelly/TagSupport.java
b/core/src/main/java/org/apache/commons/jelly/TagSupport.java
index 7944cd9e..2f2cefac 100644
--- a/core/src/main/java/org/apache/commons/jelly/TagSupport.java
+++ b/core/src/main/java/org/apache/commons/jelly/TagSupport.java
@@ -254,7 +254,6 @@ public abstract class TagSupport implements Tag {
* Executes the body of the tag and returns the result as a String.
*
* @param shouldEscape Signal if the text should be escaped.
- *
* @return the text evaluation of the body
*/
protected String getBodyText(boolean shouldEscape) throws
JellyTagException {
diff --git a/core/src/main/java/org/apache/commons/jelly/parser/XMLParser.java
b/core/src/main/java/org/apache/commons/jelly/parser/XMLParser.java
index aebb370e..4705430e 100644
--- a/core/src/main/java/org/apache/commons/jelly/parser/XMLParser.java
+++ b/core/src/main/java/org/apache/commons/jelly/parser/XMLParser.java
@@ -227,7 +227,6 @@ public class XMLParser extends DefaultHandler {
* the root element from the object stack (if any).
*
* @param file File containing the XML data to be parsed
- *
* @throws IOException if an input/output error occurs
* @throws SAXException if a parsing exception occurs
*/
@@ -240,7 +239,6 @@ public class XMLParser extends DefaultHandler {
* the root element from the object stack (if any).
*
* @param url URL containing the XML data to be parsed
- *
* @throws IOException if an input/output error occurs
* @throws SAXException if a parsing exception occurs
*/
@@ -259,7 +257,6 @@ public class XMLParser extends DefaultHandler {
* Returns the root element from the object stack (if any).
*
* @param input Input source containing the XML data to be parsed
- *
* @throws IOException if an input/output error occurs
* @throws SAXException if a parsing exception occurs
*/
@@ -317,7 +314,6 @@ public class XMLParser extends DefaultHandler {
* Returns the root element from the object stack (if any).
*
* @param uri URI containing the XML data to be parsed
- *
* @throws IOException if an input/output error occurs
* @throws SAXException if a parsing exception occurs
*/
@@ -748,7 +744,6 @@ public class XMLParser extends DefaultHandler {
* @param buffer The characters from the XML document
* @param start Starting offset into the buffer
* @param length Number of characters from the buffer
- *
* @throws SAXException if a parsing error is to be reported
*/
@Override
@@ -805,7 +800,6 @@ public class XMLParser extends DefaultHandler {
*
* @param prefix Prefix that is being declared
* @param namespaceURI Corresponding namespace URI being mapped to
- *
* @throws SAXException if a parsing error is to be reported
*/
@Override
@@ -829,7 +823,6 @@ public class XMLParser extends DefaultHandler {
* Process notification that a namespace prefix is going out of scope.
*
* @param prefix Prefix that is going out of scope
- *
* @throws SAXException if a parsing error is to be reported
*/
@Override
@@ -857,7 +850,6 @@ public class XMLParser extends DefaultHandler {
* @param buffer The characters from the XML document
* @param start Starting offset into the buffer
* @param len Number of characters from the buffer
- *
* @throws SAXException if a parsing error is to be reported
*/
@Override
@@ -871,7 +863,6 @@ public class XMLParser extends DefaultHandler {
*
* @param target The processing instruction target
* @param data The processing instruction data (if any)
- *
* @throws SAXException if a parsing error is to be reported
*/
@Override
@@ -894,7 +885,6 @@ public class XMLParser extends DefaultHandler {
* Process notification of a skipped entity.
*
* @param name Name of the skipped entity
- *
* @throws SAXException if a parsing error is to be reported
*/
@Override
@@ -942,7 +932,6 @@ public class XMLParser extends DefaultHandler {
* error handler, if any, otherwise throw a SAXException with the error.
*
* @param exception The error information
- *
* @throws SAXException if a parsing exception occurs
*/
@Override
@@ -967,7 +956,6 @@ public class XMLParser extends DefaultHandler {
* supplied error handler, if any, otherwise throw a SAXException with the
error.
*
* @param exception The fatal error information
- *
* @throws SAXException if a parsing exception occurs
*/
@Override
@@ -994,7 +982,6 @@ public class XMLParser extends DefaultHandler {
* NOT throw a SAXException by default if no error handler is supplied.
*
* @param exception The warning information
- *
* @throws SAXException if a parsing exception occurs
*/
@Override
diff --git a/core/src/main/java/org/apache/commons/jelly/tags/core/CaseTag.java
b/core/src/main/java/org/apache/commons/jelly/tags/core/CaseTag.java
index 70e0201e..dcc6357d 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/CaseTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/CaseTag.java
@@ -32,7 +32,6 @@ import org.apache.commons.jelly.expression.Expression;
* {@link SwitchTag <switch>} tag.
*
* @see SwitchTag
- *
* @author Rodney Waldhoff
*/
public class CaseTag extends TagSupport {
diff --git
a/core/src/main/java/org/apache/commons/jelly/tags/core/DefaultTag.java
b/core/src/main/java/org/apache/commons/jelly/tags/core/DefaultTag.java
index 8ceba647..622a219a 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/DefaultTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/DefaultTag.java
@@ -30,7 +30,6 @@ import org.apache.commons.jelly.XMLOutput;
* {@link SwitchTag <switch>} tag.
*
* @see SwitchTag
- *
* @author Rodney Waldhoff
*/
public class DefaultTag extends TagSupport {
diff --git
a/core/src/main/java/org/apache/commons/jelly/tags/core/SwitchTag.java
b/core/src/main/java/org/apache/commons/jelly/tags/core/SwitchTag.java
index b5a615ad..f52ba826 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/SwitchTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/SwitchTag.java
@@ -30,7 +30,6 @@ import org.apache.commons.jelly.expression.Expression;
*
* @see CaseTag
* @see DefaultTag
- *
* @author Rodney Waldhoff
*/
public class SwitchTag extends TagSupport {
diff --git
a/jelly-tags/betwixt/src/test/java/org/apache/commons/digester/rss/RSSDigester.java
b/jelly-tags/betwixt/src/test/java/org/apache/commons/digester/rss/RSSDigester.java
index 47796f96..a35063e8 100644
---
a/jelly-tags/betwixt/src/test/java/org/apache/commons/digester/rss/RSSDigester.java
+++
b/jelly-tags/betwixt/src/test/java/org/apache/commons/digester/rss/RSSDigester.java
@@ -128,7 +128,6 @@ public class RSSDigester extends Digester {
* the root element from the object stack (which will be the Channel).
*
* @param file File containing the XML data to be parsed
- *
* @throws IOException if an input/output error occurs
* @throws SAXException if a parsing exception occurs
*/
@@ -147,7 +146,6 @@ public class RSSDigester extends Digester {
* Channel).
*
* @param input Input source containing the XML data to be parsed
- *
* @throws IOException if an input/output error occurs
* @throws SAXException if a parsing exception occurs
*/
@@ -166,7 +164,6 @@ public class RSSDigester extends Digester {
* the Channel).
*
* @param input Input stream containing the XML data to be parsed
- *
* @throws IOException if an input/output error occurs
* @throws SAXException if a parsing exception occurs
*/
@@ -185,7 +182,6 @@ public class RSSDigester extends Digester {
* the Channel).
*
* @param uri URI containing the XML data to be parsed
- *
* @throws IOException if an input/output error occurs
* @throws SAXException if a parsing exception occurs
*/
diff --git
a/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/BundleTag.java
b/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/BundleTag.java
index 4629c33a..9e1cc363 100644
---
a/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/BundleTag.java
+++
b/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/BundleTag.java
@@ -153,7 +153,6 @@ public class BundleTag extends TagSupport {
* @param jellyContext Page in which the resource bundle with the
* given base name is requested
* @param basename Resource bundle base name
- *
* @return Localization context containing the resource bundle with the
* given base name and the locale that led to the resource bundle match,
* or the empty localization context if no resource bundle match was found
@@ -238,7 +237,6 @@ public class BundleTag extends TagSupport {
* @param basename the resource bundle base name
* @param pref the preferred locale
* @param cl classloader used to find resource bundle
- *
* @return the requested resource bundle, or {@code null} if no resource
* bundle with the given base name exists or if there is no exact- or
* language-match between the preferred locale and the locale of
diff --git
a/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/Config.java
b/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/Config.java
index 77475c66..69a07d87 100644
--- a/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/Config.java
+++ b/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/Config.java
@@ -98,7 +98,6 @@ public class Config {
* @param request Request object in which the configuration variable is to
* be looked up
* @param name Configuration variable name
- *
* @return The <code>java.lang.Object</code> associated with the
configuration
* variable, or null if it is not defined.
*/
@@ -116,7 +115,6 @@ public class Config {
* @param session Session object in which the configuration variable is to
* be looked up
* @param name Configuration variable name
- *
* @return The <code>java.lang.Object</code> associated with the
configuration
* variable, or null if it is not defined.
*/
@@ -134,7 +132,6 @@ public class Config {
* @param context Servlet context in which the configuration variable is
* to be looked up
* @param name Configuration variable name
- *
* @return The <code>java.lang.Object</code> associated with the
configuration
* variable, or null if it is not defined.
*/
diff --git
a/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/FormatDateTag.java
b/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/FormatDateTag.java
index 0640174d..9e0a1742 100644
---
a/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/FormatDateTag.java
+++
b/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/FormatDateTag.java
@@ -300,7 +300,6 @@ public class FormatDateTag extends TagSupport {
*
* @param style String description of formatting style for dates and times
* @param errCode Error code to throw if given style is invalid
- *
* @return java.util.DateFormat constant corresponding to given style
*
* @throws JellyException if the given style is invalid
diff --git
a/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/LocalizationContext.java
b/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/LocalizationContext.java
index 188c2079..42fd9a04 100644
---
a/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/LocalizationContext.java
+++
b/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/LocalizationContext.java
@@ -32,7 +32,6 @@ import java.util.Locale;
* and <fmt:parseDate> actions as their formatting locale.
*
* @see javax.servlet.jsp.jstl.fmt.LocalizationContext
- *
* @author <a href="mailto:willi...@yahoo.com";>Willie Vu</a>
* @version 1.1
*/
diff --git
a/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/SetLocaleTag.java
b/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/SetLocaleTag.java
index 7c3dc318..261c5ac3 100644
---
a/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/SetLocaleTag.java
+++
b/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/SetLocaleTag.java
@@ -117,7 +117,6 @@ public class SetLocaleTag extends TagSupport {
*
* @param locale the locale string to parse
* @param variant the variant
- *
* @return <code>java.util.Locale</code> object corresponding to the given
* locale string, or the runtime's default locale if the locale string is
* null or empty
@@ -204,7 +203,6 @@ public class SetLocaleTag extends TagSupport {
* this method is used to set the response locale).
*
* @param avail the array of available locales
- *
* @return the formatting locale to use
*/
static Locale getFormattingLocale(JellyContext jc,
@@ -277,7 +275,6 @@ public class SetLocaleTag extends TagSupport {
*
* @param pref the preferred locale
* @param avail the available formatting locales
- *
* @return Available locale that best matches the given preferred locale,
* or {@code null} if no match exists
*/
diff --git
a/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/HttpTagLibrary.java
b/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/HttpTagLibrary.java
index 91567f1f..3d893e93 100644
---
a/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/HttpTagLibrary.java
+++
b/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/HttpTagLibrary.java
@@ -48,7 +48,6 @@ public class HttpTagLibrary extends TagLibrary {
/**
* @see TagLibrary#getTagClasses()
- *
* @return a Map of tag name to tag class
*/
@Override
diff --git
a/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/MultipartPostTag.java
b/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/MultipartPostTag.java
index 346f7d27..ebf6c518 100644
---
a/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/MultipartPostTag.java
+++
b/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/MultipartPostTag.java
@@ -42,7 +42,6 @@ import
org.apache.commons.httpclient.methods.multipart.StringPart;
*</pre>
*
* @author <a href="mailto:wke...@yahoo.com";>Bill Keese</a>
- *
* @since ???
*/
public class MultipartPostTag extends PostTag {
diff --git
a/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/JellyResourceHttpHandler.java
b/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/JellyResourceHttpHandler.java
index bf2cf1ab..ac132609 100644
---
a/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/JellyResourceHttpHandler.java
+++
b/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/JellyResourceHttpHandler.java
@@ -76,7 +76,6 @@ final class JellyResourceHttpHandler extends
AbstractHttpHandler {
* @param pathParams the parameters (if any) of the http request
* @param request the actual http request
* @param response the place for any response
- *
* @throws HttpException when an error occurs
* @throws IOException when an error occurs
*/
diff --git
a/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/JettyTagLibrary.java
b/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/JettyTagLibrary.java
index a603fa97..5b294958 100644
---
a/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/JettyTagLibrary.java
+++
b/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/JettyTagLibrary.java
@@ -53,7 +53,6 @@ public class JettyTagLibrary extends TagLibrary {
/**
* @see TagLibrary#getTagClasses()
- *
* @return a Map of tag name to tag class
*/
@Override
diff --git
a/jelly-tags/soap/src/main/java/org/apache/commons/jelly/tags/soap/StringInputStream.java
b/jelly-tags/soap/src/main/java/org/apache/commons/jelly/tags/soap/StringInputStream.java
index a7da6948..9eb31bdc 100644
---
a/jelly-tags/soap/src/main/java/org/apache/commons/jelly/tags/soap/StringInputStream.java
+++
b/jelly-tags/soap/src/main/java/org/apache/commons/jelly/tags/soap/StringInputStream.java
@@ -51,7 +51,6 @@ public class StringInputStream
* such input.
*
* @return the value of the next character in the StringReader
- *
* @throws IOException if the original StringReader fails to be read
*/
@Override
diff --git
a/jelly-tags/sql/src/main/java/javax/servlet/jsp/jstl/sql/ResultSupport.java
b/jelly-tags/sql/src/main/java/javax/servlet/jsp/jstl/sql/ResultSupport.java
index 1a1a570d..878ecfa1 100644
--- a/jelly-tags/sql/src/main/java/javax/servlet/jsp/jstl/sql/ResultSupport.java
+++ b/jelly-tags/sql/src/main/java/javax/servlet/jsp/jstl/sql/ResultSupport.java
@@ -34,7 +34,6 @@ public class ResultSupport {
* Returns an array of Row objects.
*
* @param resultSet the ResultSet object
- *
* @return the <code>Result</code> object of the result
*/
public static Result toResult(ResultSet resultSet) {
@@ -50,7 +49,6 @@ public class ResultSupport {
*
* @param resultSet the ResultSet object
* @param maxRows the maximum number of rows
- *
* @return the <code>Result</code> object of the result limited by maxRows
*/
public static Result toResult(ResultSet resultSet, int maxRows) {
