You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ki...@apache.org on 2021/12/29 14:19:08 UTC
svn commit: r1896508 [2/5] - in /xmlbeans/branches/gradle-build: ./ src/main/java/org/apache/xmlbeans/ src/main/java/org/apache/xmlbeans/impl/common/ src/main/java/org/apache/xmlbeans/impl/inst2xsd/ src/main/java/org/apache/xmlbeans/impl/inst2xsd/util/...
Modified: xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/XmlOptionCharEscapeMap.java
URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/XmlOptionCharEscapeMap.java?rev=1896508&r1=1896507&r2=1896508&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/XmlOptionCharEscapeMap.java (original)
+++ xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/XmlOptionCharEscapeMap.java Wed Dec 29 14:19:07 2021
@@ -26,9 +26,8 @@ import java.util.Map;
* latter option applies only to the 5 characters defined as predefined entities
* in the XML Spec).
* <p>
- * <ul>
* For example:
- * <pre>
+ * <pre>{@code
* XmlOptionCharEscapeMap escapes = new XmlOptionCharEscapeMap();
* escapes.addMapping('A', XmlOptionCharEscapeMap.HEXADECIMAL);
* escapes.addMapping('B', XmlOptionCharEscapeMap.DECIMAL);
@@ -43,7 +42,7 @@ import java.util.Map;
* B being printed as B
* > being printed as >
*
- * </pre>
+ * }</pre>
*/
public class XmlOptionCharEscapeMap {
public static final int PREDEF_ENTITY = 0;
Modified: xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/XmlOptions.java
URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/XmlOptions.java?rev=1896508&r1=1896507&r2=1896508&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/XmlOptions.java (original)
+++ xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/XmlOptions.java Wed Dec 29 14:19:07 2021
@@ -28,55 +28,56 @@ import java.util.*;
* <p>
* There are two styles for using XmlOptions: multiline setup, and single-line use.
* Here are two examples. First, multiline style:
- * <pre>
+ * <pre>{@code
* XmlOptions opts = new XmlOptions();
* opts.setSavePrettyPrint();
* opts.setSavePrettyPrintIndent(4);
* System.out.println(xobj.xmlText(opts));
- * </pre>
+ * }</pre>
* <p>
* The alternative is single-line usage:
- * <pre>
+ * <pre>{@code
* System.out.println(xobj.xmlText(
* new XmlOptions().setSavePrettyPrint().setSavePrettyPrintIndent(4)));
- * </pre>
+ * }</pre>
* <p>
* Table showing where each option gets used.
* Note that:
* <ul>
- * <li>options available for <code>newInstance</code> methods will also
- * apply for <code>parse</code> methods</li>
- * <li>options used for <code>validate</code> methods are also used for
- * <code>compile</code> methods, since compilation usually implies
+ * <li>options available for {@code newInstance} methods will also
+ * apply for {@code parse} methods</li>
+ * <li>options used for {@code validate} methods are also used for
+ * {@code compile} methods, since compilation usually implies
* validation against Schema for Schemas</li>
* </ul>
*
* <table border="1">
+ * <caption>Option matrix</caption>
* <tr>
- * <th align="center"><code>newInstance</code> methods</th>
- * <th align="center"><code>parse</code> methods</th>
- * <th align="center"><code>validate</code> methods</th>
- * <th align="center"><code>compile</code> methods</th>
- * <th align="center"><code>save</code> and <code>xmlText</code>methods</th>
+ * <th>{@code newInstance} methods</th>
+ * <th>{@code parse} methods</th>
+ * <th>{@code validate} methods</th>
+ * <th>{@code compile} methods</th>
+ * <th>{@code save} and {@code xmlText}methods</th>
* </tr>
* <tr>
- * <td align="center"><code>setDocumentType</code><br/>
- * <code>setDocumentSourceName</code><br/>
- * <code>setValidateOnSet</code><br/>
- * <code>setUnsynchronized</code></td>
- * <td align="center"><code>setLoad***</code><br/>
- * <code>setEntityResolver</code></td>
- * <td align="center"><code>setErrorListener</code><br/>
- * <code>setValidateTreatLaxAsSkip</code>
- * <code>setValidateStrict</code></td>
- * <td align="center"><code>setErrorListener</code><br/>
- * <code>setCompile***</code><br/>
- * <code>setEntityResolver</code><br/>
- * <code>setBaseURI</code><br/>
- * <code>setGenerateJavaVersion</code></td>
- * <td align="center"><code>setSave***</code><br/>
- * <code>setUseDefaultNamespace</code><br/>
- * <code>setCharacterEncoding</code></td>
+ * <td>{@code setDocumentType}<br>
+ * {@code setDocumentSourceName}<br>
+ * {@code setValidateOnSet}<br>
+ * {@code setUnsynchronized}</td>
+ * <td>{@code setLoad***}<br>
+ * {@code setEntityResolver}</td>
+ * <td>{@code setErrorListener}<br>
+ * {@code setValidateTreatLaxAsSkip}
+ * {@code setValidateStrict}</td>
+ * <td>{@code setErrorListener}<br>
+ * {@code setCompile***}<br>
+ * {@code setEntityResolver}<br>
+ * {@code setBaseURI}<br>
+ * {@code setGenerateJavaVersion}</td>
+ * <td>{@code setSave***}<br>
+ * {@code setUseDefaultNamespace}<br>
+ * {@code setCharacterEncoding}</td>
* </tr>
* </table>
*/
@@ -232,7 +233,7 @@ public class XmlOptions implements java.
/**
- * When used with <code>setSavePrettyPrint</code> this sets the indent
+ * When used with {@code setSavePrettyPrint} this sets the indent
* amount to use.
*
* @param indent the indent amount to use
@@ -249,7 +250,7 @@ public class XmlOptions implements java.
}
/**
- * When used with <code>setSavePrettyPrint</code> this sets the offset
+ * When used with {@code setSavePrettyPrint} this sets the offset
* amount to use.
*
* @param offset the offset amount to use
@@ -270,7 +271,7 @@ public class XmlOptions implements java.
* encoding to use.
*
* @param encoding the character encoding
- * @see XmlObject.Factory#parse(java.io.File, XmlOptions)
+ * @see org.apache.xmlbeans.impl.schema.XmlObjectFactory#parse(java.io.File, XmlOptions)
* @see XmlTokenSource#save(java.io.File, XmlOptions)
*/
public XmlOptions setCharacterEncoding(String encoding) {
@@ -284,10 +285,10 @@ public class XmlOptions implements java.
/**
* When parsing a document, this sets the type of the root
* element. If this is set, the parser will not try to guess
- * the type based on the document's <code>QName</code>.
+ * the type based on the document's {@code QName}.
*
* @param type The root element's document type.
- * @see XmlObject.Factory#parse(java.io.File, XmlOptions)
+ * @see org.apache.xmlbeans.impl.schema.XmlObjectFactory#parse(java.io.File, XmlOptions)
*/
public XmlOptions setDocumentType(SchemaType type) {
return set(XmlOptionsKeys.DOCUMENT_TYPE, type);
@@ -308,7 +309,7 @@ public class XmlOptions implements java.
* <p>The following simple example illustrates using an error listener
* during validation.</p>
*
- * <pre>
+ * <pre>{@code
* // Create an XmlOptions instance and set the error listener.
* XmlOptions validateOptions = new XmlOptions();
* ArrayList errorList = new ArrayList();
@@ -331,12 +332,12 @@ public class XmlOptions implements java.
* error.getCursorLocation().xmlText() + "\n");
* }
* }
- * </pre>
+ * }</pre>
*
* @param c A collection that will be filled with {@link XmlError} objects
* via {@link Collection#add}
* @see XmlError
- * @see XmlObject.Factory#parse(java.io.File, XmlOptions)
+ * @see org.apache.xmlbeans.impl.schema.XmlObjectFactory#parse(java.io.File, XmlOptions)
* @see XmlObject#validate(XmlOptions)
* @see XmlBeans#compileXsd
* @see XmlOptions#setLoadLineNumbers
@@ -540,7 +541,7 @@ public class XmlOptions implements java.
/**
* This option controls whether saving saves out the XML
- * declaration (<?xml ... ?>
+ * declaration {@code <?xml ... ?>}
*
* @see XmlTokenSource#save(java.io.File, XmlOptions)
* @see XmlTokenSource#xmlText(XmlOptions)
@@ -561,11 +562,12 @@ public class XmlOptions implements java.
/**
* This option controls when saving will use CDATA blocks.
* CDATA will be used if the folowing condition is true:
- * <br/>textLength > cdataLengthThreshold && entityCount > cdataEntityCountThreshold
- * <br/>The default value of cdataLengthThreshold is 32.
- * <br/>
- * <br/>Use the folowing values for these cases:
+ * <br>{@code textLength > cdataLengthThreshold && entityCount > cdataEntityCountThreshold}
+ * <br>The default value of cdataLengthThreshold is 32.
+ * <br>
+ * <br>Use the folowing values for these cases:
* <table border=1>
+ * <caption>Option matrix</caption>
* <tr><th>Scenario</th> <th>cdataLengthThreshold</th> <th>cdataEntityCountThreshold</th></tr>
* <tr><td>Every text is CDATA</td> <td>0</td> <td>-1</td></tr>
* <tr><td>Only text that has an entity is CDATA</td> <td>0</td> <td>0</td></tr>
@@ -588,8 +590,8 @@ public class XmlOptions implements java.
/**
* This option controls when saving will use CDATA blocks.
* CDATA will be used if the folowing condition is true:
- * <br/>textLength > cdataLengthThreshold && entityCount > cdataEntityCountThreshold
- * <br/>The default value of cdataEntityCountThreshold is 5.
+ * <br>{@code textLength > cdataLengthThreshold && entityCount > cdataEntityCountThreshold}
+ * <br>The default value of cdataEntityCountThreshold is 5.
*
* @see XmlOptions#setSaveCDataLengthThreshold(int)
*/
@@ -613,36 +615,34 @@ public class XmlOptions implements java.
*
* <p><b>Note: Due to the store representation, a CDATA will not be recognized
* if it is imediately after non CDATA text and all text following it will
- * be considered CDATA.</b><br/>
+ * be considered CDATA.</b><br>
* Example:<br>
- * <pre>
- * <a><![CDATA[cdata text]]></a> - is considered as: <a><![CDATA[cdata text]]></a>
- * <b><![CDATA[cdata text]]> regular text</b> - is considered as: <b><![CDATA[cdata text regular text]]></b>
- * <c>text <![CDATA[cdata text]]></c> - is considered as: <c>text cdata text</c>
- * </pre>
- * </p>
+ * <pre>{@code
+ * <a><![CDATA[cdata text]]></a> - is considered as: <a><![CDATA[cdata text]]></a>
+ * <b><![CDATA[cdata text]]> regular text</b> - is considered as: <b><![CDATA[cdata text regular text]]></b>
+ * <c>text <![CDATA[cdata text]]></c> - is considered as: <c>text cdata text</c>
+ * }</pre>
*
* <p>Sample code:
- * <pre>
- * String xmlText = "<a>\n" +
- * "<a><![CDATA[cdata text]]></a>\n" +
- * "<b><![CDATA[cdata text]]> regular text</b>\n" +
- * "<c>text <![CDATA[cdata text]]></c>\n" +
- * "</a>";
+ * <pre>{@code
+ * String xmlText = "<a>\n" +
+ * "<a><![CDATA[cdata text]]></a>\n" +
+ * "<b><![CDATA[cdata text]]> regular text</b>\n" +
+ * "<c>text <![CDATA[cdata text]]></c>\n" +
+ * "</a>";
* System.out.println(xmlText);
*
* XmlOptions opts = new XmlOptions();
* opts.setUseCDataBookmarks();
*
- * XmlObject xo = XmlObject.Factory.parse( xmlText , opts);
+ * XmlObject xo = org.apache.xmlbeans.impl.schema.XmlObjectFactory.parse( xmlText , opts);
*
* System.out.println("xo1:\n" + xo.xmlText(opts));
* System.out.println("\n");
*
* opts.setSavePrettyPrint();
* System.out.println("xo2:\n" + xo.xmlText(opts));
- * </pre>
- * </p>
+ * }</pre>
*
* @see CDataBookmark
* @see CDataBookmark#CDATA_BOOKMARK
@@ -678,7 +678,7 @@ public class XmlOptions implements java.
* given QName when parsing. If null is supplied, the document element
* is removed.
*
- * @see XmlObject.Factory#parse(java.io.File, XmlOptions)
+ * @see org.apache.xmlbeans.impl.schema.XmlObjectFactory#parse(java.io.File, XmlOptions)
*/
public XmlOptions setLoadReplaceDocumentElement(QName replacement) {
return set(XmlOptionsKeys.LOAD_REPLACE_DOCUMENT_ELEMENT, replacement);
@@ -693,7 +693,7 @@ public class XmlOptions implements java.
* when parsing a document. Can be used to save memory on large
* documents when you know there is no mixed content.
*
- * @see XmlObject.Factory#parse(java.io.File, XmlOptions)
+ * @see org.apache.xmlbeans.impl.schema.XmlObjectFactory#parse(java.io.File, XmlOptions)
*/
public XmlOptions setLoadStripWhitespace() {
return setLoadStripWhitespace(true);
@@ -711,7 +711,7 @@ public class XmlOptions implements java.
* If this option is set, all comments are stripped when parsing
* a document.
*
- * @see XmlObject.Factory#parse(java.io.File, XmlOptions)
+ * @see org.apache.xmlbeans.impl.schema.XmlObjectFactory#parse(java.io.File, XmlOptions)
*/
public XmlOptions setLoadStripComments() {
return setLoadStripComments(true);
@@ -729,7 +729,7 @@ public class XmlOptions implements java.
* If this option is set, all processing instructions
* are stripped when parsing a document.
*
- * @see XmlObject.Factory#parse(java.io.File, XmlOptions)
+ * @see org.apache.xmlbeans.impl.schema.XmlObjectFactory#parse(java.io.File, XmlOptions)
*/
public XmlOptions setLoadStripProcinsts() {
return setLoadStripProcinsts(true);
@@ -748,11 +748,11 @@ public class XmlOptions implements java.
* in the store when parsing a document. This is particularly
* useful when you want {@link XmlError} objects to contain
* line numbers.
- * <br/>Note: This adds line numbers info only for start tags.
+ * <br>Note: This adds line numbers info only for start tags.
* For line number info on end tags use:
* {@link XmlOptions#setLoadLineNumbersEndElement()}
*
- * @see XmlObject.Factory#parse(java.io.File, XmlOptions)
+ * @see org.apache.xmlbeans.impl.schema.XmlObjectFactory#parse(java.io.File, XmlOptions)
* @see XmlError
*/
public XmlOptions setLoadLineNumbers() {
@@ -804,7 +804,7 @@ public class XmlOptions implements java.
* definitions without a target namespace.
*
* @param substNamespaces a map of document URIs to replacement URIs
- * @see XmlObject.Factory#parse(java.io.File, XmlOptions)
+ * @see org.apache.xmlbeans.impl.schema.XmlObjectFactory#parse(java.io.File, XmlOptions)
*/
public XmlOptions setLoadSubstituteNamespaces(Map<String, String> substNamespaces) {
return set(XmlOptionsKeys.LOAD_SUBSTITUTE_NAMESPACES, substNamespaces);
@@ -821,7 +821,7 @@ public class XmlOptions implements java.
* footprint. Use this option if you are loading a large number
* of unchanging documents that will stay in memory for some time.
*
- * @see XmlObject.Factory#parse(java.io.File, XmlOptions)
+ * @see org.apache.xmlbeans.impl.schema.XmlObjectFactory#parse(java.io.File, XmlOptions)
*/
public XmlOptions setLoadTrimTextBuffer() {
return setLoadTrimTextBuffer(true);
@@ -840,7 +840,7 @@ public class XmlOptions implements java.
* a document.
*
* @param nses additional namespace mappings
- * @see XmlObject.Factory#parse(java.io.File, XmlOptions)
+ * @see org.apache.xmlbeans.impl.schema.XmlObjectFactory#parse(java.io.File, XmlOptions)
*/
public XmlOptions setLoadAdditionalNamespaces(Map<String, String> nses) {
return set(XmlOptionsKeys.LOAD_ADDITIONAL_NAMESPACES, nses);
@@ -860,7 +860,7 @@ public class XmlOptions implements java.
* The schema compiler uses message digests to detect and eliminate
* duplicate imported xsd files.
*
- * @see XmlObject.Factory#parse(java.io.File, XmlOptions)
+ * @see org.apache.xmlbeans.impl.schema.XmlObjectFactory#parse(java.io.File, XmlOptions)
*/
public XmlOptions setLoadMessageDigest() {
return setLoadMessageDigest(true);
@@ -879,7 +879,7 @@ public class XmlOptions implements java.
* documents (unless an explicit entity resolver is specified).
* Use this option to turn on entity resolving by default.
*
- * @see XmlObject.Factory#parse(java.io.File, XmlOptions)
+ * @see org.apache.xmlbeans.impl.schema.XmlObjectFactory#parse(java.io.File, XmlOptions)
*/
public XmlOptions setLoadUseDefaultResolver() {
return setLoadUseDefaultResolver(true);
@@ -900,7 +900,7 @@ public class XmlOptions implements java.
* For using the default JDK's SAX parser use:
* xmlOptions.setLoadUseXMLReader( SAXParserFactory.newInstance().newSAXParser().getXMLReader() );
*
- * @see XmlObject.Factory#parse(java.io.File, XmlOptions)
+ * @see org.apache.xmlbeans.impl.schema.XmlObjectFactory#parse(java.io.File, XmlOptions)
*/
public XmlOptions setLoadUseXMLReader(XMLReader xmlReader) {
return set(XmlOptionsKeys.LOAD_USE_XMLREADER, xmlReader);
@@ -954,7 +954,7 @@ public class XmlOptions implements java.
* source; otherwise, for example, when parsing a String,
* you can use this option to specify the source name yourself.
*
- * @see XmlObject.Factory#parse(java.lang.String, XmlOptions)
+ * @see org.apache.xmlbeans.impl.schema.XmlObjectFactory#parse(java.lang.String, XmlOptions)
*/
public XmlOptions setDocumentSourceName(String documentSourceName) {
return set(XmlOptionsKeys.DOCUMENT_SOURCE_NAME, documentSourceName);
@@ -965,9 +965,9 @@ public class XmlOptions implements java.
}
/**
- * This option allows for <code>QName</code> substitution during schema compilation.
+ * This option allows for {@code QName} substitution during schema compilation.
*
- * @param nameMap a map from <code>QName</code>s to substitute <code>QName</code>s.
+ * @param nameMap a map from {@code QName}s to substitute {@code QName}s.
* @see XmlBeans#compileXsd
*/
public XmlOptions setCompileSubstituteNames(Map<QName, QName> nameMap) {
@@ -981,7 +981,7 @@ public class XmlOptions implements java.
/**
* If this option is set, validation is not done on the Schema XmlBeans
- * when building a <code>SchemaTypeSystem</code>
+ * when building a {@code SchemaTypeSystem}
*
* @see XmlBeans#compileXsd
*/
@@ -995,7 +995,7 @@ public class XmlOptions implements java.
/**
* If this option is set, the unique particle attribution rule is not
- * enforced when building a <code>SchemaTypeSystem</code>. See
+ * enforced when building a {@code SchemaTypeSystem}. See
* <a target="_blank" href="http://www.w3.org/TR/xmlschema-1/#non-ambig">Appendix H of the XML Schema specification</a>
* for information on the UPA rule.
*
@@ -1015,7 +1015,7 @@ public class XmlOptions implements java.
/**
* If this option is set, the particle valid (restriciton) rule is not
- * enforced when building a <code>SchemaTypeSystem</code>. See
+ * enforced when building a {@code SchemaTypeSystem}. See
* <a target="_blank" href="http://www.w3.org/TR/xmlschema-1/#cos-particle-restrict">Section 3.9.6 of the XML Schema specification</a>
* for information on the PVR rule.
*
@@ -1110,7 +1110,7 @@ public class XmlOptions implements java.
* is introducing invalid values in an XML document, but it
* slows performance.
*
- * @see XmlObject.Factory#parse(java.io.File, XmlOptions)
+ * @see org.apache.xmlbeans.impl.schema.XmlObjectFactory#parse(java.io.File, XmlOptions)
*/
public XmlOptions setValidateOnSet() {
return setValidateOnSet(true);
@@ -1125,7 +1125,7 @@ public class XmlOptions implements java.
}
/**
- * Instructs the validator to skip elements matching an <any>
+ * Instructs the validator to skip elements matching an {@code <any>}
* particle with contentModel="lax". This is useful because,
* in certain situations, XmlBeans will find types on the
* classpath that the document author did not anticipate.
Modified: xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/XmlSaxHandler.java
URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/XmlSaxHandler.java?rev=1896508&r1=1896507&r2=1896508&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/XmlSaxHandler.java (original)
+++ xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/XmlSaxHandler.java Wed Dec 29 14:19:07 2021
@@ -15,17 +15,17 @@
package org.apache.xmlbeans;
-import javax.xml.namespace.QName;
-
import org.xml.sax.ContentHandler;
import org.xml.sax.ext.LexicalHandler;
+import javax.xml.namespace.QName;
+
/**
* A holder for a SAX {@link ContentHandler} and {@link LexicalHandler} that are
* capable of loading an {@link XmlObject} instance. Once all the SAX events are pushed
* to the handlers, call {@link #getObject()} to get the loaded XmlObject.
- *
- * @see XmlObject.Factory#newXmlSaxHandler
+ *
+ * @see org.apache.xmlbeans.impl.schema.XmlObjectFactory#newXmlSaxHandler
* @see SchemaTypeLoader#newXmlSaxHandler
*/
public interface XmlSaxHandler
@@ -33,25 +33,25 @@ public interface XmlSaxHandler
/**
* The ContentHandler expecting SAX content events.
* @see ContentHandler
- */
+ */
ContentHandler getContentHandler ( );
-
+
/**
* The LexicalHandler expecting SAX lexical events.
* @see LexicalHandler
- */
+ */
LexicalHandler getLexicalHandler ( );
-
+
/**
* Insert a bookmark before the token associated with the last SAX event.
- */
+ */
void bookmarkLastEvent ( XmlCursor.XmlBookmark mark );
-
+
/**
* Insert a bookmark before the attr token associated with the last SAX element event.
- */
+ */
void bookmarkLastAttr ( QName attrName, XmlCursor.XmlBookmark mark );
-
+
/** Returns the loaded XmlObject after all the SAX events have been finished */
XmlObject getObject ( ) throws XmlException;
}
\ No newline at end of file
Modified: xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/XmlToken.java
URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/XmlToken.java?rev=1896508&r1=1896507&r2=1896508&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/XmlToken.java (original)
+++ xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/XmlToken.java Wed Dec 29 14:19:07 2021
@@ -28,8 +28,8 @@ import org.apache.xmlbeans.impl.schema.X
* and furthermore, all contiguous runs of space are collapsed to single spaces,
* and leading and trailing spaces are trimmed.
* <p>
- * If you want <code>" high priority "</code>
- * to be equivalent to <code>"high priority"</code>, you should consider
+ * If you want {@code " high priority "}
+ * to be equivalent to {@code "high priority"}, you should consider
* using xs:token or a subtype of xs:token.
* <p>
* When the {@link #getStringValue()} is obtained from an XmlToken, the normalized,
Modified: xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/XmlTokenSource.java
URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/XmlTokenSource.java?rev=1896508&r1=1896507&r2=1896508&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/XmlTokenSource.java (original)
+++ xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/XmlTokenSource.java Wed Dec 29 14:19:07 2021
@@ -193,6 +193,7 @@ public interface XmlTokenSource {
* an attribute).
*
* <table>
+ * <caption>Method overview</caption>
* <tr><th>To specify this</th><th>Use this method</th></tr>
* <tr>
* <td>The character encoding to use when converting the character
Modified: xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/XmlUnsignedLong.java
URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/XmlUnsignedLong.java?rev=1896508&r1=1896507&r2=1896508&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/XmlUnsignedLong.java (original)
+++ xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/XmlUnsignedLong.java Wed Dec 29 14:19:07 2021
@@ -25,7 +25,7 @@ import java.math.BigInteger;
* <a target="_blank" href="http://www.w3.org/TR/xmlschema-2/#unsignedLong">xs:unsignedLong</a> type.
* One of the derived types based on <a target="_blank" href="http://www.w3.org/TR/xmlschema-2/#decimal">xs:decimal</a>.
* <p>
- * Verified to be in the range 0..2<super>64</super>-1 when validating.
+ * Verified to be in the range 0..2^64 -1 when validating.
* <p>
* Convertible to {@link BigInteger}.
*/
Modified: xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/XmlValidationError.java
URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/XmlValidationError.java?rev=1896508&r1=1896507&r2=1896508&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/XmlValidationError.java (original)
+++ xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/XmlValidationError.java Wed Dec 29 14:19:07 2021
@@ -18,10 +18,9 @@
*/
package org.apache.xmlbeans;
-import java.util.List;
-
import javax.xml.namespace.QName;
import javax.xml.stream.Location;
+import java.util.List;
/**
* The XmlValidationError class extends the {@link XmlError }XMLError class. The XML Validator contains
@@ -29,7 +28,7 @@ import javax.xml.stream.Location;
* <p>
* To extract the validation error cast the errors to XmlValidationError instead of
* XmlError for example:
- * <br/>
+ * <br>
* <pre>
* xobj.validate(new XmlOptions().setErrorListener(errors))
* for (Iterator it = errors.iterator(); it.hasNext(); )
@@ -56,54 +55,54 @@ import javax.xml.stream.Location;
* XMLValidationError are populated based on the error type.
* </p>
* if errortype == INCORRECT_ELEMENT then
- * <br/>
+ * <br>
* offendingQName, badSchemaType will always be present, however expectedSchemaType and
* expectedQNames are available only if it is possible to determine them during vaildation.
- *<br/>
+ *<br>
*
* <p>
* if errortype == ELEMENT_NOT_ALLOWED then
- * <br/>
+ * <br>
* badSchemaType will always be present, however expectedSchemaType and
* offendingQName are available only if it is possible to determine them during vaildation.
- * <br/>
+ * <br>
*
* <p>
* if errortype == INCORRECT_ATTRIBUTE then
- * <br/>
+ * <br>
* offendingQName, badSchemaType will always be present
- * <br/>
+ * <br>
*
* <p>
* if errortype == ATTRIBUTE_TYPE_INVALID then
- * <br/>
+ * <br>
* no other addtional attributes are populated
- * <br/>
+ * <br>
*
* <p>
* if errortype == LIST_INVALID then
- * <br/>
+ * <br>
* expectedSchemaType will always be present
- * <br/>
+ * <br>
*
* <p>
* if errortype == UNION_INVALID then
- * <br/>
+ * <br>
* expectedSchemaType will always be present
- * <br/>
+ * <br>
*
*
* <p>
* if errortype == NIL_ELEMENT then
- * <br/>
+ * <br>
* offendingQName, expectedSchemaType and badSchemaType will always be present
- * <br/>
+ * <br>
*
* <p>
* if errortype == ELEMENT_TYPE_INVALID then
- * <br/>
+ * <br>
* offendingQName will always be present, other attributes may be available
- * <br/>
+ * <br>
*/
public class XmlValidationError extends XmlError
Modified: xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/common/IdentityConstraint.java
URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/common/IdentityConstraint.java?rev=1896508&r1=1896507&r2=1896508&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/common/IdentityConstraint.java (original)
+++ xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/common/IdentityConstraint.java Wed Dec 29 14:19:07 2021
@@ -26,17 +26,17 @@ import java.util.*;
/**
* Identity constraint engine. Performs streaming validation of identity constraints.
- * This includes key, keyref, & unique, as well as ID & IDRef.
+ * This includes key, keyref and unique, as well as ID and IDRef.
*/
public class IdentityConstraint {
private ConstraintState _constraintStack;
private ElementState _elementStack;
- private Collection _errorListener;
+ private final Collection<XmlError> _errorListener;
private boolean _invalid;
- private boolean _trackIdrefs; // We only track idrefs if validating from the root element
+ private final boolean _trackIdrefs; // We only track idrefs if validating from the root element
- public IdentityConstraint(Collection errorListener, boolean trackIdrefs) {
+ public IdentityConstraint(Collection<XmlError> errorListener, boolean trackIdrefs) {
_errorListener = errorListener;
_trackIdrefs = trackIdrefs;
}
@@ -241,7 +241,7 @@ public class IdentityConstraint {
public class SelectorState extends ConstraintState {
SchemaIdentityConstraint _constraint;
- Set _values = new LinkedHashSet();
+ Set<XmlObjectList> _values = new LinkedHashSet<>();
XPathExecutionContext _context;
SelectorState(SchemaIdentityConstraint constraint, Event e, SchemaType st) {
@@ -304,22 +304,21 @@ public class IdentityConstraint {
}
public class KeyrefState extends SelectorState {
- Map _keyValues = new HashMap();
- private Object CHILD_ADDED = new Object();
- private Object CHILD_REMOVED = new Object();
- private Object SELF_ADDED = new Object();
+ Map<XmlObjectList,Object> _keyValues = new HashMap<>();
+ private final Object CHILD_ADDED = new Object();
+ private final Object CHILD_REMOVED = new Object();
+ private final Object SELF_ADDED = new Object();
KeyrefState(SchemaIdentityConstraint constraint, Event e, SchemaType st) {
super(constraint, e, st);
}
- void addKeyValues(final Set values, boolean child) {
- /** If the key values are added by children, then if two or
+ void addKeyValues(final Set<XmlObjectList> values, boolean child) {
+ /* If the key values are added by children, then if two or
more children add the same value, the value dissapears from the map
but if is added by the element in question directly then it will
be present in the map regardless of what children contained */
- for (Iterator it = values.iterator(); it.hasNext(); ) {
- Object key = it.next();
+ for (XmlObjectList key : values) {
Object value = _keyValues.get(key);
if (value == null) {
_keyValues.put(key, child ? CHILD_ADDED : SELF_ADDED);
@@ -337,7 +336,7 @@ public class IdentityConstraint {
}
}
- private boolean hasKeyValue(Object key) {
+ private boolean hasKeyValue(XmlObjectList key) {
Object value = _keyValues.get(key);
return value != null && value != CHILD_REMOVED;
}
@@ -356,9 +355,7 @@ public class IdentityConstraint {
// validate all values have been seen
- for (Iterator it = _values.iterator(); it.hasNext(); ) {
-
- XmlObjectList fields = (XmlObjectList) it.next();
+ for (XmlObjectList fields : _values) {
if (fields.unfilled() < 0 && !hasKeyValue(fields)) {
// KHK: cvc-identity-constraint.4.3 ?
emitError(e, XmlErrorCodes.IDENTITY_CONSTRAINT_VALID$KEYREF_KEY_NOT_FOUND,
@@ -517,7 +514,7 @@ public class IdentityConstraint {
}
public class IdState extends ConstraintState {
- Set _values = new LinkedHashSet();
+ Set<XmlObjectList> _values = new LinkedHashSet<>();
IdState() {
}
@@ -578,11 +575,11 @@ public class IdentityConstraint {
public class IdRefState extends ConstraintState {
IdState _ids;
- List _values;
+ List<XmlObjectList> _values;
IdRefState(IdState ids) {
_ids = ids;
- _values = new ArrayList();
+ _values = new ArrayList<>();
}
private void handleValue(Event e, SchemaType st, String value) {
@@ -606,9 +603,9 @@ public class IdentityConstraint {
List l = lv.xgetListValue();
// Add one value for each idref in the list
- for (int i = 0; i < l.size(); i++) {
+ for (Object o : l) {
XmlObjectList xmlValue = new XmlObjectList(1);
- XmlIDREF idref = (XmlIDREF) l.get(i);
+ XmlIDREF idref = (XmlIDREF) o;
xmlValue.set(idref, 0);
_values.add(xmlValue);
}
@@ -640,8 +637,7 @@ public class IdentityConstraint {
void remove(Event e) {
// Validate each ref has a corresponding ID
- for (Iterator it = _values.iterator(); it.hasNext(); ) {
- Object o = it.next();
+ for (XmlObjectList o : _values) {
if (!_ids._values.contains(o)) {
// KHK: cvc-id.1
emitError(e, "ID not found for IDRef value '" + o + "'");
Modified: xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/common/JarHelper.java
URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/common/JarHelper.java?rev=1896508&r1=1896507&r2=1896508&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/common/JarHelper.java (original)
+++ xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/common/JarHelper.java Wed Dec 29 14:19:07 2021
@@ -24,8 +24,6 @@ import java.util.jar.JarOutputStream;
* Provides utility services for jarring and unjarring files and directories.
* Note that a given instance of JarHelper is not threadsafe with respect to
* multiple jar operations.
- *
- * @author Patrick Calahan <pc...@bea.com>
*/
public class JarHelper {
// ========================================================================
Modified: xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/common/SystemCache.java
URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/common/SystemCache.java?rev=1896508&r1=1896507&r2=1896508&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/common/SystemCache.java (original)
+++ xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/common/SystemCache.java Wed Dec 29 14:19:07 2021
@@ -25,7 +25,7 @@ import java.lang.reflect.InvocationTarge
* By subclassing this, a client of XmlBeans can implement caches that are
* more suitable for different applications using information that XmlBeans
* cannot know.
- * <p/>
+ * <p>
* This class works as a singleton and as a default implementation for the cache.
* You can set a particular implementation using the "xmlbean.systemcacheimpl"
* system property or using the static {@link #set(SystemCache)} method.
Modified: xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/common/XMLChar.java
URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/common/XMLChar.java?rev=1896508&r1=1896507&r2=1896508&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/common/XMLChar.java (original)
+++ xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/common/XMLChar.java Wed Dec 29 14:19:07 2021
@@ -24,19 +24,11 @@ package org.apache.xmlbeans.impl.common;
* A series of convenience methods are supplied to ease the burden
* of the developer. Because inlining the checks can improve per
* character performance, the tables of character properties are
- * public. Using the character as an index into the <code>CHARS</code>
+ * public. Using the character as an index into the {@code CHARS}
* array and applying the appropriate mask flag (e.g.
- * <code>MASK_VALID</code>), yields the same results as calling the
+ * {@code MASK_VALID}), yields the same results as calling the
* convenience methods. There is one exception: check the comments
- * for the <code>isValid</code> method for details.
- *
- * @author Glenn Marcy, IBM
- * @author Andy Clark, IBM
- * @author Eric Ye, IBM
- * @author Arnaud Le Hors, IBM
- * @author Rahul Srivastava, Sun Microsystems Inc.
- *
- * @version $Id$
+ * for the {@code isValid} method for details.
*/
public class XMLChar {
@@ -61,10 +53,10 @@ public class XMLChar {
/** Pubid character mask. */
public static final int MASK_PUBID = 0x10;
-
- /**
+
+ /**
* Content character mask. Special characters are those that can
- * be considered the start of markup, such as '<' and '&'.
+ * be considered the start of markup, such as '<' and '&'.
* The various newline characters are considered special as well.
* All other valid XML characters can be considered content.
* <p>
@@ -83,13 +75,13 @@ public class XMLChar {
//
static {
-
+
//
// [2] Char ::= #x9 | #xA | #xD | [#x20-#xD7FF] |
// [#xE000-#xFFFD] | [#x10000-#x10FFFF]
//
- int charRange[] = {
+ int charRange[] = {
0x0009, 0x000A, 0x000D, 0x000D, 0x0020, 0xD7FF, 0xE000, 0xFFFD,
};
@@ -97,7 +89,7 @@ public class XMLChar {
// [3] S ::= (#x20 | #x9 | #xD | #xA)+
//
- int spaceChar[] = {
+ int spaceChar[] = {
0x0020, 0x0009, 0x000D, 0x000A,
};
@@ -106,7 +98,7 @@ public class XMLChar {
// CombiningChar | Extender
//
- int nameChar[] = {
+ int nameChar[] = {
0x002D, 0x002E, // '-' and '.'
};
@@ -114,7 +106,7 @@ public class XMLChar {
// [5] Name ::= (Letter | '_' | ':') (NameChar)*
//
- int nameStartChar[] = {
+ int nameStartChar[] = {
0x003A, 0x005F, // ':' and '_'
};
@@ -276,7 +268,7 @@ public class XMLChar {
// set name start characters
for (int i = 0; i < nameStartChar.length; i++) {
- CHARS[nameStartChar[i]] |= MASK_NAME_START | MASK_NAME |
+ CHARS[nameStartChar[i]] |= MASK_NAME_START | MASK_NAME |
MASK_NCNAME_START | MASK_NCNAME;
}
for (int i = 0; i < letterRange.length; i += 2) {
@@ -397,7 +389,7 @@ public class XMLChar {
* also checks the surrogate character range from 0x10000 to 0x10FFFF.
* <p>
* If the program chooses to apply the mask directly to the
- * <code>CHARS</code> array, then they are responsible for checking
+ * {@code CHARS} array, then they are responsible for checking
* the surrogate character range.
*
* @param c The character to check.
@@ -536,7 +528,7 @@ public class XMLChar {
}
return true;
} // isValidName(String):boolean
-
+
/*
* from the namespace rec
@@ -572,7 +564,7 @@ public class XMLChar {
* in the XML 1.0 Recommendation
*
* @param nmtoken string to check
- * @return true if nmtoken is a valid Nmtoken
+ * @return true if nmtoken is a valid Nmtoken
*/
public static boolean isValidNmtoken(String nmtoken) {
if (nmtoken.length() == 0)
Modified: xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/inst2xsd/Inst2Xsd.java
URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/inst2xsd/Inst2Xsd.java?rev=1896508&r1=1896507&r2=1896508&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/inst2xsd/Inst2Xsd.java (original)
+++ xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/inst2xsd/Inst2Xsd.java Wed Dec 29 14:19:07 2021
@@ -14,28 +14,17 @@
*/
package org.apache.xmlbeans.impl.inst2xsd;
-import org.apache.xmlbeans.SchemaTypeLoader;
-import org.apache.xmlbeans.XmlBeans;
-import org.apache.xmlbeans.XmlException;
-import org.apache.xmlbeans.XmlObject;
-import org.apache.xmlbeans.XmlOptions;
-import org.apache.xmlbeans.XmlError;
-import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument;
+import org.apache.xmlbeans.*;
import org.apache.xmlbeans.impl.inst2xsd.util.TypeSystemHolder;
import org.apache.xmlbeans.impl.tool.CommandLine;
+import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument;
import java.io.File;
import java.io.IOException;
import java.io.Reader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.HashSet;
+import java.util.*;
/**
- * @author Cezar Andrei (cezar.andrei at bea.com) Date: Jul 16, 2004
- *
* This class generates a set of XMLSchemas from an instance XML document.
*
* How it works:
Modified: xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/inst2xsd/Inst2XsdOptions.java
URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/inst2xsd/Inst2XsdOptions.java?rev=1896508&r1=1896507&r2=1896508&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/inst2xsd/Inst2XsdOptions.java (original)
+++ xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/inst2xsd/Inst2XsdOptions.java Wed Dec 29 14:19:07 2021
@@ -15,8 +15,6 @@
package org.apache.xmlbeans.impl.inst2xsd;
/**
- * @author Cezar Andrei (cezar.andrei at bea.com) Date: Jul 19, 2004
-
Options:
* Design
o Russian Doll Design - local elements and local types
@@ -27,7 +25,7 @@ package org.apache.xmlbeans.impl.inst2xs
o always xsd:string
* Use enumeration - when there are multiple valid values in a list
o never
- o only if not more than the value (default 10)- number option
+ o only if not more than the value (default 10)- number option
*/
public class Inst2XsdOptions
{
Modified: xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/inst2xsd/RussianDollStrategy.java
URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/inst2xsd/RussianDollStrategy.java?rev=1896508&r1=1896507&r2=1896508&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/inst2xsd/RussianDollStrategy.java (original)
+++ xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/inst2xsd/RussianDollStrategy.java Wed Dec 29 14:19:07 2021
@@ -30,10 +30,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-/**
- * @author Cezar Andrei ( cezar.andrei at bea.com )
- * Date: Jul 26, 2004
- */
public class RussianDollStrategy
implements XsdGenStrategy {
static final String _xsi = "http://www.w3.org/2001/XMLSchema-instance";
Modified: xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/inst2xsd/SalamiSliceStrategy.java
URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/inst2xsd/SalamiSliceStrategy.java?rev=1896508&r1=1896507&r2=1896508&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/inst2xsd/SalamiSliceStrategy.java (original)
+++ xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/inst2xsd/SalamiSliceStrategy.java Wed Dec 29 14:19:07 2021
@@ -17,10 +17,6 @@ package org.apache.xmlbeans.impl.inst2xs
import org.apache.xmlbeans.impl.inst2xsd.util.Element;
import org.apache.xmlbeans.impl.inst2xsd.util.TypeSystemHolder;
-/**
- * @author Cezar Andrei ( cezar.andrei at bea.com )
- * Date: Jul 26, 2004
- */
public class SalamiSliceStrategy
extends RussianDollStrategy
implements XsdGenStrategy
Modified: xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/inst2xsd/VenetianBlindStrategy.java
URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/inst2xsd/VenetianBlindStrategy.java?rev=1896508&r1=1896507&r2=1896508&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/inst2xsd/VenetianBlindStrategy.java (original)
+++ xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/inst2xsd/VenetianBlindStrategy.java Wed Dec 29 14:19:07 2021
@@ -15,15 +15,11 @@
package org.apache.xmlbeans.impl.inst2xsd;
import org.apache.xmlbeans.impl.inst2xsd.util.Element;
-import org.apache.xmlbeans.impl.inst2xsd.util.TypeSystemHolder;
import org.apache.xmlbeans.impl.inst2xsd.util.Type;
+import org.apache.xmlbeans.impl.inst2xsd.util.TypeSystemHolder;
import javax.xml.namespace.QName;
-/**
- * @author Cezar Andrei ( cezar.andrei at bea.com )
- * Date: Jul 26, 2004
- */
public class VenetianBlindStrategy
extends RussianDollStrategy
implements XsdGenStrategy
Modified: xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/inst2xsd/util/Attribute.java
URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/inst2xsd/util/Attribute.java?rev=1896508&r1=1896507&r2=1896508&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/inst2xsd/util/Attribute.java (original)
+++ xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/inst2xsd/util/Attribute.java Wed Dec 29 14:19:07 2021
@@ -16,9 +16,6 @@ package org.apache.xmlbeans.impl.inst2xs
import javax.xml.namespace.QName;
-/**
- * @author Cezar Andrei (cezar.andrei at bea.com) Date: Jul 18, 2004
- */
public class Attribute
{
private QName _name;
Modified: xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/inst2xsd/util/Element.java
URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/inst2xsd/util/Element.java?rev=1896508&r1=1896507&r2=1896508&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/inst2xsd/util/Element.java (original)
+++ xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/inst2xsd/util/Element.java Wed Dec 29 14:19:07 2021
@@ -16,9 +16,6 @@ package org.apache.xmlbeans.impl.inst2xs
import javax.xml.namespace.QName;
-/**
- * @author Cezar Andrei (cezar.andrei at bea.com) Date: Jul 16, 2004
- */
public class Element
{
private QName _name = null; // if isRef is true is the name of the referenced name
Modified: xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/inst2xsd/util/Type.java
URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/inst2xsd/util/Type.java?rev=1896508&r1=1896507&r2=1896508&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/inst2xsd/util/Type.java (original)
+++ xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/inst2xsd/util/Type.java Wed Dec 29 14:19:07 2021
@@ -22,9 +22,6 @@ import javax.xml.namespace.QName;
import java.util.ArrayList;
import java.util.List;
-/**
- * @author Cezar Andrei (cezar.andrei at bea.com) Date: Jul 16, 2004
- */
public class Type {
private QName _name;
Modified: xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/inst2xsd/util/TypeSystemHolder.java
URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/inst2xsd/util/TypeSystemHolder.java?rev=1896508&r1=1896507&r2=1896508&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/inst2xsd/util/TypeSystemHolder.java (original)
+++ xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/inst2xsd/util/TypeSystemHolder.java Wed Dec 29 14:19:07 2021
@@ -14,22 +14,18 @@
*/
package org.apache.xmlbeans.impl.inst2xsd.util;
-import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument;
-import org.apache.xmlbeans.XmlString;
-import org.apache.xmlbeans.XmlQName;
import org.apache.xmlbeans.XmlCursor;
+import org.apache.xmlbeans.XmlQName;
+import org.apache.xmlbeans.XmlString;
+import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument;
import javax.xml.namespace.QName;
import java.math.BigInteger;
import java.util.Collection;
import java.util.Iterator;
-import java.util.Map;
import java.util.LinkedHashMap;
-import java.util.HashMap;
+import java.util.Map;
-/**
- * @author Cezar Andrei (cezar.andrei at bea.com) Date: Jul 16, 2004
- */
public class TypeSystemHolder
{
Map _globalElements; // QName -> Element
Modified: xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/regex/BMPattern.java
URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/regex/BMPattern.java?rev=1896508&r1=1896507&r2=1896508&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/regex/BMPattern.java (original)
+++ xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/regex/BMPattern.java Wed Dec 29 14:19:07 2021
@@ -109,7 +109,7 @@ public class BMPattern {
}
/**
*
- * @return -1 if <var>chars</char> does not contain this pattern.
+ * @return -1 if {@code chars} does not contain this pattern.
*/
public int matches(char[] chars, int start, int limit) {
if (this.ignoreCase) return this.matchesIgnoreCase(chars, start, limit);
@@ -158,7 +158,7 @@ public class BMPattern {
}
return -1;
}
-
+
int matchesIgnoreCase(String text, int start, int limit) {
int plength = this.pattern.length;
if (plength == 0) return start;
Modified: xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/regex/IntStack.java
URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/regex/IntStack.java?rev=1896508&r1=1896507&r2=1896508&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/regex/IntStack.java (original)
+++ xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/regex/IntStack.java Wed Dec 29 14:19:07 2021
@@ -20,10 +20,6 @@ package org.apache.xmlbeans.impl.regex;
*
* This is copied from https://raw.githubusercontent.com/apache/xerces2-j/trunk/src/org/apache/xerces/util/IntStack.java
* and is used by RegularExpression.java
- *
- * @author Andy Clark, IBM
- *
- * @version $Id$
*/
final class IntStack {
Modified: xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/regex/Match.java
URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/regex/Match.java?rev=1896508&r1=1896507&r2=1896508&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/regex/Match.java (original)
+++ xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/regex/Match.java Wed Dec 29 14:19:07 2021
@@ -18,7 +18,7 @@ package org.apache.xmlbeans.impl.regex;
import java.text.CharacterIterator;
/**
- *
+ *
* An instance of this class has ranges captured in matching.
*
* @see RegularExpression#matches(char[], int, int, Match)
@@ -26,7 +26,6 @@ import java.text.CharacterIterator;
* @see RegularExpression#matches(java.text.CharacterIterator, Match)
* @see RegularExpression#matches(java.lang.String, int, int, Match)
* @see RegularExpression#matches(java.lang.String, Match)
- * @author TAMURA Kent <kent@trl.ibm.co.jp>
*/
public class Match implements Cloneable {
int[] beginpos = null;
@@ -129,7 +128,7 @@ public class Match implements Cloneable
/**
* Return a start position in the target text matched to specified regular expression group.
*
- * @param index Less than <code>getNumberOfGroups()</code>.
+ * @param index Less than {@code getNumberOfGroups()}.
*/
public int getBeginning(int index) {
if (this.beginpos == null)
@@ -143,7 +142,7 @@ public class Match implements Cloneable
/**
* Return an end position in the target text matched to specified regular expression group.
*
- * @param index Less than <code>getNumberOfGroups()</code>.
+ * @param index Less than {@code getNumberOfGroups()}.
*/
public int getEnd(int index) {
if (this.endpos == null)
@@ -157,7 +156,7 @@ public class Match implements Cloneable
/**
* Return an substring of the target text matched to specified regular expression group.
*
- * @param index Less than <code>getNumberOfGroups()</code>.
+ * @param index Less than {@code getNumberOfGroups()}.
*/
public String getCapturedText(int index) {
if (this.beginpos == null)
Modified: xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/regex/ParseException.java
URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/regex/ParseException.java?rev=1896508&r1=1896507&r2=1896508&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/regex/ParseException.java (original)
+++ xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/regex/ParseException.java Wed Dec 29 14:19:07 2021
@@ -15,10 +15,6 @@
package org.apache.xmlbeans.impl.regex;
-/**
- *
- * @author TAMURA Kent <kent@trl.ibm.co.jp>
- */
public class ParseException extends RuntimeException {
int location;
Modified: xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/regex/ParserForXMLSchema.java
URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/regex/ParserForXMLSchema.java?rev=1896508&r1=1896507&r2=1896508&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/regex/ParserForXMLSchema.java (original)
+++ xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/regex/ParserForXMLSchema.java Wed Dec 29 14:19:07 2021
@@ -20,8 +20,6 @@ import java.util.Locale;
/**
* A regular expression parser for the XML Schema.
- *
- * @author TAMURA Kent <kent@trl.ibm.co.jp>
*/
class ParserForXMLSchema extends RegexParser {
@@ -203,7 +201,7 @@ class ParserForXMLSchema extends RegexPa
c = this.processCIinCharacterClass(tok, c);
if (c < 0) end = true;
break;
-
+
case 'p':
case 'P':
int pstart = this.offset;
@@ -288,7 +286,7 @@ class ParserForXMLSchema extends RegexPa
protected RangeToken parseSetOperations() throws ParseException {
throw this.ex("parser.process.1", this.offset);
}
-
+
Token getTokenForShorthand(int ch) {
switch (ch) {
case 'd':
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org