mrglavas 2004/10/03 14:48:35
Modified: java/src/org/apache/xerces/impl/dv XSSimpleType.java
SchemaDVFactory.java
java/src/org/apache/xerces/impl/dtd/models
MixedContentModel.java DFAContentModel.java
SimpleContentModel.java
Log:
Fixing Javadoc warnings.
Revision Changes Path
1.16 +5 -6 xml-xerces/java/src/org/apache/xerces/impl/dv/XSSimpleType.java
Index: XSSimpleType.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/dv/XSSimpleType.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- XSSimpleType.java 30 Sep 2004 04:19:34 -0000 1.15
+++ XSSimpleType.java 3 Oct 2004 21:48:35 -0000 1.16
@@ -126,9 +126,8 @@
throws InvalidDatatypeValueException;
/**
- * validate an actual value against this simple type.
+ * Validate an actual value against this simple type.
*
- * @param value the actual value that needs to be validated
* @param context the validation context
* @param validatedInfo used to provide the actual value and member types
* @exception InvalidDatatypeValueException exception for invalid values.
@@ -142,11 +141,11 @@
* different facets.
*
* @param facets the value of all the facets
- * @param presentFacets bit combination value of the costraining facet
+ * @param presentFacet bit combination value of the costraining facet
* constants which are present.
- * @param fixedFacets bit combination value of the costraining facet
+ * @param fixedFacet bit combination value of the costraining facet
* constants which are fixed.
- * @param ValidationContext the validation context
+ * @param context the validation context
* @exception InvalidDatatypeFacetException exception for invalid facet values.
*/
public void applyFacets(XSFacets facets, short presentFacet, short fixedFacet,
ValidationContext context)
1.14 +5 -5
xml-xerces/java/src/org/apache/xerces/impl/dv/SchemaDVFactory.java
Index: SchemaDVFactory.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/dv/SchemaDVFactory.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- SchemaDVFactory.java 24 Feb 2004 22:44:25 -0000 1.13
+++ SchemaDVFactory.java 3 Oct 2004 21:48:35 -0000 1.14
@@ -103,7 +103,7 @@
* @param targetNamespace target namespace of the new type, could be null
* @param finalSet value of "final"
* @param base base type of the new type
- * @param annotation set of annotations
+ * @param annotations set of annotations
* @return the newly created simple type
*/
public abstract XSSimpleType createTypeRestriction(String name, String
targetNamespace,
@@ -118,7 +118,7 @@
* @param targetNamespace target namespace of the new type, could be null
* @param finalSet value of "final"
* @param itemType item type of the list type
- * @param annotation set of annotations
+ * @param annotations set of annotations
* @return the newly created simple type
*/
public abstract XSSimpleType createTypeList(String name, String targetNamespace,
@@ -132,8 +132,8 @@
* @param name name of the new type, could be null
* @param targetNamespace target namespace of the new type, could be null
* @param finalSet value of "final"
- * @param base member types of the union type
- * @param annotation set of annotations
+ * @param memberTypes member types of the union type
+ * @param annotations set of annotations
* @return the newly created simple type
*/
public abstract XSSimpleType createTypeUnion(String name, String
targetNamespace,
1.7 +2 -5
xml-xerces/java/src/org/apache/xerces/impl/dtd/models/MixedContentModel.java
Index: MixedContentModel.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/dtd/models/MixedContentModel.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MixedContentModel.java 24 Feb 2004 22:48:16 -0000 1.6
+++ MixedContentModel.java 3 Oct 2004 21:48:35 -0000 1.7
@@ -21,8 +21,6 @@
import org.apache.xerces.impl.dtd.XMLContentSpec;
/**
- * @version $Id$
- *
* MixedContentModel is a derivative of the abstract content model base
* class that handles the special case of mixed model elements. If an element
* is mixed model, it has PCDATA as its first possible content, followed
@@ -34,7 +32,8 @@
* So, all we have to do is to keep an array of the possible children and
* validate by just looking up each child being validated by looking it up
* in the list.
- *
+ *
+ * @version $Id$
*/
public class MixedContentModel
implements ContentModelValidator {
@@ -73,8 +72,6 @@
* @param offset The start offset position in the children.
* @param length The child count.
* @param ordered True if content must be ordered.
- * @param dtd True if it is for a DTDGrammar.
- *
*/
public MixedContentModel(QName[] children, int[] type, int offset, int length ,
boolean ordered) {
// Make our own copy now, which is exactly the right size
1.6 +3 -5
xml-xerces/java/src/org/apache/xerces/impl/dtd/models/DFAContentModel.java
Index: DFAContentModel.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/dtd/models/DFAContentModel.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DFAContentModel.java 24 Feb 2004 22:48:16 -0000 1.5
+++ DFAContentModel.java 3 Oct 2004 21:48:35 -0000 1.6
@@ -20,8 +20,6 @@
import org.apache.xerces.impl.dtd.XMLContentSpec;
/**
- * @version $Id$
- *
* DFAContentModel is the derivative of ContentModel that does
* all of the non-trivial element content validation. This class does
* the conversion from the regular expression to the DFA that
@@ -32,7 +30,8 @@
* and is handled via the MixedContentModel class since mixed models
* are very constrained in form and easily handled via a special case.
* This also makes implementation of this class much easier.
- *
+ *
+ * @version $Id$
*/
public class DFAContentModel
implements ContentModelValidator {
@@ -187,10 +186,9 @@
*
* @param syntaxTree The syntax tree of the content model.
* @param leafCount The number of leaves.
- * @param dtd if it is created for a DTDGrammar.
+ * @param mixed
*
*/
-
public DFAContentModel(CMNode syntaxTree, int leafCount, boolean mixed) {
// Store away our index and pools in members
//fStringPool = stringPool;
1.6 +4 -6
xml-xerces/java/src/org/apache/xerces/impl/dtd/models/SimpleContentModel.java
Index: SimpleContentModel.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/dtd/models/SimpleContentModel.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SimpleContentModel.java 24 Feb 2004 22:48:16 -0000 1.5
+++ SimpleContentModel.java 3 Oct 2004 21:48:35 -0000 1.6
@@ -21,8 +21,6 @@
import org.apache.xerces.impl.dtd.XMLContentSpec;
/**
- * @version $Id$
- *
* SimpleContentModel is a derivative of the abstract content model base
* class that handles a small set of simple content models that are just
* way overkill to give the DFA treatment.
@@ -41,7 +39,8 @@
* operation with two elements. These are very simple and can be checked
* in a simple way without a DFA and without the overhead of setting up a
* DFA for such a simple check.
- *
+ *
+ * @version $Id$
*/
public class SimpleContentModel
implements ContentModelValidator {
@@ -95,9 +94,8 @@
* Constructs a simple content model.
*
* @param operator The content model operator.
- * @param firstChild The first child index.
- * @param secondChild The second child index.
- * @param dtd if it is for a DTDGrammar.
+ * @param firstChild qualified name of the first child
+ * @param secondChild qualified name of the second child
*
*/
public SimpleContentModel(short operator, QName firstChild, QName secondChild) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
