Author: kiwiwings
Date: Fri Dec 31 00:39:52 2021
New Revision: 1896563
URL: http://svn.apache.org/viewvc?rev=1896563&view=rev
Log:
fix javadoc issues with 1.8 javadoc lint, which complaints about ">" opposed to
later versions
Modified:
xmlbeans/trunk/ (props changed)
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDate.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDateBuilder.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDateSpecification.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XmlEncodingSniffer.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/config/NameSetBuilder.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/inst2xsd/Inst2XsdOptions.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/regex/REUtil.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/regex/RegularExpression.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/Node.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/XMLBean.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/util/HexBin.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/util/XsTypeConverter.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/soap/SOAPArrayType.java
Propchange: xmlbeans/trunk/
------------------------------------------------------------------------------
Merged /xmlbeans/branches/gradle-build:r1896561-1896562
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDate.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDate.java?rev=1896563&r1=1896562&r2=1896563&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDate.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDate.java Fri Dec 31
00:39:52 2021
@@ -882,7 +882,7 @@ public final class GDate implements GDat
/**
* The natural string representation. This represents the information
* that is available, including timezone. For types that correspond
- * to defined schema types (schemaBuiltinTypeCode() > 0),
+ * to defined schema types (schemaBuiltinTypeCode() > 0),
* this provides the natural lexical representation.
* <p>
* When both time and timezone are specified, this string is not
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDateBuilder.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDateBuilder.java?rev=1896563&r1=1896562&r2=1896563&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDateBuilder.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDateBuilder.java Fri Dec
31 00:39:52 2021
@@ -1502,7 +1502,7 @@ public final class GDateBuilder implemen
/**
* The natural string representation. This represents the information
* that is available, including timezone. For types that correspond
- * to defined schema types (schemaBuiltinTypeCode() > 0),
+ * to defined schema types (schemaBuiltinTypeCode() > 0),
* this provides the natural lexical representation.
* <p>
* When both time and timezone are specified, this string is not
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDateSpecification.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDateSpecification.java?rev=1896563&r1=1896562&r2=1896563&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDateSpecification.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDateSpecification.java
Fri Dec 31 00:39:52 2021
@@ -225,7 +225,7 @@ public interface GDateSpecification
/**
* The natural string representation. This represents the information
* that is available, including timezone. For types that correspond
- * to defined schema types (schemaBuiltinTypeCode() > 0),
+ * to defined schema types (schemaBuiltinTypeCode() > 0),
* this provides the natural lexical representation.
*
* When both time and timezone are specified, this string is not
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XmlEncodingSniffer.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XmlEncodingSniffer.java?rev=1896563&r1=1896562&r2=1896563&view=diff
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XmlEncodingSniffer.java
(original)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XmlEncodingSniffer.java
Fri Dec 31 00:39:52 2021
@@ -15,11 +15,7 @@
package org.apache.xmlbeans.impl.common;
-import java.io.Reader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
-import java.io.IOException;
+import java.io.*;
public class XmlEncodingSniffer
{
@@ -37,14 +33,12 @@ public class XmlEncodingSniffer
*
* @param stream The stream to sniff
* @param encodingOverride The XML (IANA) name for the overriding encoding
- * @throws IOException
- * @throws UnsupportedEncodingException
*/
public XmlEncodingSniffer(InputStream stream, String encodingOverride)
throws IOException, UnsupportedEncodingException
{
_stream = stream;
-
+
if (encodingOverride != null)
_xmlencoding = EncodingMap.getJava2IANAMapping(encodingOverride);
@@ -60,10 +54,10 @@ public class XmlEncodingSniffer
}
_javaencoding = EncodingMap.getIANA2JavaMapping(_xmlencoding);
-
+
// we allow you to use Java's encoding names in XML even though you're
// not supposed to.
-
+
if (_javaencoding == null)
_javaencoding = _xmlencoding;
}
@@ -85,7 +79,7 @@ public class XmlEncodingSniffer
{
if (encodingDefault == null)
encodingDefault = "UTF-8";
-
+
SniffedXmlReader sniffedReader = new SniffedXmlReader(reader);
_reader = sniffedReader;
_xmlencoding = sniffedReader.getXmlEncoding();
@@ -101,12 +95,12 @@ public class XmlEncodingSniffer
if (_xmlencoding == null)
_xmlencoding = "UTF-8";
-
+
// we allow you to use Java's encoding names in XML even though you're
// not supposed to.
-
+
_javaencoding = EncodingMap.getIANA2JavaMapping(_xmlencoding);
-
+
if (_javaencoding == null)
_javaencoding = _xmlencoding;
}
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/config/NameSetBuilder.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/config/NameSetBuilder.java?rev=1896563&r1=1896562&r2=1896563&view=diff
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/config/NameSetBuilder.java
(original)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/config/NameSetBuilder.java
Fri Dec 31 00:39:52 2021
@@ -39,7 +39,6 @@ public class NameSetBuilder
/**
* Adds a name to the representing NameSet
- * @param name
*/
public void add(String name) {
if (_isFinite) {
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/inst2xsd/Inst2XsdOptions.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/inst2xsd/Inst2XsdOptions.java?rev=1896563&r1=1896562&r2=1896563&view=diff
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/inst2xsd/Inst2XsdOptions.java
(original)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/inst2xsd/Inst2XsdOptions.java
Fri Dec 31 00:39:52 2021
@@ -61,7 +61,7 @@ public class Inst2XsdOptions
o Russian Doll Design
o Salami Slice Design
o Venetian Blind Design
- * @param designType
+
* @see #DESIGN_RUSSIAN_DOLL
* @see #DESIGN_SALAMI_SLICE
* @see #DESIGN_VENETIAN_BLIND
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/regex/REUtil.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/regex/REUtil.java?rev=1896563&r1=1896562&r2=1896563&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/regex/REUtil.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/regex/REUtil.java Fri
Dec 31 00:39:52 2021
@@ -168,7 +168,7 @@ public final class REUtil {
/**
* Sample entry.
- * <div>Usage: <KBD>org.apache.xerces.utils.regex.REUtil <regex>
<string></KBD></div>
+ * <div>Usage: org.apache.xerces.utils.regex.REUtil <regex>
<string></div>
*/
public static void main(String[] argv) {
String pattern = null;
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/regex/RegularExpression.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/regex/RegularExpression.java?rev=1896563&r1=1896562&r2=1896563&view=diff
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/regex/RegularExpression.java
(original)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/regex/RegularExpression.java
Fri Dec 31 00:39:52 2021
@@ -49,10 +49,10 @@ import java.util.Stack;
* </dl>
*
* <h3>Case-insensitive matching</h3>
- * <pre>
- * RegularExpression re = new RegularExpression(<var>regex</var>, "i");
+ * <pre>{@code
+ * RegularExpression re = new RegularExpression(regex, "i");
* if (re.matches(text) >= 0) { ...}
- * </pre>
+ * }</pre>
*
* <h3>Options</h3>
* <p>You can specify options to {@link #RegularExpression(java.lang.String,
java.lang.String)}
@@ -67,12 +67,12 @@ import java.util.Stack;
* <dt><a id="S_OPTION"><code>"s"</code></a>
* <dd class="REGEX">. matches any one character.
* <dt><a id="U_OPTION"><code>"u"</code></a>
- * <dd class="REGEX">Redefines \d \D \w \W \s \S \b \B \< \> as becoming
to Unicode.
+ * <dd class="REGEX">Redefines \d \D \w \W \s \S \b \B \< \> as
becoming to Unicode.
* <dt><a id="W_OPTION"><code>"w"</code></a>
- * <dd class="REGEX">By this option, \b \B \< \> are processed with the
method of
+ * <dd class="REGEX">By this option, \b \B \< \> are processed with
the method of
* 'Unicode Regular Expression Guidelines' Revision 4.
* When "w" and "u" are specified at the same time,
- * \b \B \< \> are processed for the "w" option.
+ * \b \B \< \> are processed for the "w" option.
* <dt><a id="COMMA_OPTION"><code>","</code></a>
* <dd>The parser treats a comma in a character class as a range separator.
* [a,b] matches a or , or b without this option.
@@ -163,7 +163,7 @@ import java.util.Stack;
* <li class="REGEX">A character (including \e \f \n \r \t
\u005cx<var>HH</var> \u005cx{<var>HHHH</var>} \u005cv<var>HHHHHH</var>)
* <p>This range matches the character.
* <li class="REGEX"><var>C<sub>1</sub></var>-<var>C<sub>2</sub></var>
- * <p>This range matches a character which has a code point that
is >= <var>C<sub>1</sub></var>'s code point and <=
<var>C<sub>2</sub></var>'s code point.
+ * <p>This range matches a character which has a code point that
is >= <var>C<sub>1</sub></var>'s code point and <=
<var>C<sub>2</sub></var>'s code point.
* <li class="REGEX">A POSIX character class: [:alpha:] [:alnum:]
[:ascii:] [:cntrl:] [:digit:] [:graph:] [:lower:] [:print:] [:punct:] [:space:]
[:upper:] [:xdigit:],
* and negative POSIX character classes in Perl like [:^alpha:]
* <p>...
@@ -324,7 +324,7 @@ import java.util.Stack;
*
* <dt class="REGEX">\1 \2 \3 \4 \5 \6 \7 \8 \9
*
- * <dt class="REGEX">(?><var>X</var>)
+ * <dt class="REGEX">(?><var>X</var>)
* <dd>Independent expression group. ................
*
* <dt class="REGEX">(?<var>options</var>:<var>X</var>)
@@ -422,10 +422,10 @@ import java.util.Stack;
* minmax ::= '{' ([0-9]+ | [0-9]+ ',' | ',' [0-9]+ | [0-9]+ ',' [0-9]+) '}'
* atom ::= char | '.' | char-class | '(' regex ')' | '(?:' regex ')' | '\'
[0-9]
* | '\w' | '\W' | '\d' | '\D' | '\s' | '\S' | category-block | '\X'
- * | '(?>' regex ')' | '(?' options ':' regex ')'
+ * | '(?>' regex ')' | '(?' options ':' regex ')'
* | '(?' ('(' [0-9] ')' | '(' anchors ')' | looks) term ('|' term)?
')'
* options ::= [imsw]* ('-' [imsw]+)?
- * anchors ::= '^' | '$' | '\A' | '\Z' | '\z' | '\b' | '\B' | '\<' | '\>'
+ * anchors ::= '^' | '$' | '\A' | '\Z' | '\z' | '\b' | '\B' | '\<' | '\>'
* looks ::= '(?=' regex ')' | '(?!' regex ')'
* | '(?<=' regex ')' | '(?<!' regex ')'
* char ::= '\\' | '\' [efnrtv] | '\c' [@-_] | code-point | character-1
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/Node.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/Node.java?rev=1896563&r1=1896562&r2=1896563&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/Node.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/Node.java Fri
Dec 31 00:39:52 2021
@@ -53,7 +53,7 @@ public interface Node extends org.w3c.do
* this {@code Node} object or {@code null} if this
* {@code Node} object is root
* @throws java.lang.UnsupportedOperationException if the whole tree is
not kept in memory
- * @see #setParentElement(javax.xml.soap.SOAPElement)
setParentElement(javax.xml.soap.SOAPElement)
+ * @see #setParentElement(SOAPElement)
*/
public abstract SOAPElement getParentElement();
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/XMLBean.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/XMLBean.java?rev=1896563&r1=1896562&r2=1896563&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/XMLBean.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/XMLBean.java Fri
Dec 31 00:39:52 2021
@@ -510,7 +510,7 @@ public class XMLBean extends MatchingTas
* Keyword list to be appended to the -g command-line switch.
* <p>
* This will be ignored by all implementations except modern
- * and classic(ver >= 1.2). Legal values are none or a
+ * and classic(ver >= 1.2). Legal values are none or a
* comma-separated list of the following keywords: lines, vars,
* and source. If debuglevel is not specified, by default, :none
* will be appended to -g. If debug is not turned on, this attribute
@@ -573,7 +573,7 @@ public class XMLBean extends MatchingTas
}
/**
- * One or more SchemaCompiler extensions can be passed in via the
<extension> subelement.
+ * One or more SchemaCompiler extensions can be passed in via the {@code
<extension>} subelement.
* Schema Compiler extensions must implement the interface
org.apache.xmlbeans.impl.tool.SchemaCompilerExtension
*/
public Extension createExtension() {
@@ -584,7 +584,7 @@ public class XMLBean extends MatchingTas
/**
* One or more namespaces in which duplicate definitions are to be ignored
- * can be passed in via the <ignoreDuplicatesInNamespaces> subelement.
+ * can be passed in via the {@code <ignoreDuplicatesInNamespaces>}
subelement.
*/
public void setIgnoreDuplicatesInNamespaces(String namespaces) {
mdefnamespaces = new HashSet<>();
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/util/HexBin.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/util/HexBin.java?rev=1896563&r1=1896562&r2=1896563&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/util/HexBin.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/util/HexBin.java Fri
Dec 31 00:39:52 2021
@@ -53,9 +53,6 @@ public final class HexBin {
/**
* byte to be tested if it is Base64 alphabet
- *
- * @param octect
- * @return
*/
static boolean isHex(byte octect) {
return (hexNumberTable[octect] != -1);
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/util/XsTypeConverter.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/util/XsTypeConverter.java?rev=1896563&r1=1896562&r2=1896563&view=diff
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/util/XsTypeConverter.java
(original)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/util/XsTypeConverter.java
Fri Dec 31 00:39:52 2021
@@ -643,7 +643,6 @@ public final class XsTypeConverter {
*
* @param lexical_value the lexical value
* @return same input value if input value is in the lexical space
- * @throws InvalidLexicalValueException
*/
public static CharSequence lexAnyURI(CharSequence lexical_value) {
/* // Reg exp from RFC2396, but it's too forgiving for XQTS
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/soap/SOAPArrayType.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/soap/SOAPArrayType.java?rev=1896563&r1=1896562&r2=1896563&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/soap/SOAPArrayType.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/soap/SOAPArrayType.java
Fri Dec 31 00:39:52 2021
@@ -144,7 +144,7 @@ public final class SOAPArrayType {
* E.g.,
* Nested foo:bar[,][][,,][1,2]
* Dimensions [6,7,8]
- * Result -> foo:bar[,][][,,][,][6,7,8]
+ * Result -> foo:bar[,][][,,][,][6,7,8]
*/
public SOAPArrayType(SOAPArrayType nested, int[] dimensions) {
_type = nested._type;
@@ -236,7 +236,7 @@ public final class SOAPArrayType {
/**
* True if this array contains nested arrays. Equivalent
- * to (getRanks().length > 0).
+ * to (getRanks().length > 0).
*/
public boolean containsNestedArrays() {
return (_ranks.length > 0);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
