diff --git a/oro-javadoc.patch b/oro-javadoc.patch deleted file mode 100644 index b6f6a91..0000000 --- a/oro-javadoc.patch +++ /dev/null @@ -1,2053 +0,0 @@ ---- jakarta-oro-2.0.8/src/java/org/apache/oro/io/AwkFilenameFilter.java 2022-03-19 12:16:14.327229056 +0100 -+++ jakarta-oro-2.0.8/src/java/org/apache/oro/io/AwkFilenameFilter.java 2022-03-19 13:23:23.483432771 +0100 -@@ -84,7 +84,7 @@ - * Construct a filter initialized with the indicated regular expression - * and accompanying compilation options conforming to those used by - * org.apache.oro.text.awk.AwkCompiler -- *

-+ * - * @param regex The regular expression on which to filter. - * @param options A set of compilation options. - * @exception MalformedCachePatternException If there is an error in ---- jakarta-oro-2.0.8/src/java/org/apache/oro/io/GlobFilenameFilter.java 2022-03-19 12:16:14.327229056 +0100 -+++ jakarta-oro-2.0.8/src/java/org/apache/oro/io/GlobFilenameFilter.java 2022-03-19 13:34:36.903481666 +0100 -@@ -83,7 +83,7 @@ - * Construct a filter initialized with the indicated regular expression - * and accompanying compilation options conforming to those used by - * org.apache.oro.text.GlobCompiler -- *

-+ * - * @param regex The regular expression on which to filter. - * @param options A set of compilation options. - * @exception MalformedCachePatternException If there is an error in ---- jakarta-oro-2.0.8/src/java/org/apache/oro/io/Perl5FilenameFilter.java 2022-03-19 12:16:14.327229056 +0100 -+++ jakarta-oro-2.0.8/src/java/org/apache/oro/io/Perl5FilenameFilter.java 2022-03-19 13:30:11.233884317 +0100 -@@ -83,7 +83,7 @@ - * Construct a filter initialized with the indicated regular expression - * and accompanying compilation options conforming to those used by - * org.apache.oro.text.regex.Perl5Compiler -- *

-+ * - * @param regex The regular expression on which to filter. - * @param options A set of compilation options. - * @exception MalformedCachePatternException If there is an error in ---- jakarta-oro-2.0.8/src/java/org/apache/oro/io/RegexFilenameFilter.java 2022-03-19 12:16:14.327229056 +0100 -+++ jakarta-oro-2.0.8/src/java/org/apache/oro/io/RegexFilenameFilter.java 2022-03-19 13:12:46.155601506 +0100 -@@ -101,7 +101,7 @@ - - /** - * Set the regular expression on which to filter. -- *

-+ * - * @param regex The regular expression on which to filter. - * @exception MalformedCachePatternException If there is an error in - * compiling the regular expression. This need not be caught if -@@ -118,7 +118,7 @@ - /** - * Set the regular expression on which to filter along with any - * special options to use when compiling the expression. -- *

-+ * - * @param regex The regular expression on which to filter. - * @param options A set of compilation options specific to the regular - * expression grammar being used. -@@ -138,7 +138,7 @@ - * Filters a filename. Tests if the filename EXACTLY matches the pattern - * contained by the filter. The directory argument is not examined. - * Conforms to the java.io.FilenameFilter interface. -- *

-+ * - * @param dir The directory containing the file. - * @param filename The name of the file. - * @return True if the filename EXACTLY matches the pattern, false if not. -@@ -153,7 +153,7 @@ - * Filters a filename. Tests if the filename EXACTLY matches the pattern - * contained by the filter. The filename is defined as pathname.getName(). - * Conforms to the java.io.FileFilter interface. -- *

-+ * - * @param pathname The file pathname. - * @return True if the filename EXACTLY matches the pattern, false if not. - */ ---- jakarta-oro-2.0.8/src/java/org/apache/oro/text/awk/AwkCompiler.java 2022-03-19 12:16:14.327229056 +0100 -+++ jakarta-oro-2.0.8/src/java/org/apache/oro/text/awk/AwkCompiler.java 2022-03-19 13:13:14.331770872 +0100 -@@ -78,7 +78,7 @@ - *

- *
  • Special backslashed characters -- *
    -+ *
    - *
    \b
    backspace - *
    \n
    newline - *
    \r
    carriage return -@@ -115,7 +115,7 @@ - * This is the extended syntax that is supported: - *
      - *
    • Quantified atoms -- *
      -+ *
      - *
      {n,m}
      Match at least n but not more than m times. - *
      {n,}
      Match at least n times. - *
      {n}
      Match exactly n times. -@@ -123,7 +123,7 @@ - *
    • Atoms - *
        - *
      • Special backslashed characters -- *
        -+ *
        - *
        \d
        digit [0-9] - *
        \D
        non-digit [^0-9] - *
        \w
        word character [0-9a-z_A-Z] -@@ -810,7 +810,7 @@ - /** - * Compiles an Awk regular expression into an AwkPattern instance that - * can be used by an AwkMatcher object to perform pattern matching. -- *

        -+ * - * @param pattern An Awk regular expression to compile. - * @param options A set of flags giving the compiler instructions on - * how to treat the regular expression. Currently the -@@ -843,7 +843,7 @@ - /** - * Compiles an Awk regular expression into an AwkPattern instance that - * can be used by an AwkMatcher object to perform pattern matching. -- *

        -+ * - * @param pattern An Awk regular expression to compile. - * @param options A set of flags giving the compiler instructions on - * how to treat the regular expression. Currently the -@@ -874,7 +874,7 @@ - - /** - * Same as calling compile(pattern, AwkCompiler.DEFAULT_MASK); -- *

        -+ * - * @param pattern A regular expression to compile. - * @return A Pattern instance constituting the compiled regular expression. - * This instance will always be an AwkPattern and can be reliably -@@ -889,7 +889,7 @@ - - /** - * Same as calling compile(pattern, AwkCompiler.DEFAULT_MASK); -- *

        -+ * - * @param pattern A regular expression to compile. - * @return A Pattern instance constituting the compiled regular expression. - * This instance will always be an AwkPattern and can be reliably ---- jakarta-oro-2.0.8/src/java/org/apache/oro/text/awk/AwkMatcher.java 2022-03-19 12:16:14.323229032 +0100 -+++ jakarta-oro-2.0.8/src/java/org/apache/oro/text/awk/AwkMatcher.java 2022-03-19 13:12:25.427476908 +0100 -@@ -110,7 +110,7 @@ - *

        - * This method is useful for certain common token identification tasks - * that are made more difficult without this functionality. -- *

        -+ * - * @param input The char[] to test for a prefix match. - * @param pattern The Pattern to be matched. - * @param offset The offset at which to start searching for the prefix. -@@ -158,7 +158,7 @@ - *

        - * This method is useful for certain common token identification tasks - * that are made more difficult without this functionality. -- *

        -+ * - * @param input The char[] to test for a prefix match. - * @param pattern The Pattern to be matched. - * @return True if input matches pattern, false otherwise. -@@ -176,7 +176,7 @@ - *

        - * This method is useful for certain common token identification tasks - * that are made more difficult without this functionality. -- *

        -+ * - * @param input The String to test for a prefix match. - * @param pattern The Pattern to be matched. - * @return True if input matches pattern, false otherwise. -@@ -199,7 +199,7 @@ - *

        - * This method is useful for certain common token identification tasks - * that are made more difficult without this functionality. -- *

        -+ * - * @param input The PatternMatcherInput to test for a prefix match. - * @param pattern The Pattern to be matched. - * @return True if input matches pattern, false otherwise. -@@ -247,7 +247,7 @@ - * (for performance reasons), catch a ClassCastException because it - * will never be thrown as long as you use an AwkPattern as the pattern - * parameter. -- *

        -+ * - * @param input The char[] to test for an exact match. - * @param pattern The AwkPattern to be matched. - * @return True if input matches pattern, false otherwise. -@@ -295,7 +295,7 @@ - * (for performance reasons), catch a ClassCastException because it - * will never be thrown as long as you use an AwkPattern as the pattern - * parameter. -- *

        -+ * - * @param input The String to test for an exact match. - * @param pattern The AwkPattern to be matched. - * @return True if input matches pattern, false otherwise. -@@ -324,7 +324,7 @@ - * indeed should NOT try to (for performance reasons), catch a - * ClassCastException because it will never be thrown as long as you use - * an AwkPattern as the pattern parameter. -- *

        -+ * - * @param input The PatternMatcherInput to test for a match. - * @param pattern The AwkPattern to be matched. - * @return True if input matches pattern, false otherwise. -@@ -379,7 +379,7 @@ - * indeed should NOT try to (for performance reasons), catch a - * ClassCastException because it will never be thrown as long as you use - * an AwkPattern as the pattern parameter. -- *

        -+ * - * @param input The char[] to test for a match. - * @param pattern The AwkPattern to be matched. - * @return True if the input contains a pattern match, false otherwise. -@@ -426,7 +426,7 @@ - * indeed should NOT try to (for performance reasons), catch a - * ClassCastException because it will never be thrown as long as you use - * an AwkPattern as the pattern parameter. -- *

        -+ * - * @param input The String to test for a match. - * @param pattern The AwkPattern to be matched. - * @return True if the input contains a pattern match, false otherwise. -@@ -495,7 +495,7 @@ - * } - * - * -- *

        -+ * - * @param input The PatternMatcherInput to test for a match. - * @param pattern The Pattern to be matched. - * @return True if the input contains a pattern match, false otherwise. -@@ -587,7 +587,7 @@ - * } - * - * -- *

        -+ * - * @param input The PatternStreamInput to test for a match. - * @param pattern The Pattern to be matched. - * @return True if the input contains a pattern match, false otherwise. -@@ -744,7 +744,7 @@ - /** - * Fetches the last match found by a call to a matches() or contains() - * method. -- *

        -+ * - * @return A MatchResult instance containing the pattern match found - * by the last call to any one of the matches() or contains() - * methods. If no match was found by the last call, returns ---- jakarta-oro-2.0.8/src/java/org/apache/oro/text/awk/AwkPattern.java 2022-03-19 12:16:14.327229056 +0100 -+++ jakarta-oro-2.0.8/src/java/org/apache/oro/text/awk/AwkPattern.java 2022-03-19 13:16:02.808783643 +0100 -@@ -190,7 +190,7 @@ - - /** - * This method returns the string representation of the pattern. -- *

        -+ * - * @return The original string representation of the regular expression - * pattern. - */ -@@ -200,7 +200,7 @@ - /** - * This method returns an integer containing the compilation options used - * to compile this pattern. -- *

        -+ * - * @return The compilation options used to compile the pattern. - */ - public int getOptions() { return _options; } ---- jakarta-oro-2.0.8/src/java/org/apache/oro/text/awk/AwkStreamInput.java 2022-03-19 12:16:14.323229032 +0100 -+++ jakarta-oro-2.0.8/src/java/org/apache/oro/text/awk/AwkStreamInput.java 2022-03-19 13:16:50.229068710 +0100 -@@ -110,7 +110,7 @@ - /** - * Creates an AwkStreamInput instance bound to a Reader with a - * specified initial buffer size and default buffer increment. -- *

        -+ * - * @param input The InputStream to associate with the AwkStreamInput - * instance. - * @param bufferIncrement The initial buffer size and the default buffer -@@ -129,7 +129,7 @@ - /** - * Creates an AwkStreamInput instance bound to a Reader with an - * initial buffer size and default buffer increment of 2048 bytes. -- *

        -+ * - * @param input The InputStream to associate with the AwkStreamInput - * instance. - */ ---- jakarta-oro-2.0.8/src/java/org/apache/oro/text/GenericPatternCache.java 2022-03-19 12:16:14.323229032 +0100 -+++ jakarta-oro-2.0.8/src/java/org/apache/oro/text/GenericPatternCache.java 2022-03-19 13:33:55.955235458 +0100 -@@ -93,7 +93,7 @@ - * The primary constructor for GenericPatternCache. It has default - * access so it will only be used within the package. It initializes - * _cache and _compiler to the arguments provided. -- *

        -+ * - * @param cache The cache with which to store patterns. - * @param compiler The PatternCompiler that should be used to compile - * patterns. -@@ -120,7 +120,7 @@ - *

        - * The expected behavior of this method should be to start replacing - * patterns in the cache only after the cache has been filled to capacity. -- *

        -+ * - * @param expression The regular expression to add to the cache. - * @param options The compilation options to use when compiling the - * expression. -@@ -177,7 +177,7 @@ - * you are NOT forced to catch it by the compiler. Please refer to - * {@link MalformedCachePatternException} for a discussion of - * when you should and shouldn't catch this exception. -- *

        -+ * - * @param expression The regular expression to fetch from the cache in - * compiled form. - * @param options The compilation options to use when compiling the -@@ -221,7 +221,7 @@ - * Returns the number of elements in the cache, not to be confused with - * the {@link #capacity()} which returns the number - * of elements that can be held in the cache at one time. -- *

        -+ * - * @return The current size of the cache (i.e., the number of elements - * currently cached). - */ -@@ -229,7 +229,7 @@ - - /** - * Returns the maximum number of patterns that can be cached at one time. -- *

        -+ * - * @return The maximum number of patterns that can be cached at one time. - */ - public final int capacity() { return _cache.capacity(); } ---- jakarta-oro-2.0.8/src/java/org/apache/oro/text/GlobCompiler.java 2022-03-19 12:16:14.323229032 +0100 -+++ jakarta-oro-2.0.8/src/java/org/apache/oro/text/GlobCompiler.java 2022-03-19 13:08:23.026019700 +0100 -@@ -180,7 +180,7 @@ - * converting the glob pattern to a Perl5 pattern using this method, and - * then invoking the compile() method of an internally stored Perl5Compiler - * instance. -- *

        -+ * - * @param pattern A character array representation of a Glob pattern. - * @return A String representation of a Perl5 pattern equivalent to the - * Glob pattern. -@@ -273,7 +273,7 @@ - /** - * Compiles a Glob expression into a Perl5Pattern instance that - * can be used by a Perl5Matcher object to perform pattern matching. -- *

        -+ * - * @param pattern A Glob expression to compile. - * @param options A set of flags giving the compiler instructions on - * how to treat the glob expression. The flags -@@ -307,7 +307,7 @@ - - /** - * Same as calling compile(pattern, GlobCompiler.DEFAULT_MASK); -- *

        -+ * - * @param pattern A regular expression to compile. - * @return A Pattern instance constituting the compiled regular expression. - * This instance will always be a Perl5Pattern and can be reliably -@@ -321,7 +321,7 @@ - - /** - * Same as calling compile(pattern, GlobCompiler.DEFAULT_MASK); -- *

        -+ * - * @param pattern A regular expression to compile. - * @return A Pattern instance constituting the compiled regular expression. - * This instance will always be a Perl5Pattern and can be reliably -@@ -336,7 +336,7 @@ - /** - * Compiles a Glob expression into a Perl5Pattern instance that - * can be used by a Perl5Matcher object to perform pattern matching. -- *

        -+ * - * @param pattern A Glob expression to compile. - * @param options A set of flags giving the compiler instructions on - * how to treat the glob expression. The flags ---- jakarta-oro-2.0.8/src/java/org/apache/oro/text/MalformedCachePatternException.java 2022-03-19 12:16:14.323229032 +0100 -+++ jakarta-oro-2.0.8/src/java/org/apache/oro/text/MalformedCachePatternException.java 2022-03-19 13:34:58.579611992 +0100 -@@ -89,7 +89,7 @@ - - /** - * Simply calls the corresponding constructor of its superclass. -- *

        -+ * - * @param message A message indicating the nature of the error. - */ - public MalformedCachePatternException(String message) { ---- jakarta-oro-2.0.8/src/java/org/apache/oro/text/MatchAction.java 2022-03-19 12:16:14.323229032 +0100 -+++ jakarta-oro-2.0.8/src/java/org/apache/oro/text/MatchAction.java 2022-03-19 13:36:00.059981636 +0100 -@@ -76,7 +76,7 @@ - * This method is called by MatchActionProcessor when it finds an associated - * pattern in a line of input. Information pertaining to the matched - * line is included in the MatchActionInfo parameter. -- *

        -+ * - * @see MatchActionProcessor - * @see MatchActionInfo - * @param matchInfo The match information associated with the line ---- jakarta-oro-2.0.8/src/java/org/apache/oro/text/MatchActionProcessor.java 2022-03-19 12:16:14.323229032 +0100 -+++ jakarta-oro-2.0.8/src/java/org/apache/oro/text/MatchActionProcessor.java 2022-03-19 13:37:07.452386825 +0100 -@@ -87,7 +87,7 @@ - * classes are used. Here's an example of how you might use - * MatchActionProcessor to extract only the second column of a semicolon - * delimited file: -- *

        -+ * - *

        -  * import java.io.*;
        -  *
        -@@ -154,7 +154,7 @@
        -    * default, which means that matched lines will not be split into separate
        -    * fields unless the field separator is set with
        -    * {@link #setFieldSeparator setFieldSeparator()}.
        --   * 

        -+ * - * @param compiler The PatternCompiler to use to compile registered - * patterns. - * @param matcher The PatternMatcher to use when searching for matches. -@@ -180,7 +180,7 @@ - * Registers a pattern action pair, providing options to be used to - * compile the pattern. If a pattern is null, the action - * is performed for every line of input. -- *

        -+ * - * @param pattern The pattern to bind to an action. - * @param options The compilation options to use for the pattern. - * @param action The action to associate with the pattern. -@@ -201,7 +201,7 @@ - * used to compile the pattern. The default action is to simply print - * the matched line to the output. If a pattern is null, the action - * is performed for every line of input. -- *

        -+ * - * @param pattern The pattern to bind to an action. - * @param options The compilation options to use for the pattern. - * @exception MalformedPatternException If the pattern cannot be compiled. -@@ -216,7 +216,7 @@ - * Binds a patten to the default action. The default action is to simply - * print the matched line to the output. If a pattern is null, the action - * is performed for every line of input. -- *

        -+ * - * @param pattern The pattern to bind to an action. - * @exception MalformedPatternException If the pattern cannot be compiled. - */ -@@ -228,7 +228,7 @@ - /** - * Registers a pattern action pair. If a pattern is null, the action - * is performed for every line of input. -- *

        -+ * - * @param pattern The pattern to bind to an action. - * @param action The action to associate with the pattern. - * @exception MalformedPatternException If the pattern cannot be compiled. -@@ -243,7 +243,7 @@ - * Sets the field separator to use when splitting a line into fields. - * If the field separator is never set, or set to null, matched input - * lines are not split into fields. -- *

        -+ * - * @param separator A regular expression defining the field separator. - * @param options The options to use when compiling the separator. - * @exception MalformedPatternException If the separator cannot be compiled. -@@ -263,7 +263,7 @@ - * Sets the field separator to use when splitting a line into fields. - * If the field separator is never set, or set to null, matched input - * lines are not split into fields. -- *

        -+ * - * @param separator A regular expression defining the field separator. - * @exception MalformedPatternException If the separator cannot be compiled. - */ -@@ -290,7 +290,7 @@ - *

        - * The input stream, having been exhausted, is closed right before the - * method terminates and the output stream is flushed. -- *

        -+ * - * @see MatchActionInfo - * @param input The input stream from which to read lines. - * @param output Where to send output. -@@ -328,7 +328,6 @@ - *

        - * The input stream, having been exhausted, is closed right before the - * method terminates and the output stream is flushed. -- *

        - * - * @see MatchActionInfo - * @param input The input stream from which to read lines. -@@ -359,7 +358,7 @@ - *

        - * The input stream, having been exhausted, is closed right before the - * method terminates and the output stream is flushed. -- *

        -+ * - * @see MatchActionInfo - * @param input The input stream from which to read lines. - * @param output Where to send output. ---- jakarta-oro-2.0.8/src/java/org/apache/oro/text/PatternCacheFIFO2.java 2022-03-19 12:16:14.323229032 +0100 -+++ jakarta-oro-2.0.8/src/java/org/apache/oro/text/PatternCacheFIFO2.java 2022-03-19 13:38:40.012943333 +0100 -@@ -86,7 +86,7 @@ - /** - * Creates a PatternCacheFIFO2 instance with a given cache capacity, - * initialized to use a given PatternCompiler instance as a pattern compiler. -- *

        -+ * - * @param capacity The capacity of the cache. - * @param compiler The PatternCompiler to use to compile patterns. - */ ---- jakarta-oro-2.0.8/src/java/org/apache/oro/text/PatternCacheFIFO.java 2022-03-19 12:16:14.323229032 +0100 -+++ jakarta-oro-2.0.8/src/java/org/apache/oro/text/PatternCacheFIFO.java 2022-03-19 13:38:35.692917358 +0100 -@@ -79,7 +79,7 @@ - /** - * Creates a PatternCacheFIFO instance with a given cache capacity, - * initialized to use a given PatternCompiler instance as a pattern compiler. -- *

        -+ * - * @param capacity The capacity of the cache. - * @param compiler The PatternCompiler to use to compile patterns. - */ ---- jakarta-oro-2.0.8/src/java/org/apache/oro/text/PatternCache.java 2022-03-19 12:16:14.323229032 +0100 -+++ jakarta-oro-2.0.8/src/java/org/apache/oro/text/PatternCache.java 2022-03-19 12:50:30.431573186 +0100 -@@ -93,7 +93,7 @@ - *

        - * The expected behavior of this method should be to start replacing - * patterns in the cache only after the cache has been filled to capacity. -- *

        -+ * - * @param expression The regular expression to add to the cache. - * @return The Pattern corresponding to the String representation of the - * regular expression. -@@ -120,7 +120,7 @@ - *

        - * The expected behavior of this method should be to start replacing - * patterns in the cache only after the cache has been filled to capacity. -- *

        -+ * - * @param expression The regular expression to add to the cache. - * @param options The compilation options to use when compiling the - * expression. -@@ -144,7 +144,7 @@ - * you are NOT forced to catch it by the compiler. Please refer to - * {@link MalformedCachePatternException} for a discussion of when you - * should and shouldn't catch this exception. -- *

        -+ * - * @param expression The regular expression to fetch from the cache in - * compiled form. - * @return The Pattern corresponding to the String representation of the -@@ -167,7 +167,7 @@ - * you are NOT forced to catch it by the compiler. Please refer to - * {@link MalformedCachePatternException} for a discussion of when you - * should and shouldn't catch this exception. -- *

        -+ * - * @param expression The regular expression to fetch from the cache in - * compiled form. - * @param options The compilation options to use when compiling the -@@ -185,7 +185,7 @@ - * Returns the number of elements in the cache, not to be confused with - * the {@link #capacity()} which returns the number - * of elements that can be held in the cache at one time. -- *

        -+ * - * @return The current size of the cache (i.e., the number of elements - * currently cached). - */ -@@ -194,7 +194,7 @@ - - /** - * Returns the maximum number of patterns that can be cached at one time. -- *

        -+ * - * @return The maximum number of patterns that can be cached at one time. - */ - public int capacity(); ---- jakarta-oro-2.0.8/src/java/org/apache/oro/text/PatternCacheLRU.java 2022-03-19 12:16:14.323229032 +0100 -+++ jakarta-oro-2.0.8/src/java/org/apache/oro/text/PatternCacheLRU.java 2022-03-19 13:42:08.118195389 +0100 -@@ -81,7 +81,7 @@ - * Creates a PatternCacheLRU instance with a given cache capacity, - * and initialized to use a given PatternCompiler instance as a pattern - * compiler. -- *

        -+ * - * @param capacity The capacity of the cache. - * @param compiler The PatternCompiler to use to compile patterns. - */ ---- jakarta-oro-2.0.8/src/java/org/apache/oro/text/PatternCacheRandom.java 2022-03-19 12:16:14.323229032 +0100 -+++ jakarta-oro-2.0.8/src/java/org/apache/oro/text/PatternCacheRandom.java 2022-03-19 13:39:27.317227758 +0100 -@@ -80,7 +80,7 @@ - * Creates a PatternCacheRandom instance with a given cache capacity - * and initialized to use a given PatternCompiler instance as a pattern - * compiler. -- *

        -+ * - * @param capacity The capacity of the cache. - * @param compiler The PatternCompiler to use to compile patterns. - */ ---- jakarta-oro-2.0.8/src/java/org/apache/oro/text/perl/MalformedPerl5PatternException.java 2022-03-19 12:16:14.327229056 +0100 -+++ jakarta-oro-2.0.8/src/java/org/apache/oro/text/perl/MalformedPerl5PatternException.java 2022-03-19 13:35:39.067855424 +0100 -@@ -91,7 +91,7 @@ - - /** - * Simply calls the corresponding constructor of its superclass. -- *

        -+ * - * @param message A message indicating the nature of the error. - */ - public MalformedPerl5PatternException(String message) { ---- jakarta-oro-2.0.8/src/java/org/apache/oro/text/perl/Perl5Util.java 2022-03-19 12:16:14.327229056 +0100 -+++ jakarta-oro-2.0.8/src/java/org/apache/oro/text/perl/Perl5Util.java 2022-03-19 13:27:36.984956911 +0100 -@@ -270,7 +270,7 @@ - * then parses the expression and fetches a compiled pattern from the - * pattern cache. Otherwise, just uses the pattern found in the - * expression cache. __matchPattern is used to parse the expression. -- *

        -+ * - * @param pattern The Perl5 match expression to parse. - * @exception MalformedPerl5PatternException If there is an error parsing - * the expression. -@@ -340,7 +340,7 @@ - *

        - * The m prefix is optional and the meaning of the optional - * trailing options are: -- *
        -+ *
        - *
        i
        case insensitive match - *
        m
        treat the input as consisting of multiple lines - *
        s
        treat the input as consisting of a single line -@@ -355,7 +355,7 @@ - * However, Perl5Util implements the MatchResult interface as a wrapper - * around the last MatchResult found, so you can call its methods to - * access match information. -- *

        -+ * - * @param pattern The pattern to search for. - * @param input The char[] input to search. - * @return True if the input contains the pattern, false otherwise. -@@ -390,7 +390,7 @@ - * - * The m prefix is optional and the meaning of the optional - * trailing options are: -- *

        -+ *
        - *
        i
        case insensitive match - *
        m
        treat the input as consisting of multiple lines - *
        s
        treat the input as consisting of a single line -@@ -406,7 +406,7 @@ - * However, Perl5Util implements the MatchResult interface as a wrapper - * around the last MatchResult found, so you can call its methods to - * access match information. -- *

        -+ * - * @param pattern The pattern to search for. - * @param input The String input to search. - * @return True if the input contains the pattern, false otherwise. -@@ -430,7 +430,7 @@ - * - * The m prefix is optional and the meaning of the optional - * trailing options are: -- *

        -+ *
        - *
        i
        case insensitive match - *
        m
        treat the input as consisting of multiple lines - *
        s
        treat the input as consisting of a single line -@@ -451,7 +451,7 @@ - * search for expressions in the entire input using a while loop as - * explained in the {@link org.apache.oro.text.regex.PatternMatcherInput - * PatternMatcherInput} documentation. -- *

        -+ * - * @param pattern The pattern to search for. - * @param input The PatternMatcherInput to search. - * @return True if the input contains the pattern, false otherwise. -@@ -484,7 +484,7 @@ - * be used when you want to save MatchResult instances. Otherwise, for - * simply accessing match information, it is more convenient to use the - * Perl5Util methods implementing the MatchResult interface. -- *

        -+ * - * @return The org.apache.oro.text.regex.MatchResult instance containing the - * last match found. - */ -@@ -501,7 +501,7 @@ - * - * The s prefix is mandatory and the meaning of the optional - * trailing options are: -- *

        -+ *
        - *
        g
        Substitute all occurrences of pattern with replacement. - * The default is to replace only the first occurrence. - *
        i
        perform a case insensitive match -@@ -557,7 +557,7 @@ - *
        -    * numSubs = util.substitute(result, "s#/#\\#g", input);
        -    * 
        -- *

        -+ * - * @param result The StringBuffer in which to store the result of the - * substitutions. The buffer is only appended to. - * @param expression The Perl5 substitution regular expression. -@@ -717,7 +717,7 @@ - /** - * Substitutes a pattern in a given input with a replacement string. - * The substitution expression is specified in Perl5 native format. -- *

        -+ *
        - *
        Calling this method is the same as:
        - *
        - *
        -@@ -755,7 +755,7 @@
        -    * 
        - * The m prefix is optional and the meaning of the optional - * trailing options are: -- *
        -+ *
        - *
        i
        case insensitive match - *
        m
        treat the input as consisting of multiple lines - *
        s
        treat the input as consisting of a single line -@@ -788,7 +788,7 @@ - * does NOT implement these behaviors because it is intended to - * be a general self-consistent and predictable split function usable - * with Pattern instances other than Perl5Pattern. -- *

        -+ * - * @param results - * A Collection to which the substrings of the input - * that occur between the regular expression delimiter occurences -@@ -802,7 +802,7 @@ - * @param pattern The regular expression to use as a split delimiter. - * @param input The String to split. - * @param limit The limit on the size of the returned Vector. -- * Values <= 0 produce the same behavior as the SPLIT_ALL constant which -+ * Values <= 0 produce the same behavior as the SPLIT_ALL constant which - * causes the limit to be ignored and splits to be performed on all - * occurrences of the pattern. You should use the SPLIT_ALL constant - * to achieve this behavior instead of relying on the default behavior -@@ -899,7 +899,7 @@ - * - * The m prefix is optional and the meaning of the optional - * trailing options are: -- *

        -+ *
        - *
        i
        case insensitive match - *
        m
        treat the input as consisting of multiple lines - *
        s
        treat the input as consisting of a single line -@@ -927,14 +927,14 @@ - * The {@link org.apache.oro.text.regex.Util#split Util.split()} method - * does NOT implement this particular behavior because it is intended to - * be usable with Pattern instances other than Perl5Pattern. -- *

        -+ * - * @deprecated Use - * {@link #split(Collection results, String pattern, String input, int limit)} - * instead. - * @param pattern The regular expression to use as a split delimiter. - * @param input The String to split. - * @param limit The limit on the size of the returned Vector. -- * Values <= 0 produce the same behavior as the SPLIT_ALL constant which -+ * Values <= 0 produce the same behavior as the SPLIT_ALL constant which - * causes the limit to be ignored and splits to be performed on all - * occurrences of the pattern. You should use the SPLIT_ALL constant - * to achieve this behavior instead of relying on the default behavior -@@ -993,7 +993,7 @@ - - /** - * Returns the length of the last match found. -- *

        -+ * - * @return The length of the last match found. - */ - public synchronized int length() { -@@ -1014,7 +1014,7 @@ - /** - * Returns the contents of the parenthesized subgroups of the last match - * found according to the behavior dictated by the MatchResult interface. -- *

        -+ * - * @param group The pattern subgroup to return. - * @return A string containing the indicated pattern subgroup. Group - * 0 always refers to the entire match. If a group was never -@@ -1029,7 +1029,7 @@ - /** - * Returns the begin offset of the subgroup of the last match found - * relative the beginning of the match. -- *

        -+ * - * @param group The pattern subgroup. - * @return The offset into group 0 of the first token in the indicated - * pattern subgroup. If a group was never matched or does -@@ -1046,7 +1046,7 @@ - /** - * Returns the end offset of the subgroup of the last match found - * relative the beginning of the match. -- *

        -+ * - * @param group The pattern subgroup. - * @return Returns one plus the offset into group 0 of the last token in - * the indicated pattern subgroup. If a group was never matched -@@ -1062,7 +1062,7 @@ - * Returns an offset marking the beginning of the last pattern match - * found relative to the beginning of the input from which the match - * was extracted. -- *

        -+ * - * @param group The pattern subgroup. - * @return The offset of the first token in the indicated - * pattern subgroup. If a group was never matched or does -@@ -1076,7 +1076,7 @@ - * Returns an offset marking the end of the last pattern match found - * relative to the beginning of the input from which the match was - * extracted. -- *

        -+ * - * @param group The pattern subgroup. - * @return Returns one plus the offset of the last token in - * the indicated pattern subgroup. If a group was never matched -@@ -1089,7 +1089,7 @@ - - /** - * Returns the same as group(0). -- *

        -+ * - * @return A string containing the entire match. - */ - public synchronized String toString() { -@@ -1101,7 +1101,7 @@ - - /** - * Returns the part of the input preceding the last match found. -- *

        -+ * - * @return The part of the input following the last match found. - */ - public synchronized String preMatch() { -@@ -1145,7 +1145,7 @@ - - /** - * Returns the part of the input following the last match found. -- *

        -+ * - * @return The part of the input following the last match found. - */ - public synchronized String postMatch() { -@@ -1190,7 +1190,7 @@ - * Returns the part of the input preceding the last match found as a - * char array. This method eliminates the extra - * buffer copying caused by preMatch().toCharArray(). -- *

        -+ * - * @return The part of the input preceding the last match found as a char[]. - * If the result is of zero length, returns null instead of a zero - * length array. -@@ -1241,7 +1241,7 @@ - * Returns the part of the input following the last match found as a char - * array. This method eliminates the extra buffer copying caused by - * preMatch().toCharArray(). -- *

        -+ * - * @return The part of the input following the last match found as a char[]. - * If the result is of zero length, returns null instead of a zero - * length array. ---- jakarta-oro-2.0.8/src/java/org/apache/oro/text/regex/MalformedPatternException.java 2022-03-19 12:16:14.323229032 +0100 -+++ jakarta-oro-2.0.8/src/java/org/apache/oro/text/regex/MalformedPatternException.java 2022-03-19 13:35:18.875734018 +0100 -@@ -84,7 +84,7 @@ - - /** - * Simply calls the corresponding constructor of its superclass. -- *

        -+ * - * @param message A message indicating the nature of the parse error. - */ - public MalformedPatternException(String message) { ---- jakarta-oro-2.0.8/src/java/org/apache/oro/text/regex/MatchResult.java 2022-03-19 12:16:14.323229032 +0100 -+++ jakarta-oro-2.0.8/src/java/org/apache/oro/text/regex/MatchResult.java 2022-03-19 13:38:06.548742132 +0100 -@@ -117,7 +117,7 @@ - * System.out.println("Saved Groups: "); - * - * // Start at 1 because we just printed out group 0 -- * for(int group = 1; group < groups; group++) { -+ * for(int group = 1; group < groups; group++) { - * System.out.println(group + ": " + result.group(group)); - * System.out.println("Begin: " + result.begin(group)); - * System.out.println("End: " + result.end(group)); -@@ -136,7 +136,7 @@ - * If you want to get the length of a particular subgroup you should - * use the {@link #group(int)} method to get - * the string and then access its length() method as follows: -- *

        -+ * - *

        -    * int length = -1; // Use -1 to indicate group doesn't exist
        -    * MatchResult result;
        -@@ -152,11 +152,10 @@
        -    * 

        - * - * The length() method serves as a more a more efficient way to do: -- *

        -+ * - *

        -    * length = result.group(0).length();
        -    * 
        -- *

        - * - * @return The length of the match. - */ -@@ -181,7 +180,7 @@ - * 123 . group(2) will return - * null because there is only one subgroup in the original - * pattern. -- *

        -+ * - * @param group The pattern subgroup to return. - * @return A string containing the indicated pattern subgroup. Group - * 0 always refers to the entire match. If a group was never -@@ -218,7 +217,7 @@ - * Returns an offset marking the beginning of the pattern match - * relative to the beginning of the input from which the match - * was extracted. -- *

        -+ * - * @param group The pattern subgroup. - * @return The offset of the first token in the indicated - * pattern subgroup. If a group was never matched or does -@@ -231,7 +230,7 @@ - * Returns an offset marking the end of the pattern match - * relative to the beginning of the input from which the match was - * extracted. -- *

        -+ * - * @param group The pattern subgroup. - * @return Returns one plus the offset of the last token in - * the indicated pattern subgroup. If a group was never matched ---- jakarta-oro-2.0.8/src/java/org/apache/oro/text/regex/package.html 2022-03-19 12:16:14.323229032 +0100 -+++ jakarta-oro-2.0.8/src/java/org/apache/oro/text/regex/package.html 2022-03-19 13:19:35.054059533 +0100 -@@ -8,8 +8,7 @@ - Note: The following information will be moved into the user's guide. -

        - --

        Perl5 regular expressions

        -- -+

        Perl5 regular expressions

        -

        - Here we summarize the syntax of Perl5.003 regular expressions, all of - which is supported by the Perl5 classes in this package. However, for -@@ -17,16 +16,15 @@ - - perlre man page - that accompanies the Perl5 distribution and also the book -- Programming Perl, 2nd Edition from O'Reilly & Associates. -+ Programming Perl, 2nd Edition from O'Reilly & Associates. - We are working toward implementing the features added after Perl5.003 - up to and including Perl 5.6. Please remember, we only guarantee - support for Perl5.003 expressions in version 2.0. - --

        -

          -
        • Alternatives separated by | -
        • Quantified atoms --
          -+
          -
          {n,m}
          Match at least n but not more than m times. -
          {n,}
          Match at least n times. -
          {n}
          Match exactly n times. -@@ -51,7 +49,7 @@ -
        • \b is backspace inside a character class -
        -
      • Special backslashed characters --
        -+
        -
        \b
        null token matching a word boundary (\w on one side - and \W on the other) -
        \B
        null token matching a boundary that isn't a -@@ -93,7 +91,7 @@ - causing the rest of the pattern not to match, you may use - a "?" right after the quantifier. - --
        -+
        -
        *?
        Match 0 or more times -
        +?
        Match 1 or more times -
        ??
        Match 0 or 1 time -@@ -105,7 +103,7 @@ -

        - Perl5 extended regular expressions are fully supported. - --

        -+
        -
        (?#text)
        An embedded comment causing text to be ignored. -
        (?:regexp)
        Groups things like "()" but doesn't cause the - group match to be saved. -@@ -129,7 +127,7 @@ - i enables case insensitivity, m enables multiline - treatment of the input, s enables single line treatment - of the input, and x enables extended whitespace comments. --
      -+
    • - - - ---- jakarta-oro-2.0.8/src/java/org/apache/oro/text/regex/PatternCompiler.java 2022-03-19 12:16:14.323229032 +0100 -+++ jakarta-oro-2.0.8/src/java/org/apache/oro/text/regex/PatternCompiler.java 2022-03-19 13:18:45.933764246 +0100 -@@ -71,7 +71,7 @@ - * instance. The Pattern can then be used in conjunction with the appropriate - * PatternMatcher instance to perform pattern searches. A form - * of use might be: -- *

      -+ * - *

      -  * PatternCompiler compiler;
      -  * PatternMatcher matcher;
      -@@ -111,7 +111,7 @@
      -   /**
      -    * Compiles a regular expression into a data structure that can be used
      -    * by a PatternMatcher implementation to perform pattern matching.
      --   * 

      -+ * - * @param pattern A regular expression to compile. - * @return A Pattern instance constituting the compiled regular expression. - * @exception MalformedPatternException If the compiled expression -@@ -126,7 +126,7 @@ - * used by a PatternMatcher implementation to perform pattern matching. - * Additional regular expression syntax specific options can be passed - * as a bitmask of options. -- *

      -+ * - * @param pattern A regular expression to compile. - * @param options A set of flags giving the compiler instructions on - * how to treat the regular expression. The flags -@@ -145,7 +145,7 @@ - /** - * Compiles a regular expression into a data structure that can be used - * by a PatternMatcher implementation to perform pattern matching. -- *

      -+ * - * @param pattern A regular expression to compile. - * @return A Pattern instance constituting the compiled regular expression. - * @exception MalformedPatternException If the compiled expression -@@ -160,7 +160,7 @@ - * used by a PatternMatcher implementation to perform pattern matching. - * Additional regular expression syntax specific options can be passed - * as a bitmask of options. -- *

      -+ * - * @param pattern A regular expression to compile. - * @param options A set of flags giving the compiler instructions on - * how to treat the regular expression. The flags ---- jakarta-oro-2.0.8/src/java/org/apache/oro/text/regex/Pattern.java 2022-03-19 12:16:14.323229032 +0100 -+++ jakarta-oro-2.0.8/src/java/org/apache/oro/text/regex/Pattern.java 2022-03-19 13:15:44.948676277 +0100 -@@ -85,7 +85,7 @@ - * structures bear no relation to the string defining the pattern. - * It is often useful to be able to access the string defining a pattern - * after it has been compiled. -- *

      -+ * - * @return The original string representation of the regular expression - * pattern. - */ -@@ -96,7 +96,7 @@ - /** - * This method returns an integer containing the compilation options used - * to compile this pattern. -- *

      -+ * - * @return The compilation options used to compile the pattern. - */ - public int getOptions(); ---- jakarta-oro-2.0.8/src/java/org/apache/oro/text/regex/PatternMatcherInput.java 2022-03-19 12:16:14.323229032 +0100 -+++ jakarta-oro-2.0.8/src/java/org/apache/oro/text/regex/PatternMatcherInput.java 2022-03-19 12:54:02.760849283 +0100 -@@ -129,7 +129,7 @@ - * the string unless you know what you are doing. - * The current offset of the PatternMatcherInput is set to the begin - * offset of the region. -- *

      -+ * - * @param input The input to associate with the PatternMatcherInput. - * @param begin The offset into the char[] to use as the beginning of - * the input. -@@ -145,7 +145,7 @@ - *

      -    * PatternMatcherInput(input, 0, input.length());
      -    * 
      -- *

      -+ * - * @param input The input to associate with the PatternMatcherInput. - */ - public PatternMatcherInput(String input) { -@@ -161,7 +161,7 @@ - * the string unless you know what you are doing. - * The current offset of the PatternMatcherInput is set to the begin - * offset of the region. -- *

      -+ * - * @param input The input to associate with the PatternMatcherInput. - * @param begin The offset into the char[] to use as the beginning of - * the input. -@@ -177,7 +177,7 @@ - *

      -    * PatternMatcherInput(input, 0, input.length);
      -    * 
      -- *

      -+ * - * @param input The input to associate with the PatternMatcherInput. - */ - public PatternMatcherInput(char[] input) { -@@ -201,7 +201,7 @@ - * to be used for pattern matching by PatternMatcher objects. - * The current offset of the PatternMatcherInput is set to the begin - * offset of the region. -- *

      -+ * - * @param input The input to associate with the PatternMatcherInput. - * @param begin The offset into the String to use as the beginning of - * the input. -@@ -223,7 +223,7 @@ - *

      -    * setInput(input, 0, input.length());
      -    * 
      -- *

      -+ * - * @param input The input to associate with the PatternMatcherInput. - */ - public void setInput(String input) { -@@ -238,7 +238,7 @@ - * the string unless you know what you are doing. - * The current offset of the PatternMatcherInput is set to the begin - * offset of the region. -- *

      -+ * - * @param input The input to associate with the PatternMatcherInput. - * @param begin The offset into the char[] to use as the beginning of - * the input. -@@ -260,7 +260,7 @@ - *

      -    * setInput(input, 0, input.length);
      -    * 
      -- *

      -+ * - * @param input The input to associate with the PatternMatcherInput. - */ - public void setInput(char[] input) { -@@ -271,7 +271,7 @@ - /** - * Returns the character at a particular offset relative to the begin - * offset of the input. -- *

      -+ * - * @param offset The offset at which to fetch a character (relative to - * the beginning offset. - * @return The character at a particular offset. -@@ -287,7 +287,7 @@ - * instance. The substring begins at the specified beginOffset relative - * to the begin offset and extends to the specified endOffset - 1 - * relative to the begin offset of the PatternMatcherInput instance. -- *

      -+ * - * @param beginOffset The offset relative to the begin offset of the - * PatternMatcherInput at which to start the substring (inclusive). - * @param endOffset The offset relative to the begin offset of the -@@ -306,7 +306,7 @@ - * instance. The substring begins at the specified beginOffset relative - * to the begin offset and extends to the end offset of the - * PatternMatcherInput. -- *

      -+ * - * @param beginOffset The offset relative to the begin offset of the - * PatternMatcherInput at which to start the substring. - * @return The specified substring. -@@ -325,7 +325,7 @@ - * If a char[] was used, a char instance will be returned. This violates - * data encapsulation and hiding principles, but it is a great convenience - * for the programmer. -- *

      -+ * - * @return The String or char[] input used to initialize the - * PatternMatcherInput instance. - */ -@@ -339,7 +339,7 @@ - * Retrieves the char[] buffer to be used used as input by PatternMatcher - * implementations to look for matches. This array should be treated - * as read only by the programmer. -- *

      -+ * - * @return The char[] buffer to be used as input by PatternMatcher - * implementations. - */ -@@ -347,7 +347,7 @@ - - /** - * Returns whether or not the end of the input has been reached. -- *

      -+ * - * @return True if the current offset is greater than or equal to the - * end offset. - */ -@@ -381,7 +381,7 @@ - * of the region to be considered as input by PatternMatcher - * methods. In other words, everything before this offset is ignored - * by a PatternMatcher. -- *

      -+ * - * @param offset The offset to use as the beginning of the input. - */ - public void setBeginOffset(int offset) { _beginOffset = offset; } -@@ -391,7 +391,7 @@ - * of the region to be considered as input by PatternMatcher - * methods. This offset is actually 1 plus the last offset - * that is part of the input region. -- *

      -+ * - * @param offset The offset to use as the end of the input. - */ - public void setEndOffset(int offset) { _endOffset = offset; } -@@ -403,7 +403,7 @@ - * this method, you invalidate all previous match information. Therefore - * a PatternMatcher implementation must call this method before setting - * match offset information. -- *

      -+ * - * @param offset The offset to use as the current offset. - */ - public void setCurrentOffset(int offset) { -@@ -414,7 +414,7 @@ - /** - * Returns the string representation of the input, where the input is - * considered to start from the begin offset and end at the end offset. -- *

      -+ * - * @return The string representation of the input. - */ - public String toString() { -@@ -426,7 +426,7 @@ - * A convenience method returning the part of the input occurring before - * the last match found by a call to a Perl5Matcher - * {@link Perl5Matcher#contains contains} method. -- *

      -+ * - * @return The input preceeding a match. - */ - public String preMatch() { -@@ -439,7 +439,7 @@ - * A convenience method returning the part of the input occurring after - * the last match found by a call to a Perl5Matcher - * {@link Perl5Matcher#contains contains} method. -- *

      -+ * - * @return The input succeeding a contains() match. - */ - public String postMatch() { -@@ -455,7 +455,7 @@ - * The method is not called getMatch() so as not to confuse it - * with Perl5Matcher's getMatch() which returns a MatchResult instance - * and also for consistency with preMatch() and postMatch(). -- *

      -+ * - * @return The input consisting of the match found by contains(). - */ - public String match() { -@@ -476,7 +476,7 @@ - * as conveniences because PatternMatcherInput must store match offset - * information to completely preserve state for consecutive PatternMatcher - * contains() matches. -- *

      -+ * - * @param matchBeginOffset The begin offset of a match found by contains(). - * @param matchEndOffset The end offset of a match found by contains(). - */ -@@ -488,14 +488,14 @@ - /** - * Returns the offset marking the beginning of the match found by - * contains(). -- *

      -+ * - * @return The begin offset of a contains() match. - */ - public int getMatchBeginOffset() { return _matchBeginOffset; } - - /** - * Returns the offset marking the end of the match found by contains(). -- *

      -+ * - * @return The end offset of a contains() match. - */ - public int getMatchEndOffset() { return _matchEndOffset; } ---- jakarta-oro-2.0.8/src/java/org/apache/oro/text/regex/PatternMatcher.java 2022-03-19 12:16:14.323229032 +0100 -+++ jakarta-oro-2.0.8/src/java/org/apache/oro/text/regex/PatternMatcher.java 2022-03-19 12:52:19.776230359 +0100 -@@ -94,7 +94,7 @@ - *

      - * This method is useful for certain common token identification tasks - * that are made more difficult without this functionality. -- *

      -+ * - * @param input The char[] to test for a prefix match. - * @param pattern The Pattern to be matched. - * @param offset The offset at which to start searching for the prefix. -@@ -110,7 +110,7 @@ - *

      - * This method is useful for certain common token identification tasks - * that are made more difficult without this functionality. -- *

      -+ * - * @param input The String to test for a prefix match. - * @param pattern The Pattern to be matched. - * @return True if input matches pattern, false otherwise. -@@ -126,7 +126,7 @@ - *

      - * This method is useful for certain common token identification tasks - * that are made more difficult without this functionality. -- *

      -+ * - * @param input The char[] to test for a prefix match. - * @param pattern The Pattern to be matched. - * @return True if input matches pattern, false otherwise. -@@ -146,7 +146,7 @@ - *

      - * This method is useful for certain common token identification tasks - * that are made more difficult without this functionality. -- *

      -+ * - * @param input The PatternMatcherInput to test for a prefix match. - * @param pattern The Pattern to be matched. - * @return True if input matches pattern, false otherwise. -@@ -158,7 +158,7 @@ - * there is an exact match, a MatchResult instance - * representing the match is made accesible via - * {@link #getMatch()}. -- *

      -+ * - * @param input The String to test for an exact match. - * @param pattern The Pattern to be matched. - * @return True if input matches pattern, false otherwise. -@@ -170,7 +170,7 @@ - * a given pattern. If there is an exact match, a MatchResult - * instance representing the match is made accesible via - * {@link #getMatch()}. -- *

      -+ * - * @param input The char[] to test for a match. - * @param pattern The Pattern to be matched. - * @return True if input matches pattern, false otherwise. -@@ -188,7 +188,7 @@ - * is not updated. You should remember that the region between - * the begin and end offsets of the PatternMatcherInput will be - * tested for an exact match. -- *

      -+ * - * @param input The PatternMatcherInput to test for a match. - * @param pattern The Pattern to be matched. - * @return True if input matches pattern, false otherwise. -@@ -205,7 +205,7 @@ - * representing the remaining input. Using the MatchResult offset - * information is the recommended method of obtaining the parts of the - * string preceeding the match and following the match. -- *

      -+ * - * @param input The String to test for a match. - * @param pattern The Pattern to be matched. - * @return True if the input contains a pattern match, false otherwise. -@@ -222,7 +222,7 @@ - * representing the remaining input. Using the MatchResult offset - * information is the recommended method of obtaining the parts of the - * string preceeding the match and following the match. -- *

      -+ * - * @param input The String to test for a match. - * @param pattern The Pattern to be matched. - * @return True if the input contains a pattern match, false otherwise. -@@ -273,7 +273,7 @@ - * } - * - *

      -- *

      -+ * - * @param input The PatternMatcherInput to test for a match. - * @param pattern The Pattern to be matched. - * @return True if the input contains a pattern match, false otherwise. -@@ -283,7 +283,7 @@ - /** - * Fetches the last match found by a call to a matches() or contains() - * method. -- *

      -+ * - * @return A MatchResult instance containing the pattern match found - * by the last call to any one of the matches() or contains() - * methods. If no match was found by the last call, ---- jakarta-oro-2.0.8/src/java/org/apache/oro/text/regex/Perl5Compiler.java 2022-03-19 12:16:14.323229032 +0100 -+++ jakarta-oro-2.0.8/src/java/org/apache/oro/text/regex/Perl5Compiler.java 2022-03-19 13:11:01.858974539 +0100 -@@ -226,7 +226,7 @@ - *

      - * In effect, this method is the analog of the Perl5 quotemeta() builtin - * method. -- *

      -+ * - * @param expression The expression to convert. - * @return A String containing a Perl5 regular expression corresponding to - * a literal interpretation of the pattern. -@@ -254,8 +254,8 @@ - *

      - * In effect, this method is the analog of the Perl5 quotemeta() builtin - * method. -- *

      -- * @param pattern The pattern to convert. -+ * -+ * @param expression The pattern to convert. - * @return A String containing a Perl5 regular expression corresponding to - * a literal interpretation of the pattern. - */ -@@ -1673,7 +1673,7 @@ - * can be used by a Perl5Matcher object to perform pattern matching. - * Please see the user's guide for more information about Perl5 regular - * expressions. -- *

      -+ * - * @param pattern A Perl5 regular expression to compile. - * @param options A set of flags giving the compiler instructions on - * how to treat the regular expression. The flags -@@ -1946,7 +1946,7 @@ - - /** - * Same as calling compile(pattern, Perl5Compiler.DEFAULT_MASK); -- *

      -+ * - * @param pattern A regular expression to compile. - * @return A Pattern instance constituting the compiled regular expression. - * This instance will always be a Perl5Pattern and can be reliably -@@ -1961,7 +1961,7 @@ - - /** - * Same as calling compile(pattern, Perl5Compiler.DEFAULT_MASK); -- *

      -+ * - * @param pattern A regular expression to compile. - * @return A Pattern instance constituting the compiled regular expression. - * This instance will always be a Perl5Pattern and can be reliably -@@ -1979,7 +1979,7 @@ - * can be used by a Perl5Matcher object to perform pattern matching. - * Please see the user's guide for more information about Perl5 regular - * expressions. -- *

      -+ * - * @param pattern A Perl5 regular expression to compile. - * @param options A set of flags giving the compiler instructions on - * how to treat the regular expression. The flags ---- jakarta-oro-2.0.8/src/java/org/apache/oro/text/regex/Perl5Debug.java 2022-03-19 12:16:14.323229032 +0100 -+++ jakarta-oro-2.0.8/src/java/org/apache/oro/text/regex/Perl5Debug.java 2022-03-19 13:29:44.649724477 +0100 -@@ -92,7 +92,7 @@ - * and the output of Perl5 with the -r option on the same regular - * expression, you can determine if Perl5Compiler correctly compiled - * an expression. -- *

      -+ * - * @param regexp The Perl5Pattern to print. - * @return A string representation of the bytecode program defining the - * regular expression. ---- jakarta-oro-2.0.8/src/java/org/apache/oro/text/regex/Perl5Matcher.java 2022-03-19 12:16:14.323229032 +0100 -+++ jakarta-oro-2.0.8/src/java/org/apache/oro/text/regex/Perl5Matcher.java 2022-03-19 13:10:37.754829630 +0100 -@@ -1363,7 +1363,7 @@ - * interpreted on the fly. The compilation options used when compiling - * a pattern ALWAYS override the behavior specified by setMultiline(). See - * {@link Perl5Compiler} for more details. -- *

      -+ * - * @param multiline If set to true treats the input as consisting of - * multiple lines with respect to the ^ and $ - * metacharacters. If set to false treats the input as consisting -@@ -1411,7 +1411,7 @@ - *

      - * This method is useful for certain common token identification tasks - * that are made more difficult without this functionality. -- *

      -+ * - * @param input The char[] to test for a prefix match. - * @param pattern The Pattern to be matched. - * @param offset The offset at which to start searching for the prefix. -@@ -1443,7 +1443,7 @@ - *

      - * This method is useful for certain common token identification tasks - * that are made more difficult without this functionality. -- *

      -+ * - * @param input The char[] to test for a prefix match. - * @param pattern The Pattern to be matched. - * @return True if input matches pattern, false otherwise. -@@ -1461,7 +1461,7 @@ - *

      - * This method is useful for certain common token identification tasks - * that are made more difficult without this functionality. -- *

      -+ * - * @param input The String to test for a prefix match. - * @param pattern The Pattern to be matched. - * @return True if input matches pattern, false otherwise. -@@ -1484,7 +1484,7 @@ - *

      - * This method is useful for certain common token identification tasks - * that are made more difficult without this functionality. -- *

      -+ * - * @param input The PatternMatcherInput to test for a prefix match. - * @param pattern The Pattern to be matched. - * @return True if input matches pattern, false otherwise. -@@ -1544,7 +1544,7 @@ - * match, as that is the first alternative tried, and it - * successfully matches the target string. - * -- *

      -+ * - * @param input The char[] to test for an exact match. - * @param pattern The Perl5Pattern to be matched. - * @return True if input matches pattern, false otherwise. -@@ -1598,7 +1598,7 @@ - * match, as that is the first alternative tried, and it - * successfully matches the target string. - * -- *

      -+ * - * @param input The String to test for an exact match. - * @param pattern The Perl5Pattern to be matched. - * @return True if input matches pattern, false otherwise. -@@ -1647,7 +1647,7 @@ - * match, as that is the first alternative tried, and it - * successfully matches the target string. - * -- *

      -+ * - * @param input The PatternMatcherInput to test for a match. - * @param pattern The Perl5Pattern to be matched. - * @return True if input matches pattern, false otherwise. -@@ -1704,7 +1704,7 @@ - * indeed should NOT try to (for performance reasons), catch a - * ClassCastException because it will never be thrown as long as you use - * a Perl5Pattern as the pattern parameter. -- *

      -+ * - * @param input The String to test for a match. - * @param pattern The Perl5Pattern to be matched. - * @return True if the input contains a pattern match, false otherwise. -@@ -1733,7 +1733,7 @@ - * indeed should NOT try to (for performance reasons), catch a - * ClassCastException because it will never be thrown as long as you use - * a Perl5Pattern as the pattern parameter. -- *

      -+ * - * @param input The char[] to test for a match. - * @param pattern The Perl5Pattern to be matched. - * @return True if the input contains a pattern match, false otherwise. -@@ -1811,7 +1811,7 @@ - * } - * - * -- *

      -+ * - * @param input The PatternMatcherInput to test for a match. - * @param pattern The Pattern to be matched. - * @return True if the input contains a pattern match, false otherwise. -@@ -1880,7 +1880,7 @@ - * the actual match and only care if the pattern occurs in the input. - * Otherwise, a MatchResult would be created for every match found, - * whether or not the MatchResult was later used by a call to getMatch(). -- *

      -+ * - * @return A MatchResult instance containing the pattern match found - * by the last call to any one of the matches() or contains() - * methods. If no match was found by the last call, returns ---- jakarta-oro-2.0.8/src/java/org/apache/oro/text/regex/Perl5Pattern.java 2022-03-19 12:16:14.323229032 +0100 -+++ jakarta-oro-2.0.8/src/java/org/apache/oro/text/regex/Perl5Pattern.java 2022-03-19 13:30:29.225992495 +0100 -@@ -116,7 +116,7 @@ - - /** - * This method returns the string representation of the pattern. -- *

      -+ * - * @return The original string representation of the regular expression - * pattern. - */ -@@ -126,7 +126,7 @@ - /** - * This method returns an integer containing the compilation options used - * to compile this pattern. -- *

      -+ * - * @return The compilation options used to compile the pattern. - */ - public int getOptions() { return _options; } ---- jakarta-oro-2.0.8/src/java/org/apache/oro/text/regex/Perl5Substitution.java 2022-03-19 12:16:14.323229032 +0100 -+++ jakarta-oro-2.0.8/src/java/org/apache/oro/text/regex/Perl5Substitution.java 2022-03-19 13:28:35.177306783 +0100 -@@ -72,8 +72,8 @@ - * or $3, etc. If you want such expressions to be - * interpreted literally, you should set the numInterpolations - * parameter to INTERPOLATE_NONE . It is easiest to explain -- * what an interpolated variable does by giving an example: -- *

        -+ * what an interpolated variable does by giving an example:

        -+ *

        - * Suppose you have the pattern b\d+: and you want to substitute - * the b's for a's and the colon for a dash in parts of - * your input matching the pattern. You can do this by changing the -@@ -102,7 +102,6 @@ - *

        Tank a123- 85  Tank a256- 32  Tank a256- 22
        - * Notice how the last substitution uses the same value for $1 - * as the second substitution. -- *
      - *

      - * A final thing to keep in mind is that if you use an interpolation variable - * that corresponds to a group not contained in the match, then it is -@@ -110,18 +109,18 @@ - * example, and a substitution expression of a$2-, the result - * of the last sample input would be: - *

      Tank a- 85  Tank a- 32  Tank a- 22
      -- * The special substitution $& will interpolate the entire portion -+ * The special substitution $& will interpolate the entire portion - * of the input matched by the regular expression. $0 will - * do the same, but it is recommended that it be avoided because the - * latest versions of Perl use $0 to store the program name rather -- * than duplicate the behavior of $&. -+ * than duplicate the behavior of $&. - * Also, the result of substituting $ followed by a non-positive integer - * is undefined. In order to include a $ in a substitution, it should - * be escaped with a backslash (e.g., "\\$0"). - *

      - * Perl5 double-quoted string case modification is also supported in - * the substitution. The following escape sequences are supported: -- *

      -+ *
      - *
      \\U
      make substitution uppercase until end of substitution or \\E - *
      \\u
      make next character uppercase - *
      \\L
      make substitution uppercase until end of substitution or \\E -@@ -424,7 +423,7 @@ - * Creates a Perl5Substitution using the specified substitution - * and setting the number of interpolations to - * {@link #INTERPOLATE_ALL}. -- *

      -+ * - * @param substitution The string to use as a substitution. - */ - public Perl5Substitution(String substitution) { -@@ -434,7 +433,7 @@ - /** - * Creates a Perl5Substitution using the specified substitution - * and setting the number of interpolations to the specified value. -- *

      -+ * - * @param substitution The string to use as a substitution. - * @param numInterpolations - * If set to INTERPOLATE_NONE, interpolation variables are -@@ -461,7 +460,7 @@ - * You should use this method in order to avoid repeatedly allocating new - * Perl5Substitutions. It is recommended that you allocate a single - * Perl5Substitution and reuse it by using this method when appropriate. -- *

      -+ * - * @param substitution The string to use as a substitution. - */ - public void setSubstitution(String substitution) { -@@ -475,7 +474,7 @@ - * You should use this method in order to avoid repeatedly allocating new - * Perl5Substitutions. It is recommended that you allocate a single - * Perl5Substitution and reuse it by using this method when appropriate. -- *

      -+ * - * @param substitution The string to use as a substitution. - * @param numInterpolations - * If set to INTERPOLATE_NONE, interpolation variables are -@@ -509,7 +508,7 @@ - * See - * {@link Substitution#appendSubstitution Substitution.appendSubstition()} - * for more details regarding the expected behavior of this method. -- *

      -+ * - * @param appendBuffer The buffer containing the new string resulting - * from performing substitutions on the original input. - * @param match The current match causing a substitution to be made. ---- jakarta-oro-2.0.8/src/java/org/apache/oro/text/regex/StringSubstitution.java 2022-03-19 12:16:14.323229032 +0100 -+++ jakarta-oro-2.0.8/src/java/org/apache/oro/text/regex/StringSubstitution.java 2022-03-19 13:28:52.377410202 +0100 -@@ -86,7 +86,7 @@ - - /** - * Creates a StringSubstitution representing the given string. -- *

      -+ * - * @param substitution The string to use as a substitution. - */ - public StringSubstitution(String substitution) { -@@ -99,7 +99,7 @@ - * should use this method in order to avoid repeatedly allocating new - * StringSubstitutions. It is recommended that you allocate a single - * StringSubstitution and reuse it by using this method when appropriate. -- *

      -+ * - * @param substitution The string to use as a substitution. - */ - public void setSubstitution(String substitution) { -@@ -109,14 +109,14 @@ - - /** - * Returns the string substitution represented by this object. -- *

      -+ * - * @return The string substitution represented by this object. - */ - public String getSubstitution() { return _substitution; } - - /** - * Returns the same value as {@link #getSubstitution()}. -- *

      -+ * - * @return The string substitution represented by this object. - */ - public String toString() { return getSubstitution(); } -@@ -127,7 +127,7 @@ - * See - * {@link Substitution#appendSubstitution Substitution.appendSubstition()} - * for more details regarding the expected behavior of this method. -- *

      -+ * - * @param appendBuffer The buffer containing the new string resulting - * from performing substitutions on the original input. - * @param match The current match causing a substitution to be made. ---- jakarta-oro-2.0.8/src/java/org/apache/oro/text/regex/Substitution.java 2022-03-19 12:16:14.323229032 +0100 -+++ jakarta-oro-2.0.8/src/java/org/apache/oro/text/regex/Substitution.java 2022-03-19 13:42:39.014381345 +0100 -@@ -104,7 +104,7 @@ - * of Util.substitute. Its value starts at 1 when the first substitution - * is found and appendSubstitution is invoked for the first time. It - * will NEVER be zero or a negative value. -- *

      -+ * - * @param appendBuffer The buffer containing the new string resulting - * from performing substitutions on the original input. - * @param match The current match causing a substitution to be made. ---- jakarta-oro-2.0.8/src/java/org/apache/oro/text/regex/Util.java 2022-03-19 12:16:14.323229032 +0100 -+++ jakarta-oro-2.0.8/src/java/org/apache/oro/text/regex/Util.java 2022-03-19 13:41:05.573818936 +0100 -@@ -124,21 +124,21 @@ - * This method is inspired by the Perl split() function and behaves - * identically to it when used in conjunction with the Perl5Matcher and - * Perl5Pattern classes except for the following difference: -- *

        -+ *

        - * In Perl, if the split expression contains parentheses, the split() - * method creates additional list elements from each of the matching - * subgroups in the pattern. In other words: -- *

          -- * split(list, "/([,-])/", "8-12,15,18", Util.SPLIT_ALL)

        -- *

        produces the list containing: -- *

          { "8", "-", "12", ",", "15", ",", "18" }

        -- *

        The OROMatcher split method does not follow this behavior. The -+ *

        -+ * split(list, "/([,-])/", "8-12,15,18", Util.SPLIT_ALL)
        -+ * produces the list containing: -+ *
        { "8", "-", "12", ",", "15", ",", "18" }
        -+ * The OROMatcher split method does not follow this behavior. The - * following list would be produced by OROMatcher: -- *

          { "8", "12", "15", "18" }

        -- *

        To obtain the Perl behavior, use -+ *

        { "8", "12", "15", "18" }
        -+ * To obtain the Perl behavior, use - * {@link org.apache.oro.text.perl.Perl5Util#split}. -- *
      -- *

      -+ * -+ * - * @param results A Collection to which the split results are appended. - * After the method returns, it contains the substrings of the input - * that occur between the regular expression delimiter occurences. -@@ -150,7 +150,7 @@ - * @param pattern The regular expression to use as a split delimiter. - * @param input The String to split. - * @param limit The limit on the number of resulting split elements. -- * Values <= 0 produce the same behavior as using the -+ * Values <= 0 produce the same behavior as using the - * SPLIT_ALL constant which causes the limit to be - * ignored and splits to be performed on all occurrences of - * the pattern. You should use the SPLIT_ALL constant -@@ -186,26 +186,26 @@ - * This method is inspired by the Perl split() function and behaves - * identically to it when used in conjunction with the Perl5Matcher and - * Perl5Pattern classes except for the following difference: -- *

      -- *

        -+ * -+ *
        - * In Perl, if the split expression contains parentheses, the split() - * method creates additional list elements from each of the matching - * subgroups in the pattern. In other words: -- *

          split(list, "/([,-])/", "8-12,15,18")

        -+ *

        split(list, "/([,-])/", "8-12,15,18")

        - *

        produces the list containing: -- *

          { "8", "-", "12", ",", "15", ",", "18" }

        -+ *

        { "8", "-", "12", ",", "15", ",", "18" }

        - *

        The OROMatcher split method does not follow this behavior. The - * following list would be produced by OROMatcher: -- *

          { "8", "12", "15", "18" }

        -+ *

        { "8", "12", "15", "18" }

        - *

        To obtain the Perl behavior, use - * {@link org.apache.oro.text.perl.Perl5Util#split}. -- *

      -+ * - *

      - * This method is identical to calling: - *

      -    * split(matcher, pattern, input, Util.SPLIT_ALL);
      -    * 
      -- *

      -+ * - * @param results A Collection to which all the substrings of - * the input that occur between the regular expression delimiter - * occurences are appended. -@@ -231,27 +231,27 @@ - * This method is inspired by the Perl split() function and behaves - * identically to it when used in conjunction with the Perl5Matcher and - * Perl5Pattern classes except for the following difference: -- *

        -+ *

        - * In Perl, if the split expression contains parentheses, the split() - * method creates additional list elements from each of the matching - * subgroups in the pattern. In other words: -- *

          split("/([,-])/", "8-12,15,18")

        -+ *

        split("/([,-])/", "8-12,15,18")

        - *

        produces the Vector containing: -- *

          { "8", "-", "12", ",", "15", ",", "18" }

        -+ *

        { "8", "-", "12", ",", "15", ",", "18" }

        - *

        The OROMatcher split method does not follow this behavior. The - * following Vector would be produced by OROMatcher: -- *

          { "8", "12", "15", "18" }

        -+ *

        { "8", "12", "15", "18" }

        - *

        To obtain the Perl behavior, use - * {@link org.apache.oro.text.perl.Perl5Util#split}. -- *

      -- *

      -+ * -+ * - * @deprecated Use - * {@link #split(Collection, PatternMatcher, Pattern, String, int)} instead. - * @param matcher The regular expression matcher to execute the split. - * @param pattern The regular expression to use as a split delimiter. - * @param input The String to split. - * @param limit The limit on the size of the returned Vector. -- * Values <= 0 produce the same behavior as using the -+ * Values <= 0 produce the same behavior as using the - * SPLIT_ALL constant which causes the limit to be - * ignored and splits to be performed on all occurrences of - * the pattern. You should use the SPLIT_ALL constant -@@ -282,26 +282,26 @@ - * This method is inspired by the Perl split() function and behaves - * identically to it when used in conjunction with the Perl5Matcher and - * Perl5Pattern classes except for the following difference: -- *

      -- *

        -+ * -+ *
        - * In Perl, if the split expression contains parentheses, the split() - * method creates additional list elements from each of the matching - * subgroups in the pattern. In other words: -- *

          split("/([,-])/", "8-12,15,18")

        -+ *

        split("/([,-])/", "8-12,15,18")

        - *

        produces the Vector containing: -- *

          { "8", "-", "12", ",", "15", ",", "18" }

        -+ *

        { "8", "-", "12", ",", "15", ",", "18" }

        - *

        The OROMatcher split method does not follow this behavior. The - * following Vector would be produced by OROMatcher: -- *

          { "8", "12", "15", "18" }

        -+ *

        { "8", "12", "15", "18" }

        - *

        To obtain the Perl behavior, use - * {@link org.apache.oro.text.perl.Perl5Util#split}. -- *

      -+ * - *

      - * This method is identical to calling: - *

      -    * split(matcher, pattern, input, Util.SPLIT_ALL);
      -    * 
      -- *

      -+ * - * @deprecated Use - * {@link #split(Collection, PatternMatcher, Pattern, String)} instead. - * @param matcher The regular expression matcher to execute the split. -@@ -324,7 +324,7 @@ - * substitutions specified by the numSubs parameter. A - * numSubs value of SUBSTITUTE_ALL will cause all occurrences - * of the pattern to be replaced. -- *

      -+ * - * @param matcher The regular expression matcher to execute the pattern - * search. - * @param pattern The regular expression to search for and substitute -@@ -362,7 +362,7 @@ - *

      -    * substitute(matcher, pattern, sub, input, 1);
      -    * 
      -- *

      -+ * - * @param matcher The regular expression matcher to execute the pattern - * search. - * @param pattern The regular expression to search for and substitute -@@ -387,7 +387,7 @@ - * numSubs value of SUBSTITUTE_ALL will cause all occurrences - * of the pattern to be replaced. The number of substitutions made - * is returned. -- *

      -+ * - * @param result The StringBuffer in which to store the result of the - * substitutions. The buffer is only appended to. - * @param matcher The regular expression matcher to execute the pattern -@@ -419,7 +419,7 @@ - * numSubs value of SUBSTITUTE_ALL will cause all occurrences - * of the pattern to be replaced. The number of substitutions made - * is returned. -- *

      -+ * - * @param result The StringBuffer in which to store the result of the - * substitutions. The buffer is only appended to. - * @param matcher The regular expression matcher to execute the pattern ---- jakarta-oro-2.0.8/src/java/org/apache/oro/util/CacheFIFO2.java 2022-03-19 12:16:14.327229056 +0100 -+++ jakarta-oro-2.0.8/src/java/org/apache/oro/util/CacheFIFO2.java 2022-03-19 13:32:23.082677072 +0100 -@@ -84,7 +84,7 @@ - - /** - * Creates a CacheFIFO2 instance with a given cache capacity. -- *

      -+ * - * @param capacity The capacity of the cache. - */ - public CacheFIFO2(int capacity) { -@@ -127,7 +127,7 @@ - * Adds a value to the cache. If the cache is full, when a new value - * is added to the cache, it replaces the first of the current values - * in the cache to have been added (i.e., FIFO2). -- *

      -+ * - * @param key The key referencing the value added to the cache. - * @param value The value to add to the cache. - */ ---- jakarta-oro-2.0.8/src/java/org/apache/oro/util/CacheFIFO.java 2022-03-19 12:16:14.327229056 +0100 -+++ jakarta-oro-2.0.8/src/java/org/apache/oro/util/CacheFIFO.java 2022-03-19 13:32:00.530541472 +0100 -@@ -77,7 +77,7 @@ - - /** - * Creates a CacheFIFO instance with a given cache capacity. -- *

      -+ * - * @param capacity The capacity of the cache. - */ - public CacheFIFO(int capacity) { -@@ -100,7 +100,7 @@ - * Adds a value to the cache. If the cache is full, when a new value - * is added to the cache, it replaces the first of the current values - * in the cache to have been added (i.e., FIFO). -- *

      -+ * - * @param key The key referencing the value added to the cache. - * @param value The value to add to the cache. - */ ---- jakarta-oro-2.0.8/src/java/org/apache/oro/util/Cache.java 2022-03-19 12:16:14.327229056 +0100 -+++ jakarta-oro-2.0.8/src/java/org/apache/oro/util/Cache.java 2022-03-19 13:25:00.216014347 +0100 -@@ -75,7 +75,7 @@ - * Returns the number of elements in the cache, not to be confused with - * the {@link #capacity()} which returns the number - * of elements that can be held in the cache at one time. -- *

      -+ * - * @return The current size of the cache (i.e., the number of elements - * currently cached). - */ -@@ -84,7 +84,7 @@ - - /** - * Returns the maximum number of elements that can be cached at one time. -- *

      -+ * - * @return The maximum number of elements that can be cached at one time. - */ - public int capacity(); ---- jakarta-oro-2.0.8/src/java/org/apache/oro/util/CacheLRU.java 2022-03-19 12:16:14.327229056 +0100 -+++ jakarta-oro-2.0.8/src/java/org/apache/oro/util/CacheLRU.java 2022-03-19 13:32:47.362823055 +0100 -@@ -78,7 +78,7 @@ - - /** - * Creates a CacheLRU instance with a given cache capacity. -- *

      -+ * - * @param capacity The capacity of the cache. - */ - public CacheLRU(int capacity) { -@@ -154,7 +154,7 @@ - * Adds a value to the cache. If the cache is full, when a new value - * is added to the cache, it replaces the least recently used value - * in the cache (i.e., LRU). -- *

      -+ * - * @param key The key referencing the value added to the cache. - * @param value The value to add to the cache. - */ ---- jakarta-oro-2.0.8/src/java/org/apache/oro/util/CacheRandom.java 2022-03-19 12:16:14.327229056 +0100 -+++ jakarta-oro-2.0.8/src/java/org/apache/oro/util/CacheRandom.java 2022-03-19 13:33:07.690945277 +0100 -@@ -76,7 +76,7 @@ - - /** - * Creates a CacheRandom instance with a given cache capacity. -- *

      -+ * - * @param capacity The capacity of the cache. - */ - public CacheRandom(int capacity) { -@@ -98,7 +98,7 @@ - * Adds a value to the cache. If the cache is full, when a new value - * is added to the cache, it replaces the first of the current values - * in the cache to have been added (i.e., Random). -- *

      -+ * - * @param key The key referencing the value added to the cache. - * @param value The value to add to the cache. - */ ---- jakarta-oro-2.0.8/src/java/org/apache/oro/util/GenericCache.java 2022-03-19 12:16:14.327229056 +0100 -+++ jakarta-oro-2.0.8/src/java/org/apache/oro/util/GenericCache.java 2022-03-19 13:31:00.474180375 +0100 -@@ -95,7 +95,7 @@ - * _table to a Hashtable of capacity equal to the capacity argument, - * _cache to an array of size equal to the capacity argument, and - * _numEntries to 0. -- *

      -+ * - * @param capacity The maximum capacity of the cache. - */ - GenericCache(int capacity) { -@@ -128,7 +128,7 @@ - * Returns the number of elements in the cache, not to be confused with - * the {@link #capacity()} which returns the number - * of elements that can be held in the cache at one time. -- *

      -+ * - * @return The current size of the cache (i.e., the number of elements - * currently cached). - */ -@@ -136,7 +136,7 @@ - - /** - * Returns the maximum number of elements that can be cached at one time. -- *

      -+ * - * @return The maximum number of elements that can be cached at one time. - */ - public final int capacity() { return _cache.length; } diff --git a/oro.changes b/oro.changes index 07a8165..4f36a0a 100644 --- a/oro.changes +++ b/oro.changes @@ -2,9 +2,6 @@ Sat Mar 19 12:44:52 UTC 2022 - Fridrich Strba - Build with source/target levels 8 -- Added patch: - * oro-javadoc.patch - + fix javadoc errors that prevent the generation with jdk 17 ------------------------------------------------------------------- Thu Feb 14 08:46:56 UTC 2019 - Fridrich Strba diff --git a/oro.spec b/oro.spec index 1829a3f..ac638d3 100644 --- a/oro.spec +++ b/oro.spec @@ -26,7 +26,6 @@ Group: Development/Libraries/Java URL: https://jakarta.apache.org/oro/ Source0: https://archive.apache.org/dist/jakarta/oro/%{full_name}-%{version}.tar.gz Source1: https://repo1.maven.org/maven2/%{name}/%{name}/%{version}/%{name}-%{version}.pom -Patch0: oro-javadoc.patch BuildRequires: ant BuildRequires: fdupes BuildRequires: java-devel >= 1.8 @@ -56,7 +55,6 @@ Javadoc for %{name}. %prep %setup -q -n %{full_name}-%{version} -%patch0 -p1 # remove all binary libs find . -name "*.jar" -exec rm -f {} \; # remove all CVS files @@ -66,7 +64,7 @@ for file in `find . -type f -name .cvsignore`; do rm -rf $file; done perl -pi -e 's#\@version\@#VERSION#g' $(grep -rl \@version\@ . |xargs) %build -ant \ +%ant \ -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 \ -Dfinal.name=%{name} jar javadocs